From 444389aba4249dfd22b39223767ef30d72cf5f4a Mon Sep 17 00:00:00 2001 From: henrypp Date: Fri, 2 Aug 2019 13:12:36 +0600 Subject: [PATCH] main menu cosmetics --- src/resource.hpp | 278 ++++++++++++++++++++++++----------------------- src/resource.rc | 19 +++- 2 files changed, 156 insertions(+), 141 deletions(-) diff --git a/src/resource.hpp b/src/resource.hpp index 70f97fff..851d4a6c 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -89,166 +89,170 @@ #define IDC_TITLE_GENERAL 158 #define IDC_TITLE_LANGUAGE 159 -#define IDC_TITLE_BLOCKLIST_SPY 160 -#define IDC_TITLE_BLOCKLIST_UPDATE 161 -#define IDC_TITLE_BLOCKLIST_EXTRA 162 -#define IDC_TITLE_SECURITY 163 -#define IDC_TITLE_CONFIRMATIONS 164 -#define IDC_TITLE_HIGHLIGHTING 165 -#define IDC_TITLE_NOTIFICATIONS 166 -#define IDC_TITLE_LOGGING 167 -#define IDC_TITLE_EXCLUDE 168 -#define IDC_TITLE_ADVANCED 169 +#define IDC_TITLE_CONNECTIONS 160 +#define IDC_TITLE_SECURITY 161 +#define IDC_TITLE_BLOCKLIST_SPY 162 +#define IDC_TITLE_BLOCKLIST_UPDATE 163 +#define IDC_TITLE_BLOCKLIST_EXTRA 164 +#define IDC_TITLE_CONFIRMATIONS 165 +#define IDC_TITLE_HIGHLIGHTING 166 +#define IDC_TITLE_NOTIFICATIONS 167 +#define IDC_TITLE_LOGGING 168 +#define IDC_TITLE_EXCLUDE 169 +#define IDC_TITLE_ADVANCED 170 -#define IDC_ALWAYSONTOP_CHK 170 -#define IDC_LOADONSTARTUP_CHK 171 -#define IDC_STARTMINIMIZED_CHK 172 -#define IDC_SKIPUACWARNING_CHK 173 -#define IDC_CHECKUPDATES_CHK 174 -#define IDC_CHECKUPDATESBETA_CHK 175 +#define IDC_ALWAYSONTOP_CHK 171 +#define IDC_LOADONSTARTUP_CHK 172 +#define IDC_STARTMINIMIZED_CHK 173 +#define IDC_SKIPUACWARNING_CHK 174 +#define IDC_CHECKUPDATES_CHK 175 +#define IDC_CHECKUPDATESBETA_CHK 176 -#define IDC_LANGUAGE_HINT 176 -#define IDC_LANGUAGE 177 +#define IDC_LANGUAGE_HINT 177 +#define IDC_LANGUAGE 178 -#define IDC_RULE_ALLOWINBOUND 178 -#define IDC_RULE_ALLOWLISTEN 179 -#define IDC_RULE_ALLOWLOOPBACK 180 -#define IDC_RULE_ALLOW6TO4 181 +#define IDC_RULE_BLOCKOUTBOUND 179 +#define IDC_RULE_BLOCKINBOUND 180 +#define IDC_RULE_ALLOWLOOPBACK 181 +#define IDC_RULE_ALLOW6TO4 182 -#define IDC_USESTEALTHMODE_CHK 182 -#define IDC_INSTALLBOOTTIMEFILTERS_CHK 183 -#define IDC_SECUREFILTERS_CHK 184 +#define IDC_USESTEALTHMODE_CHK 183 +#define IDC_INSTALLBOOTTIMEFILTERS_CHK 184 +#define IDC_SECUREFILTERS_CHK 185 -#define IDC_USECERTIFICATES_CHK 185 -#define IDC_USENETWORKRESOLUTION_CHK 186 -#define IDC_USEREFRESHDEVICES_CHK 187 +#define IDC_USECERTIFICATES_CHK 186 +#define IDC_USENETWORKRESOLUTION_CHK 187 +#define IDC_USEREFRESHDEVICES_CHK 188 -#define IDC_BLOCKLIST_SPY_DISABLE 188 -#define IDC_BLOCKLIST_SPY_ALLOW 189 -#define IDC_BLOCKLIST_SPY_BLOCK 190 +#define IDC_BLOCKLIST_SPY_DISABLE 189 +#define IDC_BLOCKLIST_SPY_ALLOW 190 +#define IDC_BLOCKLIST_SPY_BLOCK 191 -#define IDC_BLOCKLIST_UPDATE_DISABLE 191 -#define IDC_BLOCKLIST_UPDATE_ALLOW 192 -#define IDC_BLOCKLIST_UPDATE_BLOCK 193 +#define IDC_BLOCKLIST_UPDATE_DISABLE 192 +#define IDC_BLOCKLIST_UPDATE_ALLOW 193 +#define IDC_BLOCKLIST_UPDATE_BLOCK 194 -#define IDC_BLOCKLIST_EXTRA_DISABLE 194 -#define IDC_BLOCKLIST_EXTRA_ALLOW 195 -#define IDC_BLOCKLIST_EXTRA_BLOCK 196 +#define IDC_BLOCKLIST_EXTRA_DISABLE 195 +#define IDC_BLOCKLIST_EXTRA_ALLOW 196 +#define IDC_BLOCKLIST_EXTRA_BLOCK 197 -#define IDC_BLOCKLIST_INFO 197 +#define IDC_BLOCKLIST_INFO 198 -#define IDC_CONFIRMEXIT_CHK 198 -#define IDC_CONFIRMEXITTIMER_CHK 199 -#define IDC_CONFIRMLOGCLEAR_CHK 200 +#define IDC_CONFIRMEXIT_CHK 199 +#define IDC_CONFIRMEXITTIMER_CHK 200 +#define IDC_CONFIRMLOGCLEAR_CHK 201 -#define IDC_COLORS 201 -#define IDC_COLORS_HINT 202 +#define IDC_COLORS 202 +#define IDC_COLORS_HINT 203 -#define IDC_ENABLENOTIFICATIONS_CHK 203 -#define IDC_NOTIFICATIONSOUND_CHK 204 -#define IDC_NOTIFICATIONONTRAY_CHK 205 -#define IDC_NOTIFICATIONTIMEOUT_HINT 206 -#define IDC_NOTIFICATIONTIMEOUT_CTRL 207 -#define IDC_NOTIFICATIONTIMEOUT 208 -#define IDC_EXCLUDESTEALTH_CHK 209 -#define IDC_EXCLUDECLASSIFYALLOW_CHK 210 -#define IDC_EXCLUDEBLOCKLIST_CHK 211 -#define IDC_EXCLUDECUSTOM_CHK 212 +#define IDC_ENABLENOTIFICATIONS_CHK 204 +#define IDC_NOTIFICATIONSOUND_CHK 205 +#define IDC_NOTIFICATIONONTRAY_CHK 206 +#define IDC_NOTIFICATIONTIMEOUT_HINT 207 +#define IDC_NOTIFICATIONTIMEOUT_CTRL 208 +#define IDC_NOTIFICATIONTIMEOUT 209 +#define IDC_EXCLUDESTEALTH_CHK 210 +#define IDC_EXCLUDECLASSIFYALLOW_CHK 211 +#define IDC_EXCLUDEBLOCKLIST_CHK 212 +#define IDC_EXCLUDECUSTOM_CHK 213 -#define IDC_ENABLELOG_CHK 213 -#define IDC_LOGPATH 214 -#define IDC_LOGPATH_BTN 215 +#define IDC_ENABLELOG_CHK 214 +#define IDC_LOGPATH 215 +#define IDC_LOGPATH_BTN 216 -#define IDC_LOGVIEWER_HINT 216 -#define IDC_LOGVIEWER 217 -#define IDC_LOGVIEWER_BTN 218 +#define IDC_LOGVIEWER_HINT 217 +#define IDC_LOGVIEWER 218 +#define IDC_LOGVIEWER_BTN 219 -#define IDC_LOGSIZELIMIT_HINT 219 -#define IDC_LOGSIZELIMIT_CTRL 220 -#define IDC_LOGSIZELIMIT 221 +#define IDC_LOGSIZELIMIT_HINT 220 +#define IDC_LOGSIZELIMIT_CTRL 221 +#define IDC_LOGSIZELIMIT 222 // Main Menu -#define IDM_SETTINGS 222 -#define IDM_EXIT 223 -#define IDM_PURGE_UNUSED 224 -#define IDM_PURGE_TIMERS 225 -#define IDM_FIND 226 -#define IDM_FINDNEXT 227 -#define IDM_REFRESH 228 -#define IDM_ALWAYSONTOP_CHK 229 -#define IDM_SHOWFILENAMESONLY_CHK 230 -#define IDM_AUTOSIZECOLUMNS_CHK 231 -#define IDM_ENABLESPECIALGROUP_CHK 232 -#define IDM_ICONSSMALL 233 -#define IDM_ICONSLARGE 234 -#define IDM_ICONSEXTRALARGE 235 -#define IDM_ICONSISTABLEVIEW 236 -#define IDM_ICONSISHIDDEN 237 -#define IDM_FONT 238 -#define IDM_RULE_ALLOWINBOUND 239 -#define IDM_RULE_ALLOWLISTEN 240 -#define IDM_RULE_ALLOWLOOPBACK 241 -#define IDM_RULE_ALLOW6TO4 242 -#define IDM_SECUREFILTERS_CHK 243 -#define IDM_USESTEALTHMODE_CHK 244 -#define IDM_INSTALLBOOTTIMEFILTERS_CHK 245 -#define IDM_USENETWORKRESOLUTION_CHK 246 -#define IDM_USECERTIFICATES_CHK 247 -#define IDM_USEREFRESHDEVICES_CHK 248 -#define IDM_BLOCKLIST_SPY_TITLE 249 -#define IDM_BLOCKLIST_SPY_DISABLE 250 -#define IDM_BLOCKLIST_SPY_ALLOW 251 -#define IDM_BLOCKLIST_SPY_BLOCK 252 -#define IDM_BLOCKLIST_UPDATE_TITLE 253 -#define IDM_BLOCKLIST_UPDATE_DISABLE 254 -#define IDM_BLOCKLIST_UPDATE_ALLOW 255 -#define IDM_BLOCKLIST_UPDATE_BLOCK 256 -#define IDM_BLOCKLIST_EXTRA_TITLE 257 -#define IDM_BLOCKLIST_EXTRA_DISABLE 258 -#define IDM_BLOCKLIST_EXTRA_ALLOW 259 -#define IDM_BLOCKLIST_EXTRA_BLOCK 260 -#define IDM_WEBSITE 261 -#define IDM_CHECKUPDATES 262 -#define IDM_ABOUT 263 +#define IDM_SETTINGS 223 +#define IDM_EXIT 224 +#define IDM_PURGE_UNUSED 225 +#define IDM_PURGE_TIMERS 226 +#define IDM_FIND 227 +#define IDM_FINDNEXT 228 +#define IDM_REFRESH 229 +#define IDM_ALWAYSONTOP_CHK 230 +#define IDM_SHOWFILENAMESONLY_CHK 231 +#define IDM_AUTOSIZECOLUMNS_CHK 232 +#define IDM_ENABLESPECIALGROUP_CHK 233 +#define IDM_ICONSSMALL 234 +#define IDM_ICONSLARGE 235 +#define IDM_ICONSEXTRALARGE 236 +#define IDM_ICONSISTABLEVIEW 237 +#define IDM_ICONSISHIDDEN 238 +#define IDM_FONT 239 +#define IDM_CONNECTIONS_TITLE 240 +#define IDM_RULE_BLOCKOUTBOUND 241 +#define IDM_RULE_BLOCKINBOUND 242 +#define IDM_RULE_ALLOWLOOPBACK 243 +#define IDM_RULE_ALLOW6TO4 244 +#define IDM_SECURITY_TITLE 245 +#define IDM_SECUREFILTERS_CHK 246 +#define IDM_USESTEALTHMODE_CHK 247 +#define IDM_INSTALLBOOTTIMEFILTERS_CHK 248 +#define IDM_ADVANCED_TITLE 249 +#define IDM_USENETWORKRESOLUTION_CHK 250 +#define IDM_USECERTIFICATES_CHK 251 +#define IDM_USEREFRESHDEVICES_CHK 252 +#define IDM_BLOCKLIST_SPY_TITLE 253 +#define IDM_BLOCKLIST_SPY_DISABLE 254 +#define IDM_BLOCKLIST_SPY_ALLOW 255 +#define IDM_BLOCKLIST_SPY_BLOCK 256 +#define IDM_BLOCKLIST_UPDATE_TITLE 257 +#define IDM_BLOCKLIST_UPDATE_DISABLE 258 +#define IDM_BLOCKLIST_UPDATE_ALLOW 259 +#define IDM_BLOCKLIST_UPDATE_BLOCK 260 +#define IDM_BLOCKLIST_EXTRA_TITLE 261 +#define IDM_BLOCKLIST_EXTRA_DISABLE 262 +#define IDM_BLOCKLIST_EXTRA_ALLOW 263 +#define IDM_BLOCKLIST_EXTRA_BLOCK 264 +#define IDM_WEBSITE 265 +#define IDM_CHECKUPDATES 266 +#define IDM_ABOUT 267 // Tray Menu -#define IDM_TRAY_SHOW 264 -#define IDM_TRAY_START 265 -#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 266 -#define IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK 267 -#define IDM_TRAY_NOTIFICATIONONTRAY_CHK 268 -#define IDM_TRAY_ENABLELOG_CHK 269 -#define IDM_TRAY_LOGSHOW 270 -#define IDM_TRAY_LOGCLEAR 271 -#define IDM_TRAY_LOGSHOW_ERR 272 -#define IDM_TRAY_LOGCLEAR_ERR 273 -#define IDM_TRAY_SETTINGS 274 -#define IDM_TRAY_WEBSITE 275 -#define IDM_TRAY_ABOUT 276 -#define IDM_TRAY_EXIT 277 +#define IDM_TRAY_SHOW 268 +#define IDM_TRAY_START 269 +#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 270 +#define IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK 271 +#define IDM_TRAY_NOTIFICATIONONTRAY_CHK 272 +#define IDM_TRAY_ENABLELOG_CHK 273 +#define IDM_TRAY_LOGSHOW 274 +#define IDM_TRAY_LOGCLEAR 275 +#define IDM_TRAY_LOGSHOW_ERR 276 +#define IDM_TRAY_LOGCLEAR_ERR 277 +#define IDM_TRAY_SETTINGS 278 +#define IDM_TRAY_WEBSITE 279 +#define IDM_TRAY_ABOUT 280 +#define IDM_TRAY_EXIT 281 // Listview Menu -#define IDM_ADD_FILE 278 -#define IDM_DISABLENOTIFICATIONS 279 -#define IDM_EDITRULES 280 -#define IDM_OPENRULESEDITOR 281 -#define IDM_EXPLORE 282 -#define IDM_COPY 283 -#define IDM_COPY2 284 -#define IDM_CHECK 285 -#define IDM_UNCHECK 286 -#define IDM_DELETE 287 -#define IDM_DISABLETIMER 288 -#define IDM_PROPERTIES 289 -#define IDM_NETWORK_CLOSE 290 +#define IDM_ADD_FILE 282 +#define IDM_DISABLENOTIFICATIONS 283 +#define IDM_EDITRULES 284 +#define IDM_OPENRULESEDITOR 285 +#define IDM_EXPLORE 286 +#define IDM_COPY 287 +#define IDM_COPY2 288 +#define IDM_CHECK 289 +#define IDM_UNCHECK 290 +#define IDM_DELETE 291 +#define IDM_DISABLETIMER 292 +#define IDM_PROPERTIES 293 +#define IDM_NETWORK_CLOSE 294 -#define IDM_IMPORT 291 -#define IDM_EXPORT 292 +#define IDM_IMPORT 295 +#define IDM_EXPORT 296 -#define IDM_NOTIMER 293 +#define IDM_NOTIMER 297 -#define IDM_SELECT_ALL 294 -#define IDM_ZOOM 295 +#define IDM_SELECT_ALL 298 +#define IDM_ZOOM 299 #define IDX_LANGUAGE 1000 #define IDX_TIMER 1200 @@ -491,6 +495,8 @@ #define IDS_LOGVIEWER_HINT 233 #define IDS_NOTIFICATIONONTRAY_CHK 234 #define IDS_NETWORK_CLOSE 235 +#define IDS_RULE_BLOCKOUTBOUND 236 +#define IDS_RULE_BLOCKINBOUND 237 // RC data #define IDR_PROFILE_INTERNAL 1 diff --git a/src/resource.rc b/src/resource.rc index 6e667e60..1d02e6c8 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -89,15 +89,21 @@ BEGIN END POPUP " " BEGIN - MENUITEM " ", IDM_RULE_ALLOWINBOUND - MENUITEM " ", IDM_RULE_ALLOWLISTEN + MENUITEM " ", IDM_CONNECTIONS_TITLE + MENUITEM SEPARATOR + MENUITEM " ", IDM_RULE_BLOCKOUTBOUND + MENUITEM " ", IDM_RULE_BLOCKINBOUND MENUITEM " ", IDM_RULE_ALLOWLOOPBACK MENUITEM " ", IDM_RULE_ALLOW6TO4 MENUITEM SEPARATOR + MENUITEM " ", IDM_SECURITY_TITLE + MENUITEM SEPARATOR MENUITEM " ", IDM_SECUREFILTERS_CHK MENUITEM " ", IDM_USESTEALTHMODE_CHK MENUITEM " ", IDM_INSTALLBOOTTIMEFILTERS_CHK MENUITEM SEPARATOR + MENUITEM " ", IDM_ADVANCED_TITLE + MENUITEM SEPARATOR MENUITEM " ", IDM_USENETWORKRESOLUTION_CHK MENUITEM " ", IDM_USECERTIFICATES_CHK MENUITEM " ", IDM_USEREFRESHDEVICES_CHK @@ -317,10 +323,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg" BEGIN - GROUPBOX "", IDC_TITLE_GENERAL, 4, 4, 262, 64, WS_GROUP + GROUPBOX "", IDC_TITLE_CONNECTIONS, 4, 4, 262, 64, WS_GROUP - AUTOCHECKBOX "", IDC_RULE_ALLOWINBOUND, 12, 16, 246, 10 - AUTOCHECKBOX "", IDC_RULE_ALLOWLISTEN, 12, 28, 246, 10 + AUTOCHECKBOX "", IDC_RULE_BLOCKOUTBOUND, 12, 16, 246, 10 + AUTOCHECKBOX "", IDC_RULE_BLOCKINBOUND, 12, 28, 246, 10 AUTOCHECKBOX "", IDC_RULE_ALLOWLOOPBACK, 12, 40, 246, 10 AUTOCHECKBOX "", IDC_RULE_ALLOW6TO4, 12, 52, 246, 10 @@ -706,6 +712,9 @@ BEGIN IDS_NOTIFICATIONONTRAY_CHK "Show notification window on tray" IDS_NETWORK_CLOSE "Close connection" + + IDS_RULE_BLOCKOUTBOUND "Block outbound connections for all" + IDS_RULE_BLOCKINBOUND "Block inbound connections for all" END //