diff --git a/src/res/allow_btn.ico b/src/res/allow_btn.ico index 6b4da4db..10844343 100644 Binary files a/src/res/allow_btn.ico and b/src/res/allow_btn.ico differ diff --git a/src/res/block_btn.ico b/src/res/block_btn.ico index 09e0dca2..7a344ca7 100644 Binary files a/src/res/block_btn.ico and b/src/res/block_btn.ico differ diff --git a/src/res/checked.ico b/src/res/checked.ico index e08e73d9..59390f26 100644 Binary files a/src/res/checked.ico and b/src/res/checked.ico differ diff --git a/src/res/rules_btn.ico b/src/res/rules_btn.ico index 60210a31..6b770770 100644 Binary files a/src/res/rules_btn.ico and b/src/res/rules_btn.ico differ diff --git a/src/res/timer_btn.ico b/src/res/timer_btn.ico index d7b9d753..1611f151 100644 Binary files a/src/res/timer_btn.ico and b/src/res/timer_btn.ico differ diff --git a/src/res/unchecked.ico b/src/res/unchecked.ico index f2ebc158..a95f01e6 100644 Binary files a/src/res/unchecked.ico and b/src/res/unchecked.ico differ diff --git a/src/resource.hpp b/src/resource.hpp index eea631fa..11ddab93 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -38,207 +38,210 @@ // Notification Dlg #define IDC_ICON_ID 110 #define IDC_TITLE_ID 111 -#define IDC_RULES_BTN 112 -#define IDC_TIMER_BTN 113 -#define IDC_CLOSE_BTN 114 -#define IDC_FILE_ID 115 -#define IDC_FILE_TEXT 116 -#define IDC_SIGNATURE_ID 117 -#define IDC_SIGNATURE_TEXT 118 -#define IDC_ADDRESS_LOCAL_ID 119 -#define IDC_ADDRESS_LOCAL_TEXT 120 -#define IDC_ADDRESS_REMOTE_ID 121 -#define IDC_ADDRESS_REMOTE_TEXT 122 -#define IDC_PROTOCOL_ID 123 -#define IDC_PROTOCOL_TEXT 124 -#define IDC_FILTER_ID 125 -#define IDC_FILTER_TEXT 126 -#define IDC_DATE_ID 127 -#define IDC_DATE_TEXT 128 -#define IDC_CREATERULE_ADDR_ID 129 -#define IDC_CREATERULE_PORT_ID 130 -#define IDC_DISABLENOTIFICATION_ID 131 -#define IDC_PREV_ID 132 -#define IDC_NEXT_ID 133 -#define IDC_IDX_ID 134 -#define IDC_ALLOW_BTN 135 -#define IDC_BLOCK_BTN 136 -#define IDC_LATER_BTN 137 +#define IDC_MENU_BTN 112 +#define IDC_RULES_BTN 113 +#define IDC_TIMER_BTN 114 +#define IDC_CLOSE_BTN 115 +#define IDC_FILE_ID 116 +#define IDC_FILE_TEXT 117 +#define IDC_SIGNATURE_ID 118 +#define IDC_SIGNATURE_TEXT 119 +#define IDC_ADDRESS_LOCAL_ID 120 +#define IDC_ADDRESS_LOCAL_TEXT 121 +#define IDC_ADDRESS_REMOTE_ID 122 +#define IDC_ADDRESS_REMOTE_TEXT 123 +#define IDC_PROTOCOL_ID 124 +#define IDC_PROTOCOL_TEXT 125 +#define IDC_FILTER_ID 126 +#define IDC_FILTER_TEXT 127 +#define IDC_DATE_ID 128 +#define IDC_DATE_TEXT 129 +#define IDC_CREATERULE_ADDR_ID 130 +#define IDC_CREATERULE_PORT_ID 131 +#define IDC_DISABLENOTIFICATION_ID 132 +#define IDC_PREV_ID 133 +#define IDC_NEXT_ID 134 +#define IDC_IDX_ID 135 +#define IDC_ALLOW_BTN 136 +#define IDC_BLOCK_BTN 137 +#define IDC_LATER_BTN 138 // Editor Dlg -#define IDC_NAME 138 -#define IDC_NAME_EDIT 139 -#define IDC_PORTVERSION 140 -#define IDC_PORTVERSION_EDIT 141 -#define IDC_PROTOCOL 142 -#define IDC_PROTOCOL_EDIT 143 -#define IDC_DIRECTION 144 -#define IDC_DIRECTION_EDIT 145 -#define IDC_ACTION 146 -#define IDC_ACTION_EDIT 147 -#define IDC_RULE_REMOTE 148 -#define IDC_RULE_REMOTE_EDIT 149 -#define IDC_RULE_LOCAL 150 -#define IDC_RULE_LOCAL_EDIT 151 -#define IDC_REGION 152 -#define IDC_DISABLE_CHK 153 -#define IDC_ENABLE_CHK 154 -#define IDC_ENABLEFORAPPS_CHK 155 -#define IDC_APPS_LV 156 +#define IDC_NAME 139 +#define IDC_NAME_EDIT 140 +#define IDC_PORTVERSION 141 +#define IDC_PORTVERSION_EDIT 142 +#define IDC_PROTOCOL 143 +#define IDC_PROTOCOL_EDIT 144 +#define IDC_DIRECTION 145 +#define IDC_DIRECTION_EDIT 146 +#define IDC_ACTION 147 +#define IDC_ACTION_EDIT 148 +#define IDC_RULE_REMOTE 149 +#define IDC_RULE_REMOTE_EDIT 150 +#define IDC_RULE_LOCAL 151 +#define IDC_RULE_LOCAL_EDIT 152 +#define IDC_REGION 153 +#define IDC_DISABLE_CHK 154 +#define IDC_ENABLE_CHK 155 +#define IDC_ENABLEFORAPPS_CHK 156 +#define IDC_APPS_LV 157 // Settings Dlg -#define IDC_NAV 157 -#define IDC_SAVE 158 -#define IDC_RESET 159 -#define IDC_CLOSE 160 -#define IDC_WIKI 161 +#define IDC_NAV 158 +#define IDC_SAVE 159 +#define IDC_RESET 160 +#define IDC_CLOSE 161 +#define IDC_WIKI 162 -#define IDC_TITLE_GENERAL 162 -#define IDC_TITLE_LANGUAGE 163 -#define IDC_TITLE_CONFIRMATIONS 164 -#define IDC_TITLE_HIGHLIGHTING 165 -#define IDC_TITLE_ADVANCED 166 -#define IDC_TITLE_EXPERTS 167 -#define IDC_TITLE_LOGGING 168 -#define IDC_TITLE_NOTIFICATIONS 169 +#define IDC_TITLE_GENERAL 163 +#define IDC_TITLE_LANGUAGE 164 +#define IDC_TITLE_CONFIRMATIONS 165 +#define IDC_TITLE_HIGHLIGHTING 166 +#define IDC_TITLE_ADVANCED 167 +#define IDC_TITLE_EXPERTS 168 +#define IDC_TITLE_LOGGING 169 +#define IDC_TITLE_NOTIFICATIONS 170 #define IDS_TITLE_EXCLUDE 1 -#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_CONFIRMEXIT_CHK 178 -#define IDC_CONFIRMEXITTIMER_CHK 179 -#define IDC_CONFIRMDELETE_CHK 180 -#define IDC_CONFIRMLOGCLEAR_CHK 181 +#define IDC_CONFIRMEXIT_CHK 179 +#define IDC_CONFIRMEXITTIMER_CHK 180 +#define IDC_CONFIRMDELETE_CHK 181 +#define IDC_CONFIRMLOGCLEAR_CHK 182 -#define IDC_COLORS_HINT 182 +#define IDC_COLORS_HINT 183 -#define IDC_RULE_ALLOWINBOUND 183 -#define IDC_RULE_ALLOWLISTEN 184 -#define IDC_RULE_ALLOWLOOPBACK 185 -#define IDC_RULE_ALLOW6TO4 186 +#define IDC_RULE_ALLOWINBOUND 184 +#define IDC_RULE_ALLOWLISTEN 185 +#define IDC_RULE_ALLOWLOOPBACK 186 +#define IDC_RULE_ALLOW6TO4 187 -#define IDC_USESTEALTHMODE_CHK 187 -#define IDC_INSTALLBOOTTIMEFILTERS_CHK 188 -#define IDC_SECUREFILTERS_CHK 189 +#define IDC_USESTEALTHMODE_CHK 188 +#define IDC_INSTALLBOOTTIMEFILTERS_CHK 189 +#define IDC_SECUREFILTERS_CHK 190 -#define IDC_USECERTIFICATES_CHK 190 -#define IDC_USENETWORKRESOLUTION_CHK 191 -#define IDC_USEREFRESHDEVICES_CHK 192 +#define IDC_USECERTIFICATES_CHK 191 +#define IDC_USENETWORKRESOLUTION_CHK 192 +#define IDC_USEREFRESHDEVICES_CHK 193 -#define IDC_ENABLELOG_CHK 193 -#define IDC_LOGPATH 194 -#define IDC_LOGPATH_BTN 195 +#define IDC_ENABLELOG_CHK 194 +#define IDC_LOGPATH 195 +#define IDC_LOGPATH_BTN 196 -#define IDC_LOGSIZELIMIT_HINT 196 -#define IDC_LOGSIZELIMIT_CTRL 197 -#define IDC_LOGSIZELIMIT 198 +#define IDC_LOGSIZELIMIT_HINT 197 +#define IDC_LOGSIZELIMIT_CTRL 198 +#define IDC_LOGSIZELIMIT 199 -#define IDC_ENABLENOTIFICATIONS_CHK 199 -#define IDC_NOTIFICATIONSOUND_CHK 200 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_HINT 201 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_CTRL 202 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT 203 -#define IDC_NOTIFICATIONTIMEOUT_HINT 204 -#define IDC_NOTIFICATIONTIMEOUT_CTRL 205 -#define IDC_NOTIFICATIONTIMEOUT 206 -#define IDC_EXCLUDE1 207 -#define IDC_EXCLUDE2 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 200 +#define IDC_NOTIFICATIONSOUND_CHK 201 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT_HINT 202 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT_CTRL 203 +#define IDC_NOTIFICATIONDISPLAYTIMEOUT 204 +#define IDC_NOTIFICATIONTIMEOUT_HINT 205 +#define IDC_NOTIFICATIONTIMEOUT_CTRL 206 +#define IDC_NOTIFICATIONTIMEOUT 207 +#define IDC_EXCLUDE1 208 +#define IDC_EXCLUDE2 209 +#define IDC_EXCLUDESTEALTH_CHK 210 +#define IDC_EXCLUDECLASSIFYALLOW_CHK 211 +#define IDC_EXCLUDEBLOCKLIST_CHK 212 +#define IDC_EXCLUDECUSTOM_CHK 213 -#define IDC_RULES_BLOCKLIST_HINT 213 -#define IDC_RULES_SYSTEM_HINT 214 -#define IDC_RULES_CUSTOM_HINT 215 +#define IDC_RULES_BLOCKLIST_HINT 214 +#define IDC_RULES_SYSTEM_HINT 215 +#define IDC_RULES_CUSTOM_HINT 216 -#define IDC_COLORS 216 -#define IDC_EDITOR 217 +#define IDC_COLORS 217 +#define IDC_EDITOR 218 // Main Menu -#define IDM_SETTINGS 218 -#define IDM_EXIT 219 -#define IDM_PURGE_UNUSED 220 -#define IDM_PURGE_ERRORS 221 -#define IDM_PURGE_TIMERS 222 -#define IDM_REFRESH 223 -#define IDM_ALWAYSONTOP_CHK 224 -#define IDM_SHOWFILENAMESONLY_CHK 225 -#define IDM_AUTOSIZECOLUMNS_CHK 226 -#define IDM_ENABLESPECIALGROUP_CHK 227 -#define IDM_ICONSSMALL 228 -#define IDM_ICONSLARGE 229 -#define IDM_ICONSEXTRALARGE 230 -#define IDM_ICONSISTABLEVIEW 231 -#define IDM_ICONSISHIDDEN 232 -#define IDM_FONT 233 -#define IDM_ENABLELOG_CHK 234 -#define IDM_ENABLENOTIFICATIONS_CHK 235 -#define IDM_LOGSHOW 236 -#define IDM_LOGCLEAR 237 -#define IDM_WEBSITE 238 -#define IDM_CHECKUPDATES 239 -#define IDM_ABOUT 240 +#define IDM_SETTINGS 219 +#define IDM_EXIT 220 +#define IDM_PURGE_UNUSED 221 +#define IDM_PURGE_ERRORS 222 +#define IDM_PURGE_TIMERS 223 +#define IDM_REFRESH 224 +#define IDM_ALWAYSONTOP_CHK 225 +#define IDM_SHOWFILENAMESONLY_CHK 226 +#define IDM_AUTOSIZECOLUMNS_CHK 227 +#define IDM_ENABLESPECIALGROUP_CHK 228 +#define IDM_ICONSSMALL 229 +#define IDM_ICONSLARGE 230 +#define IDM_ICONSEXTRALARGE 231 +#define IDM_ICONSISTABLEVIEW 232 +#define IDM_ICONSISHIDDEN 233 +#define IDM_FONT 234 +#define IDM_ENABLELOG_CHK 235 +#define IDM_ENABLENOTIFICATIONS_CHK 236 +#define IDM_LOGSHOW 237 +#define IDM_LOGCLEAR 238 +#define IDM_WEBSITE 239 +#define IDM_CHECKUPDATES 240 +#define IDM_ABOUT 241 // Tray Menu -#define IDM_TRAY_SHOW 241 -#define IDM_TRAY_START 242 -#define IDM_TRAY_MODEWHITELIST 243 -#define IDM_TRAY_MODEBLACKLIST 244 -#define IDM_TRAY_ENABLELOG_CHK 245 -#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 246 -#define IDM_TRAY_LOGSHOW 247 -#define IDM_TRAY_LOGCLEAR 248 -#define IDM_TRAY_LOGSHOW_ERR 249 -#define IDM_TRAY_LOGCLEAR_ERR 250 -#define IDM_TRAY_SETTINGS 251 -#define IDM_TRAY_WEBSITE 252 -#define IDM_TRAY_ABOUT 253 -#define IDM_TRAY_EXIT 254 +#define IDM_TRAY_SHOW 242 +#define IDM_TRAY_START 243 +#define IDM_TRAY_MODEWHITELIST 244 +#define IDM_TRAY_MODEBLACKLIST 245 +#define IDM_TRAY_ENABLELOG_CHK 246 +#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 247 +#define IDM_TRAY_LOGSHOW 248 +#define IDM_TRAY_LOGCLEAR 249 +#define IDM_TRAY_LOGSHOW_ERR 250 +#define IDM_TRAY_LOGCLEAR_ERR 251 +#define IDM_TRAY_SETTINGS 252 +#define IDM_TRAY_WEBSITE 253 +#define IDM_TRAY_ABOUT 254 +#define IDM_TRAY_EXIT 255 // Listview Menu -#define IDM_INFO 255 -#define IDM_ADD_FILE 256 -#define IDM_ALL_PROCESSES 257 -#define IDM_ALL_PACKAGES 258 -#define IDM_ALL_SERVICES 259 -#define IDM_REFRESH2 260 -#define IDM_DISABLENOTIFICATIONS 261 -#define IDM_OPENRULESEDITOR 262 -#define IDM_EXPLORE 263 -#define IDM_COPY 264 -#define IDM_CHECK 265 -#define IDM_UNCHECK 266 -#define IDM_DISABLETIMER 267 -#define IDM_PROPERTIES 268 +#define IDM_INFO 256 +#define IDM_ADD_FILE 257 +#define IDM_ALL_PROCESSES 258 +#define IDM_ALL_PACKAGES 259 +#define IDM_ALL_SERVICES 260 +#define IDM_REFRESH2 261 +#define IDM_DISABLENOTIFICATIONS 262 +#define IDM_EDITRULES 263 +#define IDM_OPENRULESEDITOR 264 +#define IDM_EXPLORE 265 +#define IDM_COPY 266 +#define IDM_CHECK 267 +#define IDM_UNCHECK 268 +#define IDM_DISABLETIMER 269 +#define IDM_PROPERTIES 270 -#define IDM_ADD 269 -#define IDM_EDIT 270 -#define IDM_DELETE 271 +#define IDM_ADD 271 +#define IDM_EDIT 272 +#define IDM_DELETE 273 -#define IDM_EXPORT_APPS 272 -#define IDM_EXPORT_RULES 273 -#define IDM_IMPORT_APPS 274 -#define IDM_IMPORT_RULES 275 +#define IDM_EXPORT_APPS 274 +#define IDM_EXPORT_RULES 275 +#define IDM_IMPORT_APPS 276 +#define IDM_IMPORT_RULES 277 -#define IDM_NOTIMER 276 +#define IDM_NOTIMER 278 -#define IDM_SELECT_ALL 277 -#define IDM_ZOOM 278 +#define IDM_SELECT_ALL 279 +#define IDM_ZOOM 280 #define IDX_PROCESS 1000 #define IDX_PACKAGE 2000 #define IDX_SERVICE 3000 #define IDX_LANGUAGE 4000 #define IDX_TIMER 5000 +#define IDX_NOTIFICATIONS 5100 #define IDX_RULES_SPECIAL 6000 // Strings @@ -454,6 +457,7 @@ #define IDS_ACTION_BLOCK_HINT 211 #define IDS_ACTION_LATER_HINT 212 #define IDS_RULE_APPLY_2 213 +#define IDS_EDITRULES 214 // RC data #define IDR_RULES_BLOCKLIST 1 @@ -470,6 +474,6 @@ #define IDI_CLOSE 106 #define IDI_CHECKED 107 #define IDI_UNCHECKED 108 -#define IDI_MENU2 109 +#define IDI_MENU 109 #endif // __RESOURCE_H__ diff --git a/src/resource.rc b/src/resource.rc index 535aa2e9..4b7c9db2 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -686,6 +686,8 @@ BEGIN IDS_ACTION_LATER_HINT "Do nothing and ask me later" IDS_RULE_APPLY_2 "Apply ""%s"" for app" + + IDS_EDITRULES "Edit rules" END // @@ -706,7 +708,7 @@ IDI_TIMER ICON "res\\timer_btn.ico" IDI_CLOSE ICON "res\\close_btn.ico" IDI_CHECKED ICON "res\\checked.ico" IDI_UNCHECKED ICON "res\\unchecked.ico" -//IDI_MENU2 ICON "res\\menu_btn2.ico" +IDI_MENU ICON "res\\menu_btn.ico" // // Manifest resource