InitializeComplete for GitExtensionsControl

drewnoakes · drewnoakes · commit a60ab4ab8647 · 2018-07-22T22:09:24.000+01:00
Extract common code from GitExtensionsForm into new class
GitExtensionsControlInitialiser.
diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.cs b/GitUI/BranchTreePanel/RepoObjectsTree.cs
@@ -39,7 +39,7 @@ public RepoObjectsTree()
 
             btnSearch.PreviewKeyDown += OnPreviewKeyDown;
             PreviewKeyDown += OnPreviewKeyDown;
-            Translate();
+            InitializeComplete();
 
             RegisterContextActions();
 
diff --git a/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/Dashboard.cs b/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/Dashboard.cs
@@ -29,7 +29,7 @@ public partial class Dashboard : GitModuleControl
         public Dashboard()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
             Visible = false;
diff --git a/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/UserRepositoriesList.cs b/GitUI/CommandsDialogs/BrowseDialog/DashboardControl/UserRepositoriesList.cs
@@ -43,7 +43,7 @@ public partial class UserRepositoriesList : GitExtensionsControl
         public UserRepositoriesList()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             mnuTop.DropDownItems.Clear();
 
diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -1298,7 +1298,7 @@ private void OnShowSettingsClick(object sender, EventArgs e)
 
             if (translation != AppSettings.Translation)
             {
-                InitializeComplete();
+                Translator.Translate(this, AppSettings.CurrentTranslation);
             }
 
             if (showRevisionInfoNextToRevisionGrid != AppSettings.ShowRevisionInfoNextToRevisionGrid)
diff --git a/GitUI/CommandsDialogs/RevisionDiffControl.cs b/GitUI/CommandsDialogs/RevisionDiffControl.cs
@@ -42,7 +42,7 @@ public RevisionDiffControl()
         {
             InitializeComponent();
             DiffFiles.AlwaysRevisionGroups = true;
-            Translate();
+            InitializeComplete();
             HotkeysEnabled = true;
             _fullPathResolver = new FullPathResolver(() => Module.WorkingDir);
             _findFilePredicateProvider = new FindFilePredicateProvider();
diff --git a/GitUI/CommandsDialogs/RevisionFileTreeControl.cs b/GitUI/CommandsDialogs/RevisionFileTreeControl.cs
@@ -55,7 +55,7 @@ public partial class RevisionFileTreeControl : GitModuleControl
         public RevisionFileTreeControl()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
             HotkeysEnabled = true;
             _fullPathResolver = new FullPathResolver(() => Module.WorkingDir);
             _findFilePredicateProvider = new FindFilePredicateProvider();
diff --git a/GitUI/CommandsDialogs/RevisionGpgInfoControl.cs b/GitUI/CommandsDialogs/RevisionGpgInfoControl.cs
@@ -15,7 +15,7 @@ public partial class RevisionGpgInfoControl : GitModuleControl
         public RevisionGpgInfoControl()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             DisplayGpgInfo(null);
             this.AdjustForDpiScaling();
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/AdvancedSettingsPage.cs
@@ -8,7 +8,7 @@ public AdvancedSettingsPage()
         {
             InitializeComponent();
             Text = "Advanced";
-            Translate();
+            InitializeComplete();
 
             var autoNormaliseSymbols = new[]
             {
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/AppearanceFontsSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/AppearanceFontsSettingsPage.cs
@@ -15,7 +15,7 @@ public AppearanceFontsSettingsPage()
         {
             InitializeComponent();
             Text = "Fonts";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/AppearanceSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/AppearanceSettingsPage.cs
@@ -17,7 +17,7 @@ public partial class AppearanceSettingsPage : SettingsPageWithHeader
         public AppearanceSettingsPage()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             NoImageService.Items.AddRange(Enum.GetNames(typeof(DefaultImageType)));
         }
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/BuildServerIntegrationSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/BuildServerIntegrationSettingsPage.cs
@@ -23,7 +23,7 @@ public BuildServerIntegrationSettingsPage()
         {
             InitializeComponent();
             Text = "Build server integration";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void Init(ISettingsPageHost pageHost)
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ChecklistSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ChecklistSettingsPage.cs
@@ -172,7 +172,7 @@ public ChecklistSettingsPage()
         {
             InitializeComponent();
             Text = "Checklist";
-            Translate();
+            InitializeComplete();
         }
 
         public static SettingsPageReference GetPageReference()
@@ -214,7 +214,8 @@ private void translationConfig_Click(object sender, EventArgs e)
             }
 
             PageHost.LoadAll();
-            Translate();
+
+            Translator.Translate(this, AppSettings.CurrentTranslation);
             SaveAndRescan_Click(null, null);
         }
 
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ColorsSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ColorsSettingsPage.cs
@@ -10,7 +10,7 @@ public partial class ColorsSettingsPage : SettingsPageWithHeader
         public ColorsSettingsPage()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
         }
 
         protected override void OnRuntimeLoad()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/CommitDialogSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/CommitDialogSettingsPage.cs
@@ -8,7 +8,7 @@ public CommitDialogSettingsPage()
         {
             InitializeComponent();
             Text = "Commit dialog";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.cs
@@ -9,7 +9,7 @@ public ConfirmationsSettingsPage()
         {
             InitializeComponent();
             Text = "Confirmations";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ControlHotkeys.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ControlHotkeys.cs
@@ -60,7 +60,7 @@ private HotkeyCommand SelectedHotkeyCommand
         public ControlHotkeys()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             cmbSettings.DisplayMember = nameof(HotkeySettings.Name);
         }
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/DetailedSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/DetailedSettingsPage.cs
@@ -8,7 +8,7 @@ public DetailedSettingsPage()
         {
             InitializeComponent();
             Text = "Detailed";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void Init(ISettingsPageHost pageHost)
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/DiffViewerSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/DiffViewerSettingsPage.cs
@@ -8,7 +8,7 @@ public DiffViewerSettingsPage()
         {
             InitializeComponent();
             Text = "Diff Viewer";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/FormBrowseRepoSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/FormBrowseRepoSettingsPage.cs
@@ -8,7 +8,7 @@ public FormBrowseRepoSettingsPage()
         {
             InitializeComponent();
             Text = "Browse repository window";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void Init(ISettingsPageHost pageHost)
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/GeneralSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/GeneralSettingsPage.cs
@@ -12,7 +12,7 @@ public GeneralSettingsPage()
         {
             InitializeComponent();
             Text = "General";
-            Translate();
+            InitializeComplete();
 
             ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigAdvancedSettingsPage.cs
@@ -6,7 +6,7 @@ public GitConfigAdvancedSettingsPage()
         {
             InitializeComponent();
             Text = "Advanced";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/GitConfigSettingsPage.cs
@@ -20,7 +20,7 @@ public GitConfigSettingsPage()
         {
             InitializeComponent();
             Text = "Config";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void Init(ISettingsPageHost pageHost)
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/GitSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/GitSettingsPage.cs
@@ -14,7 +14,7 @@ public GitSettingsPage()
         {
             InitializeComponent();
             Text = "Paths";
-            Translate();
+            InitializeComplete();
         }
 
         public static SettingsPageReference GetPageReference()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/HotkeysSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/HotkeysSettingsPage.cs
@@ -6,7 +6,7 @@ public HotkeysSettingsPage()
         {
             InitializeComponent();
             Text = "Hotkeys";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/RevisionLinksSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/RevisionLinksSettingsPage.cs
@@ -14,7 +14,7 @@ public RevisionLinksSettingsPage()
             InitializeComponent();
             CaptionCol.Width = DpiUtil.Scale(150);
             Text = "Revision links";
-            Translate();
+            InitializeComplete();
             LinksGrid.AutoGenerateColumns = false;
             CaptionCol.DataPropertyName = nameof(ExternalLinkFormat.Caption);
             URICol.DataPropertyName = nameof(ExternalLinkFormat.Format);
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ScriptsSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ScriptsSettingsPage.cs
@@ -62,7 +62,7 @@ public ScriptsSettingsPage()
             InitializeComponent();
             HotkeyCommandIdentifier.Width = DpiUtil.Scale(39);
             Text = "Scripts";
-            Translate();
+            InitializeComplete();
 
             HotkeyCommandIdentifier.DataPropertyName = nameof(ScriptInfo.HotkeyCommandIdentifier);
             EnabledColumn.DataPropertyName = nameof(ScriptInfo.Enabled);
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ShellExtensionSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ShellExtensionSettingsPage.cs
@@ -9,7 +9,7 @@ public ShellExtensionSettingsPage()
         {
             InitializeComponent();
             Text = "Shell extension";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/SshSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/SshSettingsPage.cs
@@ -16,7 +16,7 @@ public SshSettingsPage()
         {
             InitializeComponent();
             Text = "SSH";
-            Translate();
+            InitializeComplete();
 
             label18.ForeColor = ColorHelper.GetForeColorForBackColor(label18.BackColor);
         }
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Plugins/PluginRootIntroductionPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Plugins/PluginRootIntroductionPage.cs
@@ -9,7 +9,7 @@ public PluginRootIntroductionPage()
         {
             InitializeComponent();
             Text = "Plugins Settings";
-            Translate();
+            InitializeComplete();
         }
 
         protected override void SettingsToPage()
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Plugins/PluginSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Plugins/PluginSettingsPage.cs
@@ -13,7 +13,6 @@ public partial class PluginSettingsPage : AutoLayoutSettingsPage
         public PluginSettingsPage()
         {
             InitializeComponent();
-            Translate();
         }
 
         private void CreateSettingsControls()
@@ -31,7 +30,7 @@ private void Init(IGitPlugin gitPlugin)
             _gitPlugin = gitPlugin;
             _settingsCointainer = new GitPluginSettingsContainer(gitPlugin.Name);
             CreateSettingsControls();
-            Translate();
+            InitializeComplete();
         }
 
         public static PluginSettingsPage CreateSettingsPageFromPlugin(ISettingsPageHost pageHost, IGitPlugin gitPlugin)
diff --git a/GitUI/CommandsDialogs/SettingsDialog/SettingsPageHeader.cs b/GitUI/CommandsDialogs/SettingsDialog/SettingsPageHeader.cs
@@ -27,7 +27,7 @@ public partial class SettingsPageHeader
         public SettingsPageHeader(SettingsPageWithHeader page)
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             if (page != null)
             {
diff --git a/GitUI/CommitInfo/CommitInfo.cs b/GitUI/CommitInfo/CommitInfo.cs
@@ -68,7 +68,7 @@ public partial class CommitInfo : GitModuleControl
         public CommitInfo()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             GitUICommandsSourceSet += (s, e) => _sortedRefs = null;
 
diff --git a/GitUI/Editor/FileViewer.cs b/GitUI/Editor/FileViewer.cs
@@ -61,7 +61,7 @@ public FileViewer()
             ShowEntireFile = false;
             NumberOfVisibleLines = AppSettings.NumberOfContextLines;
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             GitUICommandsSourceSet += FileViewer_GitUICommandsSourceSet;
 
diff --git a/GitUI/Editor/FileViewerInternal.cs b/GitUI/Editor/FileViewerInternal.cs
@@ -33,7 +33,7 @@ public FileViewerInternal(Func<GitModule> moduleProvider)
             _moduleProvider = moduleProvider;
 
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             TextEditor.TextChanged += (s, e) => TextChanged?.Invoke(s, e);
             TextEditor.ActiveTextAreaControl.VScrollBar.ValueChanged += (s, e) => ScrollPosChanged?.Invoke(s, e);
diff --git a/GitUI/GitExtensionsForm.cs b/GitUI/GitExtensionsForm.cs
@@ -61,7 +61,7 @@ protected override void OnLoad(EventArgs e)
             // Should be called after restoring position
             base.OnLoad(e);
 
-            if (!IsDesignModeComponent())
+            if (!IsDesignModeActive)
             {
                 OnRuntimeLoad(e);
             }
diff --git a/GitUI/SpellChecker/EditNetSpell.cs b/GitUI/SpellChecker/EditNetSpell.cs
@@ -63,7 +63,7 @@ public partial class EditNetSpell : GitModuleControl
         public EditNetSpell()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             MistakeFont = new Font(TextBox.Font, FontStyle.Underline);
             TextBoxFont = TextBox.Font;
diff --git a/GitUI/UserControls/AvatarControl.cs b/GitUI/UserControls/AvatarControl.cs
@@ -21,7 +21,7 @@ public sealed partial class AvatarControl : GitExtensionsControl
         public AvatarControl()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             clearImagecacheToolStripMenuItem.Click += delegate { ClearCache(); };
 
diff --git a/GitUI/UserControls/BlameControl.cs b/GitUI/UserControls/BlameControl.cs
@@ -34,7 +34,7 @@ public sealed partial class BlameControl : GitModuleControl
         public BlameControl()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             BlameCommitter.IsReadOnly = true;
             BlameCommitter.EnableScrollBars(false);
diff --git a/GitUI/UserControls/BranchComboBox.cs b/GitUI/UserControls/BranchComboBox.cs
@@ -16,7 +16,7 @@ public partial class BranchComboBox : GitExtensionsControl
         public BranchComboBox()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             branches.DisplayMember = nameof(IGitRef.Name);
         }
diff --git a/GitUI/UserControls/BranchSelector.cs b/GitUI/UserControls/BranchSelector.cs
@@ -21,7 +21,7 @@ public BranchSelector()
             {
                 InitializeComponent();
                 Branches.SelectedIndexChanged += Branches_SelectedIndexChanged;
-                Translate();
+                InitializeComplete();
             }
             finally
             {
diff --git a/GitUI/UserControls/CommitDiff.cs b/GitUI/UserControls/CommitDiff.cs
@@ -12,7 +12,7 @@ public partial class CommitDiff : GitModuleControl
         public CommitDiff()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
 
             DiffText.ExtraDiffArgumentsChanged += DiffText_ExtraDiffArgumentsChanged;
             DiffFiles.Focus();
diff --git a/GitUI/UserControls/CommitPickerSmallControl.cs b/GitUI/UserControls/CommitPickerSmallControl.cs
@@ -13,7 +13,7 @@ public partial class CommitPickerSmallControl : GitModuleControl
         public CommitPickerSmallControl()
         {
             InitializeComponent();
-            Translate();
+            InitializeComplete();
         }
 
         ////public event EventHandler<EventArgs> OnCommitSelected;
diff --git a/GitUI/UserControls/CommitSummaryUserControl.cs b/GitUI/UserControls/CommitSummaryUserControl.cs
diff --git a/GitUI/UserControls/FileStatusList.cs b/GitUI/UserControls/FileStatusList.cs
diff --git a/GitUI/UserControls/FolderBrowserButton.cs b/GitUI/UserControls/FolderBrowserButton.cs
diff --git a/GitUI/UserControls/GotoUserManualControl.cs b/GitUI/UserControls/GotoUserManualControl.cs
diff --git a/GitUI/UserControls/HelpImageDisplayUserControl.cs b/GitUI/UserControls/HelpImageDisplayUserControl.cs
diff --git a/GitUI/UserControls/PatchGrid.cs b/GitUI/UserControls/PatchGrid.cs
diff --git a/GitUI/UserControls/RemotesComboboxControl.cs b/GitUI/UserControls/RemotesComboboxControl.cs
diff --git a/GitUI/UserControls/RevisionGrid/BareRepoControl.cs b/GitUI/UserControls/RevisionGrid/BareRepoControl.cs
diff --git a/GitUI/UserControls/RevisionGrid/EmptyRepoControl.cs b/GitUI/UserControls/RevisionGrid/EmptyRepoControl.cs
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
diff --git a/Plugins/BuildServerIntegration/AppVeyorIntegration/Settings/AppVeyorSettingsUserControl.cs b/Plugins/BuildServerIntegration/AppVeyorIntegration/Settings/AppVeyorSettingsUserControl.cs
diff --git a/Plugins/BuildServerIntegration/JenkinsIntegration/Settings/JenkinsSettingsUserControl.cs b/Plugins/BuildServerIntegration/JenkinsIntegration/Settings/JenkinsSettingsUserControl.cs
diff --git a/Plugins/BuildServerIntegration/TeamCityIntegration/Settings/TeamCitySettingsUserControl.cs b/Plugins/BuildServerIntegration/TeamCityIntegration/Settings/TeamCitySettingsUserControl.cs
diff --git a/Plugins/BuildServerIntegration/TfsIntegration/Settings/TfsSettingsUserControl.cs b/Plugins/BuildServerIntegration/TfsIntegration/Settings/TfsSettingsUserControl.cs
diff --git a/Plugins/BuildServerIntegration/VstsAndTfsIntegration/Settings/VstsAndTfsSettingsUserControl.cs b/Plugins/BuildServerIntegration/VstsAndTfsIntegration/Settings/VstsAndTfsSettingsUserControl.cs
diff --git a/ResourceManager/GitExtensionsControlInitialiser.cs b/ResourceManager/GitExtensionsControlInitialiser.cs
diff --git a/ResourceManager/GitExtensionsFormBase.cs b/ResourceManager/GitExtensionsFormBase.cs
diff --git a/ResourceManager/GitExtensionsUserControl.cs b/ResourceManager/GitExtensionsUserControl.cs
diff --git a/ResourceManager/ResourceManager.csproj b/ResourceManager/ResourceManager.csproj

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public partial class Dashboard : GitModuleControl`
`29`	`29`	`public Dashboard()`
`30`	`30`	`{`
`31`	`31`	`InitializeComponent();`
`32`		`- Translate();`
	`32`	`+ InitializeComplete();`
`33`	`33`
`34`	`34`	`SetStyle(ControlStyles.OptimizedDoubleBuffer, true);`
`35`	`35`	`Visible = false;`