3.2.1

henrypp · Feb 9, 2018 · 90976cd · 90976cd
1 parent 8bb88c3
commit 90976cd
Show file tree

Hide file tree

Showing 31 changed files with 187 additions and 131 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v3.3.2 (9 February 2018)
+- revert "start minimized" option (issue #39)
+- updated project sdk
+- cosmetic fixes
+
 v3.3.1 (5 January 2018)
 - disable auto-reduct by default
 - updated translations

diff --git a/bin/History.txt b/bin/History.txt
@@ -1,3 +1,8 @@
+v3.3.2 (9 February 2018)
+- revert "start minimized" option (issue #39)
+- updated project sdk
+- cosmetic fixes
+
 v3.3.1 (5 January 2018)
 - disable auto-reduct by default
 - updated translations

diff --git a/bin/i18n/!example.txt b/bin/i18n/!example.txt
diff --git a/bin/i18n/Bulgarian.ini b/bin/i18n/Bulgarian.ini
diff --git a/bin/i18n/Chinese (Simplified).ini b/bin/i18n/Chinese (Simplified).ini
diff --git a/bin/i18n/Chinese (Simplified2).ini b/bin/i18n/Chinese (Simplified2).ini
diff --git a/bin/i18n/Chinese (Traditional).ini b/bin/i18n/Chinese (Traditional).ini
diff --git a/bin/i18n/French.ini b/bin/i18n/French.ini
diff --git a/bin/i18n/German.ini b/bin/i18n/German.ini
diff --git a/bin/i18n/Hungarian.ini b/bin/i18n/Hungarian.ini
diff --git a/bin/i18n/Indonesian.ini b/bin/i18n/Indonesian.ini
diff --git a/bin/i18n/Italiano.ini b/bin/i18n/Italiano.ini
diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini
diff --git a/bin/i18n/Persian.ini b/bin/i18n/Persian.ini
diff --git a/bin/i18n/Polski.ini b/bin/i18n/Polski.ini
diff --git a/bin/i18n/Portuguese (Brazil).ini b/bin/i18n/Portuguese (Brazil).ini
diff --git a/bin/i18n/Portuguese.ini b/bin/i18n/Portuguese.ini
diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini
diff --git a/bin/i18n/Spanish.ini b/bin/i18n/Spanish.ini
diff --git a/bin/i18n/Spanish2.ini b/bin/i18n/Spanish2.ini
diff --git a/bin/i18n/Spanish3.ini b/bin/i18n/Spanish3.ini
diff --git a/bin/i18n/Swedish.ini b/bin/i18n/Swedish.ini
diff --git a/bin/i18n/Turkish.ini b/bin/i18n/Turkish.ini
diff --git a/bin/i18n/Ukrainian.ini b/bin/i18n/Ukrainian.ini
diff --git a/bin/memreduct.lng b/bin/memreduct.lng
diff --git a/memreduct.vcxproj b/memreduct.vcxproj
@@ -131,7 +131,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>
       </MinimalRebuild>
       <OmitFramePointers>true</OmitFramePointers>
@@ -172,7 +172,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>
       </MinimalRebuild>
       <OmitFramePointers>true</OmitFramePointers>
@@ -219,7 +219,7 @@
       <MinimalRebuild>
       </MinimalRebuild>
       <DebugInformationFormat>None</DebugInformationFormat>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableParallelCodeGeneration>
       </EnableParallelCodeGeneration>
@@ -265,7 +265,7 @@
       <MinimalRebuild>
       </MinimalRebuild>
       <DebugInformationFormat>None</DebugInformationFormat>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableParallelCodeGeneration>
       </EnableParallelCodeGeneration>
       <BufferSecurityCheck>false</BufferSecurityCheck>

diff --git a/src/app.hpp b/src/app.hpp
@@ -6,8 +6,8 @@
 
 #define APP_NAME L"Mem Reduct"
 #define APP_NAME_SHORT L"memreduct"
-#define APP_VERSION L"3.3.1"
-#define APP_VERSION_RES 3,3,1,0
-#define APP_COPYRIGHT L"(c) 2011-2018 " _APP_AUTHOR L". All Rights Reserved."
+#define APP_VERSION L"3.3.2"
+#define APP_VERSION_RES 3,3,2,0
+#define APP_COPYRIGHT L"(c) 2011-2018 " _APP_AUTHOR L". All Rights Reversed."
 
 #endif // __APP_H__
diff --git a/src/main.cpp b/src/main.cpp
@@ -297,14 +297,7 @@ HICON _app_iconcreate ()
 		}
 		else
 		{
-			if (has_danger)
-			{
-				color = app.ConfigGet (L"TrayColorDanger", TRAY_COLOR_DANGER).AsUlong ();
-			}
-			else
-			{
-				color = app.ConfigGet (L"TrayColorWarning", TRAY_COLOR_WARNING).AsUlong ();
-			}
+			color = has_danger ? app.ConfigGet (L"TrayColorDanger", TRAY_COLOR_DANGER).AsUlong () : app.ConfigGet (L"TrayColorWarning", TRAY_COLOR_WARNING).AsUlong ();
 		}
 	}
 
@@ -580,6 +573,9 @@ BOOL initializer_callback (HWND hwnd, DWORD msg, LPVOID, LPVOID)
 
 			// configure menu
 			CheckMenuItem (GetMenu (hwnd), IDM_ALWAYSONTOP_CHK, MF_BYCOMMAND | (app.ConfigGet (L"AlwaysOnTop", false).AsBool () ? MF_CHECKED : MF_UNCHECKED));
+			CheckMenuItem (GetMenu (hwnd), IDM_LOADONSTARTUP_CHK, MF_BYCOMMAND | (app.AutorunIsEnabled () ? MF_CHECKED : MF_UNCHECKED));
+			CheckMenuItem (GetMenu (hwnd), IDM_STARTMINIMIZED_CHK, MF_BYCOMMAND | (app.ConfigGet (L"IsStartMinimized", false).AsBool () ? MF_CHECKED : MF_UNCHECKED));
+			CheckMenuItem (GetMenu (hwnd), IDM_REDUCTCONFIRMATION_CHK, MF_BYCOMMAND | (app.ConfigGet (L"IsShowReductConfirmation", true).AsBool () ? MF_CHECKED : MF_UNCHECKED));
 			CheckMenuItem (GetMenu (hwnd), IDM_CHECKUPDATES_CHK, MF_BYCOMMAND | (app.ConfigGet (L"CheckUpdates", true).AsBool () ? MF_CHECKED : MF_UNCHECKED));
 
 			break;
@@ -595,8 +591,11 @@ BOOL initializer_callback (HWND hwnd, DWORD msg, LPVOID, LPVOID)
 			app.LocaleMenu (menu, IDS_EXIT, IDM_EXIT, false, nullptr);
 			app.LocaleMenu (menu, IDS_SETTINGS, 1, true, nullptr);
 			app.LocaleMenu (menu, IDS_ALWAYSONTOP_CHK, IDM_ALWAYSONTOP_CHK, false, nullptr);
+			app.LocaleMenu (menu, IDS_LOADONSTARTUP_CHK, IDM_LOADONSTARTUP_CHK, false, nullptr);
+			app.LocaleMenu (menu, IDS_STARTMINIMIZED_CHK, IDM_STARTMINIMIZED_CHK, false, nullptr);
+			app.LocaleMenu (menu, IDS_REDUCTCONFIRMATION_CHK, IDM_REDUCTCONFIRMATION_CHK, false, nullptr);
 			app.LocaleMenu (menu, IDS_CHECKUPDATES_CHK, IDM_CHECKUPDATES_CHK, false, nullptr);
-			app.LocaleMenu (GetSubMenu (menu, 1), IDS_LANGUAGE, 3, true, L" (Language)");
+			app.LocaleMenu (GetSubMenu (menu, 1), IDS_LANGUAGE, LANG_MENU, true, L" (Language)");
 			app.LocaleMenu (menu, IDS_HELP, 2, true, nullptr);
 			app.LocaleMenu (menu, IDS_WEBSITE, IDM_WEBSITE, false, nullptr);
 			app.LocaleMenu (menu, IDS_CHECKUPDATES, IDM_CHECKUPDATES, false, nullptr);
@@ -656,6 +655,7 @@ BOOL settings_callback (HWND hwnd, DWORD msg, LPVOID lpdata1, LPVOID lpdata2)
 					CheckDlgButton (hwnd, IDC_LOADONSTARTUP_CHK, app.AutorunIsEnabled () ? BST_CHECKED : BST_UNCHECKED);
 #endif // _APP_HAVE_AUTORUN
 
+					CheckDlgButton (hwnd, IDC_STARTMINIMIZED_CHK, app.ConfigGet (L"IsStartMinimized", false).AsBool () ? BST_CHECKED : BST_UNCHECKED);
 					CheckDlgButton (hwnd, IDC_REDUCTCONFIRMATION_CHK, app.ConfigGet (L"IsShowReductConfirmation", true).AsBool () ? BST_CHECKED : BST_UNCHECKED);
 
 #ifdef _APP_HAVE_SKIPUAC
@@ -783,6 +783,7 @@ BOOL settings_callback (HWND hwnd, DWORD msg, LPVOID lpdata1, LPVOID lpdata2)
 				{
 					SetDlgItemText (hwnd, IDC_ALWAYSONTOP_CHK, app.LocaleString (IDS_ALWAYSONTOP_CHK, nullptr));
 					SetDlgItemText (hwnd, IDC_LOADONSTARTUP_CHK, app.LocaleString (IDS_LOADONSTARTUP_CHK, nullptr));
+					SetDlgItemText (hwnd, IDC_STARTMINIMIZED_CHK, app.LocaleString (IDS_STARTMINIMIZED_CHK, nullptr));
 					SetDlgItemText (hwnd, IDC_REDUCTCONFIRMATION_CHK, app.LocaleString (IDS_REDUCTCONFIRMATION_CHK, nullptr));
 					SetDlgItemText (hwnd, IDC_SKIPUACWARNING_CHK, app.LocaleString (IDS_SKIPUACWARNING_CHK, nullptr));
 					SetDlgItemText (hwnd, IDC_CHECKUPDATES_CHK, app.LocaleString (IDS_CHECKUPDATES_CHK, nullptr));
@@ -988,8 +989,9 @@ BOOL settings_callback (HWND hwnd, DWORD msg, LPVOID lpdata1, LPVOID lpdata2)
 						}
 
 						case IDC_ALWAYSONTOP_CHK:
-						case IDC_REDUCTCONFIRMATION_CHK:
 						case IDC_LOADONSTARTUP_CHK:
+						case IDC_STARTMINIMIZED_CHK:
+						case IDC_REDUCTCONFIRMATION_CHK:
 						case IDC_SKIPUACWARNING_CHK:
 						case IDC_CHECKUPDATES_CHK:
 						case IDC_LANGUAGE:
@@ -1021,6 +1023,10 @@ BOOL settings_callback (HWND hwnd, DWORD msg, LPVOID lpdata1, LPVOID lpdata2)
 								app.ConfigSet (L"AlwaysOnTop", (IsDlgButtonChecked (hwnd, ctrl_id) == BST_CHECKED) ? true : false);
 								CheckMenuItem (GetMenu (app.GetHWND ()), IDM_ALWAYSONTOP_CHK, MF_BYCOMMAND | ((IsDlgButtonChecked (hwnd, ctrl_id) == BST_CHECKED) ? MF_CHECKED : MF_UNCHECKED));
 							}
+							else if (ctrl_id == IDC_STARTMINIMIZED_CHK && notify_code == BN_CLICKED)
+							{
+								app.ConfigSet (L"IsStartMinimized", (IsDlgButtonChecked (hwnd, ctrl_id) == BST_CHECKED) ? true : false);
+							}
 							else if (ctrl_id == IDC_REDUCTCONFIRMATION_CHK && notify_code == BN_CLICKED)
 							{
 								app.ConfigSet (L"IsShowReductConfirmation", (IsDlgButtonChecked (hwnd, ctrl_id) == BST_CHECKED) ? true : false);
@@ -1576,19 +1582,49 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 				{
 					const bool new_val = !app.ConfigGet (L"AlwaysOnTop", false).AsBool ();
 
-					CheckMenuItem (GetMenu (hwnd), IDM_ALWAYSONTOP_CHK, MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
+					CheckMenuItem (GetMenu (hwnd), LOWORD (wparam), MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
 					app.ConfigSet (L"AlwaysOnTop", new_val);
 
 					_r_wnd_top (hwnd, new_val);
 
 					break;
 				}
 
+				case IDM_STARTMINIMIZED_CHK:
+				{
+					const bool new_val = !app.ConfigGet (L"IsStartMinimized", false).AsBool ();
+
+					CheckMenuItem (GetMenu (hwnd), LOWORD (wparam), MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
+					app.ConfigSet (L"IsStartMinimized", new_val);
+
+					break;
+				}
+
+				case IDM_REDUCTCONFIRMATION_CHK:
+				{
+					const bool new_val = !app.ConfigGet (L"IsShowReductConfirmation", true).AsBool ();
+
+					CheckMenuItem (GetMenu (hwnd), LOWORD (wparam), MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
+					app.ConfigSet (L"IsShowReductConfirmation", new_val);
+
+					break;
+				}
+
+				case IDM_LOADONSTARTUP_CHK:
+				{
+					const bool new_val = !app.AutorunIsEnabled ();
+
+					app.AutorunEnable (new_val);
+					CheckMenuItem (GetMenu (hwnd), LOWORD (wparam), MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
+
+					break;
+				}
+
 				case IDM_CHECKUPDATES_CHK:
 				{
 					const bool new_val = !app.ConfigGet (L"CheckUpdates", true).AsBool ();
 
-					CheckMenuItem (GetMenu (hwnd), IDM_CHECKUPDATES_CHK, MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
+					CheckMenuItem (GetMenu (hwnd), LOWORD (wparam), MF_BYCOMMAND | (new_val ? MF_CHECKED : MF_UNCHECKED));
 					app.ConfigSet (L"CheckUpdates", new_val);
 
 					break;

diff --git a/src/main.hpp b/src/main.hpp
@@ -13,7 +13,7 @@
 #define FONT_DEFAULT L"Tahoma;8;400"
 #define TIMER 1000
 #define UID 1337
-#define LANG_MENU 3
+#define LANG_MENU 6
 
 // libs
 #pragma comment(lib, "ntdll.lib")