diff --git a/OneMore/Commands/Settings/HashtagSheet.Designer.cs b/OneMore/Commands/Settings/HashtagSheet.Designer.cs index 354efb0d69..615aede0b2 100644 --- a/OneMore/Commands/Settings/HashtagSheet.Designer.cs +++ b/OneMore/Commands/Settings/HashtagSheet.Designer.cs @@ -44,6 +44,7 @@ private void InitializeComponent() this.delayBox = new System.Windows.Forms.NumericUpDown(); this.msLabel = new System.Windows.Forms.Label(); this.layoutPanel = new System.Windows.Forms.Panel(); + this.upgradeLink = new River.OneMoreAddIn.UI.MoreLinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.intervalBox)).BeginInit(); this.advancedGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.delayBox)).BeginInit(); @@ -108,13 +109,14 @@ private void InitializeComponent() // this.advancedGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.advancedGroup.Controls.Add(this.upgradeLink); this.advancedGroup.Controls.Add(this.warningLabel); this.advancedGroup.Controls.Add(this.scheduleLink); this.advancedGroup.Controls.Add(this.disabledBox); - this.advancedGroup.Location = new System.Drawing.Point(10, 220); + this.advancedGroup.Location = new System.Drawing.Point(10, 212); this.advancedGroup.Name = "advancedGroup"; this.advancedGroup.Padding = new System.Windows.Forms.Padding(15, 3, 3, 3); - this.advancedGroup.Size = new System.Drawing.Size(759, 189); + this.advancedGroup.Size = new System.Drawing.Size(759, 253); this.advancedGroup.TabIndex = 6; this.advancedGroup.TabStop = false; this.advancedGroup.Text = "Advanced Options"; @@ -156,7 +158,7 @@ private void InitializeComponent() this.disabledBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.disabledBox.Cursor = System.Windows.Forms.Cursors.Hand; this.disabledBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.disabledBox.Location = new System.Drawing.Point(18, 127); + this.disabledBox.Location = new System.Drawing.Point(18, 203); this.disabledBox.Name = "disabledBox"; this.disabledBox.Size = new System.Drawing.Size(540, 25); this.disabledBox.StylizeImage = false; @@ -169,7 +171,7 @@ private void InitializeComponent() // styleLabel // this.styleLabel.AutoSize = true; - this.styleLabel.Location = new System.Drawing.Point(7, 150); + this.styleLabel.Location = new System.Drawing.Point(7, 144); this.styleLabel.Name = "styleLabel"; this.styleLabel.Size = new System.Drawing.Size(140, 20); this.styleLabel.TabIndex = 7; @@ -183,7 +185,7 @@ private void InitializeComponent() "None", "Red Foreground", "Yellow Background"}); - this.styleBox.Location = new System.Drawing.Point(304, 147); + this.styleBox.Location = new System.Drawing.Point(304, 141); this.styleBox.Name = "styleBox"; this.styleBox.Size = new System.Drawing.Size(280, 28); this.styleBox.TabIndex = 8; @@ -249,9 +251,28 @@ private void InitializeComponent() this.layoutPanel.Location = new System.Drawing.Point(13, 74); this.layoutPanel.Margin = new System.Windows.Forms.Padding(0); this.layoutPanel.Name = "layoutPanel"; - this.layoutPanel.Size = new System.Drawing.Size(772, 412); + this.layoutPanel.Size = new System.Drawing.Size(772, 476); this.layoutPanel.TabIndex = 4; // + // upgradeLink + // + this.upgradeLink.ActiveLinkColor = System.Drawing.Color.MediumOrchid; + this.upgradeLink.AutoSize = true; + this.upgradeLink.Cursor = System.Windows.Forms.Cursors.Hand; + this.upgradeLink.HoverColor = System.Drawing.Color.Orchid; + this.upgradeLink.LinkColor = System.Drawing.Color.MediumOrchid; + this.upgradeLink.Location = new System.Drawing.Point(18, 144); + this.upgradeLink.Name = "upgradeLink"; + this.upgradeLink.Size = new System.Drawing.Size(274, 20); + this.upgradeLink.StrictColors = false; + this.upgradeLink.TabIndex = 3; + this.upgradeLink.TabStop = true; + this.upgradeLink.Text = "Upgrade page tags to inline hashtags"; + this.upgradeLink.ThemedBack = null; + this.upgradeLink.ThemedFore = null; + this.upgradeLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid; + this.upgradeLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.UpgradeTags); + // // HashtagSheet // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -262,7 +283,7 @@ private void InitializeComponent() this.ForeColor = System.Drawing.SystemColors.ControlText; this.Name = "HashtagSheet"; this.Padding = new System.Windows.Forms.Padding(13, 8, 15, 10); - this.Size = new System.Drawing.Size(800, 496); + this.Size = new System.Drawing.Size(800, 560); ((System.ComponentModel.ISupportInitialize)(this.intervalBox)).EndInit(); this.advancedGroup.ResumeLayout(false); this.advancedGroup.PerformLayout(); @@ -290,5 +311,6 @@ private void InitializeComponent() private System.Windows.Forms.Panel layoutPanel; private UI.MoreMultilineLabel warningLabel; private UI.MoreLinkLabel scheduleLink; + private UI.MoreLinkLabel upgradeLink; } } diff --git a/OneMore/Commands/Settings/HashtagSheet.cs b/OneMore/Commands/Settings/HashtagSheet.cs index 7c71ca8f43..971be5d9fe 100644 --- a/OneMore/Commands/Settings/HashtagSheet.cs +++ b/OneMore/Commands/Settings/HashtagSheet.cs @@ -36,6 +36,7 @@ public HashtagSheet(SettingsProvider provider) : base(provider) "filterBox", "scheduleLink", "warningBox", + "upgradeLink", "disabledBox" }); } @@ -76,6 +77,8 @@ public HashtagSheet(SettingsProvider provider) : base(provider) filterBox.Checked = settings.Get("unfiltered"); + upgradeLink.Enabled = !provider.GetCollection("tagging").Get("converted", false); + if (provider.GetCollection("GeneralSheet").Get("experimental", false)) { delayBox.Value = settings.Get("delay", HashtagScanner.DefaultThrottle); @@ -126,6 +129,19 @@ private async void ScheduleRebuild(object sender, LinkLabelLinkClickedEventArgs } + // NOTE: temporary page tags + private async void UpgradeTags(object sender, LinkLabelLinkClickedEventArgs e) + { + var converter = new LegacyTaggingConverter(); + var upgraded = await converter.UpgradeLegacyTags(ParentForm); + + if (upgraded) + { + upgradeLink.Enabled = false; + } + } + + public override bool CollectSettings() { // general... diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs index ac46e52511..1c78a6da4c 100644 --- a/OneMore/Properties/Resources.Designer.cs +++ b/OneMore/Properties/Resources.Designer.cs @@ -3602,6 +3602,15 @@ internal static string HashtagSheet_Title { } } + /// + /// Looks up a localized string similar to Upgrade page tags to inline hashtags. + /// + internal static string HashtagSheet_upgradeLink_Text { + get { + return ResourceManager.GetString("HashtagSheet_upgradeLink.Text", resourceCulture); + } + } + /// /// Looks up a localized string similar to This should be used after adding or removing one or more notebooks. It is recommended to schedule rebuilds after-hours, such as midnight.. /// diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx index 894c57dd46..349d188c88 100644 --- a/OneMore/Properties/Resources.ar-SA.resx +++ b/OneMore/Properties/Resources.ar-SA.resx @@ -1356,6 +1356,10 @@ علامات التصنيف sheet title + + ترقية علامات الصفحة إلى علامات التصنيف المضمنة + link + يجب استخدام هذا بعد إضافة أو إزالة دفتر واحد أو أكثر من دفاتر الملاحظات. يوصى بجدولة إعادة البناء بعد ساعات ، مثل منتصف الليل. multiline label diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx index ecff098364..bc2dd88392 100644 --- a/OneMore/Properties/Resources.de-DE.resx +++ b/OneMore/Properties/Resources.de-DE.resx @@ -1354,6 +1354,10 @@ Gelber Hintergrund Hashtags sheet title + + Aktualisieren Sie Seiten-Tags auf Inline-Hashtags + link + Dies sollte verwendet werden, nachdem ein oder mehrere Notizbücher hinzugefügt oder entfernt werden. Es wird empfohlen, den Wiederaufbau von Nachbästen wie Mitternacht zu planen. multiline label diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx index a75093faa6..d0336b0084 100644 --- a/OneMore/Properties/Resources.es-ES.resx +++ b/OneMore/Properties/Resources.es-ES.resx @@ -1356,6 +1356,10 @@ Fondo amarillo Etiquetas sheet title + + Actualice las etiquetas de la página a hashtags en línea + link + Esto debe usarse después de agregar o eliminar uno o más cuadernos. Se recomienda programar las reconstrucciones fuera del horario de atención, como la medianoche. multiline label diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx index 5ffa414cf5..a9d068462a 100644 --- a/OneMore/Properties/Resources.fr-FR.resx +++ b/OneMore/Properties/Resources.fr-FR.resx @@ -1356,6 +1356,10 @@ Fond jaune Hashtags sheet title + + Mettre à niveau les balises de page vers des hashtags en ligne + link + Ceci doit être utilisé après avoir ajouté ou supprimé un ou plusieurs cahiers. Il est recommandé de planifier des reconstructions après les heures d'ouverture, comme minuit. multiline label diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx index 72b9339eb3..420652c43f 100644 --- a/OneMore/Properties/Resources.he-IL.resx +++ b/OneMore/Properties/Resources.he-IL.resx @@ -1365,6 +1365,10 @@ Total Row Font Hashtags sheet title + + שדרג את תגי העמוד להאשטאגים מוטבעים + link + יש להשתמש בזה לאחר הוספת או הסרת מחברת אחת או יותר. מומלץ לתאם מחדש את הבנייה מחדש לאחר שעות העבודה, כמו חצות. multiline label diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx index a93b1633d2..4eba43cb9f 100644 --- a/OneMore/Properties/Resources.nl-NL.resx +++ b/OneMore/Properties/Resources.nl-NL.resx @@ -1357,6 +1357,10 @@ Gele achtergrond Hashtags sheet title + + Upgrade paginatags naar inline hashtags + link + Dit moet worden gebruikt na het toevoegen of verwijderen van een of meer notebooks. Het wordt aanbevolen om wederopbouw na uur te plannen, zoals middernacht. multiline label diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx index c176ccc6ad..6b0cb19702 100644 --- a/OneMore/Properties/Resources.pl-PL.resx +++ b/OneMore/Properties/Resources.pl-PL.resx @@ -1365,6 +1365,10 @@ Czerwony pierwszy plan Hashtagi sheet title + + Uaktualnij tagi strony do hashtagów wbudowanych + link + Należy to użyć po dodaniu lub usunięciu jednego lub więcej notebooków. Zaleca się zaplanowanie przebudowy po godzinach, takich jak północ. multiline label diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx index 6d0df11ce8..45c334c09b 100644 --- a/OneMore/Properties/Resources.pt-BR.resx +++ b/OneMore/Properties/Resources.pt-BR.resx @@ -1357,6 +1357,10 @@ Fundo Amarelo Hashtags sheet title + + Atualizar tags de página para hashtags embutidas + link + Isso deve ser usado após adicionar ou remover um ou mais notebooks. Recomenda-se agendar reconstrução após o horário comercial, como a meia-noite. multiline label diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx index 4b6b45f787..fbbce0c7ef 100644 --- a/OneMore/Properties/Resources.resx +++ b/OneMore/Properties/Resources.resx @@ -1369,6 +1369,10 @@ Yellow Background Hashtags sheet title + + Upgrade page tags to inline hashtags + link + This should be used after adding or removing one or more notebooks. It is recommended to schedule rebuilds after-hours, such as midnight. multiline label diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx index ce858f3bc9..fe5f12ee0f 100644 --- a/OneMore/Properties/Resources.zh-CN.resx +++ b/OneMore/Properties/Resources.zh-CN.resx @@ -1355,6 +1355,10 @@ OneNote 文件 (*.one) 标签 sheet title + + 将页面标签升级为内联主题标签 + link + 在添加或删除一个或多个笔记本电脑后应使用此功能。 建议在下班后（例如午夜）安排重建。 multiline label