Skip to content

Commit 261a1e2

Browse files
AlexanderProAlexanderPro
committed
Language settings refactoring.
1 parent e87488f commit 261a1e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+516
-521
lines changed

‎SmartSystemMenu/EnumWindows.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using System.Diagnostics;
55
using SmartSystemMenu.Settings;
6+
using SmartSystemMenu.Native;
67

78
namespace SmartSystemMenu
89
{
@@ -12,26 +13,26 @@ static class EnumWindows
1213
private static IntPtr[] _filterHandles;
1314
private static IList<Window> _windows;
1415
private static MenuItems _menuItems;
15-
private static MenuLanguage _menuLanguage;
16+
private static LanguageSettings _languageSettings;
1617

17-
public static IList<Window> EnumAllWindows(MenuItems menuItems, MenuLanguage MenuLanguage, params string[] filterTitles)
18+
public static IList<Window> EnumAllWindows(MenuItems menuItems, LanguageSettings languageSettings, params string[] filterTitles)
1819
{
1920
_filterTitles = filterTitles ?? new string[0];
2021
_filterHandles = new IntPtr[0];
2122
_windows = new List<Window>();
2223
_menuItems = menuItems;
23-
_menuLanguage = MenuLanguage;
24+
_languageSettings = languageSettings;
2425
NativeMethods.EnumWindows(EnumWindowCallback, 0);
2526
return _windows;
2627
}
2728

28-
public static IList<Window> EnumProcessWindows(int processId, IntPtr[] filterHandles, MenuItems menuItems, MenuLanguage menuLanguage, params string[] filterTitles)
29+
public static IList<Window> EnumProcessWindows(int processId, IntPtr[] filterHandles, MenuItems menuItems, LanguageSettings languageSettings, params string[] filterTitles)
2930
{
3031
_filterTitles = filterTitles ?? new string[0];
3132
_filterHandles = filterHandles ?? new IntPtr[0];
3233
_windows = new List<Window>();
3334
_menuItems = menuItems;
34-
_menuLanguage = menuLanguage;
35+
_languageSettings = languageSettings;
3536
var process = SystemUtils.GetProcessByIdSafely(processId);
3637
if (process != null)
3738
{
@@ -60,7 +61,7 @@ private static bool EnumWindowCallback(IntPtr hwnd, int lParam)
6061

6162
if (!isAdd) return true;
6263

63-
var window = new Window(hwnd, _menuItems, _menuLanguage);
64+
var window = new Window(hwnd, _menuItems, _languageSettings);
6465

6566
if (!window.Menu.Exists)
6667
{

‎SmartSystemMenu/Extensions/PriorityExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace SmartSystemMenu.Extensions
1+
using SmartSystemMenu.Native;
2+
3+
namespace SmartSystemMenu.Extensions
24
{
35
static class PriorityExtensions
46
{

‎SmartSystemMenu/Extensions/ProcessExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Text;
33
using System.Diagnostics;
44
using System.Collections.Generic;
5+
using SmartSystemMenu.Native;
56

67
namespace SmartSystemMenu.Extensions
78
{

‎SmartSystemMenu/Forms/AboutForm.Designer.cs‎

Lines changed: 2 additions & 5 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
@@ -8,10 +8,11 @@ partial class AboutForm : Form
88
{
99
private const string URL = "https://github.com/AlexanderPro/SmartSystemMenu";
1010

11-
public AboutForm(MenuLanguage menuLanguage)
11+
public AboutForm(SmartSystemMenuSettings settings)
1212
{
13-
InitializeComponent(menuLanguage);
14-
Text = menuLanguage.GetStringValue("about_form") + AssemblyUtils.AssemblyProductName;
13+
InitializeComponent();
14+
btnOk.Text = settings.LanguageSettings.GetValue("about_btn_ok");
15+
Text = settings.LanguageSettings.GetValue("about_form") + AssemblyUtils.AssemblyProductName;
1516
lblProductName.Text = string.Format("{0} v{1}", AssemblyUtils.AssemblyProductName, AssemblyUtils.AssemblyProductVersion);
1617
lblCopyright.Text = string.Format("{0}-{1} {2}", AssemblyUtils.AssemblyCopyright, DateTime.Now.Year, AssemblyUtils.AssemblyCompany);
1718
linkUrl.Text = URL;

‎SmartSystemMenu/Forms/InfoForm.Designer.cs‎

Lines changed: 2 additions & 17 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: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
11
using System.Windows.Forms;
2-
using System.Diagnostics;
32
using System.IO;
43
using SmartSystemMenu.Settings;
54

65
namespace SmartSystemMenu.Forms
76
{
87
partial class InfoForm : Form
98
{
10-
private Window _window;
11-
12-
public InfoForm(Window window, MenuLanguage menuLanguage)
9+
public InfoForm(Window window, SmartSystemMenuSettings settings)
1310
{
14-
_window = window;
15-
InitializeComponent(menuLanguage);
16-
InitializeControls();
11+
InitializeComponent();
12+
InitializeControls(window, settings);
1713
}
1814

19-
private void InitializeControls()
15+
private void InitializeControls(Window window, SmartSystemMenuSettings settings)
2016
{
21-
txtHandleValue.Text = _window.Handle.ToInt64().ToString("X8");
22-
txtCaptionValue.Text = _window.WindowText;
23-
txtClassValue.Text = _window.ClassName;
24-
lblStyleValue.Text = _window.Style.ToString("X8");
25-
lblRectangleValue.Text = string.Format("({0},{1}) - ({2},{3}) - {4}x{5}", _window.Size.Left, _window.Size.Top, _window.Size.Right, _window.Size.Bottom, _window.Size.Width, _window.Size.Height);
26-
lblProcessIdValue.Text = string.Format("{0:X8} ({0})", _window.ProcessId);
27-
lblThreadIdValue.Text = string.Format("{0:X8} ({0})", _window.ThreadId);
28-
var process = SystemUtils.GetProcessByIdSafely(_window.ProcessId);
17+
tabGeneral.Text = settings.LanguageSettings.GetValue("tab_general");
18+
tabProcess.Text = settings.LanguageSettings.GetValue("tab_process");
19+
lblRectangle.Text = settings.LanguageSettings.GetValue("lbl_rectangle");
20+
lblStyle.Text = settings.LanguageSettings.GetValue("lbl_style");
21+
lblClass.Text = settings.LanguageSettings.GetValue("lbl_class");
22+
lblCaption.Text = settings.LanguageSettings.GetValue("lbl_caption");
23+
lblHandle.Text = settings.LanguageSettings.GetValue("lbl_handle");
24+
lblThreadId.Text = settings.LanguageSettings.GetValue("lbl_thread_id");
25+
lblProcessId.Text = settings.LanguageSettings.GetValue("lbl_process_id");
26+
lblModulePath.Text = settings.LanguageSettings.GetValue("lbl_module_path");
27+
lblModuleName.Text = settings.LanguageSettings.GetValue("lbl_module_name");
28+
Text = settings.LanguageSettings.GetValue("information");
29+
txtHandleValue.Text = window.Handle.ToInt64().ToString("X8");
30+
txtCaptionValue.Text = window.WindowText;
31+
txtClassValue.Text = window.ClassName;
32+
lblStyleValue.Text = window.Style.ToString("X8");
33+
lblRectangleValue.Text = string.Format("({0},{1}) - ({2},{3}) - {4}x{5}", window.Size.Left, window.Size.Top, window.Size.Right, window.Size.Bottom, window.Size.Width, window.Size.Height);
34+
lblProcessIdValue.Text = string.Format("{0:X8} ({0})", window.ProcessId);
35+
lblThreadIdValue.Text = string.Format("{0:X8} ({0})", window.ThreadId);
36+
var process = SystemUtils.GetProcessByIdSafely(window.ProcessId);
2937
if (process != null)
3038
{
3139
txtModuleNameValue.Text = Path.GetFileName(process.MainModule.FileName);

‎SmartSystemMenu/Forms/MainForm.cs‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Drawing.Imaging;
99
using System.Text;
1010
using System.Threading;
11+
using SmartSystemMenu.Native;
1112
using SmartSystemMenu.Extensions;
1213
using SmartSystemMenu.Hooks;
1314
using SmartSystemMenu.Settings;
@@ -74,14 +75,14 @@ protected override void OnLoad(EventArgs e)
7475
}
7576
}
7677

77-
_systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon, _settings.MenuLanguage);
78+
_systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon, _settings.LanguageSettings);
7879
_systemTrayMenu.MenuItemAutoStart.Click += MenuItemAutoStartClick;
7980
_systemTrayMenu.MenuItemSettings.Click += MenuItemSettingsClick;
8081
_systemTrayMenu.MenuItemAbout.Click += MenuItemAboutClick;
8182
_systemTrayMenu.MenuItemExit.Click += MenuItemExitClick;
8283
_systemTrayMenu.MenuItemAutoStart.Checked = AutoStarter.IsAutoStartByRegisterEnabled(AssemblyUtils.AssemblyProductName, AssemblyUtils.AssemblyLocation);
8384
#endif
84-
_windows = EnumWindows.EnumAllWindows(_settings.MenuItems, _settings.MenuLanguage, new string[] { SHELL_WINDOW_NAME }).ToList();
85+
_windows = EnumWindows.EnumAllWindows(_settings.MenuItems, _settings.LanguageSettings, new string[] { SHELL_WINDOW_NAME }).ToList();
8586

8687
foreach (var window in _windows)
8788
{
@@ -233,7 +234,7 @@ private void MenuItemAboutClick(object sender, EventArgs e)
233234
{
234235
if (_aboutForm == null || _aboutForm.IsDisposed || !_aboutForm.IsHandleCreated)
235236
{
236-
_aboutForm = new AboutForm(_settings.MenuLanguage);
237+
_aboutForm = new AboutForm(_settings);
237238
}
238239
_aboutForm.Show();
239240
_aboutForm.Activate();
@@ -258,14 +259,14 @@ private void MenuItemExitClick(object sender, EventArgs e)
258259

259260
private void WindowCreated(object sender, WindowEventArgs e)
260261
{
261-
if (e.Handle != IntPtr.Zero && new SystemMenu(e.Handle, _settings.MenuItems, _settings.MenuLanguage).Exists && !_windows.Any(w => w.Handle == e.Handle))
262+
if (e.Handle != IntPtr.Zero && new SystemMenu(e.Handle, _settings.MenuItems, _settings.LanguageSettings).Exists && !_windows.Any(w => w.Handle == e.Handle))
262263
{
263264
int processId;
264265
NativeMethods.GetWindowThreadProcessId(e.Handle, out processId);
265266
IList<Window> windows = new List<Window>();
266267
try
267268
{
268-
windows = EnumWindows.EnumProcessWindows(processId, _windows.Select(w => w.Handle).ToArray(), _settings.MenuItems, _settings.MenuLanguage, new string[] { SHELL_WINDOW_NAME });
269+
windows = EnumWindows.EnumProcessWindows(processId, _windows.Select(w => w.Handle).ToArray(), _settings.MenuItems, _settings.LanguageSettings, new string[] { SHELL_WINDOW_NAME });
269270
}
270271
catch
271272
{
@@ -387,7 +388,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
387388

388389
case SystemMenu.SC_INFORMATION:
389390
{
390-
var infoForm = new InfoForm(window, _settings.MenuLanguage);
391+
var infoForm = new InfoForm(window, _settings);
391392
infoForm.Show(window.Win32Window);
392393
}
393394
break;
@@ -399,11 +400,11 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
399400
{
400401
OverwritePrompt = true,
401402
ValidateNames = true,
402-
Title = _settings.MenuLanguage.GetStringValue("save_screenshot_title"),
403-
FileName = _settings.MenuLanguage.GetStringValue("save_screenshot_filename"),
404-
DefaultExt = _settings.MenuLanguage.GetStringValue("save_screenshot_default_ext"),
403+
Title = _settings.LanguageSettings.GetValue("save_screenshot_title"),
404+
FileName = _settings.LanguageSettings.GetValue("save_screenshot_filename"),
405+
DefaultExt = _settings.LanguageSettings.GetValue("save_screenshot_default_ext"),
405406
RestoreDirectory = false,
406-
Filter = _settings.MenuLanguage.GetStringValue("save_screenshot_filter")
407+
Filter = _settings.LanguageSettings.GetValue("save_screenshot_filter")
407408
};
408409
if (dialog.ShowDialog(window.Win32Window) == DialogResult.OK)
409410
{
@@ -571,7 +572,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
571572

572573
case SystemMenu.SC_SIZE_CUSTOM:
573574
{
574-
var sizeForm = new SizeForm(window, _settings.MenuLanguage);
575+
var sizeForm = new SizeForm(window, _settings);
575576
sizeForm.Show(window.Win32Window);
576577
}
577578
break;
@@ -586,7 +587,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
586587

587588
case SystemMenu.SC_TRANS_CUSTOM:
588589
{
589-
var opacityForm = new TransparencyForm(window, _settings.MenuLanguage);
590+
var opacityForm = new TransparencyForm(window, _settings);
590591
opacityForm.Show(window.Win32Window);
591592
}
592593
break;
@@ -601,7 +602,7 @@ private void WindowGetMsg(object sender, WndProcEventArgs e)
601602

602603
case SystemMenu.SC_ALIGN_CUSTOM:
603604
{
604-
var positionForm = new PositionForm(window, _settings.MenuLanguage);
605+
var positionForm = new PositionForm(window, _settings);
605606
positionForm.Show(window.Win32Window);
606607
}
607608
break;

0 commit comments

Comments
 (0)