fixes #2371 (NewStory: add grouping support)

1 files changed, 41 insertions, 38 deletions

diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 9a9c62d80d..445e44c64f 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -1,15 +1,16 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by D:\Miranda NG Git_orig_commit\miranda-ng\plugins\NewStory\res\resource.rc
+// Used by w:\miranda-ng\plugins\NewStory\res\resource.rc
 //
 #define IDD_HISTORY                     101
+#define IDD_OPT_TEMPLATES               102
+#define IDD_OPT_ADVANCED                103
 #define IDD_SEARCH                      105
-#define IDD_MESSAGE                     112 //!!!
+#define IDD_MESSAGE                     112
 #define IDR_POPUPS                      113
-#define IDR_ACCEL                       114 //!!!
+#define IDR_ACCEL                       114
 #define IDD_CALENDARTOOL                118
-#define IDD_OPT_TEMPLATES               121
-#define IDD_FILTERMODE                  123 //!!!
+#define IDD_FILTERMODE                  123
 #define ICO_NEWSTORY                    127
 #define ICO_USERINFO                    128
 #define ICO_USERMENU                    129
@@ -35,8 +36,8 @@
 #define ICO_TIMETREE                    152
 #define IDC_GPREVIEW                    1000
 #define IDC_ITEMS2                      1001
-#define IDC_PROGRESS                    1002 //!!!
-#define IDC_EDIT1                       1003 //!!!
+#define IDC_PROGRESS                    1002
+#define IDC_EDIT1                       1003
 #define IDC_SEARCHTEXT                  1004
 #define IDC_RESET                       1005
 #define IDC_MESSAGE                     1010
@@ -50,9 +51,9 @@
 #define IDC_LOGOPTIONS                  1018
 #define IDC_FINDPREV                    1019
 #define IDC_SEARCHICON                  1020
-#define IDC_TEXT                        1021 //!!!
-#define IDC_USERNICK                    1022 //!!!
-#define IDC_MSGICON                     1023 //!!!
+#define IDC_TEXT                        1021
+#define IDC_USERNICK                    1022
+#define IDC_MSGICON                     1023
 #define IDC_DATEPOPUP                   1024
 #define IDC_ICO_MESSAGES_IN             1025
 #define IDC_ICO_MESSAGES_OUT            1026
@@ -65,26 +66,26 @@
 #define IDC_PREVIEW                     1033
 #define IDC_DELETE                      1034
 #define IDC_TIMETREEVIEW                1035
-#define IDC_PROGRESS1                   1037  //!!!
-#define IDC_COMBO1                      1038  //!!!
+#define IDC_PROGRESS1                   1037
+#define IDC_COMBO1                      1038
 #define IDC_TIMETREE                    1039
-#define IDC_CHECK2                      1040  //!!!
-#define IDC_CHECK3                      1041  //!!!
+#define IDC_CHECK2                      1040
+#define IDC_CHECK3                      1041
 #define IDC_MONTHCALENDAR1              1044
 #define IDC_TEMPLATES                   1057
 #define IDC_VARHELP                     1058
 #define IDC_DISCARD                     1060
 #define IDC_UPDATEPREVIEW               1061
-#define IDC_CHK_FILE                    1062  //!!!
-#define IDC_CHK_URL                     1063  //!!!
-#define IDC_CHK_STATUS                  1064  //!!!
-#define IDC_CHK_OTHER                   1065  //!!!
-#define IDC_CHK_AUTOFILTER              1066  //!!!
-#define IDC_DATETIMEPICKER1             1067  //!!!
-#define IDC_DATETIMEPICKER2             1068  //!!!
-#define IDC_CHK_IN                      1069  //!!!
-#define IDC_CHK_OUT                     1070  //!!!
-#define IDC_CHK_MESSAGES                1071  //!!!
+#define IDC_CHK_FILE                    1062
+#define IDC_CHK_URL                     1063
+#define IDC_CHK_STATUS                  1064
+#define IDC_CHK_OTHER                   1065
+#define IDC_CHK_AUTOFILTER              1066
+#define IDC_DATETIMEPICKER1             1067
+#define IDC_DATETIMEPICKER2             1068
+#define IDC_CHK_IN                      1069
+#define IDC_CHK_OUT                     1070
+#define IDC_CHK_MESSAGES                1071
 #define IDC_EDITTEMPLATE                1072
 #define IDC_ICO_MESSAGES                1078
 #define IDC_ICO_FILES                   1079
@@ -107,6 +108,8 @@
 #define IDC_DATE_TO                     1104
 #define IDC_CHK_DATE_FROM               1105
 #define IDC_CHK_DATE_TO                 1106
+#define IDC_CHECK1                      1107
+#define IDC_GROUPING                    1107
 #define ID_FILTER_INCOMING              40003
 #define ID_FILTER_OUTGOING              40004
 #define ID_FILTER_MESSAGES              40006
@@ -114,29 +117,29 @@
 #define ID_FILTER_URLS                  40009
 #define ID_FILTER_STATUS                40010
 #define ID_FILTER_OTHER                 40011
-#define ID_CONTEXT_COPY                 40012  //!!!
-#define IDA_COPY                        40020  //!!!
-#define IDA_SEARCH                      40021  //!!!
+#define ID_CONTEXT_COPY                 40012
+#define IDA_COPY                        40020
+#define IDA_SEARCH                      40021
 #define ID_FILTER_AUTO                  40022
 #define ID_LOGOPTIONS_TEMPLATES         40023
 #define ID_LOGOPTIONS_OPTIONS           40024
-#define ID_CONTEXT_DELETE               40026  //!!!
-#define ID_CONTEXT_SELECTALL            40027  //!!!
-#define ID_CONTEXT_CANCEL               40028  //!!!
-#define ID_EXPORT_SAVEAS                40029  //!!!
-#define ID_EXPORT_SAVESELECTEDAS        40031  //!!!
-#define ID_FILTER_SHOWALLEVENTS         40036  //!!!
-#define ID_FILTER_SHOWINCOMINGEVENTSONLY 40037  //!!!
-#define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40038  //!!!
-#define ID_FILTER_USECUSTOMFILTER       40039  //!!!
+#define ID_CONTEXT_DELETE               40026
+#define ID_CONTEXT_SELECTALL            40027
+#define ID_CONTEXT_CANCEL               40028
+#define ID_EXPORT_SAVEAS                40029
+#define ID_EXPORT_SAVESELECTEDAS        40031
+#define ID_FILTER_SHOWALLEVENTS         40036
+#define ID_FILTER_SHOWINCOMINGEVENTSONLY 40037
+#define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40038
+#define ID_FILTER_USECUSTOMFILTER       40039
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        128
+#define _APS_NEXT_RESOURCE_VALUE        129
 #define _APS_NEXT_COMMAND_VALUE         40041
-#define _APS_NEXT_CONTROL_VALUE         1107
+#define _APS_NEXT_CONTROL_VALUE         1108
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif