* Restart no longer required in order to change certain settings

CodeDead · CodeDead · commit 9040ea5ecb99 · 2016-09-07T16:11:15.000+02:00
* Updated languages
* Minor design changes
* Minor design fixes
diff --git a/DeadLock/Classes/Language.cs b/DeadLock/Classes/Language.cs
@@ -143,9 +143,6 @@ public class Language
         public string BtnReset;
         public string BtnSave;
 
-        //Settins Form - Messages:
-        public string MsgRestartRequired;
-
         //Settings Form - ToggleButtons
         public string TbtnOn;
         public string TbtnOff;
diff --git a/DeadLock/Forms/FrmMain.cs b/DeadLock/Forms/FrmMain.cs
@@ -219,7 +219,7 @@ private async void Update(bool showError, bool showNoUpdates)
         /// <summary>
         /// Change the GUI to match the current theme.
         /// </summary>
-        private void LoadTheme()
+        internal void LoadTheme()
         {
             try
             {
diff --git a/DeadLock/Forms/FrmSettings.Designer.cs b/DeadLock/Forms/FrmSettings.Designer.cs
diff --git a/DeadLock/Forms/FrmSettings.cs b/DeadLock/Forms/FrmSettings.cs
@@ -192,24 +192,19 @@ private void SaveSettings()
                 Properties.Settings.Default.StartMinimized = tbtnStartMinimized.ToggleState == ToggleButtonState.Active;
                 Properties.Settings.Default.ShowAdminWarning = tbtnAdminWarning.ToggleState == ToggleButtonState.Active;
 
-                if ((cpbThemeStyle.MetroColor != Properties.Settings.Default.MetroColor) || (Properties.Settings.Default.BorderThickness != (int)itxtBorderThickness.IntegerValue) || (tbtnDetails.ToggleState == ToggleButtonState.Active) != Properties.Settings.Default.ViewDetails)
-                {
-                    MessageBoxAdv.Show(_main.LanguageManager.GetLanguage().MsgRestartRequired, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-
                 Properties.Settings.Default.MetroColor = cpbThemeStyle.SelectedColor;
                 Properties.Settings.Default.BorderThickness = (int)itxtBorderThickness.IntegerValue;
                 Properties.Settings.Default.RememberFormSize = tbtnFormSize.ToggleState == ToggleButtonState.Active;
                 Properties.Settings.Default.ViewDetails = tbtnDetails.ToggleState == ToggleButtonState.Active;
 
-                if (cboLanguage.SelectedIndex != Properties.Settings.Default.Language || txtLanguagePath.Text != Properties.Settings.Default.LanguagePath)
-                {
-                    Properties.Settings.Default.Language = cboLanguage.SelectedIndex;
-                    Properties.Settings.Default.LanguagePath = txtLanguagePath.Text;
+                _main.LoadTheme();
+                LoadTheme();
 
-                    _main.LanguageSwitch();
-                    LoadLanguage();
-                }
+                Properties.Settings.Default.Language = cboLanguage.SelectedIndex;
+                Properties.Settings.Default.LanguagePath = txtLanguagePath.Text;
+
+                _main.LanguageSwitch();
+                LoadLanguage();
 
                 List<string> args = new List<string>();
 
@@ -230,7 +225,6 @@ private void SaveSettings()
                     StartRegManager(args);
                 }
                 Properties.Settings.Default.TakeOwnership = tbtnOwnership.ToggleState == ToggleButtonState.Active;
-
                 Properties.Settings.Default.Save();
             }
             catch (Exception ex)
@@ -243,7 +237,7 @@ private void SaveSettings()
         /// Start the RegManager with a list of arguments.
         /// </summary>
         /// <param name="args">A list of arguments.</param>
-        private static void StartRegManager(IReadOnlyList<string> args)
+        private static void StartRegManager(IEnumerable<string> args)
         {
             string a = string.Join(" ", args);
             Process process = new Process
@@ -342,15 +336,10 @@ private void btnReset_Click(object sender, EventArgs e)
 
                 Properties.Settings.Default.Reset();
                 Properties.Settings.Default.Save();
-                if ((cpbThemeStyle.MetroColor != Properties.Settings.Default.MetroColor) || (Properties.Settings.Default.BorderThickness != (int)itxtBorderThickness.IntegerValue) || (tbtnDetails.ToggleState == ToggleButtonState.Active) != Properties.Settings.Default.ViewDetails)
-                {
-                    MessageBoxAdv.Show(_main.LanguageManager.GetLanguage().MsgRestartRequired, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                if (cboLanguage.SelectedIndex != Properties.Settings.Default.Language || txtLanguagePath.Text != Properties.Settings.Default.LanguagePath)
-                {
-                    _main.LanguageSwitch();
-                    LoadLanguage();
-                }
+                _main.LoadTheme();
+                LoadTheme();
+                _main.LanguageSwitch();
+                LoadLanguage();
                 LoadSettings();
             }
             catch (Exception ex)
diff --git a/DeadLock/Resources/Languages/eng.xml b/DeadLock/Resources/Languages/eng.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Take ownership:</LblOwnership>
   <BtnReset>Reset</BtnReset>
   <BtnSave>Save</BtnSave>
-  <MsgRestartRequired>A restart is required in order to change certain settings!</MsgRestartRequired>
   <TbtnOn>ON</TbtnOn>
   <TbtnOff>OFF</TbtnOff>
   <TxtUpdater>Updater</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/esp.xml b/DeadLock/Resources/Languages/esp.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Tomar posesión:</LblOwnership>
   <BtnReset>Predefinidos</BtnReset>
   <BtnSave>Guardar</BtnSave>
-  <MsgRestartRequired>¡Es necesario reiniciar para cambiar ciertos ajustes!</MsgRestartRequired>
   <TbtnOn>Sí</TbtnOn>
   <TbtnOff>No</TbtnOff>
   <TxtUpdater>Actualizador</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/fr.xml b/DeadLock/Resources/Languages/fr.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Prend la propriété:</LblOwnership>
   <BtnReset>Reset</BtnReset>
   <BtnSave>Sauver</BtnSave>
-  <MsgRestartRequired>Un redémarrage est requis pour changer certains réglages!</MsgRestartRequired>
   <TbtnOn>ON</TbtnOn>
   <TbtnOff>OFF</TbtnOff>
   <TxtUpdater>Mise à jour</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/ger.xml b/DeadLock/Resources/Languages/ger.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Besit ergreifen:</LblOwnership>
   <BtnReset>Reset</BtnReset>
   <BtnSave>Speichern</BtnSave>
-  <MsgRestartRequired>Ein Neustart ist nötig um bestimmte Aänderungen wirksam zu machen!</MsgRestartRequired>
   <TbtnOn>AN</TbtnOn>
   <TbtnOff>AUS</TbtnOff>
   <TxtUpdater>Updater</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/ita.xml b/DeadLock/Resources/Languages/ita.xml
@@ -83,7 +83,6 @@
 	<BtnClose>Chiudi</BtnClose>
 	<BtnReset>Resetta</BtnReset>
 	<BtnSave>Salva</BtnSave>
-	<MsgRestartRequired>È necessario un riavvio per modificare alcune impostazioni!</MsgRestartRequired>
   <TbtnOn>ACCESO</TbtnOn>
   <TbtnOff>SPENTO</TbtnOff>
 	<TxtUpdater>Aggiornatore</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/kor.xml b/DeadLock/Resources/Languages/kor.xml
@@ -83,7 +83,6 @@
   <LblOwnership>관리자 권한 얻기:</LblOwnership>
   <BtnReset>재설정</BtnReset>
   <BtnSave>저장</BtnSave>
-  <MsgRestartRequired>변경된 설정을 적용하려면 프로그램의 재시작이 필요합니다!</MsgRestartRequired>
   <TbtnOn>켜짐</TbtnOn>
   <TbtnOff>꺼짐</TbtnOff>
   <TxtUpdater>업데이터</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/nl.xml b/DeadLock/Resources/Languages/nl.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Neem eigendomsrecht:</LblOwnership>
   <BtnReset>Resetten</BtnReset>
   <BtnSave>Opslaan</BtnSave>
-  <MsgRestartRequired>Het programma moet opnieuw opgestart worden om de instellingen te wijzigen!</MsgRestartRequired>
   <TbtnOn>AAN</TbtnOn>
   <TbtnOff>UIT</TbtnOff>
   <TxtUpdater>Updater</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/pl.xml b/DeadLock/Resources/Languages/pl.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Przejąć na własność:</LblOwnership>
 	<BtnReset>Resetuj</BtnReset>
 	<BtnSave>Zapisz</BtnSave>
-	<MsgRestartRequired>Wymagane jest Ponowne uruchomienie w celu zmiany niektórych ustawień!</MsgRestartRequired>
   <TbtnOn>WŁ</TbtnOn>
   <TbtnOff>WYŁ</TbtnOff>
 	<TxtUpdater>Aktualizator</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/rus.xml b/DeadLock/Resources/Languages/rus.xml
@@ -67,7 +67,7 @@
   <BtnClose>Закрыть</BtnClose>
   <BtnLicense>Лицензия</BtnLicense>
   <LblGeneral>Главная</LblGeneral>
-  <ChbAutoUpdate>Автоматически проверять наличие обновлений:</ChbAutoUpdate>
+  <ChbAutoUpdate>Проверить наличие обновлений:</ChbAutoUpdate>
   <ChbShowNotifyIcon>Показать значок в Панели задач:</ChbShowNotifyIcon>
   <ChbStartMinimized>Запустить минимизированно:</ChbStartMinimized>
   <ChbShowAdminWarning>Показать предупреждение администратора:</ChbShowAdminWarning>
@@ -83,7 +83,6 @@
   <LblOwnership>Получить права:</LblOwnership>
   <BtnReset>Перезапуск</BtnReset>
   <BtnSave>Сохранить</BtnSave>
-  <MsgRestartRequired>Перезапуск необходим для того, чтобы изменить некоторые настройки!</MsgRestartRequired>
   <TbtnOn>ON</TbtnOn>
   <TbtnOff>OFF</TbtnOff>
   <TxtUpdater>Центр обновлений</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/sr.xml b/DeadLock/Resources/Languages/sr.xml
@@ -82,7 +82,6 @@
   <LblOwnership>Preuzmi vlasništvo:</LblOwnership>
   <BtnReset>Ресет</BtnReset>
   <BtnSave>Sačuvaj</BtnSave>
-  <MsgRestartRequired>Ponovno pokretanje programa je potrebno da bi se primenile određene postavke!</MsgRestartRequired>
   <TbtnOn>Ukljući</TbtnOn>
   <TbtnOff>Iskljući</TbtnOff>
   <TxtUpdater>Updater</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/swe.xml b/DeadLock/Resources/Languages/swe.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Överta ägarskap:</LblOwnership>
   <BtnReset>Återställ</BtnReset>
   <BtnSave>Spara</BtnSave>
-  <MsgRestartRequired>Omstart krävs för att ändra vissa inställningar!</MsgRestartRequired>
   <TbtnOn>PÅ</TbtnOn>
   <TbtnOff>AV</TbtnOff>
   <TxtUpdater>Uppdaterare</TxtUpdater>
diff --git a/DeadLock/Resources/Languages/tr.xml b/DeadLock/Resources/Languages/tr.xml
@@ -83,7 +83,6 @@
   <LblOwnership>Sahiplik alma:</LblOwnership>
   <BtnReset>Sıfırla</BtnReset>
   <BtnSave>Kaydet</BtnSave>
-  <MsgRestartRequired>Bir yeniden başlatma belirli ayarları değiştirmek için gereklidir!</MsgRestartRequired>
   <TbtnOn>Açık</TbtnOn>
   <TbtnOff>Kapalı</TbtnOff>
   <TxtUpdater>Güncelleyici</TxtUpdater>

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private async void Update(bool showError, bool showNoUpdates)`
`219`	`219`	`/// <summary>`
`220`	`220`	`/// Change the GUI to match the current theme.`
`221`	`221`	`/// </summary>`
`222`		`- private void LoadTheme()`
	`222`	`+ internal void LoadTheme()`
`223`	`223`	`{`
`224`	`224`	`try`
`225`	`225`	`{`