Index: src/ch/resource.h
===================================================================
diff -u -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -r31be0106a2d78fd0ddcb735f5351658abe56dc48
--- src/ch/resource.h	(.../resource.h)	(revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
+++ 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         1019
 #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
@@ -270,6 +271,7 @@
 #define IDC_007_STATIC                  1225
 #define IDC_008_STATIC                  1226
 #define IDC_SUBTASKCOUNT_LABEL_STATIC   1226
+#define IDC_FEEDBACK_RULES_STATIC       1226
 #define IDC_009_STATIC                  1227
 #define IDC_CURRENTOBJECT_LABEL_STATIC  1227
 #define IDC_010_STATIC                  1228
@@ -320,7 +322,9 @@
 #define IDC_BAR4_STATIC                 1252
 #define IDC_BAR5_STATIC                 1253
 #define IDC_HEADER_STATIC               1254
+#define IDC_BAR8_STATIC                 1254
 #define IDC_HOSTLINK_STATIC             1255
+#define IDC_BAR7_STATIC                 1255
 #define IDC_PROGRAM_STATICEX            1263
 #define IDC_FULLVERSION_STATICEX        1264
 #define IDC_HOMEPAGE_STATICEX           1265
@@ -373,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
@@ -429,11 +431,18 @@
 #define IDC_NOT_ENOUGH_SPACE_ADD_BUTTON 1400
 #define IDC_BOTTOM_BAR_STATIC           1401
 #define IDC_INCLUDE_MASK_CHECK          1402
+#define IDC_ALREADY_EXISTS_UP_BUTTON    1402
 #define IDC_INCLUDE_MASK_COMBO          1403
+#define IDC_ALREADY_EXISTS_DOWN_BUTTON  1403
 #define IDC_EXCLUDE_MASK_CHECK          1404
+#define IDC_FILE_ERROR_UP_BUTTON        1404
 #define IDC_EXCLUDE_MASK_COMBO          1405
+#define IDC_FILE_ERROR_DOWN_BUTTON      1405
 #define IDC_FILTER_BY_SIZE_CHECK        1406
+#define IDC_NOT_ENOUGH_SPACE_UP_BUTTON  1406
 #define IDC_FILTER_BY_SIZE_COMBO        1407
+#define IDC_FILE_ERROR_DOWN_BUTTON2     1407
+#define IDC_NOT_ENOUGH_SPACE_DOWN_BUTTON 1407
 #define IDC_FILTER_BY_DATE_CHECK        1408
 #define IDC_FILTER_BY_DATE_COMBO        1409
 #define IDC_RESPONSE_STATIC             1410
@@ -446,12 +455,15 @@
 #define IDC_SOURCE_DATE_STATIC          1417
 #define IDC_DST_DATE_STATIC             1418
 #define IDC_ERROR_DETAILS_STATIC        1423
-#define IDC_NAMES_STATIC                1424
 #define IDC_FILENAME_EDIT               1425
 #define IDC_LOCATION_STATIC             1426
+#define IDC_NAMES_STATIC2               1426
 #define IDC_REQUIRED_SPACE_HDR_STATIC   1427
 #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
@@ -736,6 +748,8 @@
 #define IDS_OPERATION_CREATEERROR       15039
 #define IDS_OPERATION_CHECKFORFREESPACE 15040
 #define IDS_OPERATION_RETRIEVEFILEINFO  15041
+#define IDS_RULES_EMPTY_STRING          15042
+#define IDS_RULES_NON_EMPTY_STRING      15043
 #define IDS_DATECREATED_STRING          18000
 #define IDS_DATELASTWRITE_STRING        18001
 #define IDS_DATEACCESSED_STRING         18002
@@ -826,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        239
-#define _APS_NEXT_COMMAND_VALUE         32835
-#define _APS_NEXT_CONTROL_VALUE         1430
+#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