From 853556dcc46fe34e5bbacf25ebcc5d4bc3d945fd Mon Sep 17 00:00:00 2001 From: henrypp Date: Fri, 21 Jun 2019 17:45:54 +0600 Subject: [PATCH] upd resource ids --- src/resource.hpp | 275 +++++++++++++++++++++++++---------------------- 1 file changed, 145 insertions(+), 130 deletions(-) diff --git a/src/resource.hpp b/src/resource.hpp index 71496f2e..b3613409 100644 --- a/src/resource.hpp +++ b/src/resource.hpp @@ -21,10 +21,10 @@ #define IDD_SETTINGS 102 #define IDD_SETTINGS_GENERAL 103 #define IDD_SETTINGS_RULES 104 -#define IDD_SETTINGS_INTERFACE 105 -#define IDD_SETTINGS_NOTIFICATIONS 106 -#define IDD_SETTINGS_LOGGING 107 -#define IDD_SETTINGS_ADVANCED 108 +#define IDD_SETTINGS_BLOCKLIST 105 +#define IDD_SETTINGS_INTERFACE 106 +#define IDD_SETTINGS_NOTIFICATIONS 107 +#define IDD_SETTINGS_LOGGING 108 // Main Dlg #define IDC_REBAR 105 @@ -56,155 +56,168 @@ #define IDC_DATE_ID 129 #define IDC_DATE_TEXT 130 #define IDC_RULES_BTN 131 -#define IDC_ALLOW_BTN 132 -#define IDC_BLOCK_BTN 133 +#define IDC_NEXT_BTN 132 +#define IDC_ALLOW_BTN 133 +#define IDC_BLOCK_BTN 134 // Editor Dlg -#define IDC_NAME 134 -#define IDC_NAME_EDIT 135 -#define IDC_PORTVERSION 136 -#define IDC_PORTVERSION_EDIT 137 -#define IDC_PROTOCOL 138 -#define IDC_PROTOCOL_EDIT 139 -#define IDC_DIRECTION 140 -#define IDC_DIRECTION_EDIT 141 -#define IDC_ACTION 142 -#define IDC_ACTION_EDIT 143 -#define IDC_RULE_REMOTE 144 -#define IDC_RULE_REMOTE_EDIT 145 -#define IDC_RULE_LOCAL 146 -#define IDC_RULE_LOCAL_EDIT 147 -#define IDC_DISABLE_CHK 148 -#define IDC_ENABLE_CHK 149 -#define IDC_ENABLEFORAPPS_CHK 150 -#define IDC_APPS_LV 151 +#define IDC_NAME 135 +#define IDC_NAME_EDIT 136 +#define IDC_PORTVERSION 137 +#define IDC_PORTVERSION_EDIT 138 +#define IDC_PROTOCOL 139 +#define IDC_PROTOCOL_EDIT 140 +#define IDC_DIRECTION 141 +#define IDC_DIRECTION_EDIT 142 +#define IDC_ACTION 143 +#define IDC_ACTION_EDIT 144 +#define IDC_RULE_REMOTE 145 +#define IDC_RULE_REMOTE_EDIT 146 +#define IDC_RULE_LOCAL 147 +#define IDC_RULE_LOCAL_EDIT 148 +#define IDC_DISABLE_CHK 149 +#define IDC_ENABLE_CHK 150 +#define IDC_ENABLEFORAPPS_CHK 151 +#define IDC_APPS_LV 152 // Settings Dlg -#define IDC_NAV 152 -#define IDC_SAVE 153 -#define IDC_RESET 154 -#define IDC_CLOSE 155 -#define IDC_WIKI 156 +#define IDC_NAV 153 +#define IDC_SAVE 154 +#define IDC_RESET 155 +#define IDC_CLOSE 156 +#define IDC_WIKI 157 -#define IDC_TITLE_GENERAL 157 -#define IDC_TITLE_LANGUAGE 158 -#define IDC_TITLE_BLOCKLIST 159 -#define IDC_TITLE_EXPERTS 160 -#define IDC_TITLE_CONFIRMATIONS 161 -#define IDC_TITLE_HIGHLIGHTING 162 -#define IDC_TITLE_NOTIFICATIONS 163 -#define IDC_TITLE_LOGGING 164 -#define IDC_TITLE_EXCLUDE 165 -#define IDC_TITLE_ADVANCED 166 +#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_EXPERTS 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_ALWAYSONTOP_CHK 167 -#define IDC_LOADONSTARTUP_CHK 168 -#define IDC_STARTMINIMIZED_CHK 169 -#define IDC_USECERTIFICATES_CHK 170 -#define IDC_USENETWORKRESOLUTION_CHK 171 -#define IDC_USEREFRESHDEVICES_CHK 172 -#define IDC_SKIPUACWARNING_CHK 173 -#define IDC_CHECKUPDATES_CHK 174 -#define IDC_CHECKUPDATESBETA_CHK 175 +#define IDC_ALWAYSONTOP_CHK 170 +#define IDC_LOADONSTARTUP_CHK 171 +#define IDC_STARTMINIMIZED_CHK 172 +#define IDC_USECERTIFICATES_CHK 173 +#define IDC_USENETWORKRESOLUTION_CHK 174 +#define IDC_USEREFRESHDEVICES_CHK 175 +#define IDC_SKIPUACWARNING_CHK 176 +#define IDC_CHECKUPDATES_CHK 177 +#define IDC_CHECKUPDATESBETA_CHK 178 -#define IDC_LANGUAGE_HINT 176 -#define IDC_LANGUAGE 177 +#define IDC_LANGUAGE_HINT 179 +#define IDC_LANGUAGE 180 -#define IDC_RULE_ALLOWINBOUND 178 -#define IDC_RULE_ALLOWLISTEN 179 -#define IDC_RULE_ALLOWLOOPBACK 180 -#define IDC_RULE_ALLOW6TO4 181 - -#define IDC_BLOCKLIST_BLOCKTELEMETRY 182 -#define IDC_BLOCKLIST_ALLOWUPDATE 183 -#define IDC_BLOCKLIST_ALLOWEXTRA 184 +#define IDC_RULE_ALLOWINBOUND 181 +#define IDC_RULE_ALLOWLISTEN 182 +#define IDC_RULE_ALLOWLOOPBACK 183 +#define IDC_RULE_ALLOW6TO4 184 #define IDC_USESTEALTHMODE_CHK 185 #define IDC_INSTALLBOOTTIMEFILTERS_CHK 186 #define IDC_SECUREFILTERS_CHK 187 -#define IDC_CONFIRMEXIT_CHK 188 -#define IDC_CONFIRMEXITTIMER_CHK 189 -#define IDC_CONFIRMLOGCLEAR_CHK 190 +#define IDC_BLOCKLIST_SPY_DISABLE 188 +#define IDC_BLOCKLIST_SPY_ALLOW 189 +#define IDC_BLOCKLIST_SPY_BLOCK 190 -#define IDC_COLORS 191 -#define IDC_COLORS_HINT 192 +#define IDC_BLOCKLIST_UPDATE_DISABLE 191 +#define IDC_BLOCKLIST_UPDATE_ALLOW 192 +#define IDC_BLOCKLIST_UPDATE_BLOCK 193 -#define IDC_ENABLENOTIFICATIONS_CHK 193 -#define IDC_NOTIFICATIONSOUND_CHK 194 -#define IDC_NOTIFICATIONTIMEOUT_HINT 195 -#define IDC_NOTIFICATIONTIMEOUT_CTRL 196 -#define IDC_NOTIFICATIONTIMEOUT 197 -#define IDC_EXCLUDESTEALTH_CHK 198 -#define IDC_EXCLUDECLASSIFYALLOW_CHK 199 -#define IDC_EXCLUDEBLOCKLIST_CHK 200 -#define IDC_EXCLUDECUSTOM_CHK 201 +#define IDC_BLOCKLIST_EXTRA_DISABLE 194 +#define IDC_BLOCKLIST_EXTRA_ALLOW 195 +#define IDC_BLOCKLIST_EXTRA_BLOCK 196 -#define IDC_ENABLELOG_CHK 202 -#define IDC_LOGPATH 203 -#define IDC_LOGPATH_BTN 204 +#define IDC_BLOCKLIST_INFO 197 -#define IDC_LOGSIZELIMIT_HINT 205 -#define IDC_LOGSIZELIMIT_CTRL 206 -#define IDC_LOGSIZELIMIT 207 +#define IDC_CONFIRMEXIT_CHK 198 +#define IDC_CONFIRMEXITTIMER_CHK 199 +#define IDC_CONFIRMLOGCLEAR_CHK 200 + +#define IDC_COLORS 201 +#define IDC_COLORS_HINT 202 + +#define IDC_ENABLENOTIFICATIONS_CHK 203 +#define IDC_NOTIFICATIONSOUND_CHK 204 +#define IDC_NOTIFICATIONTIMEOUT_HINT 205 +#define IDC_NOTIFICATIONTIMEOUT_CTRL 206 +#define IDC_NOTIFICATIONTIMEOUT 207 +#define IDC_EXCLUDESTEALTH_CHK 208 +#define IDC_EXCLUDECLASSIFYALLOW_CHK 209 +#define IDC_EXCLUDEBLOCKLIST_CHK 210 +#define IDC_EXCLUDECUSTOM_CHK 211 + +#define IDC_ENABLELOG_CHK 212 +#define IDC_LOGPATH 213 +#define IDC_LOGPATH_BTN 214 + +#define IDC_LOGSIZELIMIT_HINT 215 +#define IDC_LOGSIZELIMIT_CTRL 216 +#define IDC_LOGSIZELIMIT 217 // Main Menu -#define IDM_SETTINGS 208 -#define IDM_EXIT 209 -#define IDM_PURGE_UNUSED 210 -#define IDM_PURGE_TIMERS 211 -#define IDM_FIND 212 -#define IDM_FINDNEXT 213 -#define IDM_REFRESH 214 -#define IDM_ALWAYSONTOP_CHK 215 -#define IDM_SHOWFILENAMESONLY_CHK 216 -#define IDM_AUTOSIZECOLUMNS_CHK 217 -#define IDM_ENABLESPECIALGROUP_CHK 218 -#define IDM_ICONSSMALL 219 -#define IDM_ICONSLARGE 220 -#define IDM_ICONSEXTRALARGE 221 -#define IDM_ICONSISTABLEVIEW 222 -#define IDM_ICONSISHIDDEN 223 -#define IDM_FONT 224 -#define IDM_WEBSITE 225 -#define IDM_CHECKUPDATES 226 -#define IDM_ABOUT 227 +#define IDM_SETTINGS 218 +#define IDM_EXIT 219 +#define IDM_PURGE_UNUSED 220 +#define IDM_PURGE_TIMERS 221 +#define IDM_FIND 222 +#define IDM_FINDNEXT 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_WEBSITE 235 +#define IDM_CHECKUPDATES 236 +#define IDM_ABOUT 237 // Tray Menu -#define IDM_TRAY_SHOW 228 -#define IDM_TRAY_START 229 -#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 230 -#define IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK 231 -#define IDM_TRAY_ENABLELOG_CHK 232 -#define IDM_TRAY_LOGSHOW 233 -#define IDM_TRAY_LOGCLEAR 234 -#define IDM_TRAY_LOGSHOW_ERR 235 -#define IDM_TRAY_LOGCLEAR_ERR 236 -#define IDM_TRAY_SETTINGS 237 -#define IDM_TRAY_WEBSITE 238 -#define IDM_TRAY_ABOUT 239 -#define IDM_TRAY_EXIT 240 +#define IDM_TRAY_SHOW 238 +#define IDM_TRAY_START 239 +#define IDM_TRAY_ENABLENOTIFICATIONS_CHK 240 +#define IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK 241 +#define IDM_TRAY_ENABLELOG_CHK 242 +#define IDM_TRAY_LOGSHOW 243 +#define IDM_TRAY_LOGCLEAR 244 +#define IDM_TRAY_LOGSHOW_ERR 245 +#define IDM_TRAY_LOGCLEAR_ERR 246 +#define IDM_TRAY_SETTINGS 247 +#define IDM_TRAY_WEBSITE 248 +#define IDM_TRAY_ABOUT 249 +#define IDM_TRAY_EXIT 250 // Listview Menu -#define IDM_ADD_FILE 241 -#define IDM_DISABLENOTIFICATIONS 242 -#define IDM_EDITRULES 243 -#define IDM_OPENRULESEDITOR 244 -#define IDM_EXPLORE 245 -#define IDM_COPY 246 -#define IDM_CHECK 247 -#define IDM_UNCHECK 248 -#define IDM_DELETE 249 -#define IDM_DISABLETIMER 250 -#define IDM_PROPERTIES 251 +#define IDM_ADD_FILE 251 +#define IDM_DISABLENOTIFICATIONS 252 +#define IDM_EDITRULES 253 +#define IDM_OPENRULESEDITOR 254 +#define IDM_EXPLORE 255 +#define IDM_COPY 256 +#define IDM_CHECK 257 +#define IDM_UNCHECK 258 +#define IDM_DELETE 259 +#define IDM_DISABLETIMER 260 +#define IDM_PROPERTIES 261 -#define IDM_IMPORT 252 -#define IDM_EXPORT 253 +#define IDM_IMPORT 262 +#define IDM_EXPORT 263 -#define IDM_NOTIMER 254 +#define IDM_NOTIMER 264 -#define IDM_SELECT_ALL 255 -#define IDM_ZOOM 256 +#define IDM_SELECT_ALL 265 +#define IDM_ZOOM 266 #define IDX_LANGUAGE 1000 #define IDX_TIMER 1200 @@ -436,12 +449,13 @@ #define IDS_STATUS_FILTERS_PROCESSING 222 #define IDS_HIGHLIGHT_CONNECTION 223 #define IDS_SHOWINLIST 224 -#define IDS_BLOCKLIST_BLOCKTELEMETRY 225 -#define IDS_BLOCKLIST_ALLOWUPDATE 226 -#define IDS_BLOCKLIST_ALLOWEXTRA 227 +#define IDS_BLOCKLIST_SPY 225 +#define IDS_BLOCKLIST_UPDATE 226 +#define IDS_BLOCKLIST_EXTRA 227 #define IDS_PORT 228 #define IDS_NOTIFY_TITLE 229 #define IDS_NOTIFY_HEADER 230 +#define IDS_DISABLE 231 // RC data #define IDR_PROFILE_INTERNAL 1 @@ -461,6 +475,7 @@ #define IDP_LOG 111 #define IDP_LOGOPEN 112 #define IDP_LOGCLEAR 113 +#define IDP_NEXT 114 // Icons #define IDI_MAIN 100