diff --git a/CHANGELOG.md b/CHANGELOG.md index a39a4d0f..ff3cf633 100644 --- 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 index a39a4d0f..ff3cf633 100644 --- 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 index 9b9fb848..4b52d05f 100644 Binary files a/bin/i18n/!example.txt and b/bin/i18n/!example.txt differ diff --git a/bin/i18n/Bulgarian.ini b/bin/i18n/Bulgarian.ini index 00f04892..064de5df 100644 Binary files a/bin/i18n/Bulgarian.ini and b/bin/i18n/Bulgarian.ini differ diff --git a/bin/i18n/Chinese (Simplified).ini b/bin/i18n/Chinese (Simplified).ini index bac2f3a2..8c565f8b 100644 Binary files a/bin/i18n/Chinese (Simplified).ini and b/bin/i18n/Chinese (Simplified).ini differ diff --git a/bin/i18n/Chinese (Simplified2).ini b/bin/i18n/Chinese (Simplified2).ini index d3d936f7..85fbccc8 100644 Binary files a/bin/i18n/Chinese (Simplified2).ini and b/bin/i18n/Chinese (Simplified2).ini differ diff --git a/bin/i18n/Chinese (Traditional).ini b/bin/i18n/Chinese (Traditional).ini index 63f3e8c8..5295e822 100644 Binary files a/bin/i18n/Chinese (Traditional).ini and b/bin/i18n/Chinese (Traditional).ini differ diff --git a/bin/i18n/French.ini b/bin/i18n/French.ini index f0a70f79..f3cf7389 100644 Binary files a/bin/i18n/French.ini and b/bin/i18n/French.ini differ diff --git a/bin/i18n/German.ini b/bin/i18n/German.ini index 780be568..3690308a 100644 Binary files a/bin/i18n/German.ini and b/bin/i18n/German.ini differ diff --git a/bin/i18n/Hungarian.ini b/bin/i18n/Hungarian.ini index f7f6edf1..516a9379 100644 Binary files a/bin/i18n/Hungarian.ini and b/bin/i18n/Hungarian.ini differ diff --git a/bin/i18n/Indonesian.ini b/bin/i18n/Indonesian.ini index 6db2e28d..d34a8adf 100644 Binary files a/bin/i18n/Indonesian.ini and b/bin/i18n/Indonesian.ini differ diff --git a/bin/i18n/Italiano.ini b/bin/i18n/Italiano.ini index ce1f29a2..178cf669 100644 Binary files a/bin/i18n/Italiano.ini and b/bin/i18n/Italiano.ini differ diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini index 9257a754..f09fb46a 100644 Binary files a/bin/i18n/Korean.ini and b/bin/i18n/Korean.ini differ diff --git a/bin/i18n/Persian.ini b/bin/i18n/Persian.ini index 384469da..47f18866 100644 Binary files a/bin/i18n/Persian.ini and b/bin/i18n/Persian.ini differ diff --git a/bin/i18n/Polski.ini b/bin/i18n/Polski.ini index 986a208d..46ffca33 100644 Binary files a/bin/i18n/Polski.ini and b/bin/i18n/Polski.ini differ diff --git a/bin/i18n/Portuguese (Brazil).ini b/bin/i18n/Portuguese (Brazil).ini index ed1cc047..76b8d1ea 100644 Binary files a/bin/i18n/Portuguese (Brazil).ini and b/bin/i18n/Portuguese (Brazil).ini differ diff --git a/bin/i18n/Portuguese.ini b/bin/i18n/Portuguese.ini index a2333ed4..37c9d916 100644 Binary files a/bin/i18n/Portuguese.ini and b/bin/i18n/Portuguese.ini differ diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini index cd6c3a32..0808957b 100644 Binary files a/bin/i18n/Russian.ini and b/bin/i18n/Russian.ini differ diff --git a/bin/i18n/Spanish.ini b/bin/i18n/Spanish.ini index 8235d632..12631898 100644 Binary files a/bin/i18n/Spanish.ini and b/bin/i18n/Spanish.ini differ diff --git a/bin/i18n/Spanish2.ini b/bin/i18n/Spanish2.ini index 4a35318c..5faf3e92 100644 Binary files a/bin/i18n/Spanish2.ini and b/bin/i18n/Spanish2.ini differ diff --git a/bin/i18n/Spanish3.ini b/bin/i18n/Spanish3.ini index a932a134..6a0b49cf 100644 Binary files a/bin/i18n/Spanish3.ini and b/bin/i18n/Spanish3.ini differ diff --git a/bin/i18n/Swedish.ini b/bin/i18n/Swedish.ini index eaef4010..deb4e2a1 100644 Binary files a/bin/i18n/Swedish.ini and b/bin/i18n/Swedish.ini differ diff --git a/bin/i18n/Turkish.ini b/bin/i18n/Turkish.ini index 552c062b..8244917e 100644 Binary files a/bin/i18n/Turkish.ini and b/bin/i18n/Turkish.ini differ diff --git a/bin/i18n/Ukrainian.ini b/bin/i18n/Ukrainian.ini index be98df41..fa04c5fb 100644 Binary files a/bin/i18n/Ukrainian.ini and b/bin/i18n/Ukrainian.ini differ diff --git a/bin/memreduct.lng b/bin/memreduct.lng index 58d77740..5955771c 100644 Binary files a/bin/memreduct.lng and b/bin/memreduct.lng differ diff --git a/memreduct.vcxproj b/memreduct.vcxproj index 146e1511..ef279789 100644 --- a/memreduct.vcxproj +++ b/memreduct.vcxproj @@ -131,7 +131,7 @@ Sync Guard true - _UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) true @@ -172,7 +172,7 @@ Sync Guard true - _UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) true @@ -219,7 +219,7 @@ None - _UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) true @@ -265,7 +265,7 @@ None - _UNICODE;UNICODE;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_APP_HAVE_SETTINGS;_APP_HAVE_UPDATES;_APP_HAVE_NTDLL;_APP_HAVE_AUTORUN;_APP_HAVE_SKIPUAC;_APP_HAVE_TRAY;%(PreprocessorDefinitions) false diff --git a/src/app.hpp b/src/app.hpp index 580ac58d..12b7685a 100644 --- 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 index 29c8578d..1a4f2e2e 100644 --- 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,7 +1582,7 @@ 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); @@ -1584,11 +1590,41 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) 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 index 5711420d..86326d24 100644 --- 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") diff --git a/src/resource.hpp b/src/resource.hpp index 507b5698..776a8de7 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -40,94 +40,98 @@ #define IDC_ALWAYSONTOP_CHK 115 #define IDC_LOADONSTARTUP_CHK 116 -#define IDC_SKIPUACWARNING_CHK 117 -#define IDC_REDUCTCONFIRMATION_CHK 118 -#define IDC_CHECKUPDATES_CHK 119 +#define IDC_STARTMINIMIZED_CHK 117 +#define IDC_SKIPUACWARNING_CHK 118 +#define IDC_REDUCTCONFIRMATION_CHK 119 +#define IDC_CHECKUPDATES_CHK 120 -#define IDC_LANGUAGE_HINT 120 -#define IDC_LANGUAGE 121 +#define IDC_LANGUAGE_HINT 121 +#define IDC_LANGUAGE 122 -#define IDC_WORKINGSET_CHK 122 -#define IDC_SYSTEMWORKINGSET_CHK 123 -#define IDC_STANDBYLISTPRIORITY0_CHK 124 -#define IDC_STANDBYLIST_CHK 125 -#define IDC_MODIFIEDLIST_CHK 126 -#define IDC_COMBINEMEMORYLISTS_CHK 127 +#define IDC_WORKINGSET_CHK 123 +#define IDC_SYSTEMWORKINGSET_CHK 124 +#define IDC_STANDBYLISTPRIORITY0_CHK 125 +#define IDC_STANDBYLIST_CHK 126 +#define IDC_MODIFIEDLIST_CHK 127 +#define IDC_COMBINEMEMORYLISTS_CHK 128 -#define IDC_AUTOREDUCTENABLE_CHK 128 -#define IDC_AUTOREDUCTVALUE_CTRL 129 -#define IDC_AUTOREDUCTVALUE 130 +#define IDC_AUTOREDUCTENABLE_CHK 129 +#define IDC_AUTOREDUCTVALUE_CTRL 130 +#define IDC_AUTOREDUCTVALUE 131 -#define IDC_AUTOREDUCTINTERVALENABLE_CHK 131 -#define IDC_AUTOREDUCTINTERVALVALUE_CTRL 132 -#define IDC_AUTOREDUCTINTERVALVALUE 133 +#define IDC_AUTOREDUCTINTERVALENABLE_CHK 132 +#define IDC_AUTOREDUCTINTERVALVALUE_CTRL 133 +#define IDC_AUTOREDUCTINTERVALVALUE 134 -#define IDC_HOTKEY_CLEAN_CHK 134 -#define IDC_HOTKEY_CLEAN 135 +#define IDC_HOTKEY_CLEAN_CHK 135 +#define IDC_HOTKEY_CLEAN 136 -#define IDC_TRAYUSETRANSPARENCY_CHK 136 -#define IDC_TRAYSHOWBORDER_CHK 137 -#define IDC_TRAYROUNDCORNERS_CHK 138 -#define IDC_TRAYCHANGEBG_CHK 139 -#define IDC_TRAYUSEANTIALIASING_CHK 140 +#define IDC_TRAYUSETRANSPARENCY_CHK 137 +#define IDC_TRAYSHOWBORDER_CHK 138 +#define IDC_TRAYROUNDCORNERS_CHK 139 +#define IDC_TRAYCHANGEBG_CHK 140 +#define IDC_TRAYUSEANTIALIASING_CHK 141 -#define IDC_FONT_HINT 141 -#define IDC_FONT 142 +#define IDC_FONT_HINT 142 +#define IDC_FONT 143 -#define IDC_COLOR_TEXT_HINT 143 -#define IDC_COLOR_TEXT 144 +#define IDC_COLOR_TEXT_HINT 144 +#define IDC_COLOR_TEXT 145 -#define IDC_COLOR_BACKGROUND_HINT 145 -#define IDC_COLOR_BACKGROUND 146 +#define IDC_COLOR_BACKGROUND_HINT 146 +#define IDC_COLOR_BACKGROUND 147 -#define IDC_COLOR_WARNING_HINT 147 -#define IDC_COLOR_WARNING 148 +#define IDC_COLOR_WARNING_HINT 148 +#define IDC_COLOR_WARNING 149 -#define IDC_COLOR_DANGER_HINT 149 -#define IDC_COLOR_DANGER 150 +#define IDC_COLOR_DANGER_HINT 150 +#define IDC_COLOR_DANGER 151 -#define IDC_TRAYLEVELWARNING_HINT 151 -#define IDC_TRAYLEVELWARNING_CTRL 152 -#define IDC_TRAYLEVELWARNING 153 +#define IDC_TRAYLEVELWARNING_HINT 152 +#define IDC_TRAYLEVELWARNING_CTRL 153 +#define IDC_TRAYLEVELWARNING 154 -#define IDC_TRAYLEVELDANGER_HINT 154 -#define IDC_TRAYLEVELDANGER_CTRL 155 -#define IDC_TRAYLEVELDANGER 156 +#define IDC_TRAYLEVELDANGER_HINT 155 +#define IDC_TRAYLEVELDANGER_CTRL 156 +#define IDC_TRAYLEVELDANGER 157 -#define IDC_TRAYACTIONDC_HINT 157 -#define IDC_TRAYACTIONDC 158 +#define IDC_TRAYACTIONDC_HINT 158 +#define IDC_TRAYACTIONDC 159 -#define IDC_TRAYACTIONMC_HINT 159 -#define IDC_TRAYACTIONMC 160 +#define IDC_TRAYACTIONMC_HINT 160 +#define IDC_TRAYACTIONMC 161 -#define IDC_SHOW_CLEAN_RESULT_CHK 161 +#define IDC_SHOW_CLEAN_RESULT_CHK 162 // Main Menu -#define IDM_SETTINGS 162 -#define IDM_EXIT 163 -#define IDM_ALWAYSONTOP_CHK 164 -#define IDM_CHECKUPDATES_CHK 165 - -#define IDM_WEBSITE 166 -#define IDM_CHECKUPDATES 167 -#define IDM_ABOUT 168 +#define IDM_SETTINGS 163 +#define IDM_EXIT 164 +#define IDM_ALWAYSONTOP_CHK 165 +#define IDM_LOADONSTARTUP_CHK 166 +#define IDM_STARTMINIMIZED_CHK 167 +#define IDM_REDUCTCONFIRMATION_CHK 168 +#define IDM_CHECKUPDATES_CHK 169 + +#define IDM_WEBSITE 170 +#define IDM_CHECKUPDATES 171 +#define IDM_ABOUT 172 // Tray Menu -#define IDM_TRAY_SHOW 169 -#define IDM_TRAY_CLEAN 170 -#define IDM_TRAY_DISABLE_1 171 -#define IDM_TRAY_DISABLE_2 172 -#define IDM_TRAY_SETTINGS 173 -#define IDM_TRAY_WEBSITE 174 -#define IDM_TRAY_ABOUT 175 -#define IDM_TRAY_EXIT 176 - -#define IDM_WORKINGSET_CHK 177 -#define IDM_SYSTEMWORKINGSET_CHK 178 -#define IDM_STANDBYLISTPRIORITY0_CHK 179 -#define IDM_STANDBYLIST_CHK 180 -#define IDM_MODIFIEDLIST_CHK 181 -#define IDM_COMBINEMEMORYLISTS_CHK 182 +#define IDM_TRAY_SHOW 173 +#define IDM_TRAY_CLEAN 174 +#define IDM_TRAY_DISABLE_1 175 +#define IDM_TRAY_DISABLE_2 176 +#define IDM_TRAY_SETTINGS 177 +#define IDM_TRAY_WEBSITE 178 +#define IDM_TRAY_ABOUT 179 +#define IDM_TRAY_EXIT 180 + +#define IDM_WORKINGSET_CHK 181 +#define IDM_SYSTEMWORKINGSET_CHK 182 +#define IDM_STANDBYLISTPRIORITY0_CHK 183 +#define IDM_STANDBYLIST_CHK 184 +#define IDM_MODIFIEDLIST_CHK 185 +#define IDM_COMBINEMEMORYLISTS_CHK 186 #define IDX_LANGUAGE 1000 #define IDX_TRAY_POPUP_1 2000 @@ -182,54 +186,55 @@ #define IDS_ALWAYSONTOP_CHK 38 #define IDS_LOADONSTARTUP_CHK 39 -#define IDS_REDUCTCONFIRMATION_CHK 40 -#define IDS_SKIPUACWARNING_CHK 41 -#define IDS_CHECKUPDATES_CHK 42 +#define IDS_STARTMINIMIZED_CHK 40 +#define IDS_REDUCTCONFIRMATION_CHK 41 +#define IDS_SKIPUACWARNING_CHK 42 +#define IDS_CHECKUPDATES_CHK 43 -#define IDS_LANGUAGE_HINT 43 +#define IDS_LANGUAGE_HINT 44 -#define IDS_WORKINGSET_CHK 44 -#define IDS_SYSTEMWORKINGSET_CHK 45 -#define IDS_STANDBYLISTPRIORITY0_CHK 46 -#define IDS_STANDBYLIST_CHK 47 -#define IDS_MODIFIEDLIST_CHK 48 -#define IDS_COMBINEMEMORYLISTS_CHK 49 +#define IDS_WORKINGSET_CHK 45 +#define IDS_SYSTEMWORKINGSET_CHK 46 +#define IDS_STANDBYLISTPRIORITY0_CHK 47 +#define IDS_STANDBYLIST_CHK 48 +#define IDS_MODIFIEDLIST_CHK 49 +#define IDS_COMBINEMEMORYLISTS_CHK 50 -#define IDS_AUTOREDUCTENABLE_CHK 50 -#define IDS_AUTOREDUCTINTERVALENABLE_CHK 51 +#define IDS_AUTOREDUCTENABLE_CHK 51 +#define IDS_AUTOREDUCTINTERVALENABLE_CHK 52 -#define IDS_HOTKEY_CLEAN_CHK 52 +#define IDS_HOTKEY_CLEAN_CHK 53 -#define IDS_TRAYUSETRANSPARENCY_CHK 53 -#define IDS_TRAYSHOWBORDER_CHK 54 -#define IDS_TRAYROUNDCORNERS_CHK 55 -#define IDS_TRAYCHANGEBG_CHK 56 -#define IDS_TRAYUSEANTIALIASING_CHK 57 +#define IDS_TRAYUSETRANSPARENCY_CHK 54 +#define IDS_TRAYSHOWBORDER_CHK 55 +#define IDS_TRAYROUNDCORNERS_CHK 56 +#define IDS_TRAYCHANGEBG_CHK 57 +#define IDS_TRAYUSEANTIALIASING_CHK 58 -#define IDS_FONT_HINT 58 -#define IDS_COLOR_TEXT_HINT 59 -#define IDS_COLOR_BACKGROUND_HINT 60 -#define IDS_COLOR_WARNING_HINT 61 -#define IDS_COLOR_DANGER_HINT 62 +#define IDS_FONT_HINT 59 +#define IDS_COLOR_TEXT_HINT 60 +#define IDS_COLOR_BACKGROUND_HINT 61 +#define IDS_COLOR_WARNING_HINT 62 +#define IDS_COLOR_DANGER_HINT 63 -#define IDS_TRAYLEVELWARNING_HINT 63 -#define IDS_TRAYLEVELDANGER_HINT 64 +#define IDS_TRAYLEVELWARNING_HINT 64 +#define IDS_TRAYLEVELDANGER_HINT 65 -#define IDS_TRAYACTIONDC_HINT 65 -#define IDS_TRAYACTIONMC_HINT 66 +#define IDS_TRAYACTIONDC_HINT 66 +#define IDS_TRAYACTIONMC_HINT 67 -#define IDS_TRAY_ACTION_1 67 -#define IDS_TRAY_ACTION_2 68 -#define IDS_TRAY_ACTION_3 69 +#define IDS_TRAY_ACTION_1 68 +#define IDS_TRAY_ACTION_2 69 +#define IDS_TRAY_ACTION_3 70 -#define IDS_SHOW_CLEAN_RESULT_CHK 70 +#define IDS_SHOW_CLEAN_RESULT_CHK 71 -#define IDS_QUESTION 71 -#define IDS_QUESTION_WARNING 72 -#define IDS_QUESTION_FLAG_CHK 73 +#define IDS_QUESTION 72 +#define IDS_QUESTION_WARNING 73 +#define IDS_QUESTION_FLAG_CHK 74 -#define IDS_STATUS_CLEANED 74 -#define IDS_STATUS_NOPRIVILEGES 75 +#define IDS_STATUS_CLEANED 75 +#define IDS_STATUS_NOPRIVILEGES 76 // Icons #define IDI_MAIN 100 diff --git a/src/resource.rc b/src/resource.rc index 56438daf..e259ddb8 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -30,6 +30,9 @@ IDM_MAIN MENU POPUP " " { MENUITEM " ", IDM_ALWAYSONTOP_CHK + MENUITEM " ", IDM_LOADONSTARTUP_CHK + MENUITEM " ", IDM_STARTMINIMIZED_CHK + MENUITEM " ", IDM_REDUCTCONFIRMATION_CHK MENUITEM " ", IDM_CHECKUPDATES_CHK MENUITEM SEPARATOR POPUP " " @@ -111,18 +114,19 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" { - GROUPBOX "", IDC_TITLE_1, 4, 4, 262, 78 + GROUPBOX "", IDC_TITLE_1, 4, 4, 262, 90 AUTOCHECKBOX "", IDC_ALWAYSONTOP_CHK, 12, 16, 246, 10 AUTOCHECKBOX "", IDC_LOADONSTARTUP_CHK, 12, 28, 246, 10 - AUTOCHECKBOX "", IDC_REDUCTCONFIRMATION_CHK, 12, 40, 246, 10 - AUTOCHECKBOX "", IDC_SKIPUACWARNING_CHK, 12, 52, 246, 10 - AUTOCHECKBOX "", IDC_CHECKUPDATES_CHK, 12, 64, 246, 10 + AUTOCHECKBOX "", IDC_STARTMINIMIZED_CHK, 12, 40, 246, 10 + AUTOCHECKBOX "", IDC_REDUCTCONFIRMATION_CHK, 12, 52, 246, 10 + AUTOCHECKBOX "", IDC_SKIPUACWARNING_CHK, 12, 64, 246, 10 + AUTOCHECKBOX "", IDC_CHECKUPDATES_CHK, 12, 76, 246, 10 - GROUPBOX "", IDC_TITLE_2, 4, 84, 262, 32 + GROUPBOX "", IDC_TITLE_2, 4, 96, 262, 32 - LTEXT "", IDC_LANGUAGE_HINT, 12, 96, 114, 12, SS_CENTERIMAGE - COMBOBOX IDC_LANGUAGE, 134, 96, 124, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_LANGUAGE_HINT, 12, 108, 114, 12, SS_CENTERIMAGE + COMBOBOX IDC_LANGUAGE, 134, 108, 124, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP } IDD_SETTINGS_MEMORY DIALOGEX 107, 0, 272, 186 @@ -268,6 +272,7 @@ STRINGTABLE IDS_ALWAYSONTOP_CHK "Always on top" IDS_LOADONSTARTUP_CHK "Load on system startup" + IDS_STARTMINIMIZED_CHK "Start minimized" IDS_REDUCTCONFIRMATION_CHK "Confirm memory cleaning start" IDS_SKIPUACWARNING_CHK "Skip ""User Account Control"" prompt warning" IDS_CHECKUPDATES_CHK "Periodically check for updates (recommended)"