Skip to content

Commit 0b24a2c

Browse files
LightLight
authored andcommitted
Complete the extraction of the main string.
1 parent 7953966 commit 0b24a2c

16 files changed

+137
-99
lines changed

SmartSystemMenu/Forms/AboutForm.Designer.cs

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

SmartSystemMenu/Forms/AboutForm.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using System;
22
using System.Windows.Forms;
3+
using SmartSystemMenu.Settings;
34

45
namespace SmartSystemMenu.Forms
56
{
67
partial class AboutForm : Form
78
{
89
private const string URL = "https://github.com/AlexanderPro/SmartSystemMenu";
910

10-
public AboutForm()
11+
public AboutForm(MenuLanguage menuLanguage)
1112
{
12-
InitializeComponent();
13-
Text = "About " + AssemblyUtils.AssemblyProductName;
13+
InitializeComponent(menuLanguage);
14+
Text = menuLanguage.GetStringValue("about_form") + AssemblyUtils.AssemblyProductName;
1415
lblProductName.Text = string.Format("{0} v{1}", AssemblyUtils.AssemblyProductName, AssemblyUtils.AssemblyProductVersion);
1516
lblCopyright.Text = string.Format("{0}-{1} {2}", AssemblyUtils.AssemblyCopyright, DateTime.Now.Year, AssemblyUtils.AssemblyCompany);
1617
linkUrl.Text = URL;

SmartSystemMenu/Forms/InfoForm.Designer.cs

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

SmartSystemMenu/Forms/InfoForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ partial class InfoForm : Form
99
{
1010
private Window _window;
1111

12-
public InfoForm(Window window, SmartSystemMenuSettings _sttings)
12+
public InfoForm(Window window, MenuLanguage menuLanguage)
1313
{
1414
_window = window;
15-
InitializeComponent(_sttings.MenuLanguage);
15+
InitializeComponent(menuLanguage);
1616
InitializeControls();
1717
}
1818

SmartSystemMenu/Forms/MainForm.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected override void OnLoad(EventArgs e)
7272
return;
7373
}
7474
}
75-
_systemTrayMenu = new SystemTrayMenu();
75+
_systemTrayMenu = new SystemTrayMenu(_settings.MenuLanguage);
7676
_systemTrayMenu.MenuItemAutoStart.Click += MenuItemAutoStartClick;
7777
_systemTrayMenu.MenuItemSettings.Click += MenuItemSettingsClick;
7878
_systemTrayMenu.MenuItemAbout.Click += MenuItemAboutClick;
@@ -231,7 +231,7 @@ private void MenuItemAboutClick(object sender, EventArgs e)
231231
{
232232
if (_aboutForm == null || _aboutForm.IsDisposed || !_aboutForm.IsHandleCreated)
233233
{
234-
_aboutForm = new AboutForm();
234+
_aboutForm = new AboutForm(_settings.MenuLanguage);
235235
}
236236
_aboutForm.Show();
237237
_aboutForm.Activate();
@@ -385,7 +385,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
385385

386386
case SystemMenu.SC_INFORMATION:
387387
{
388-
var infoForm = new InfoForm(window, _settings);
388+
var infoForm = new InfoForm(window, _settings.MenuLanguage);
389389
infoForm.Show(window.Win32Window);
390390
}
391391
break;
@@ -570,7 +570,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
570570

571571
case SystemMenu.SC_SIZE_CUSTOM:
572572
{
573-
var sizeForm = new SizeForm(window, _settings);
573+
var sizeForm = new SizeForm(window, _settings.MenuLanguage);
574574
sizeForm.Show(window.Win32Window);
575575
}
576576
break;
@@ -585,7 +585,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
585585

586586
case SystemMenu.SC_TRANS_CUSTOM:
587587
{
588-
var opacityForm = new TransparencyForm(window, _settings);
588+
var opacityForm = new TransparencyForm(window, _settings.MenuLanguage);
589589
opacityForm.Show(window.Win32Window);
590590
}
591591
break;
@@ -600,7 +600,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
600600

601601
case SystemMenu.SC_ALIGN_CUSTOM:
602602
{
603-
var positionForm = new PositionForm(window, _settings);
603+
var positionForm = new PositionForm(window, _settings.MenuLanguage);
604604
positionForm.Show(window.Win32Window);
605605
}
606606
break;

SmartSystemMenu/Forms/PositionForm.Designer.cs

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

SmartSystemMenu/Forms/PositionForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ partial class PositionForm : Form
88
{
99
private Window _window;
1010

11-
public PositionForm(Window window, SmartSystemMenuSettings _settins)
11+
public PositionForm(Window window, MenuLanguage menuLanguage)
1212
{
13-
InitializeComponent(_settins.MenuLanguage);
13+
InitializeComponent(menuLanguage);
1414

1515
_window = window;
1616
numericLeft.Value = _window.SizeOnMonitor.Left;

0 commit comments

Comments
 (0)