Skip to content

Commit 9040ea5

Browse files
CodeDeadCodeDead
committed
* Restart no longer required in order to change certain settings
* Updated languages * Minor design changes * Minor design fixes
1 parent fd2d446 commit 9040ea5

File tree

16 files changed

+44
-70
lines changed

16 files changed

+44
-70
lines changed

‎DeadLock/Classes/Language.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ public class Language
143143
public string BtnReset;
144144
public string BtnSave;
145145

146-
//Settins Form - Messages:
147-
public string MsgRestartRequired;
148-
149146
//Settings Form - ToggleButtons
150147
public string TbtnOn;
151148
public string TbtnOff;

‎DeadLock/Forms/FrmMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private async void Update(bool showError, bool showNoUpdates)
219219
/// <summary>
220220
/// Change the GUI to match the current theme.
221221
/// </summary>
222-
private void LoadTheme()
222+
internal void LoadTheme()
223223
{
224224
try
225225
{

‎DeadLock/Forms/FrmSettings.Designer.cs

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DeadLock/Forms/FrmSettings.cs

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,19 @@ private void SaveSettings()
192192
Properties.Settings.Default.StartMinimized = tbtnStartMinimized.ToggleState == ToggleButtonState.Active;
193193
Properties.Settings.Default.ShowAdminWarning = tbtnAdminWarning.ToggleState == ToggleButtonState.Active;
194194

195-
if ((cpbThemeStyle.MetroColor != Properties.Settings.Default.MetroColor) || (Properties.Settings.Default.BorderThickness != (int)itxtBorderThickness.IntegerValue) || (tbtnDetails.ToggleState == ToggleButtonState.Active) != Properties.Settings.Default.ViewDetails)
196-
{
197-
MessageBoxAdv.Show(_main.LanguageManager.GetLanguage().MsgRestartRequired, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Information);
198-
}
199-
200195
Properties.Settings.Default.MetroColor = cpbThemeStyle.SelectedColor;
201196
Properties.Settings.Default.BorderThickness = (int)itxtBorderThickness.IntegerValue;
202197
Properties.Settings.Default.RememberFormSize = tbtnFormSize.ToggleState == ToggleButtonState.Active;
203198
Properties.Settings.Default.ViewDetails = tbtnDetails.ToggleState == ToggleButtonState.Active;
204199

205-
if (cboLanguage.SelectedIndex != Properties.Settings.Default.Language || txtLanguagePath.Text != Properties.Settings.Default.LanguagePath)
206-
{
207-
Properties.Settings.Default.Language = cboLanguage.SelectedIndex;
208-
Properties.Settings.Default.LanguagePath = txtLanguagePath.Text;
200+
_main.LoadTheme();
201+
LoadTheme();
209202

210-
_main.LanguageSwitch();
211-
LoadLanguage();
212-
}
203+
Properties.Settings.Default.Language = cboLanguage.SelectedIndex;
204+
Properties.Settings.Default.LanguagePath = txtLanguagePath.Text;
205+
206+
_main.LanguageSwitch();
207+
LoadLanguage();
213208

214209
List<string> args = new List<string>();
215210

@@ -230,7 +225,6 @@ private void SaveSettings()
230225
StartRegManager(args);
231226
}
232227
Properties.Settings.Default.TakeOwnership = tbtnOwnership.ToggleState == ToggleButtonState.Active;
233-
234228
Properties.Settings.Default.Save();
235229
}
236230
catch (Exception ex)
@@ -243,7 +237,7 @@ private void SaveSettings()
243237
/// Start the RegManager with a list of arguments.
244238
/// </summary>
245239
/// <param name="args">A list of arguments.</param>
246-
private static void StartRegManager(IReadOnlyList<string> args)
240+
private static void StartRegManager(IEnumerable<string> args)
247241
{
248242
string a = string.Join(" ", args);
249243
Process process = new Process
@@ -342,15 +336,10 @@ private void btnReset_Click(object sender, EventArgs e)
342336

343337
Properties.Settings.Default.Reset();
344338
Properties.Settings.Default.Save();
345-
if ((cpbThemeStyle.MetroColor != Properties.Settings.Default.MetroColor) || (Properties.Settings.Default.BorderThickness != (int)itxtBorderThickness.IntegerValue) || (tbtnDetails.ToggleState == ToggleButtonState.Active) != Properties.Settings.Default.ViewDetails)
346-
{
347-
MessageBoxAdv.Show(_main.LanguageManager.GetLanguage().MsgRestartRequired, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Information);
348-
}
349-
if (cboLanguage.SelectedIndex != Properties.Settings.Default.Language || txtLanguagePath.Text != Properties.Settings.Default.LanguagePath)
350-
{
351-
_main.LanguageSwitch();
352-
LoadLanguage();
353-
}
339+
_main.LoadTheme();
340+
LoadTheme();
341+
_main.LanguageSwitch();
342+
LoadLanguage();
354343
LoadSettings();
355344
}
356345
catch (Exception ex)

‎DeadLock/Resources/Languages/eng.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Take ownership:</LblOwnership>
8484
<BtnReset>Reset</BtnReset>
8585
<BtnSave>Save</BtnSave>
86-
<MsgRestartRequired>A restart is required in order to change certain settings!</MsgRestartRequired>
8786
<TbtnOn>ON</TbtnOn>
8887
<TbtnOff>OFF</TbtnOff>
8988
<TxtUpdater>Updater</TxtUpdater>

‎DeadLock/Resources/Languages/esp.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Tomar posesión:</LblOwnership>
8484
<BtnReset>Predefinidos</BtnReset>
8585
<BtnSave>Guardar</BtnSave>
86-
<MsgRestartRequired>¡Es necesario reiniciar para cambiar ciertos ajustes!</MsgRestartRequired>
8786
<TbtnOn>Sí</TbtnOn>
8887
<TbtnOff>No</TbtnOff>
8988
<TxtUpdater>Actualizador</TxtUpdater>

‎DeadLock/Resources/Languages/fr.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Prend la propriété:</LblOwnership>
8484
<BtnReset>Reset</BtnReset>
8585
<BtnSave>Sauver</BtnSave>
86-
<MsgRestartRequired>Un redémarrage est requis pour changer certains réglages!</MsgRestartRequired>
8786
<TbtnOn>ON</TbtnOn>
8887
<TbtnOff>OFF</TbtnOff>
8988
<TxtUpdater>Mise à jour</TxtUpdater>

‎DeadLock/Resources/Languages/ger.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Besit ergreifen:</LblOwnership>
8484
<BtnReset>Reset</BtnReset>
8585
<BtnSave>Speichern</BtnSave>
86-
<MsgRestartRequired>Ein Neustart ist nötig um bestimmte Aänderungen wirksam zu machen!</MsgRestartRequired>
8786
<TbtnOn>AN</TbtnOn>
8887
<TbtnOff>AUS</TbtnOff>
8988
<TxtUpdater>Updater</TxtUpdater>

‎DeadLock/Resources/Languages/ita.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<BtnClose>Chiudi</BtnClose>
8484
<BtnReset>Resetta</BtnReset>
8585
<BtnSave>Salva</BtnSave>
86-
<MsgRestartRequired>È necessario un riavvio per modificare alcune impostazioni!</MsgRestartRequired>
8786
<TbtnOn>ACCESO</TbtnOn>
8887
<TbtnOff>SPENTO</TbtnOff>
8988
<TxtUpdater>Aggiornatore</TxtUpdater>

‎DeadLock/Resources/Languages/kor.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>관리자 권한 얻기:</LblOwnership>
8484
<BtnReset>재설정</BtnReset>
8585
<BtnSave>저장</BtnSave>
86-
<MsgRestartRequired>변경된 설정을 적용하려면 프로그램의 재시작이 필요합니다!</MsgRestartRequired>
8786
<TbtnOn>켜짐</TbtnOn>
8887
<TbtnOff>꺼짐</TbtnOff>
8988
<TxtUpdater>업데이터</TxtUpdater>

‎DeadLock/Resources/Languages/nl.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Neem eigendomsrecht:</LblOwnership>
8484
<BtnReset>Resetten</BtnReset>
8585
<BtnSave>Opslaan</BtnSave>
86-
<MsgRestartRequired>Het programma moet opnieuw opgestart worden om de instellingen te wijzigen!</MsgRestartRequired>
8786
<TbtnOn>AAN</TbtnOn>
8887
<TbtnOff>UIT</TbtnOff>
8988
<TxtUpdater>Updater</TxtUpdater>

‎DeadLock/Resources/Languages/pl.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Przejąć na własność:</LblOwnership>
8484
<BtnReset>Resetuj</BtnReset>
8585
<BtnSave>Zapisz</BtnSave>
86-
<MsgRestartRequired>Wymagane jest Ponowne uruchomienie w celu zmiany niektórych ustawień!</MsgRestartRequired>
8786
<TbtnOn>WŁ</TbtnOn>
8887
<TbtnOff>WYŁ</TbtnOff>
8988
<TxtUpdater>Aktualizator</TxtUpdater>

‎DeadLock/Resources/Languages/rus.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<BtnClose>Закрыть</BtnClose>
6868
<BtnLicense>Лицензия</BtnLicense>
6969
<LblGeneral>Главная</LblGeneral>
70-
<ChbAutoUpdate>Автоматически проверять наличие обновлений:</ChbAutoUpdate>
70+
<ChbAutoUpdate>Проверить наличие обновлений:</ChbAutoUpdate>
7171
<ChbShowNotifyIcon>Показать значок в Панели задач:</ChbShowNotifyIcon>
7272
<ChbStartMinimized>Запустить минимизированно:</ChbStartMinimized>
7373
<ChbShowAdminWarning>Показать предупреждение администратора:</ChbShowAdminWarning>
@@ -83,7 +83,6 @@
8383
<LblOwnership>Получить права:</LblOwnership>
8484
<BtnReset>Перезапуск</BtnReset>
8585
<BtnSave>Сохранить</BtnSave>
86-
<MsgRestartRequired>Перезапуск необходим для того, чтобы изменить некоторые настройки!</MsgRestartRequired>
8786
<TbtnOn>ON</TbtnOn>
8887
<TbtnOff>OFF</TbtnOff>
8988
<TxtUpdater>Центр обновлений</TxtUpdater>

‎DeadLock/Resources/Languages/sr.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<LblOwnership>Preuzmi vlasništvo:</LblOwnership>
8383
<BtnReset>Ресет</BtnReset>
8484
<BtnSave>Sačuvaj</BtnSave>
85-
<MsgRestartRequired>Ponovno pokretanje programa je potrebno da bi se primenile određene postavke!</MsgRestartRequired>
8685
<TbtnOn>Ukljući</TbtnOn>
8786
<TbtnOff>Iskljući</TbtnOff>
8887
<TxtUpdater>Updater</TxtUpdater>

‎DeadLock/Resources/Languages/swe.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Överta ägarskap:</LblOwnership>
8484
<BtnReset>Återställ</BtnReset>
8585
<BtnSave>Spara</BtnSave>
86-
<MsgRestartRequired>Omstart krävs för att ändra vissa inställningar!</MsgRestartRequired>
8786
<TbtnOn>PÅ</TbtnOn>
8887
<TbtnOff>AV</TbtnOff>
8988
<TxtUpdater>Uppdaterare</TxtUpdater>

‎DeadLock/Resources/Languages/tr.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<LblOwnership>Sahiplik alma:</LblOwnership>
8484
<BtnReset>Sıfırla</BtnReset>
8585
<BtnSave>Kaydet</BtnSave>
86-
<MsgRestartRequired>Bir yeniden başlatma belirli ayarları değiştirmek için gereklidir!</MsgRestartRequired>
8786
<TbtnOn>Açık</TbtnOn>
8887
<TbtnOff>Kapalı</TbtnOff>
8988
<TxtUpdater>Güncelleyici</TxtUpdater>

0 commit comments

Comments
 (0)