Skip to content

Commit fd2d446

Browse files
CodeDeadCodeDead
committed
* Fixed translation issue
* A restart is no longer required to switch languages
1 parent c4be222 commit fd2d446

File tree

5 files changed

+244
-229
lines changed

5 files changed

+244
-229
lines changed

‎DeadLock/Forms/FrmMain.cs

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ namespace DeadLock.Forms
1919
public partial class FrmMain : MetroForm
2020
{
2121
#region Variables
22-
23-
private readonly LanguageManager _languageManager;
22+
internal readonly LanguageManager LanguageManager;
2423
private Update _update;
25-
2624
private readonly string[] _args;
27-
2825
#endregion
2926

3027
/// <summary>
@@ -35,32 +32,10 @@ public FrmMain(string[] args)
3532
{
3633
InitializeComponent();
3734
LoadTheme();
35+
LanguageManager = new LanguageManager();
36+
_update = new Update();
3837
try
3938
{
40-
_languageManager = new LanguageManager();
41-
_update = new Update();
42-
if (Properties.Settings.Default.Language == 12)
43-
{
44-
if (Properties.Settings.Default.LanguagePath.Length != 0)
45-
{
46-
_languageManager.LoadLanguage(Properties.Settings.Default.LanguagePath);
47-
}
48-
else
49-
{
50-
_languageManager.LoadLanguage(1);
51-
}
52-
}
53-
else
54-
{
55-
try
56-
{
57-
_languageManager.LoadLanguage(Properties.Settings.Default.Language);
58-
}
59-
catch (Exception)
60-
{
61-
_languageManager.LoadLanguage(1);
62-
}
63-
}
6439
LanguageSwitch();
6540

6641
nfiTray.Visible = Properties.Settings.Default.ShowNotifyIcon;
@@ -79,9 +54,32 @@ public FrmMain(string[] args)
7954
/// <summary>
8055
/// Change the GUI to match the current Language.
8156
/// </summary>
82-
private void LanguageSwitch()
57+
internal void LanguageSwitch()
8358
{
84-
Language l = _languageManager.GetLanguage();
59+
if (Properties.Settings.Default.Language == 12)
60+
{
61+
if (Properties.Settings.Default.LanguagePath.Length != 0)
62+
{
63+
LanguageManager.LoadLanguage(Properties.Settings.Default.LanguagePath);
64+
}
65+
else
66+
{
67+
LanguageManager.LoadLanguage(1);
68+
}
69+
}
70+
else
71+
{
72+
try
73+
{
74+
LanguageManager.LoadLanguage(Properties.Settings.Default.Language);
75+
}
76+
catch (Exception)
77+
{
78+
LanguageManager.LoadLanguage(1);
79+
}
80+
}
81+
82+
Language l = LanguageManager.GetLanguage();
8583
//Main form - Menu items:
8684
fileParentBarItem.Text = l.BarFile;
8785
editParentBarItem.Text = l.BarEdit;
@@ -177,7 +175,7 @@ private void LanguageSwitch()
177175
/// <param name="showNoUpdates">Show a MessageBox when there are no updates available.</param>
178176
private async void Update(bool showError, bool showNoUpdates)
179177
{
180-
Language l = _languageManager.GetLanguage();
178+
Language l = LanguageManager.GetLanguage();
181179

182180
try
183181
{
@@ -198,7 +196,7 @@ private async void Update(bool showError, bool showNoUpdates)
198196
{
199197
if (MessageBoxAdv.Show(l.MsgVersion + " " + _update.GetUpdateVersion() + " " + l.MsgAvailable + Environment.NewLine + l.MsgDownloadNewVersion, "DeadLock", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
200198
{
201-
new FrmUpdater(_update, _languageManager.GetLanguage()).Show();
199+
new FrmUpdater(_update, LanguageManager.GetLanguage()).Show();
202200
}
203201
}
204202
else
@@ -264,7 +262,7 @@ private void FrmMain_Load(object sender, EventArgs e)
264262

265263
private void aboutBarItem_Click(object sender, EventArgs e)
266264
{
267-
new FrmAbout(_languageManager.GetLanguage()).ShowDialog();
265+
new FrmAbout(LanguageManager.GetLanguage()).ShowDialog();
268266
}
269267

270268
private void exitBarItem_Click(object sender, EventArgs e)
@@ -301,7 +299,7 @@ private void OpenPath(string path)
301299
}
302300
if (!add) return;
303301

304-
Language l = _languageManager.GetLanguage();
302+
Language l = LanguageManager.GetLanguage();
305303
int index = lsvItems.Items.Count;
306304
ListViewLocker lvi = new ListViewLocker(path, l, index);
307305

@@ -379,7 +377,7 @@ private async void unlockToolStripMenuItem1_Click(object sender, EventArgs e)
379377
{
380378
if (lsvItems.SelectedItems.Count == 0) return;
381379

382-
Language l = _languageManager.GetLanguage();
380+
Language l = LanguageManager.GetLanguage();
383381
ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
384382

385383
CancelSelectedTask(lvl);
@@ -437,7 +435,7 @@ private async void copyToolStripMenuItem_Click(object sender, EventArgs e)
437435
if (lsvItems.SelectedItems.Count == 0) return;
438436

439437
ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
440-
Language l = _languageManager.GetLanguage();
438+
Language l = LanguageManager.GetLanguage();
441439

442440
CancelSelectedTask(lvl);
443441
await Task.Run(() =>
@@ -476,7 +474,7 @@ await Task.Run(() =>
476474

477475
private void FrmMain_Shown(object sender, EventArgs e)
478476
{
479-
Language l = _languageManager.GetLanguage();
477+
Language l = LanguageManager.GetLanguage();
480478
try
481479
{
482480
if (Properties.Settings.Default.ShowAdminWarning)
@@ -489,7 +487,10 @@ private void FrmMain_Shown(object sender, EventArgs e)
489487
}
490488
}
491489

492-
if (Properties.Settings.Default.AutoUpdate) Update(false, false);
490+
if (Properties.Settings.Default.AutoUpdate)
491+
{
492+
Update(false, false);
493+
}
493494
Visible = !Properties.Settings.Default.StartMinimized;
494495

495496
if (_args.Length == 0) return;
@@ -521,7 +522,7 @@ private async void moveToolStripMenuItem_Click(object sender, EventArgs e)
521522
if (lsvItems.SelectedItems.Count == 0) return;
522523

523524
ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
524-
Language l = _languageManager.GetLanguage();
525+
Language l = LanguageManager.GetLanguage();
525526

526527
CancelSelectedTask(lvl);
527528
await Task.Run(() =>
@@ -563,7 +564,7 @@ private async void removeToolStripMenuItem_Click(object sender, EventArgs e)
563564
if (lsvItems.SelectedItems.Count == 0) return;
564565

565566
ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
566-
Language l = _languageManager.GetLanguage();
567+
Language l = LanguageManager.GetLanguage();
567568

568569
CancelSelectedTask(lvl);
569570
await Task.Run(() =>
@@ -618,7 +619,7 @@ private async void lsvItems_DoubleClick(object sender, EventArgs e)
618619
lsvDetails.Items.Clear();
619620

620621
ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
621-
Language l = _languageManager.GetLanguage();
622+
Language l = LanguageManager.GetLanguage();
622623

623624
try
624625
{
@@ -744,7 +745,7 @@ private void detailsBarItem_Click(object sender, EventArgs e)
744745
private void SetCancelled(ListViewItem selected)
745746
{
746747
if (selected == null) return;
747-
Language l = _languageManager.GetLanguage();
748+
Language l = LanguageManager.GetLanguage();
748749
selected.SubItems[1].ForeColor = Color.Red;
749750
selected.SubItems[1].Text = l.MsgOperationCancelled;
750751
selected.SubItems[2].Text = l.MsgOperationCancelled;
@@ -758,7 +759,7 @@ private void SetCancelled(ListViewItem selected)
758759
private void SetLoading(ListViewItem selected, int index)
759760
{
760761
if (selected == null) return;
761-
Language l = _languageManager.GetLanguage();
762+
Language l = LanguageManager.GetLanguage();
762763
selected.SubItems[index].ForeColor = Color.Black;
763764
selected.SubItems[index].Text = l.MsgLoading;
764765
}
@@ -829,13 +830,13 @@ private void hideShowToolStripMenuItem_Click(object sender, EventArgs e)
829830

830831
private void settingsBarItem_Click(object sender, EventArgs e)
831832
{
832-
new FrmSettings(nfiTray, _languageManager.GetLanguage()).ShowDialog();
833+
new FrmSettings(this).ShowDialog();
833834
}
834835

835836
private void killToolStripMenuItem_Click(object sender, EventArgs e)
836837
{
837838
if (lsvDetails.SelectedItems.Count == 0) return;
838-
Language lang = _languageManager.GetLanguage();
839+
Language lang = LanguageManager.GetLanguage();
839840
try
840841
{
841842
foreach (ListViewItem l in lsvDetails.SelectedItems)
@@ -910,7 +911,7 @@ private void falseOwnershipToolStripMenuItem_Click(object sender, EventArgs e)
910911
private void SetOwnership(ListViewLocker lvi, bool ownership)
911912
{
912913
lvi.SetOwnership(ownership);
913-
lvi.SubItems[2].Text = lvi.HasOwnership() ? _languageManager.GetLanguage().BarItemOwnershipTrue : _languageManager.GetLanguage().BarItemOwnershipFalse;
914+
lvi.SubItems[2].Text = lvi.HasOwnership() ? LanguageManager.GetLanguage().BarItemOwnershipTrue : LanguageManager.GetLanguage().BarItemOwnershipFalse;
914915
}
915916

916917
private void FrmMain_DragEnter(object sender, DragEventArgs e)

0 commit comments

Comments
 (0)