diff --git a/GoToBible.Providers/ApiProvider.cs b/GoToBible.Providers/ApiProvider.cs index 912f6f1..aae5a23 100644 --- a/GoToBible.Providers/ApiProvider.cs +++ b/GoToBible.Providers/ApiProvider.cs @@ -8,6 +8,7 @@ namespace GoToBible.Providers; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Net.Http; using System.Net.Http.Headers; @@ -22,6 +23,48 @@ namespace GoToBible.Providers; /// public abstract class ApiProvider : IProvider { + /// + /// A list of blocked translations that cause unnecessary duplicates. + /// + public static readonly ReadOnlyCollection BlockedTranslations = new List + { + "BibleApi-685d1470fe4d5c3b-01", + "BibleApi-6bab4d6c61b31b80-01", + "BibleApi-7142879509583d59-02", + "BibleApi-7142879509583d59-03", + "BibleApi-7142879509583d59-04", + "BibleApi-926aa5efbc5e04e2-01", + "BibleApi-9879dbb7cfe39e4d-02", + "BibleApi-9879dbb7cfe39e4d-03", + "BibleApi-9879dbb7cfe39e4d-04", + "BibleApi-bba9f40183526463-01", + "BibleApi-de4e12af7f28f599-02", + "BibleApi-f72b840c855f362c-04", + "BibliaApi-asv", + "BibliaApi-kjv", + "BibliaApi-kjv1900", + "BibliaApi-kjvapoc", + "DigitalBiblePlatformApi-AAHWBTN2ET", + "DigitalBiblePlatformApi-EN1ESV", + "DigitalBiblePlatformApi-ENGASV", + "DigitalBiblePlatformApi-ENGESH", + "DigitalBiblePlatformApi-ENGKJV", + "DigitalBiblePlatformApi-ENGREV", + "DigitalBiblePlatformApi-ENGWEB", + }.AsReadOnly(); + + /// + /// Name substitutions to help users of the web application. + /// + public static readonly IReadOnlyDictionary NameSubstitutions = new Dictionary + { + { "The Holy Bible, American Standard Version", "American Standard Version" }, + { "English Standard Version®", "English Standard Version (2007)" }, + { "New American Standard Bible (NASB)", "New American Standard Bible (1995)" }, + { "King James (Authorised) Version (Ecumenical)", "King James Version" }, + { "TCENT", "Text-Critical English New Testament" }, + }; + /// /// A map of the Bible book codes to the Passage Reference book names. /// diff --git a/GoToBible.Providers/BookHelper.cs b/GoToBible.Providers/BookHelper.cs index 6223cdc..3e64798 100644 --- a/GoToBible.Providers/BookHelper.cs +++ b/GoToBible.Providers/BookHelper.cs @@ -137,14 +137,7 @@ public ChapterReference GetNextChapter(string book, int chapter) public int GetNumberOfChapters(string book) { string bookLower = book.ToLowerInvariant(); - if (this.BookChapters.Contains(bookLower) && this.BookChapters[bookLower] is int chapters) - { - return chapters; - } - else - { - return 0; - } + return this.BookChapters.Contains(bookLower) && this.BookChapters[bookLower] is int chapters ? chapters : 0; } /// diff --git a/GoToBible.Web/Server/Controllers/TranslationsController.cs b/GoToBible.Web/Server/Controllers/TranslationsController.cs index 966c173..57152a4 100644 --- a/GoToBible.Web/Server/Controllers/TranslationsController.cs +++ b/GoToBible.Web/Server/Controllers/TranslationsController.cs @@ -7,8 +7,8 @@ namespace GoToBible.Web.Server.Controllers; using System.Collections.Generic; -using System.Collections.ObjectModel; using GoToBible.Model; +using GoToBible.Providers; using Microsoft.AspNetCore.Mvc; /// @@ -20,47 +20,6 @@ namespace GoToBible.Web.Server.Controllers; [Route("[controller]")] public class TranslationsController : ControllerBase { - /// - /// A list of blocked translations that cause unnecessary duplicates. - /// - private static readonly ReadOnlyCollection BlockedTranslations = new List - { - "BibleApi-685d1470fe4d5c3b-01", - "BibleApi-6bab4d6c61b31b80-01", - "BibleApi-7142879509583d59-02", - "BibleApi-7142879509583d59-03", - "BibleApi-7142879509583d59-04", - "BibleApi-926aa5efbc5e04e2-01", - "BibleApi-9879dbb7cfe39e4d-02", - "BibleApi-9879dbb7cfe39e4d-03", - "BibleApi-9879dbb7cfe39e4d-04", - "BibleApi-bba9f40183526463-01", - "BibleApi-de4e12af7f28f599-02", - "BibleApi-f72b840c855f362c-04", - "BibliaApi-asv", - "BibliaApi-kjv", - "BibliaApi-kjv1900", - "BibliaApi-kjvapoc", - "DigitalBiblePlatformApi-AAHWBTN2ET", - "DigitalBiblePlatformApi-EN1ESV", - "DigitalBiblePlatformApi-ENGASV", - "DigitalBiblePlatformApi-ENGESH", - "DigitalBiblePlatformApi-ENGKJV", - "DigitalBiblePlatformApi-ENGREV", - "DigitalBiblePlatformApi-ENGWEB", - }.AsReadOnly(); - - /// - /// Name substitutions to help users of the web application. - /// - private static readonly IReadOnlyDictionary NameSubstitutions = new Dictionary - { - { "The Holy Bible, American Standard Version", "American Standard Version" }, - { "English Standard Version®", "English Standard Version (2007)" }, - { "NAS New American Standard Bible", "New American Standard Bible (1995)" }, - { "King James (Authorised) Version (Ecumenical)", "King James Version" }, - }; - /// /// The providers. /// @@ -86,13 +45,13 @@ public async IAsyncEnumerable Get() await foreach (Translation translation in provider.GetTranslationsAsync()) { // Clean up any names we are displaying - if (NameSubstitutions.TryGetValue(translation.Name, out string? translationName)) + if (ApiProvider.NameSubstitutions.TryGetValue(translation.Name, out string? translationName)) { translation.Name = translationName; } // Make sure this isn't a blocked translation - if (!BlockedTranslations.Contains($"{translation.Provider}-{translation.Code}")) + if (!ApiProvider.BlockedTranslations.Contains($"{translation.Provider}-{translation.Code}")) { yield return translation; } diff --git a/GoToBible.Windows/FormMain.Designer.cs b/GoToBible.Windows/FormMain.Designer.cs index 4a43e96..4e924ed 100644 --- a/GoToBible.Windows/FormMain.Designer.cs +++ b/GoToBible.Windows/FormMain.Designer.cs @@ -30,6 +30,7 @@ private void InitializeComponent() this.ToolStripSettings = new System.Windows.Forms.ToolStrip(); this.ToolStripButtonNewWindow = new System.Windows.Forms.ToolStripButton(); this.ToolStripButtonWebBrowser = new System.Windows.Forms.ToolStripButton(); + this.ToolStripButtonApparatusGenerator = new System.Windows.Forms.ToolStripButton(); this.ToolStripSplitButtonSettings = new System.Windows.Forms.ToolStripSplitButton(); this.ToolStripMenuItemInterlinear = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItemIgnoreCase = new System.Windows.Forms.ToolStripMenuItem(); @@ -55,17 +56,11 @@ private void InitializeComponent() this.ToolStripMenuItemDebugMode = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItemDeveloperMode = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItemLegacyBrowser = new System.Windows.Forms.ToolStripMenuItem(); + this.ToolStripMenuItemBlockedTranslations = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItemSettingsDirectory = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripNavigate = new System.Windows.Forms.ToolStrip(); this.ToolStripButtonNavigateBack = new System.Windows.Forms.ToolStripButton(); this.ToolStripButtonNavigateForward = new System.Windows.Forms.ToolStripButton(); - this.ToolStripTranslation = new System.Windows.Forms.ToolStrip(); - this.ToolStripLabelPrimaryTranslation = new System.Windows.Forms.ToolStripLabel(); - this.ToolStripComboBoxPrimaryTranslation = new System.Windows.Forms.ToolStripComboBox(); - this.ToolStripButtonExport = new System.Windows.Forms.ToolStripButton(); - this.ToolStripLabelSecondaryTranslation = new System.Windows.Forms.ToolStripLabel(); - this.ToolStripComboBoxSecondaryTranslation = new System.Windows.Forms.ToolStripComboBox(); - this.ToolStripButtonSwap = new System.Windows.Forms.ToolStripButton(); this.ToolStripPassage = new System.Windows.Forms.ToolStrip(); this.ToolStripLabelPassage = new System.Windows.Forms.ToolStripLabel(); this.ToolStripTextBoxPassage = new System.Windows.Forms.ToolStripTextBox(); @@ -73,13 +68,19 @@ private void InitializeComponent() this.ToolStripResource = new System.Windows.Forms.ToolStrip(); this.ToolStripLabelResource = new System.Windows.Forms.ToolStripLabel(); this.ToolStripComboBoxResource = new System.Windows.Forms.ToolStripComboBox(); + this.ToolStripTranslation = new System.Windows.Forms.ToolStrip(); + this.ToolStripLabelPrimaryTranslation = new System.Windows.Forms.ToolStripLabel(); + this.ToolStripComboBoxPrimaryTranslation = new System.Windows.Forms.ToolStripComboBox(); + this.ToolStripButtonExport = new System.Windows.Forms.ToolStripButton(); + this.ToolStripLabelSecondaryTranslation = new System.Windows.Forms.ToolStripLabel(); + this.ToolStripComboBoxSecondaryTranslation = new System.Windows.Forms.ToolStripComboBox(); + this.ToolStripButtonSwap = new System.Windows.Forms.ToolStripButton(); this.FontDialogMain = new System.Windows.Forms.FontDialog(); this.ColourDialogBackground = new System.Windows.Forms.ColorDialog(); this.ToolTipMain = new System.Windows.Forms.ToolTip(this.components); this.FolderBrowserDialogMain = new System.Windows.Forms.FolderBrowserDialog(); this.SaveFileDialogMain = new System.Windows.Forms.SaveFileDialog(); this.ColourDialogHighlight = new System.Windows.Forms.ColorDialog(); - this.ToolStripButtonApparatusGenerator = new System.Windows.Forms.ToolStripButton(); this.ToolStripContainerMain.ContentPanel.SuspendLayout(); this.ToolStripContainerMain.TopToolStripPanel.SuspendLayout(); this.ToolStripContainerMain.SuspendLayout(); @@ -88,9 +89,9 @@ private void InitializeComponent() this.ToolStripExtras.SuspendLayout(); this.ToolStripSettings.SuspendLayout(); this.ToolStripNavigate.SuspendLayout(); - this.ToolStripTranslation.SuspendLayout(); this.ToolStripPassage.SuspendLayout(); this.ToolStripResource.SuspendLayout(); + this.ToolStripTranslation.SuspendLayout(); this.SuspendLayout(); // // ToolStripContainerMain @@ -103,7 +104,7 @@ private void InitializeComponent() // this.ToolStripContainerMain.ContentPanel.Controls.Add(this.SplitContainerMain); this.ToolStripContainerMain.ContentPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.ToolStripContainerMain.ContentPanel.Size = new System.Drawing.Size(1183, 439); + this.ToolStripContainerMain.ContentPanel.Size = new System.Drawing.Size(1183, 414); this.ToolStripContainerMain.Location = new System.Drawing.Point(-1, 0); this.ToolStripContainerMain.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ToolStripContainerMain.Name = "ToolStripContainerMain"; @@ -116,9 +117,9 @@ private void InitializeComponent() this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripExtras); this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripSettings); this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripNavigate); - this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripResource); this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripPassage); this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripTranslation); + this.ToolStripContainerMain.TopToolStripPanel.Controls.Add(this.ToolStripResource); // // SplitContainerMain // @@ -127,7 +128,7 @@ private void InitializeComponent() this.SplitContainerMain.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SplitContainerMain.Name = "SplitContainerMain"; this.SplitContainerMain.Panel2Collapsed = true; - this.SplitContainerMain.Size = new System.Drawing.Size(1183, 439); + this.SplitContainerMain.Size = new System.Drawing.Size(1183, 414); this.SplitContainerMain.SplitterDistance = 615; this.SplitContainerMain.SplitterWidth = 7; this.SplitContainerMain.TabIndex = 0; @@ -162,13 +163,13 @@ private void InitializeComponent() this.ToolStripSplitButtonSettings}); this.ToolStripSettings.Location = new System.Drawing.Point(3, 25); this.ToolStripSettings.Name = "ToolStripSettings"; - this.ToolStripSettings.Size = new System.Drawing.Size(144, 25); + this.ToolStripSettings.Size = new System.Drawing.Size(113, 25); this.ToolStripSettings.TabIndex = 3; // // ToolStripButtonNewWindow // this.ToolStripButtonNewWindow.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonNewWindow.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonNewWindow.Image"))); + this.ToolStripButtonNewWindow.Image = global::GoToBible.Windows.Properties.Resources.NewWindow; this.ToolStripButtonNewWindow.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonNewWindow.Name = "ToolStripButtonNewWindow"; this.ToolStripButtonNewWindow.Size = new System.Drawing.Size(23, 22); @@ -179,13 +180,23 @@ private void InitializeComponent() // ToolStripButtonWebBrowser // this.ToolStripButtonWebBrowser.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonWebBrowser.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonWebBrowser.Image"))); + this.ToolStripButtonWebBrowser.Image = global::GoToBible.Windows.Properties.Resources.WebBrowser; this.ToolStripButtonWebBrowser.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonWebBrowser.Name = "ToolStripButtonWebBrowser"; this.ToolStripButtonWebBrowser.Size = new System.Drawing.Size(23, 22); this.ToolStripButtonWebBrowser.Text = "Open in &Web Browser"; this.ToolStripButtonWebBrowser.Click += new System.EventHandler(this.ToolStripButtonWebBrowser_Click); // + // ToolStripButtonApparatusGenerator + // + this.ToolStripButtonApparatusGenerator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ToolStripButtonApparatusGenerator.Image = global::GoToBible.Windows.Properties.Resources.ApparatusGenerator; + this.ToolStripButtonApparatusGenerator.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ToolStripButtonApparatusGenerator.Name = "ToolStripButtonApparatusGenerator"; + this.ToolStripButtonApparatusGenerator.Size = new System.Drawing.Size(23, 22); + this.ToolStripButtonApparatusGenerator.Text = "&Apparatus Generator"; + this.ToolStripButtonApparatusGenerator.Click += new System.EventHandler(this.ToolStripButtonApparatusGenerator_Click); + // // ToolStripSplitButtonSettings // this.ToolStripSplitButtonSettings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -197,7 +208,7 @@ private void InitializeComponent() this.ToolStripMenuItemBackgroundColour, this.ToolStripMenuItemEnterApiKeys, this.ToolStripMenuItemConfigure}); - this.ToolStripSplitButtonSettings.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripSplitButtonSettings.Image"))); + this.ToolStripSplitButtonSettings.Image = global::GoToBible.Windows.Properties.Resources.Settings; this.ToolStripSplitButtonSettings.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripSplitButtonSettings.Name = "ToolStripSplitButtonSettings"; this.ToolStripSplitButtonSettings.Size = new System.Drawing.Size(32, 22); @@ -242,7 +253,7 @@ private void InitializeComponent() // ToolStripMenuItemShowItalics // this.ToolStripMenuItemShowItalics.CheckOnClick = true; - this.ToolStripMenuItemShowItalics.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemShowItalics.Image"))); + this.ToolStripMenuItemShowItalics.Image = global::GoToBible.Windows.Properties.Resources.Italic; this.ToolStripMenuItemShowItalics.Name = "ToolStripMenuItemShowItalics"; this.ToolStripMenuItemShowItalics.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemShowItalics.Text = "&Show Italics"; @@ -251,7 +262,7 @@ private void InitializeComponent() // // ToolStripMenuItemFontSettings // - this.ToolStripMenuItemFontSettings.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemFontSettings.Image"))); + this.ToolStripMenuItemFontSettings.Image = global::GoToBible.Windows.Properties.Resources.Font; this.ToolStripMenuItemFontSettings.Name = "ToolStripMenuItemFontSettings"; this.ToolStripMenuItemFontSettings.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemFontSettings.Text = "&Font Settings"; @@ -260,7 +271,7 @@ private void InitializeComponent() // // ToolStripMenuItemHighlightColour // - this.ToolStripMenuItemHighlightColour.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemHighlightColour.Image"))); + this.ToolStripMenuItemHighlightColour.Image = global::GoToBible.Windows.Properties.Resources.Highlight; this.ToolStripMenuItemHighlightColour.Name = "ToolStripMenuItemHighlightColour"; this.ToolStripMenuItemHighlightColour.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemHighlightColour.Text = "&Highlight Colour"; @@ -269,7 +280,7 @@ private void InitializeComponent() // // ToolStripMenuItemBackgroundColour // - this.ToolStripMenuItemBackgroundColour.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemBackgroundColour.Image"))); + this.ToolStripMenuItemBackgroundColour.Image = global::GoToBible.Windows.Properties.Resources.Color; this.ToolStripMenuItemBackgroundColour.Name = "ToolStripMenuItemBackgroundColour"; this.ToolStripMenuItemBackgroundColour.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemBackgroundColour.Text = "Background &Colour"; @@ -285,7 +296,7 @@ private void InitializeComponent() this.ToolStripMenuItemEsv, this.ToolStripMenuItemNlt, this.ToolStripMenuItemSql}); - this.ToolStripMenuItemEnterApiKeys.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemEnterApiKeys.Image"))); + this.ToolStripMenuItemEnterApiKeys.Image = global::GoToBible.Windows.Properties.Resources.Languages; this.ToolStripMenuItemEnterApiKeys.Name = "ToolStripMenuItemEnterApiKeys"; this.ToolStripMenuItemEnterApiKeys.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemEnterApiKeys.Text = "Enter &API Key..."; @@ -293,7 +304,7 @@ private void InitializeComponent() // // ToolStripMenuItemBibleApi // - this.ToolStripMenuItemBibleApi.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemBibleApi.Image"))); + this.ToolStripMenuItemBibleApi.Image = global::GoToBible.Windows.Properties.Resources.BibleApi; this.ToolStripMenuItemBibleApi.Name = "ToolStripMenuItemBibleApi"; this.ToolStripMenuItemBibleApi.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemBibleApi.Text = "&API.Bible"; @@ -302,7 +313,7 @@ private void InitializeComponent() // // ToolStripMenuItemBiblia // - this.ToolStripMenuItemBiblia.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemBiblia.Image"))); + this.ToolStripMenuItemBiblia.Image = global::GoToBible.Windows.Properties.Resources.Biblia; this.ToolStripMenuItemBiblia.Name = "ToolStripMenuItemBiblia"; this.ToolStripMenuItemBiblia.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemBiblia.Text = "&Biblia"; @@ -311,7 +322,7 @@ private void InitializeComponent() // // ToolStripMenuItemDigitalBiblePlatform // - this.ToolStripMenuItemDigitalBiblePlatform.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemDigitalBiblePlatform.Image"))); + this.ToolStripMenuItemDigitalBiblePlatform.Image = global::GoToBible.Windows.Properties.Resources.DigitalBiblePlatform; this.ToolStripMenuItemDigitalBiblePlatform.Name = "ToolStripMenuItemDigitalBiblePlatform"; this.ToolStripMenuItemDigitalBiblePlatform.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemDigitalBiblePlatform.Text = "&Digital Bible Platform"; @@ -320,7 +331,7 @@ private void InitializeComponent() // // ToolStripMenuItemEsv // - this.ToolStripMenuItemEsv.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemEsv.Image"))); + this.ToolStripMenuItemEsv.Image = global::GoToBible.Windows.Properties.Resources.Esv; this.ToolStripMenuItemEsv.Name = "ToolStripMenuItemEsv"; this.ToolStripMenuItemEsv.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemEsv.Text = "&ESV"; @@ -329,7 +340,7 @@ private void InitializeComponent() // // ToolStripMenuItemNlt // - this.ToolStripMenuItemNlt.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemNlt.Image"))); + this.ToolStripMenuItemNlt.Image = global::GoToBible.Windows.Properties.Resources.Nlt; this.ToolStripMenuItemNlt.Name = "ToolStripMenuItemNlt"; this.ToolStripMenuItemNlt.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemNlt.Text = "&NLT"; @@ -338,7 +349,7 @@ private void InitializeComponent() // // ToolStripMenuItemSql // - this.ToolStripMenuItemSql.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemSql.Image"))); + this.ToolStripMenuItemSql.Image = global::GoToBible.Windows.Properties.Resources.Sql; this.ToolStripMenuItemSql.Name = "ToolStripMenuItemSql"; this.ToolStripMenuItemSql.Size = new System.Drawing.Size(186, 22); this.ToolStripMenuItemSql.Text = "&SQL Server"; @@ -356,8 +367,9 @@ private void InitializeComponent() this.ToolStripMenuItemDebugMode, this.ToolStripMenuItemDeveloperMode, this.ToolStripMenuItemLegacyBrowser, + this.ToolStripMenuItemBlockedTranslations, this.ToolStripMenuItemSettingsDirectory}); - this.ToolStripMenuItemConfigure.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemConfigure.Image"))); + this.ToolStripMenuItemConfigure.Image = global::GoToBible.Windows.Properties.Resources.Configure; this.ToolStripMenuItemConfigure.Name = "ToolStripMenuItemConfigure"; this.ToolStripMenuItemConfigure.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItemConfigure.Text = "C&onfigure..."; @@ -365,36 +377,36 @@ private void InitializeComponent() // // ToolStripMenuItemCommentaries // - this.ToolStripMenuItemCommentaries.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemCommentaries.Image"))); + this.ToolStripMenuItemCommentaries.Image = global::GoToBible.Windows.Properties.Resources.Commentaries; this.ToolStripMenuItemCommentaries.Name = "ToolStripMenuItemCommentaries"; - this.ToolStripMenuItemCommentaries.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemCommentaries.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemCommentaries.Text = "&Commentaries"; this.ToolStripMenuItemCommentaries.ToolTipText = "Enable or Disable Commentaries"; this.ToolStripMenuItemCommentaries.Click += new System.EventHandler(this.ToolStripMenuItemCommentaries_Click); // // ToolStripMenuItemLanguages // - this.ToolStripMenuItemLanguages.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemLanguages.Image"))); + this.ToolStripMenuItemLanguages.Image = global::GoToBible.Windows.Properties.Resources.Languages; this.ToolStripMenuItemLanguages.Name = "ToolStripMenuItemLanguages"; - this.ToolStripMenuItemLanguages.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemLanguages.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemLanguages.Text = "&Languages"; this.ToolStripMenuItemLanguages.ToolTipText = "Enable or Disable Languages"; this.ToolStripMenuItemLanguages.Click += new System.EventHandler(this.ToolStripMenuItemLanguages_Click); // // ToolStripMenuItemTranslations // - this.ToolStripMenuItemTranslations.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemTranslations.Image"))); + this.ToolStripMenuItemTranslations.Image = global::GoToBible.Windows.Properties.Resources.Translations; this.ToolStripMenuItemTranslations.Name = "ToolStripMenuItemTranslations"; - this.ToolStripMenuItemTranslations.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemTranslations.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemTranslations.Text = "&Translations"; this.ToolStripMenuItemTranslations.ToolTipText = "Enable or Disable Translations"; this.ToolStripMenuItemTranslations.Click += new System.EventHandler(this.ToolStripMenuItemTranslations_Click); // // ToolStripMenuItemProviders // - this.ToolStripMenuItemProviders.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemProviders.Image"))); + this.ToolStripMenuItemProviders.Image = global::GoToBible.Windows.Properties.Resources.Provider; this.ToolStripMenuItemProviders.Name = "ToolStripMenuItemProviders"; - this.ToolStripMenuItemProviders.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemProviders.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemProviders.Text = "&Providers"; this.ToolStripMenuItemProviders.ToolTipText = "Enable or Disable Providers"; this.ToolStripMenuItemProviders.Click += new System.EventHandler(this.ToolStripMenuItemProviders_Click); @@ -402,14 +414,14 @@ private void InitializeComponent() // ToolStripSeparatorDebugMode // this.ToolStripSeparatorDebugMode.Name = "ToolStripSeparatorDebugMode"; - this.ToolStripSeparatorDebugMode.Size = new System.Drawing.Size(196, 6); + this.ToolStripSeparatorDebugMode.Size = new System.Drawing.Size(228, 6); // // ToolStripMenuItemDebugMode // this.ToolStripMenuItemDebugMode.CheckOnClick = true; - this.ToolStripMenuItemDebugMode.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemDebugMode.Image"))); + this.ToolStripMenuItemDebugMode.Image = global::GoToBible.Windows.Properties.Resources.Debug; this.ToolStripMenuItemDebugMode.Name = "ToolStripMenuItemDebugMode"; - this.ToolStripMenuItemDebugMode.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemDebugMode.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemDebugMode.Text = "&Debug Mode"; this.ToolStripMenuItemDebugMode.ToolTipText = "Enable or Disable Debug Mode"; this.ToolStripMenuItemDebugMode.Click += new System.EventHandler(this.ToolStripMenuItemDebugMode_Click); @@ -417,9 +429,9 @@ private void InitializeComponent() // ToolStripMenuItemDeveloperMode // this.ToolStripMenuItemDeveloperMode.CheckOnClick = true; - this.ToolStripMenuItemDeveloperMode.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemDeveloperMode.Image"))); + this.ToolStripMenuItemDeveloperMode.Image = global::GoToBible.Windows.Properties.Resources.Developer; this.ToolStripMenuItemDeveloperMode.Name = "ToolStripMenuItemDeveloperMode"; - this.ToolStripMenuItemDeveloperMode.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemDeveloperMode.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemDeveloperMode.Text = "De&veloper Mode"; this.ToolStripMenuItemDeveloperMode.ToolTipText = "Enable or Disable Developer Mode"; this.ToolStripMenuItemDeveloperMode.Click += new System.EventHandler(this.ToolStripMenuItemDeveloperMode_Click); @@ -427,18 +439,26 @@ private void InitializeComponent() // ToolStripMenuItemLegacyBrowser // this.ToolStripMenuItemLegacyBrowser.CheckOnClick = true; - this.ToolStripMenuItemLegacyBrowser.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemLegacyBrowser.Image"))); + this.ToolStripMenuItemLegacyBrowser.Image = global::GoToBible.Windows.Properties.Resources.LegacyBrowser; this.ToolStripMenuItemLegacyBrowser.Name = "ToolStripMenuItemLegacyBrowser"; - this.ToolStripMenuItemLegacyBrowser.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemLegacyBrowser.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemLegacyBrowser.Text = "Le&gacy Browser"; this.ToolStripMenuItemLegacyBrowser.ToolTipText = "Enable or Disable the Legacy Web Browser"; this.ToolStripMenuItemLegacyBrowser.Click += new System.EventHandler(this.ToolStripMenuItemLegacyBrowser_Click); // + // ToolStripMenuItemBlockedTranslations + // + this.ToolStripMenuItemBlockedTranslations.Image = global::GoToBible.Windows.Properties.Resources.BlockedTranslations; + this.ToolStripMenuItemBlockedTranslations.Name = "ToolStripMenuItemBlockedTranslations"; + this.ToolStripMenuItemBlockedTranslations.Size = new System.Drawing.Size(231, 22); + this.ToolStripMenuItemBlockedTranslations.Text = "Load &Blocked Translations List"; + this.ToolStripMenuItemBlockedTranslations.Click += new System.EventHandler(this.ToolStripMenuItemBlockedTranslations_Click); + // // ToolStripMenuItemSettingsDirectory // - this.ToolStripMenuItemSettingsDirectory.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItemSettingsDirectory.Image"))); + this.ToolStripMenuItemSettingsDirectory.Image = global::GoToBible.Windows.Properties.Resources.Directory; this.ToolStripMenuItemSettingsDirectory.Name = "ToolStripMenuItemSettingsDirectory"; - this.ToolStripMenuItemSettingsDirectory.Size = new System.Drawing.Size(199, 22); + this.ToolStripMenuItemSettingsDirectory.Size = new System.Drawing.Size(231, 22); this.ToolStripMenuItemSettingsDirectory.Text = "Open &Settings Directory"; this.ToolStripMenuItemSettingsDirectory.ToolTipText = "View the settings directory"; this.ToolStripMenuItemSettingsDirectory.Click += new System.EventHandler(this.ToolStripMenuItemSettingsDirectory_Click); @@ -449,7 +469,7 @@ private void InitializeComponent() this.ToolStripNavigate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolStripButtonNavigateBack, this.ToolStripButtonNavigateForward}); - this.ToolStripNavigate.Location = new System.Drawing.Point(147, 25); + this.ToolStripNavigate.Location = new System.Drawing.Point(116, 25); this.ToolStripNavigate.Name = "ToolStripNavigate"; this.ToolStripNavigate.Size = new System.Drawing.Size(58, 25); this.ToolStripNavigate.TabIndex = 2; @@ -457,7 +477,7 @@ private void InitializeComponent() // ToolStripButtonNavigateBack // this.ToolStripButtonNavigateBack.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonNavigateBack.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonNavigateBack.Image"))); + this.ToolStripButtonNavigateBack.Image = global::GoToBible.Windows.Properties.Resources.Prev; this.ToolStripButtonNavigateBack.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonNavigateBack.Name = "ToolStripButtonNavigateBack"; this.ToolStripButtonNavigateBack.Size = new System.Drawing.Size(23, 22); @@ -467,13 +487,71 @@ private void InitializeComponent() // ToolStripButtonNavigateForward // this.ToolStripButtonNavigateForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonNavigateForward.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonNavigateForward.Image"))); + this.ToolStripButtonNavigateForward.Image = global::GoToBible.Windows.Properties.Resources.Next; this.ToolStripButtonNavigateForward.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonNavigateForward.Name = "ToolStripButtonNavigateForward"; this.ToolStripButtonNavigateForward.Size = new System.Drawing.Size(23, 22); this.ToolStripButtonNavigateForward.Text = "Next Chapter"; this.ToolStripButtonNavigateForward.Click += new System.EventHandler(this.ToolStripButtonNavigateForward_Click); // + // ToolStripPassage + // + this.ToolStripPassage.Dock = System.Windows.Forms.DockStyle.None; + this.ToolStripPassage.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ToolStripLabelPassage, + this.ToolStripTextBoxPassage, + this.ToolStripButtonPassageGo}); + this.ToolStripPassage.Location = new System.Drawing.Point(3, 50); + this.ToolStripPassage.Name = "ToolStripPassage"; + this.ToolStripPassage.Size = new System.Drawing.Size(186, 25); + this.ToolStripPassage.TabIndex = 1; + // + // ToolStripLabelPassage + // + this.ToolStripLabelPassage.Name = "ToolStripLabelPassage"; + this.ToolStripLabelPassage.Size = new System.Drawing.Size(49, 22); + this.ToolStripLabelPassage.Text = "Passage"; + // + // ToolStripTextBoxPassage + // + this.ToolStripTextBoxPassage.Name = "ToolStripTextBoxPassage"; + this.ToolStripTextBoxPassage.Size = new System.Drawing.Size(100, 25); + this.ToolStripTextBoxPassage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ToolStripTextBoxPassage_KeyDown); + // + // ToolStripButtonPassageGo + // + this.ToolStripButtonPassageGo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ToolStripButtonPassageGo.Image = global::GoToBible.Windows.Properties.Resources.Go; + this.ToolStripButtonPassageGo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ToolStripButtonPassageGo.Name = "ToolStripButtonPassageGo"; + this.ToolStripButtonPassageGo.Size = new System.Drawing.Size(23, 22); + this.ToolStripButtonPassageGo.Text = "Go"; + this.ToolStripButtonPassageGo.Click += new System.EventHandler(this.ToolStripButtonPassageGo_Click); + // + // ToolStripResource + // + this.ToolStripResource.Dock = System.Windows.Forms.DockStyle.None; + this.ToolStripResource.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ToolStripLabelResource, + this.ToolStripComboBoxResource}); + this.ToolStripResource.Location = new System.Drawing.Point(3, 100); + this.ToolStripResource.Name = "ToolStripResource"; + this.ToolStripResource.Size = new System.Drawing.Size(244, 25); + this.ToolStripResource.TabIndex = 4; + // + // ToolStripLabelResource + // + this.ToolStripLabelResource.Name = "ToolStripLabelResource"; + this.ToolStripLabelResource.Size = new System.Drawing.Size(55, 22); + this.ToolStripLabelResource.Text = "Resource"; + // + // ToolStripComboBoxResource + // + this.ToolStripComboBoxResource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ToolStripComboBoxResource.Name = "ToolStripComboBoxResource"; + this.ToolStripComboBoxResource.Size = new System.Drawing.Size(175, 25); + this.ToolStripComboBoxResource.SelectedIndexChanged += new System.EventHandler(this.ToolStripComboBoxResource_SelectedIndexChanged); + // // ToolStripTranslation // this.ToolStripTranslation.Dock = System.Windows.Forms.DockStyle.None; @@ -486,7 +564,7 @@ private void InitializeComponent() this.ToolStripButtonSwap}); this.ToolStripTranslation.Location = new System.Drawing.Point(3, 75); this.ToolStripTranslation.Name = "ToolStripTranslation"; - this.ToolStripTranslation.Size = new System.Drawing.Size(642, 25); + this.ToolStripTranslation.Size = new System.Drawing.Size(775, 25); this.ToolStripTranslation.TabIndex = 0; // // ToolStripLabelPrimaryTranslation @@ -499,14 +577,14 @@ private void InitializeComponent() // this.ToolStripComboBoxPrimaryTranslation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ToolStripComboBoxPrimaryTranslation.Name = "ToolStripComboBoxPrimaryTranslation"; - this.ToolStripComboBoxPrimaryTranslation.Size = new System.Drawing.Size(175, 25); + this.ToolStripComboBoxPrimaryTranslation.Size = new System.Drawing.Size(225, 25); this.ToolStripComboBoxPrimaryTranslation.SelectedIndexChanged += new System.EventHandler(this.ToolStripComboBoxPrimaryTranslation_SelectedIndexChanged); // // ToolStripButtonExport // this.ToolStripButtonExport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.ToolStripButtonExport.Enabled = false; - this.ToolStripButtonExport.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonExport.Image"))); + this.ToolStripButtonExport.Image = global::GoToBible.Windows.Properties.Resources.Export; this.ToolStripButtonExport.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonExport.Name = "ToolStripButtonExport"; this.ToolStripButtonExport.Size = new System.Drawing.Size(23, 22); @@ -524,77 +602,19 @@ private void InitializeComponent() // this.ToolStripComboBoxSecondaryTranslation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ToolStripComboBoxSecondaryTranslation.Name = "ToolStripComboBoxSecondaryTranslation"; - this.ToolStripComboBoxSecondaryTranslation.Size = new System.Drawing.Size(175, 25); + this.ToolStripComboBoxSecondaryTranslation.Size = new System.Drawing.Size(225, 25); this.ToolStripComboBoxSecondaryTranslation.SelectedIndexChanged += new System.EventHandler(this.ToolStripComboBoxSecondaryTranslation_SelectedIndexChanged); // // ToolStripButtonSwap // this.ToolStripButtonSwap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonSwap.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonSwap.Image"))); + this.ToolStripButtonSwap.Image = global::GoToBible.Windows.Properties.Resources.Swap; this.ToolStripButtonSwap.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButtonSwap.Name = "ToolStripButtonSwap"; this.ToolStripButtonSwap.Size = new System.Drawing.Size(23, 22); this.ToolStripButtonSwap.Text = "Swap Translations"; this.ToolStripButtonSwap.Click += new System.EventHandler(this.ToolStripButtonSwap_Click); // - // ToolStripPassage - // - this.ToolStripPassage.Dock = System.Windows.Forms.DockStyle.None; - this.ToolStripPassage.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToolStripLabelPassage, - this.ToolStripTextBoxPassage, - this.ToolStripButtonPassageGo}); - this.ToolStripPassage.Location = new System.Drawing.Point(3, 50); - this.ToolStripPassage.Name = "ToolStripPassage"; - this.ToolStripPassage.Size = new System.Drawing.Size(186, 25); - this.ToolStripPassage.TabIndex = 1; - // - // ToolStripLabelPassage - // - this.ToolStripLabelPassage.Name = "ToolStripLabelPassage"; - this.ToolStripLabelPassage.Size = new System.Drawing.Size(49, 22); - this.ToolStripLabelPassage.Text = "Passage"; - // - // ToolStripTextBoxPassage - // - this.ToolStripTextBoxPassage.Name = "ToolStripTextBoxPassage"; - this.ToolStripTextBoxPassage.Size = new System.Drawing.Size(100, 25); - this.ToolStripTextBoxPassage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ToolStripTextBoxPassage_KeyDown); - // - // ToolStripButtonPassageGo - // - this.ToolStripButtonPassageGo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonPassageGo.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonPassageGo.Image"))); - this.ToolStripButtonPassageGo.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ToolStripButtonPassageGo.Name = "ToolStripButtonPassageGo"; - this.ToolStripButtonPassageGo.Size = new System.Drawing.Size(23, 22); - this.ToolStripButtonPassageGo.Text = "Go"; - this.ToolStripButtonPassageGo.Click += new System.EventHandler(this.ToolStripButtonPassageGo_Click); - // - // ToolStripResource - // - this.ToolStripResource.Dock = System.Windows.Forms.DockStyle.None; - this.ToolStripResource.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToolStripLabelResource, - this.ToolStripComboBoxResource}); - this.ToolStripResource.Location = new System.Drawing.Point(189, 50); - this.ToolStripResource.Name = "ToolStripResource"; - this.ToolStripResource.Size = new System.Drawing.Size(244, 25); - this.ToolStripResource.TabIndex = 4; - // - // ToolStripLabelResource - // - this.ToolStripLabelResource.Name = "ToolStripLabelResource"; - this.ToolStripLabelResource.Size = new System.Drawing.Size(55, 22); - this.ToolStripLabelResource.Text = "Resource"; - // - // ToolStripComboBoxResource - // - this.ToolStripComboBoxResource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ToolStripComboBoxResource.Name = "ToolStripComboBoxResource"; - this.ToolStripComboBoxResource.Size = new System.Drawing.Size(175, 25); - this.ToolStripComboBoxResource.SelectedIndexChanged += new System.EventHandler(this.ToolStripComboBoxResource_SelectedIndexChanged); - // // FontDialogMain // this.FontDialogMain.AllowScriptChange = false; @@ -618,16 +638,6 @@ private void InitializeComponent() // this.ColourDialogHighlight.AnyColor = true; // - // ToolStripButtonApparatusGenerator - // - this.ToolStripButtonApparatusGenerator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToolStripButtonApparatusGenerator.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButtonApparatusGenerator.Image"))); - this.ToolStripButtonApparatusGenerator.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ToolStripButtonApparatusGenerator.Name = "ToolStripButtonApparatusGenerator"; - this.ToolStripButtonApparatusGenerator.Size = new System.Drawing.Size(23, 22); - this.ToolStripButtonApparatusGenerator.Text = "&Apparatus Generator"; - this.ToolStripButtonApparatusGenerator.Click += new System.EventHandler(this.ToolStripButtonApparatusGenerator_Click); - // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -654,12 +664,12 @@ private void InitializeComponent() this.ToolStripSettings.PerformLayout(); this.ToolStripNavigate.ResumeLayout(false); this.ToolStripNavigate.PerformLayout(); - this.ToolStripTranslation.ResumeLayout(false); - this.ToolStripTranslation.PerformLayout(); this.ToolStripPassage.ResumeLayout(false); this.ToolStripPassage.PerformLayout(); this.ToolStripResource.ResumeLayout(false); this.ToolStripResource.PerformLayout(); + this.ToolStripTranslation.ResumeLayout(false); + this.ToolStripTranslation.PerformLayout(); this.ResumeLayout(false); } @@ -723,6 +733,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStrip ToolStripExtras; private System.Windows.Forms.ToolStripButton ToolStripButtonGitHub; private System.Windows.Forms.ToolStripButton ToolStripButtonApparatusGenerator; + private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemBlockedTranslations; } } diff --git a/GoToBible.Windows/FormMain.cs b/GoToBible.Windows/FormMain.cs index 0b70fe5..9be09b5 100644 --- a/GoToBible.Windows/FormMain.cs +++ b/GoToBible.Windows/FormMain.cs @@ -703,6 +703,12 @@ private async Task LoadTranslationComboBoxes(IList translationProvide } else { + // Clean up any names we are displaying + if (ApiProvider.NameSubstitutions.TryGetValue(translation.Name, out string? translationName)) + { + translation.Name = translationName; + } + unsortedTranslations.Add(translation); } } @@ -745,7 +751,7 @@ private async Task LoadTranslationComboBoxes(IList translationProvide { Bold = false, Selectable = true, - Text = commentary.UniqueName(this.translations), + Text = commentary.UniqueName(this.commentaries), CanBeExported = commentary.CanBeExported, Code = commentary.Code, Language = commentary.Language, @@ -760,6 +766,7 @@ private async Task LoadTranslationComboBoxes(IList translationProvide resourceIndex++; } + List unblockedTranslations = this.translations.Where(t => !blockedTranslations.Contains(t.UniqueKey())).ToList(); foreach (Translation translation in this.translations) { // If this translation is not blocked @@ -788,12 +795,13 @@ private async Task LoadTranslationComboBoxes(IList translationProvide { Bold = false, Selectable = true, - Text = translation.UniqueName(this.translations), + Text = translation.UniqueName(unblockedTranslations), CanBeExported = translation.CanBeExported, Code = translation.Code, Language = translation.Language, Provider = translation.Provider, }; + this.ToolStripComboBoxPrimaryTranslation.Items.Add(comboBoxItem); if (translation.Code == primaryTranslation) { @@ -1469,6 +1477,29 @@ private async void ToolStripMenuItemBiblia_Click(object sender, EventArgs e) } } + /// + /// Handles the Click event of the Load Blocked Translations List ToolStripMenuItem. + /// + /// The source of the event. + /// The instance containing the event data. + private async void ToolStripMenuItemBlockedTranslations_Click(object sender, EventArgs e) + { + // Generate the new list of blocked translations + string[] blockedTranslations = + (Settings.Default.BlockedTranslations?.Cast() ?? new List()) + .Concat(ApiProvider.BlockedTranslations).Distinct().ToArray(); + + // Save the blocked translations + Settings.Default.BlockedTranslations?.Clear(); + Settings.Default.BlockedTranslations ??= new StringCollection(); + + Settings.Default.BlockedTranslations.AddRange(blockedTranslations); + Settings.Default.Save(); + + // Reload the providers and translations + await this.LoadTranslationComboBoxes(this.renderer.Providers.ToList(), string.Empty, string.Empty, string.Empty); + } + /// /// Handles the Click event of the Commentaries ToolStripMenuItem. /// @@ -1823,6 +1854,7 @@ private async Task UpdateDeveloperMode() this.ToolStripMenuItemProviders.Visible = this.IsDeveloper; this.ToolStripMenuItemDebugMode.Visible = this.IsDeveloper; this.ToolStripMenuItemLegacyBrowser.Visible = this.IsDeveloper; + this.ToolStripMenuItemBlockedTranslations.Visible = this.IsDeveloper; this.ToolStripMenuItemSettingsDirectory.Visible = this.IsDeveloper; // Reload the providers and translations diff --git a/GoToBible.Windows/FormMain.resx b/GoToBible.Windows/FormMain.resx index bbff9ba..c8a5312 100644 --- a/GoToBible.Windows/FormMain.resx +++ b/GoToBible.Windows/FormMain.resx @@ -63,458 +63,18 @@ 17, 17 - - - - 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 - - 162, 17 - - 616, 17 - 472, 17 311, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsNAAALDQHtB8AsAAAAfUlE - QVQ4T6WNQQrAIAwEC63/KB77m4IP6LX/f4BNQCHGORgqjOhslmy11l+gjIAyAsqOHL0GphkvLOlIZy/K - O9PMJCxSKq1cKFdQdsz2nXIFpWK2P5R3UCor2xWUUrpb+aXcMgkpZbP98rln/LSix854UEZAGQFlBJTr - 1O0DGySwwS+pGk0AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DQAACw0B7QfALAAAAhVJREFUOE+lk+1LU1EAxu8f1CthZEJFhdA++FH8FGRJFFL0wgLFJJn6waikfGli - 0mxJSRGliVmW7cuSajXEBpvcvdy93W1Otu7dfT1PZ2dLnQ6KOvDjngvn9zznnMvlAPwXXN9TEVvpeSyi - 82ES1pEEWu/F0XwrhqbeKBpuCKhvF3DIGmHUXg6DBTg+gjH2gcD+zsTgrIE70zr6XmiwTaromFBwzSHj - 0qiE8/cltAzkGXtbvpQCNmNzJtE2lsSFoVJzY08Ulo4IjpQbN7O72Q3uwXMXPcqfByEEukmg6gSyajJq - TpwGZ38yX16yfWQ1gs7+ZURiEgyDyvRdVkzkZQOvF76XAsZfusvLK0dGIegeFlFzfAp8OAdFM+mVc+us - B1Q7QlIy0T4goK7hEw5anPDzWdackwxk8wbSa9pGwNYjhLI6rP1hnLniZfK+Y0PwBdJMrrqDQeebsgoE - RA2tvUEcbVzAoifF5B0HurHkE7GaM5Ba05HIaBBSKiZnv5UC7jpmmLwkKDjbFULTqbe43jWPi20zTN5Z - exPL/gyT4xkVgqgilFAwPuXZCPDwVLZFce7qZ8RWC1DoJ/pZMJm8v/4RFr1pJkdoczCuIBArVAZYTk5j - z2E7W1xEovLv+a662+xZbA7S5pWoAl9YrgwwTEIvKgTvjyBt4+H6ymPOvYJXrgCevfdjYm47FQHFyb9S - 9Rf9e8D9AgLfDDDhYHFLAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAABWklE - QVQ4T2N4+Sn3PzpWVOLHEAMCBmyYJAPaZu+3BOL/Ff3b/ue3b/ifWLUilGH+Ui+wBhAGsWEGoIvBNGfX - z/80b/35/10LTv93j2v8z/DoVRbcFpAGZBpm+K0nuf/7Fu0AueL/kTO3/tsG5vyOLZr239Qz+T/Dms0B - cNvQDYCxT19tBmr98//F22//j1969b+qd/1fkGYgtmFAV4xMg1zg4aP//8vPA/9fvf8O1twz7zBcMyhc - wGGgpSPy39hUHKxx16FwMA3CIM0nTs8Can6LVTPYAJjtyPjeo5L/B/eU/N92ZM3/05euAjW/xKoZqwH3 - nxT/Xz6z+P/PT6v/Hzq28L9rROb/mv714ABD1ww2AF1gyfRCsGYQfne3+f/cuRX/xYT4sGoGYQyBnrrE - /311Kf/LMoL/B3lY/tfTkMepGYSxCpKCsQqSgrEKkoKxCpKCsQoSj/8zAACXlsTbzwuKggAAAABJRU5E - rkJggg== - - - - - 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 - SUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAB - jAAAAYwBs5R0wwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAHzSURBVDhPpVLP - S5VBFL0u+uE337yHGtVKiH7sChLBRQVBizLIhZARbUL0m+97omGLDExwUdAqgoIIXLqU/gGXtWuTy0IM - 20SY783MeyA8lPHcedeH4kKiA4eZOefeO78u/Td04YfS3G2Df8EvaeFedGbVXrHb0BO+R+VuGjHL4G8w - KOOeoICdwaKuc/8M42JqXA1jMzX+Y1dWLdP9cBzrl6pwDYxbaW4/gbOYr6rCLhAWBRuyEdHjcBJFKtA2 - wPU0998keS4WFEBf0bl7QzjWI5iBdxIvQo/7S9D5aiEp3KDIbSDvJ7x50sbf4yC+o3gReIsP0KvgD3CZ - KHSIFQFtUxn/FJPaTS5QHrPnxINWPw1tG0UmsNNt9kuZGxA7AlpT53acksz2cYAqqlfEoySvXY2acXdK - FXeB53irEbGJpkNn1Ix9QHsBOvPXxSbKwjE80NdWYuT6/iuqscYZ1uPbyHFDYtxd8VvAoypjb/EpTo1u - aFEjSsZd5Bx8/bX2cbAYFf9IoPlucI7KGpejgH9eYwH8hR54X87s+WjsQ+vY/hX87xJbb/cFT1JTG8a3 - vIbBbdrk4FZvhA6spzgBdOA7XOuhqjTOxuRDmAwn8D3PEbiFb/yMQkuY74Bvuyc3SxJ1NBJj+5G0Cv45 - 9MD/hoMdeBBEuwnxHR4wWpQXAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAVpJREFUOE9joDn4GKysCcS2MPw5WJkVKoUJvlbIMH6rkOGE40oZpk8RSus+RSr9 - B+GPYUr/gQaIQpVjgh+VsiI/aiT//6gTB+OfteLGXxIU1n1JUvj/JVHh/8cIYgyoE/v/q533/+8urv+/ - moVMvqbLr/uWJf8fZAgxBggDbf4BNODH337WH0ADjL6kyS//miH/DeiCb0ADvgINEIEqxwQ/ayUZ/szi - YPu3nEkGjJcxsT3hYxd9ys8h/4ibTf6FmRjThwBZqGoc4N9KBu3/axn+/98MxGsYjL/qSq37oiP5/zE/ - x5+bDAwcUGW4wb8VUAM2Qgz4oi1JpgHrIAZ8VBVd90ldnAQDQF5YDdQMwqsYjN/ICa57qyBMkguYgVgQ - iplfiPGuA+L/j/mINAAdPOZjX/eQm+0/EJNnwD1W5tV3mBjn3GVhek6WAbcZGGSgtBTQAGawIPUAAwMA - pPHGg7tXLkEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAAwBQTFRF//// - +/v7+vr6+fn5+Pj49vb28fHx8PDw7u7u7Ozs6urq5+fn4+Pj4uLi3d3d2tra2NjY1tbW1NTU09PT0dHR - z8/Pzs7OysrKycnJxsbGw8PDwsLCwcHBvr6+vLy8u7u7ubm5tra2tbW1srKysLCwra2trKysqqqqqKio - p6enpqampaWloqKinZ2dnJycl5eXkpKSj4+Pjo6OjIyMi4uLioqKiYmJh4eHhoaGgoKCeXl5eHh4dnZ2 - dXV1dHR0c3NzcnJyb29vaWlpaGhoZ2dnZmZmZWVlZGRkYWFhYGBgX19fXV1dXFxcWlpaV1dXVlZWVFRU - U1NTUlJSUVFRT09PTk5OTU1NS0tLSkpKSUlJSEhIR0dHRkZGQkJCQUFBQEBAPz8/Pj4+PT09PDw8Ozs7 - Ojo6ODg4Nzc3NjY2NTU1MzMzMjIyMTExMDAwLi4uLCwsKysrKioqKSkpKCgoJiYmIiIiISEhICAgHx8f - Hh4eGxsbGhoaGRkZGBgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHlhx5wAAAAd0SU1FB+UB - FRQ0Go2dr60AAAAXdEVYdFNvZnR3YXJlAEdMRFBORyB2ZXIgMy40cYWk4QAAAPpJREFUKFNjcHEGQhgA - shiCQkKBIMQvCEyF+DE4mJkAgXmwHYgytfRnUGBgZmFh4vSXZWRhYWHgCGZQFAwJDAjy5jGKjIyMMuSO - ZVAWT4+PSwpjtfaTl/ey4klmUJNMj49PCuey9VdWCbLhS2bQlMlOTUmL4bXNTkjKtRZIZNCRy8vIyIrj - d/FkY3dxEs5l0FUqKyoqyeR3y3FyzXcXK2TQl/Lx8PB01bX39fP3M5IoZLAQEhUTE5EuNxYQExUVUSpg - cFTX0tbW0Cu3U9XW0tIwKGZIDAb5IaIiPjg0JDQkupShsqa2pqamtqISRNbUVDJUVYNBBYSuqgQAhTZG - ldRo738AAAAASUVORK5CYII= - - - - - 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 - AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DgAACw4BQL7hQQAAAc9JREFUOE+Fj9srBFEcx4/8IV68uz568+DFJbmlRItQu+zyIA8ebBQRiyxpl1gh - tyVLrFsurZIadyKh2FzWpbSWHenrnMNsM4z86jPT78z3++kMAUD21towN1IOR58B41062C1aTNn0WJ2s - pZ/BM39BXI4qeM4s+PC7fnF33gNbSwHNqZcZZHlIC3E/HeK9FeLTCN4eBvB23QbfcSluF2PQURlLc+pl - Blmw5eBViIP3sgE+Ty+eD0vwOBOCm8EgnFiD0WqIoDn1MoPMdWfDv51ABY1fgiO9QmDSR9OceplBZixZ - VJCEF0lwXIZHZ2hA0FgcSXPqZQaZ7szE+w4VXDV938CgENRrw2lOvcwgE+YMiLuJ8F5Jv6AU1BWF0Zx6 - mUHsLalUEA8fFby/bMPvmcXraSu8e1V4EIxYm2ynOcWwojSEDJtSgKMEiHfNXHCxP0BPCXLTorjAaqrg - O0MQhO9WwEHIWEchdiaScXNQwwXs48ZUOZ62jDh31fPd7XbzslRUCNhjadQIW3M+NlfsWJ/v54Hqijwc - bDjk4b8FMn5dk73ZDZxOp5pAUeanGo2GB3Q6HVsDV5dEbKSdw/YfyCewm81mXvg58uJ/SCM7A/kEzhL0 - wQrXwm0AAAAASUVORK5CYII= - - - - - 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 - AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAcRJREFUOE+ljk9LInEcxju176AXEHRa6BV06BV0qsnMYKLssNtBUDaWyKIgLOrS - IaJTaCNsTDr+rVzF7K+VzjiWOf0ZRottla1lO9QhpKeZFSHrd1jZw+fwffg8z+9XB+C/IIa1QAw1hP7k - 0L4pnlmn1kzeTlcDydEghjyd/Jq1XUCeyuN6uojEJ0H8bgiZ/Tqu/q1bdWjwvfy4ZJORHT9HceEWP+YL - kGfyyAxJ2DXGc4Eun/G1X1UW6KT1bErGyZiEq7kbXM4oOJ44RWJYwM6XOCKfY/D0+FWVMCAaBYs0e4m0 - 9RQX0woykxKOhnlsm/cQGYwi2LeBVYMb50pB1QkDh2YBojUDcfQEiRH1RYv64uAmgsYQfHQQbJfrbznm - TT8SB8ITMfwO3CNq2cZGfxhrAyF4ewPgenxg9eVylEuVlilnjjjgaedsycVU6S72BynbMdyUFy6DB2x3 - +dtRTijZOxjF0c18JA5ofGtztqzTofRNpIhf4TtsmXYq5Sc7xeQdeqbxta9RdWiwOvYDS62M8FbxofTz - GQl/9mmpfVlWy81vXY13QQV3p6v1wHS0t0q7FbueaSI5GsSwFohhLRDDfwd1L9Mj8pbR643wAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAsNJREFUOE+lzWlI02EcB3CrN9HbIrDIEB2aEYzA1KUWbplHactynni7edY8pqab - Rjk1F07NUmorXB4tO3RTE1NJ0pRQyw4zHbNhpWVeeM/9v20DLXPveuDL8/B7nu/nMQLwX1k/MPO6TJNu - qRDHLUL/D+1Eu6jMOvCkoeBe4ePdTId+Rjlpq9s2AinFqhO6cmxGEYYmdfcAjfWnrJjr188YSVTYGQL+ - LR8Le4Loe77r5amFSTDSafDJpsDO2QAQnj2MhEIFzie/hUtUK0xoYoSI/JEpi0FGSSyYlwLhyjoCb56D - YSAgawDCx9PgV04iKv8DSC53EFTCQHm3ENU9JRDKMuAcaAd6ir0WsNkM0JN6EH5V93s7HIPrQXK7i4AC - D6TfD0O1PA4tDf6I4jjCNdLWMOAa/wqZFbMI4Q8imPccnvFSyNu5UI2UYXG6HLOqPPQ2eiAxywkUQwCV - 2Y7ksjHE8JsgfvAQ37/KoZ6rxeqSDJqVGqzOCDD+PlSPhEfY6/YtG4Cjwa2IvtYHPs8Gtbc9MfNLDkL9 - AurFZmgWn4JYloCYL8S0kq1H3jTTRcrXXhbrAJnRCAc/CfIzrDDU6Ytm8RlMqLSlpXoQK+1YXWzAynwV - NEsizE9c1yPF3APyTw3k7XqAdLqBcItpQjbbCorOc/jS5YeaAlsoPwq0pUZtpFiYKkVbXSSKL9NwM8cb - aSwykRNhtlUPmLrXVe53lmgs3MUaAcccvTIHDLdQUJ17EC9l0ZCKGMjlOEBygwXlQCfGRgeQk+oE9tl9 - O/TA38nlHLcUJFj+7Kiy1gw2UTQ81iGiuvQC8W2kD+PfhtDVVk7w2RQikr5LEedlvm0ToAv/oo2FIIE0 - WiEgLxemUqH83I1njwQQ8k4RiT67B+O89x5ee7upvJbMCDPr1KCdHQm+xurkQNOZtEDj2syIPSYb38Ho - N915u2B2cpU7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKmSURBVDhPdZPbT5JxGMf9G7pWOaNiUMnpBQTDmV4Y - eMiFlKdQyVBSxGOWNRUdG9phmuU8QWJCEIo6azVNW7OtVjdtXXTZXVubtprONb+9PxsM0i4+757n93u+ - 32ffve+bAOC/ZK0okbWk0JJa/VRenBmQ7fw7E9doX6g4sb0mTEEdkoctQ3q2yietVc5KfsTeE+Ka02Tj - sqIl0mcG5bsqv+y7+Waut7BfuaOcEO+X2lTOWE20IGgWqS31ArVLanWA2lbOSaHwSqBwS9C90YyNryF0 - uCqhq81ojWjiDOic2swnMmh81FZ+4AyCnybx7PMMhl47ILydisqVAvjfjuLU4HGcdKZD5BDQWxeobTpn - NDudcz/Lq8Dchzvoe25CV7gUbeEqaEYpCJ1pMM0YkFPI/xKZJzn36JxQPpZ6NF7q2/lgIbzvB3FruQL2 - YAHKH2XD6C+C790YRtaGIOpNg8rIC0UNyEMxI9mk3GJQk2IEPg6je6kMzQE9yt1aGGb1eLDugH3OgIer - /RB2CyDo5P9Ma+NZowYEaly8a/QVw/XSiia/DmVT2SjxnMX9tV5YHxWheiKPNnBC0M5Hqp27n9LEAb+B - /VdMkI9k/KoLmnB3tR3l0zk4N5UP11IHLB49TON5cCzY0DhtQYqNi9QGzjGi4ZiZ16MGynvSgQyXED3L - 7SiZ1MG12AmLW4eqsVz0zduguCED/yq9tZ5TE9EQogVBPHBindPCxMSrYfSEGnCZNuqbb8K12Vbw6tng - 1rHAqWXusk2M6McWZ0AQdQnWRZ0CNLrrYPfUQ2QTHAh5ZlYNLdSyKpO3mGVJYFxIPHj1hwwI6Xa+O8XK - /s29Qm80M8GuZrw5ao5w5GEs7EuMTVZFMpgXk+J+tAiHDo6CYUzcSzYkbh++Q8IftyxxEzKYkqoAAAAA - SUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAWVJREFUOE+lkU8og2Ecx3dwdHKzViJsDas3Sa47KFuL08LKIpEcFPE2aYcV7b6D - wvxZUZIkznJn5TZXJW7kaquv5/u+fvNu7zMpb316er7v8/m+7/t7PQD+hTYku+agUbluQt4cmNDdF7Sh - yLifw9lGQEV2/tH57i0tPoKrZDWi4JQPl9tVZOeUcQJ8lxjMXDJ5O2+2ZK65eT7sp+Al/GyVFNvurNwl - E6e8v9qXkpwFlSlb/rVAXanNRAsO1kK5yFhcRXbObxe5YYFTqM+4qpJhytUZsFUmq5OFRvdckw0s+b1D - mR6E0t3wr3eAe+cbiCi4Jks5V8oiW0xj4Wq2WiJCfYlrsjzcn+lF8mISydMERvdi8JmtKBQegis7rxDU - PmwV8NtFJgxZooBP/UbCPaXtmwqObsvIXJZhxAssGbFeQ5XUTFZHNHoc7IrlMZP/xPjWkwX32sONUCUR - SoLaT2sP/h14vgA8BrG/wYmNkAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAjhJREFUOE+N0d1L01EYwHEv+huCoMsuiiio8CaICAwSYyAVmezCIeXAyswyC2dG - 5oVuzDRd84V8w4ymDu3FXtRKUoJkqeVWU1uiTKZzU7fm3Mu3/X4DKTxFDzzw8Dvn+ZzfOU8CIGdj5zvq - 2vuobu2l4kEPZcZOble1o9G1kF/aQE6xIbYtvvf33Cik5n9FobZZxmIhBqSTQ+ForBSHBNimnZuQjUIf - ++1gSAyEI1EZOJR6Xs7E5Ezp85+AdOdAcDMQjkBwPYo/EGHZF8bhCokB6cH8a3HA7V/E0NNNlbkLTUc2 - FR1N2OeWcS+HsM4ExIBG28KKPyw3a/vLGY9asURHKLFc4WCBiXM1zxlzePg06RMD0qi8qxFqu/sp/JxK - 45KaWks7Kp2To5UudjUdQ99dz4eJVTEgzXnRG+bOvQEyzCkoXyrI0TvIrYT9xmK2dm7neNElBse8YkB9 - /S7OpRC37tvRVL4noy0NRX8JaTovJ7Kvse3mFg7nZfJ6ZEkMqPLKmV1Yx2CaQK0FpdbEvp4dJOpSSTn7 - lN2Ki5TX1vNs2C0G0i+U4pgPYpvycLVslL0Fdews2kNS1mUOpJk5qX7Ei6F5zIMLYuBUVjH22TV5VBab - G31rG0fOFJGUXkV18yu5efjLKqY3LjGgUN3ANrMWe4d1ZlxBpuYCWH/8ZHTKx8evvljzCm9HV/4OJCvz - GRr30DUwzeO+7zzsnaT5yTcazDaMHVZqTPGsNtnFQNLpXHnhfzPeR8IvdeP8RbMgaKEAAAAASUVORK5C - YII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAuhJREFUOE+Nk3tMTXEAx8/YjBnDjA0zY8a837I8KoroIlajmce8llm0PEKIiGpq - kmQ9lVu4N49U5lFeRZ7l/cpIC3W795x777mXdc3H7942zGLO9v3v9/nufD+/c6S6mkr0OfGczIpDm7aP - YylRpCXtJCV+G4kxmxGP9K9IupwDfLMXuvL9a9HP4ChCqdeRFL1enGsZdkbKy4gRcAFfLX9E1uOwaCkp - THGVtJSH5XqknKN7+aLosDdmYauNRX2xDst9f5SrYzAW9UB/PAHUs2A9DeY8MKWDMZWLqZNZ5O+DdEJs - dx76W5rk06jVW0TxWqyPl4jy+Zhv+1Cc7M4CjReSNj2GJrUEh/0aDlspDvWyePVimpQCAeejvtmE9fka - rI8WYb43F+WWF8r1cZxLdCNg5hSk7KPRqPWZfDHlYjdkYPt8GHttHLZ3kaivw7A+W42lKgjLXQ3mck/X - NNPlgeQnjGWez0SkzOQolNpk7A3p2D8ewvZhP+rb7agvQ7E+XYHl4QLMd2ailE1CLh2FfGmAcNOLk3Gj - mTt1AlJqYiSGV7HY6g4KOBpb9VaxN0TsXYblQQDmihkoN91RSodjutgPU2EPDGc7o90/Ao3neKQj8RF8 - rIpAfR8lZIVjdcp6JGQ98BeyvFFuuCGXDMV0oS/G890F3AmDvh3Ze4bj5zEO6VBsOLUVoWLvRrE3WOx1 - ypqDUu6FLGTJVwYJuA/Ggm4YznSkQdeW+hOtydw1tLkgYe8GasqCxd5VWCsXCll+mMs8kIUs+dJAjMW9 - aSzoiiG/Aw2n2gi4FZ9yJdJ2Dm4uiNu9npqbTlmBQpZvs6yrI8Xe/kJWTxrPdRFw+1+wVqIuRyJ1x6Dm - gt3hq3lyfg5VZzTc18+iIm86N7KnUZLuQXHKRNd96w6MITdmFMf2DCMjcogL/lmwPWwF4SFLCAsOImR5 - IMGL57EySMPSQF/xqXqzUONJgO9k/L3dmT3VzQX9nhb/sP8P0g/VLd1eJ/aA2QAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADkSURBVDhPYxgFuEHhjkKVqSen/odySQPu09zVkzYk/Z94 - fCLpBrj1uql4TvD8P+P0jP8tB1v+l+0q+990oOl/79He/wRdBNNctafq/6wzs/6vvLzy/9pra//vvbf3 - /8EHB/9POD4BvwEgzVFrov7nbcv7X7O35n/H4Y7/k05M+r/k4pL/O27vAPOhSrEDx1pHY/ced7AhaZvS - /pfsLIE7f8P1Df/r9tURDhOQIS5tLv9DV4b+d+91/+/c6vzfoc7hv22FLdhAqDL8AGSIU5PTf8dGR+I0 - YAMgQ+xr7Mk3YKgABgYAEEuAYFDLBHsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADhSURBVDhPYxgFhMHUk1P/F+4oVIFySQcTj0/8n7Qh6b/7 - NHd1qBB+ALKx92jv/6YDTf/LdpX9bznY8n/G6Rn/PSd4/nfrdSPskgnHJ/w/+ODg/7339v5fe23t/5WX - V/6fdWbW/6o9VcQZ0nG44/+O2zv+L7m45P+kE5P+g/g1e2v+523L+x+1JgpsCFQpdlC3r+7/husb4N4o - 2VnyP21TGlize4/7f8daR2OoUuwApMG2wva/Q53Df+dW5//uve7/Q1eG/ndpcyGsGRtwbHT879TkRJ5m - ELCvsSdf81AADAwAhlCAYAx4oioAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJrSURBVDhPpZL9T1JRHMbvv9Kv/d6WLTKVEksLLbIyy4np - pjhy6OZy05KAWslxaqE1NRB0iHULX8ryBZflGmxasvXiy2qmLtyEpXlAwad7L1fLOeqHnu357Tyf53zP - 9zD/LUvHK7+dfUPb2BFKOllKbJwJS3XETtXXTBCPxVZD73AIMcQD/gmxsC4qnt+hcCQKWPAF/g4hdnYX - IBzZRGg9IgQl6apti5GdIm1RgPXpazQ7hmGy9sPY7IRn8gv8K2F896+DHZ6NDTByDybUcuKbg1zzKo3A - Zp2B2fwZ95s+oqHeizu3J6Ct9qDi6hg0mlGoCl3IzxsEYyAOAdDS5YKpvR+kpRv6ew4hPDQI1NcFBfiW - fqyGkKN8i4SEKpw7+wSMmtjoVvPKWhjL4rUfcM39zzeg1y2J0Wh4dj4AedYIsi92iAADocH1TTS2v0Bt - azcMJgcqa6xoqPPC6aQo1Xz6Hf4WgNu7iLiTvSi+Moozik4OcJ1Qvtm/sgEf1zznC2JmngozdzoC0JS9 - F64sPz+C/VxwT5Ide2VdyM0fQEa6BUyhmtBlLlzb2oObpi5UGW0o0zfjhtYDs8WHxqY51JApVOu8KK9w - Q1UyityCAWRm9yAttQmMUl1D+ZnnlkKYWaD48HUNE9M/hdfmw0YyjcNpOds+eipP8InTjyBLJmCyig0Y - ci8Ku/7T/KqMYjMfvKAshO1xH8bG30GmKID0eAeSEnVgpJkl2Jei3OWiIhe0+kmkXnqJg8kZKK/UY9w7 - BbbvGSSJKZBIzTgkqYj9xfMvDwpr4q1Q2CGXP0Tqsbs4Ir2F+PhKHIgr5VyKX9IzWtru7a8dAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABySURBVDhPYxgaIG4Sw38okzgQUCGiFlwi5AbGpUJJIAOI - NgSkGaYBG4Yqww1AikA2Q7koBkKF8IOgMoFKKBMOiNZMVYDNVmyuwwpgfgb5HyoEDwsoFzeAacaGkQMX - L4BrAKYBGEZ2DVEAZACUObwBAwMApPpIP0RPxlwAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPYximwGWSdG/4St3/6NitT/l/1n4tntxbBqJQ - pdiBzTR+wcClav9XXp+MgoPS/f6HEmMACLh264nBDKnfnf4/Y3Uy2ADjmQysBA2wn6LFA3IysmaYAfb7 - GViSrqvzQpViB46TxJeANFduT/ufNC/qf0hBwP/UxQlgA6BK8AO7qQL/q3ek/k9eGA/WHJjlFwLSTLQB - NpP4/5dtSfkf3RbyPzjP3xkkFpLlqwIyoL6egQmsCB8wbeEBGxBS4UGcjejAs1vTM2yCw/+wJm/yDGCw - Z2Dx7lNVsp+g/Na9xP4uVJR0YF/PwBJar8UG5Q5KwMAAAPOehMbn0TpNAAAAAElFTkSuQmCC - - + + 616, 17 + 767, 17 @@ -533,6 +93,7 @@ 175, 56 + AAABAAUAEBAAAAEAIABoBAAAVgAAABgYAAABACAAiAkAAL4EAAAgIAAAAQAgAKgQAABGDgAAMDAAAAEA diff --git a/GoToBible.Windows/Properties/Resources.Designer.cs b/GoToBible.Windows/Properties/Resources.Designer.cs index 1578458..cb1d729 100644 --- a/GoToBible.Windows/Properties/Resources.Designer.cs +++ b/GoToBible.Windows/Properties/Resources.Designer.cs @@ -130,6 +130,16 @@ internal static System.Drawing.Icon BibliaIcon { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap BlockedTranslations { + get { + object obj = ResourceManager.GetObject("BlockedTranslations", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to Sorry, you cannot show this translation interlinear with an original language. /// @@ -139,6 +149,16 @@ internal static string CannotShowInterlinear { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Color { + get { + object obj = ResourceManager.GetObject("Color", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -339,6 +359,26 @@ internal static System.Drawing.Icon LanguagesIcon { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap LegacyBrowser { + get { + object obj = ResourceManager.GetObject("LegacyBrowser", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap NewWindow { + get { + object obj = ResourceManager.GetObject("NewWindow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/GoToBible.Windows/Properties/Resources.resx b/GoToBible.Windows/Properties/Resources.resx index 04614b5..407f924 100644 --- a/GoToBible.Windows/Properties/Resources.resx +++ b/GoToBible.Windows/Properties/Resources.resx @@ -237,7 +237,7 @@ Would you like to download and install it now? This will affect future interlinear comparisons, however you can customise this in Settings. - ..\resources\webbrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\webbrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Developer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -254,4 +254,16 @@ This will affect future interlinear comparisons, however you can customise this ..\Resources\ApparatusGenerator.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\NewWindow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LegacyBrowser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\BlockedTranslations.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/GoToBible.Windows/Resources/BlockedTranslations.png b/GoToBible.Windows/Resources/BlockedTranslations.png new file mode 100644 index 0000000..d32bbc1 Binary files /dev/null and b/GoToBible.Windows/Resources/BlockedTranslations.png differ