From 9fef6dd2d3400091bcc3720816935f766bbbf666 Mon Sep 17 00:00:00 2001
From: Sean Kaim <sean.kaim@gmail.com>
Date: Mon, 7 Jan 2019 17:34:44 -0500
Subject: [PATCH] minor clean up

---
 mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs      | 1 -
 mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs    | 1 -
 mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs   | 1 -
 mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs   | 1 -
 mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs | 1 -
 mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs      | 1 -
 mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs     | 1 -
 mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs   | 1 -
 mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs    | 2 --
 mRemoteV1/UI/Forms/frmOptions.cs                     | 9 +++++++--
 10 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
index 466a83787..218432eea 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.App;
diff --git a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
index d9da8cd25..8cae1d2ed 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Tools;
diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
index a2af48da2..ec872aee5 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using mRemoteNG.Config;
 
 namespace mRemoteNG.UI.Forms.OptionsPages
diff --git a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs
index 25b7e1f3b..b108111b4 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using mRemoteNG.App;
 using mRemoteNG.Security.SymmetricEncryption;
 
diff --git a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs
index 01319c629..a8ab93351 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.App;
diff --git a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs
index 417a68d3c..cdb184b4b 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using mRemoteNG.Security;
 
 namespace mRemoteNG.UI.Forms.OptionsPages
diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
index 7f15ca529..e7705d167 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using mRemoteNG.App;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
diff --git a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
index 22b9cc587..a8b4db3ff 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 
 namespace mRemoteNG.UI.Forms.OptionsPages
 {
diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
index 2a8508bab..32474bd4b 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
@@ -1,5 +1,3 @@
-using System.Drawing;
-
 namespace mRemoteNG.UI.Forms.OptionsPages
 {
     public sealed partial class TabsPanelsPage
diff --git a/mRemoteV1/UI/Forms/frmOptions.cs b/mRemoteV1/UI/Forms/frmOptions.cs
index 25c2522f8..22f5a4d28 100644
--- a/mRemoteV1/UI/Forms/frmOptions.cs
+++ b/mRemoteV1/UI/Forms/frmOptions.cs
@@ -32,7 +32,10 @@ namespace mRemoteNG.UI.Forms
             FontOverrider.FontOverride(this);
             AddOptionsPagesToListView();
             SetInitiallyActivatedPage();
-            ApplyLanguage();
+            // ApplyLanguage();
+            // Handle the main page here and the individual pages in 
+            // AddOptionsPagesToListView()  -- one less foreach loop....
+            Text = Language.strOptionsPageTitle;
             ApplyTheme();
             Themes.ThemeManager.getInstance().ThemeChanged += ApplyTheme;
             lstOptionPages.SelectedIndexChanged += LstOptionPages_SelectedIndexChanged;
@@ -46,6 +49,7 @@ namespace mRemoteNG.UI.Forms
             ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
         }
 
+#if false
         private void ApplyLanguage()
         {
             Text = Language.strOptionsPageTitle;
@@ -54,7 +58,7 @@ namespace mRemoteNG.UI.Forms
                 optionPage.ApplyLanguage();
             }
         }
-
+#endif
         private void CompileListOfOptionsPages()
         {
             _pages = new Dictionary<string, OptionsPage>
@@ -80,6 +84,7 @@ namespace mRemoteNG.UI.Forms
 
             foreach (var page in _pages.Select(keyValuePair => keyValuePair.Value))
             {
+                page.ApplyLanguage();
                 page.LoadSettings();
                 lstOptionPages.AddObject(page);
             }