Index: src/ch/resource.h =================================================================== diff -u -N -r53e3a91f9bcb2e26f758fc92e9856a69eba71a61 -r31be0106a2d78fd0ddcb735f5351658abe56dc48 --- src/ch/resource.h (.../resource.h) (revision 53e3a91f9bcb2e26f758fc92e9856a69eba71a61) +++ src/ch/resource.h (.../resource.h) (revision 31be0106a2d78fd0ddcb735f5351658abe56dc48) @@ -64,6 +64,7 @@ #define IDD_RULE_EDIT_ALL_DIALOG 234 #define IDR_ERROR_MASS_SKIP_MENU 237 #define IDR_ERROR_MASS_RETRY_MENU 238 +#define IDR_FILTER_TYPE_MENU 244 #define IDC_PROGRAM_STATIC 1000 #define IDC_ADDFILE_BUTTON 1002 #define IDC_STATUS_LIST 1003 @@ -93,7 +94,6 @@ #define IDC_TASK_ADVANCED_BUTTON 1017 #define IDC_PAUSE_BUTTON 1018 #define IDC_STANDARD_CHECK 1019 -#define IDC_CUSTOM_RULES_BUTTON 1035 #define IDC_FORCEDIRECTORIES_CHECK 1020 #define IDC_PAUSE_BUTTON2 1020 #define IDC_RESUME_BUTTON 1021 @@ -117,6 +117,7 @@ #define IDC_TASKPROCESSED_STATIC 1033 #define IDC_TRANSFER_STATIC 1034 #define IDC_TASKTRANSFER_STATIC 1034 +#define IDC_CUSTOM_RULES_BUTTON 1035 #define IDC_OVERALL_PROGRESS_STATIC 1035 #define IDC_GLOBALPROCESSED_STATIC 1035 #define IDC_OVERALL_TRANSFER_STATIC 1036 @@ -376,12 +377,10 @@ #define IDC_EXPORT_BUTTON 1322 #define IDC_BUFFERCOUNT_SPIN 1324 #define IDC_BUFFERCOUNT_EDIT 1325 -#define IDC_COMBO1 1325 #define IDC_UPDATECHANNEL_COMBO 1325 #define IDC_COMBO2 1326 #define IDC_UPDATESFREQ_COMBO 1326 #define IDC_MAXREADAHEAD_EDIT 1326 -#define IDC_LIST1 1327 #define IDC_MAXCONCURRENTREADS_EDIT 1327 #define IDC_MAXCONCURRENTWRITES_EDIT 1328 #define IDC_RICHEDIT21 1329 @@ -463,6 +462,8 @@ #define IDC_AVAILABLE_SPACE_HDR_STATIC 1428 #define IDC_DETAILS_STATIC 1429 #define IDC_FEEDBACK_RULES_SUMMARY_EDIT 1431 +#define IDC_INCLUDE_MASK_BUTTON 1443 +#define IDC_EXCLUDE_MASK_BUTTON 1444 #define IDS_APPNAME_STRING 5000 #define IDS_PRIORITY0_STRING 5001 #define IDS_PRIORITY1_STRING 5002 @@ -839,15 +840,24 @@ #define ID_FEEDBACK_RESUME_WHENFILEBIGGERTHANDESTINATION 32832 #define ID_FEEDBACK_RETRY_WHEN_SAME_ERROR 32833 #define ID_FEEDBACK_SKIP_WHEN_SAME_ERROR 32834 +#define ID_POPUP_FILTER_FILE_WILDCARD 32835 +#define ID_POPUP_FILTER_PATH_WILDCARD 32836 +#define ID_POPUP_FILTER_FILE_REGEX 32837 +#define ID_POPUP_FILTER_PATH_REGEX 32838 +#define ID_POPUP_FILTER_FILE_WILDCARD_EXAMPLE 32844 +#define ID_POPUP_FILTER_PATH_WILDCARD_EXAMPLE 32845 +#define ID_POPUP_FILTER_FILE_REGEX_EXAMPLE 32846 +#define ID_POPUP_FILTER_PATH_REGEX_EXAMPLE 32847 +#define ID_POPUP_FILTER_SEPARATOR_CHAR 32848 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 240 -#define _APS_NEXT_COMMAND_VALUE 32835 -#define _APS_NEXT_CONTROL_VALUE 1432 +#define _APS_NEXT_RESOURCE_VALUE 246 +#define _APS_NEXT_COMMAND_VALUE 32849 +#define _APS_NEXT_CONTROL_VALUE 1444 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif