diff --git a/src/res/allow_btn.ico b/src/res/allow_btn.ico index 5eff474c..6b4da4db 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 1280b719..09e0dca2 100644 Binary files a/src/res/block_btn.ico and b/src/res/block_btn.ico differ diff --git a/src/res/timer_btn.ico b/src/res/timer_btn.ico new file mode 100644 index 00000000..1611f151 Binary files /dev/null and b/src/res/timer_btn.ico differ diff --git a/src/resource.hpp b/src/resource.hpp index ca128342..c3257015 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -39,199 +39,200 @@ #define IDC_ICON_ID 110 #define IDC_TITLE_ID 111 #define IDC_MENU_BTN 112 -#define IDC_CLOSE_BTN 113 -#define IDC_FILE_ID 114 -#define IDC_FILE_TEXT 115 -#define IDC_SIGNATURE_ID 116 -#define IDC_SIGNATURE_TEXT 117 -#define IDC_ADDRESS_LOCAL_ID 118 -#define IDC_ADDRESS_LOCAL_TEXT 119 -#define IDC_ADDRESS_REMOTE_ID 120 -#define IDC_ADDRESS_REMOTE_TEXT 121 -#define IDC_PROTOCOL_ID 122 -#define IDC_PROTOCOL_TEXT 123 -#define IDC_FILTER_ID 124 -#define IDC_FILTER_TEXT 125 -#define IDC_DATE_ID 126 -#define IDC_DATE_TEXT 127 -#define IDC_CREATERULE_ADDR_ID 128 -#define IDC_CREATERULE_PORT_ID 129 -#define IDC_DISABLENOTIFICATION_ID 130 -#define IDC_PREV_ID 131 -#define IDC_NEXT_ID 132 -#define IDC_IDX_ID 133 -#define IDC_ALLOW_BTN 134 -#define IDC_BLOCK_BTN 135 -#define IDC_LATER_BTN 136 +#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 // Editor Dlg -#define IDC_NAME 137 -#define IDC_NAME_EDIT 138 -#define IDC_PORTVERSION 139 -#define IDC_PORTVERSION_EDIT 140 -#define IDC_PROTOCOL 141 -#define IDC_PROTOCOL_EDIT 142 -#define IDC_DIRECTION 143 -#define IDC_DIRECTION_EDIT 144 -#define IDC_ACTION 145 -#define IDC_ACTION_EDIT 146 -#define IDC_RULE_REMOTE 147 -#define IDC_RULE_REMOTE_EDIT 148 -#define IDC_RULE_LOCAL 149 -#define IDC_RULE_LOCAL_EDIT 150 -#define IDC_REGION 151 -#define IDC_DISABLE_CHK 152 -#define IDC_ENABLE_CHK 153 -#define IDC_ENABLEFORAPPS_CHK 154 -#define IDC_APPS_LV 155 +#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 // Settings Dlg -#define IDC_NAV 156 -#define IDC_SAVE 157 -#define IDC_RESET 158 -#define IDC_CLOSE 159 -#define IDC_WIKI 160 +#define IDC_NAV 157 +#define IDC_SAVE 158 +#define IDC_RESET 159 +#define IDC_CLOSE 160 +#define IDC_WIKI 161 -#define IDC_TITLE_GENERAL 161 -#define IDC_TITLE_LANGUAGE 162 -#define IDC_TITLE_CONFIRMATIONS 163 -#define IDC_TITLE_HIGHLIGHTING 164 -#define IDC_TITLE_ADVANCED 165 -#define IDC_TITLE_EXPERTS 166 -#define IDC_TITLE_LOGGING 167 -#define IDC_TITLE_NOTIFICATIONS 168 +#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 IDS_TITLE_EXCLUDE 1 -#define IDC_ALWAYSONTOP_CHK 169 -#define IDC_LOADONSTARTUP_CHK 170 -#define IDC_STARTMINIMIZED_CHK 171 -#define IDC_SKIPUACWARNING_CHK 172 -#define IDC_CHECKUPDATES_CHK 173 -#define IDC_CHECKUPDATESBETA_CHK 174 +#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_LANGUAGE_HINT 175 -#define IDC_LANGUAGE 176 +#define IDC_LANGUAGE_HINT 176 +#define IDC_LANGUAGE 177 -#define IDC_CONFIRMEXIT_CHK 177 -#define IDC_CONFIRMEXITTIMER_CHK 178 -#define IDC_CONFIRMDELETE_CHK 179 -#define IDC_CONFIRMLOGCLEAR_CHK 180 +#define IDC_CONFIRMEXIT_CHK 178 +#define IDC_CONFIRMEXITTIMER_CHK 179 +#define IDC_CONFIRMDELETE_CHK 180 +#define IDC_CONFIRMLOGCLEAR_CHK 181 -#define IDC_COLORS_HINT 181 +#define IDC_COLORS_HINT 182 -#define IDC_RULE_ALLOWINBOUND 182 -#define IDC_RULE_ALLOWLISTEN 183 -#define IDC_RULE_ALLOWLOOPBACK 184 -#define IDC_RULE_ALLOW6TO4 185 +#define IDC_RULE_ALLOWINBOUND 183 +#define IDC_RULE_ALLOWLISTEN 184 +#define IDC_RULE_ALLOWLOOPBACK 185 +#define IDC_RULE_ALLOW6TO4 186 -#define IDC_USESTEALTHMODE_CHK 186 -#define IDC_INSTALLBOOTTIMEFILTERS_CHK 187 -#define IDC_SECUREFILTERS_CHK 188 +#define IDC_USESTEALTHMODE_CHK 187 +#define IDC_INSTALLBOOTTIMEFILTERS_CHK 188 +#define IDC_SECUREFILTERS_CHK 189 -#define IDC_USECERTIFICATES_CHK 189 -#define IDC_USENETWORKRESOLUTION_CHK 190 -#define IDC_USEREFRESHDEVICES_CHK 191 +#define IDC_USECERTIFICATES_CHK 190 +#define IDC_USENETWORKRESOLUTION_CHK 191 +#define IDC_USEREFRESHDEVICES_CHK 192 -#define IDC_ENABLELOG_CHK 192 -#define IDC_LOGPATH 193 -#define IDC_LOGPATH_BTN 194 +#define IDC_ENABLELOG_CHK 193 +#define IDC_LOGPATH 194 +#define IDC_LOGPATH_BTN 195 -#define IDC_LOGSIZELIMIT_HINT 195 -#define IDC_LOGSIZELIMIT_CTRL 196 -#define IDC_LOGSIZELIMIT 197 +#define IDC_LOGSIZELIMIT_HINT 196 +#define IDC_LOGSIZELIMIT_CTRL 197 +#define IDC_LOGSIZELIMIT 198 -#define IDC_ENABLENOTIFICATIONS_CHK 198 -#define IDC_NOTIFICATIONSOUND_CHK 199 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_HINT 200 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT_CTRL 201 -#define IDC_NOTIFICATIONDISPLAYTIMEOUT 202 -#define IDC_NOTIFICATIONTIMEOUT_HINT 203 -#define IDC_NOTIFICATIONTIMEOUT_CTRL 204 -#define IDC_NOTIFICATIONTIMEOUT 205 -#define IDC_EXCLUDE1 206 -#define IDC_EXCLUDE2 207 -#define IDC_EXCLUDESTEALTH_CHK 208 -#define IDC_EXCLUDECLASSIFYALLOW_CHK 209 -#define IDC_EXCLUDEBLOCKLIST_CHK 210 -#define IDC_EXCLUDECUSTOM_CHK 211 +#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_RULES_BLOCKLIST_HINT 212 -#define IDC_RULES_SYSTEM_HINT 213 -#define IDC_RULES_CUSTOM_HINT 214 +#define IDC_RULES_BLOCKLIST_HINT 213 +#define IDC_RULES_SYSTEM_HINT 214 +#define IDC_RULES_CUSTOM_HINT 215 -#define IDC_COLORS 215 -#define IDC_EDITOR 216 +#define IDC_COLORS 216 +#define IDC_EDITOR 217 // Main Menu -#define IDM_SETTINGS 217 -#define IDM_EXIT 218 -#define IDM_PURGE_UNUSED 219 -#define IDM_PURGE_ERRORS 220 -#define IDM_PURGE_TIMERS 221 -#define IDM_REFRESH 222 -#define IDM_ALWAYSONTOP_CHK 223 -#define IDM_SHOWFILENAMESONLY_CHK 224 -#define IDM_AUTOSIZECOLUMNS_CHK 225 -#define IDM_ENABLESPECIALGROUP_CHK 226 -#define IDM_ICONSSMALL 227 -#define IDM_ICONSLARGE 228 -#define IDM_ICONSEXTRALARGE 229 -#define IDM_ICONSISTABLEVIEW 230 -#define IDM_ICONSISHIDDEN 231 -#define IDM_FONT 232 -#define IDM_ENABLELOG_CHK 233 -#define IDM_ENABLENOTIFICATIONS_CHK 234 -#define IDM_LOGSHOW 235 -#define IDM_LOGCLEAR 236 -#define IDM_WEBSITE 237 -#define IDM_CHECKUPDATES 238 -#define IDM_ABOUT 239 +#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 // Tray Menu -#define IDM_TRAY_SHOW 240 -#define IDM_TRAY_START 241 -#define IDM_TRAY_MODEWHITELIST 242 -#define IDM_TRAY_MODEBLACKLIST 243 -#define IDM_TRAY_ENABLELOG_CHK 244 -#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 245 -#define IDM_TRAY_LOGSHOW 246 -#define IDM_TRAY_LOGCLEAR 247 -#define IDM_TRAY_LOGSHOW_ERR 248 -#define IDM_TRAY_LOGCLEAR_ERR 249 -#define IDM_TRAY_SETTINGS 250 -#define IDM_TRAY_WEBSITE 251 -#define IDM_TRAY_ABOUT 252 -#define IDM_TRAY_EXIT 253 +#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 // Listview Menu -#define IDM_INFO 254 -#define IDM_ADD_FILE 255 -#define IDM_ALL_PROCESSES 256 -#define IDM_ALL_PACKAGES 257 -#define IDM_ALL_SERVICES 258 -#define IDM_REFRESH2 259 -#define IDM_DISABLENOTIFICATIONS 260 -#define IDM_OPENRULESEDITOR 261 -#define IDM_EXPLORE 262 -#define IDM_COPY 263 -#define IDM_CHECK 264 -#define IDM_UNCHECK 265 -#define IDM_DISABLETIMER 266 -#define IDM_PROPERTIES 267 +#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_ADD 268 -#define IDM_EDIT 269 -#define IDM_DELETE 270 +#define IDM_ADD 269 +#define IDM_EDIT 270 +#define IDM_DELETE 271 -#define IDM_EXPORT_APPS 271 -#define IDM_EXPORT_RULES 272 -#define IDM_IMPORT_APPS 273 -#define IDM_IMPORT_RULES 274 +#define IDM_EXPORT_APPS 272 +#define IDM_EXPORT_RULES 273 +#define IDM_IMPORT_APPS 274 +#define IDM_IMPORT_RULES 275 -#define IDM_NOTIMER 275 +#define IDM_NOTIMER 276 -#define IDM_SELECT_ALL 276 -#define IDM_ZOOM 277 +#define IDM_SELECT_ALL 277 +#define IDM_ZOOM 278 #define IDX_PROCESS 1000 #define IDX_PACKAGE 2000 @@ -453,6 +454,7 @@ #define IDS_ACTION_ALLOW_HINT 210 #define IDS_ACTION_BLOCK_HINT 211 #define IDS_ACTION_LATER_HINT 212 +#define IDS_RULE_APPLY_2 213 // RC data #define IDR_RULES_BLOCKLIST 1 @@ -465,6 +467,7 @@ #define IDI_ALLOW 102 #define IDI_BLOCK 103 #define IDI_MENU 104 -#define IDI_CLOSE 105 +#define IDI_TIMER 105 +#define IDI_CLOSE 106 #endif // __RESOURCE_H__ diff --git a/src/resource.rc b/src/resource.rc index 47a4fe32..0f7e004f 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -683,6 +683,8 @@ BEGIN IDS_ACTION_ALLOW_HINT "Always allow this program to access the internet" IDS_ACTION_BLOCK_HINT "Always blocks this program to access the internet" IDS_ACTION_LATER_HINT "Do nothing and ask me later" + + IDS_RULE_APPLY_2 "Apply ""%s"" for app" END // @@ -698,6 +700,7 @@ IDI_MAIN ICON "res\\100.ico" IDI_INACTIVE ICON "res\\101.ico" IDI_ALLOW ICON "res\\allow_btn.ico" IDI_BLOCK ICON "res\\block_btn.ico" +IDI_TIMER ICON "res\\timer_btn.ico" IDI_MENU ICON "res\\menu_btn.ico" IDI_CLOSE ICON "res\\close_btn.ico"