From 3373c325b3f8b06ca3d5b2917033c7aa36582023 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Tue, 3 Oct 2017 15:19:18 -0500 Subject: [PATCH] save last translation window choices --- EduNetworkBuilder/App.config | 6 +++ EduNetworkBuilder/NBSettings.cs | 8 +++- .../Properties/Settings.Designer.cs | 24 +++++++++++ .../Properties/Settings.settings | 6 +++ .../TranslationWindow.Designer.cs | 1 + EduNetworkBuilder/TranslationWindow.cs | 40 ++++++++++++++++--- 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/EduNetworkBuilder/App.config b/EduNetworkBuilder/App.config index 6349420..18776bf 100644 --- a/EduNetworkBuilder/App.config +++ b/EduNetworkBuilder/App.config @@ -40,6 +40,12 @@ False + + + + + + \ No newline at end of file diff --git a/EduNetworkBuilder/NBSettings.cs b/EduNetworkBuilder/NBSettings.cs index 7096dfc..0f7a79a 100644 --- a/EduNetworkBuilder/NBSettings.cs +++ b/EduNetworkBuilder/NBSettings.cs @@ -33,6 +33,8 @@ namespace EduNetworkBuilder public string ProcessingLevel = "none"; public UInt32 NextID = 100; public bool AutoDHCPAllMachinesAtNetworkLoad = false; //Mainly for teachers + public string LastTrans1Lang = ""; + public string LastTrans2Lang = ""; public NBSettings() { @@ -117,8 +119,10 @@ namespace EduNetworkBuilder MainWindowHeight = Properties.Settings.Default.MainWindowHeight; MainWindowWidth = Properties.Settings.Default.MainWindowWidth; AutoDHCPAllMachinesAtNetworkLoad = Properties.Settings.Default.AutoDHCP; + LastTrans1Lang = Properties.Settings.Default.LastTrans1Lang; + LastTrans2Lang = Properties.Settings.Default.LastTrans2Lang; - foreach(string one in Properties.Settings.Default.ScoreList) + foreach (string one in Properties.Settings.Default.ScoreList) { if (!ScoreList.Contains(one)) ScoreList.Add(one); @@ -247,6 +251,8 @@ namespace EduNetworkBuilder Properties.Settings.Default.MainWindowHeight = MainWindowHeight; Properties.Settings.Default.MainWindowWidth = MainWindowWidth; Properties.Settings.Default.AutoDHCP = AutoDHCPAllMachinesAtNetworkLoad; + Properties.Settings.Default.LastTrans1Lang = LastTrans1Lang; + Properties.Settings.Default.LastTrans2Lang = LastTrans2Lang; Properties.Settings.Default.ScoreList.Clear(); foreach(string One in ScoreList) diff --git a/EduNetworkBuilder/Properties/Settings.Designer.cs b/EduNetworkBuilder/Properties/Settings.Designer.cs index 451b5b9..2d0f0d2 100644 --- a/EduNetworkBuilder/Properties/Settings.Designer.cs +++ b/EduNetworkBuilder/Properties/Settings.Designer.cs @@ -164,5 +164,29 @@ namespace EduNetworkBuilder.Properties { this["AutoDHCP"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string LastTrans1Lang { + get { + return ((string)(this["LastTrans1Lang"])); + } + set { + this["LastTrans1Lang"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string LastTrans2Lang { + get { + return ((string)(this["LastTrans2Lang"])); + } + set { + this["LastTrans2Lang"] = value; + } + } } } diff --git a/EduNetworkBuilder/Properties/Settings.settings b/EduNetworkBuilder/Properties/Settings.settings index 6290b5d..a6624f6 100644 --- a/EduNetworkBuilder/Properties/Settings.settings +++ b/EduNetworkBuilder/Properties/Settings.settings @@ -38,5 +38,11 @@ False + + + + + + \ No newline at end of file diff --git a/EduNetworkBuilder/TranslationWindow.Designer.cs b/EduNetworkBuilder/TranslationWindow.Designer.cs index 6618810..49d147c 100644 --- a/EduNetworkBuilder/TranslationWindow.Designer.cs +++ b/EduNetworkBuilder/TranslationWindow.Designer.cs @@ -100,6 +100,7 @@ this.Controls.Add(this.cb1Language); this.Name = "TranslationWindow"; this.Text = "TranslationWindow"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TranslationWindow_FormClosing); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TranslationWindow_KeyDown); this.ResumeLayout(false); this.PerformLayout(); diff --git a/EduNetworkBuilder/TranslationWindow.cs b/EduNetworkBuilder/TranslationWindow.cs index a98ec58..946cd2e 100644 --- a/EduNetworkBuilder/TranslationWindow.cs +++ b/EduNetworkBuilder/TranslationWindow.cs @@ -27,20 +27,45 @@ namespace EduNetworkBuilder string[,] LanguageChoices = NB.LanguageChoices; cb1Language.Items.Clear(); cb2Language.Items.Clear(); + NBSettings mySettings = NB.GetSettings(); for (int i = 0; i < LanguageChoices.GetLength(0); i++) { cb1Language.Items.Add(LanguageChoices[i, 0]); cb2Language.Items.Add(LanguageChoices[i, 0]); + if(mySettings.LastTrans1Lang == LanguageChoices[i, 1]) + { + cb1Language.SelectedItem = LanguageChoices[i, 0]; + } + if (mySettings.LastTrans2Lang == LanguageChoices[i, 1]) + { + cb2Language.SelectedItem = LanguageChoices[i, 0]; + } } - if (LanguageChoices.Length > 0) - cb1Language.SelectedIndex = 0; - if (LanguageChoices.Length > 1) - cb1Language.SelectedIndex = 1; + if (cb1Language.SelectedIndex == -1) cb1Language.SelectedIndex = 0; + if (cb2Language.SelectedIndex == -1) cb2Language.SelectedIndex = 0; Icon = Properties.Resources.NBIco; } - private void btnClose_Click(object sender, EventArgs e) + private void ClosingStuff() { + string[,] LanguageChoices = NB.LanguageChoices; + NBSettings mySettings = NB.GetSettings(); + for (int i = 0; i < LanguageChoices.GetLength(0); i++) + { + if (cb1Language.Text == LanguageChoices[i, 0]) + { + mySettings.LastTrans1Lang = LanguageChoices[i, 1]; + } + if (cb2Language.Text == LanguageChoices[i, 0]) + { + mySettings.LastTrans2Lang = LanguageChoices[i, 1]; + } + } + mySettings.Save(); + } + + private void btnClose_Click(object sender, EventArgs e) + { Close(); } @@ -57,5 +82,10 @@ namespace EduNetworkBuilder Save(); } } + + private void TranslationWindow_FormClosing(object sender, FormClosingEventArgs e) + { + ClosingStuff(); + } } }