newstory: resource reorganization

2 files changed, 104 insertions, 104 deletions

diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index dc38d17629..e52a969a2c 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -103,28 +103,28 @@ BEGIN
     CONTROL         "",IDC_IB_SEPARATOR,"Static",SS_ETCHEDHORZ,21,76,124,1
     ICON            "",IDC_ICO_MESSAGES,4,7,20,20
     ICON            "",IDC_ICO_FILES,123,7,20,20
+    ICON            "",IDC_ICO_URLS,205,9,20,20
     ICON            "",IDC_ICO_TOTAL,279,2,20,20
     LTEXT           "Messages",IDC_TXT_MESSAGES,31,9,25,8,SS_CENTERIMAGE
     LTEXT           "Files",IDC_TXT_FILES,155,12,25,8,SS_CENTERIMAGE
+    LTEXT           "URLs",IDC_TXT_URLS,237,15,25,8,SS_CENTERIMAGE
     LTEXT           "Total",IDC_TXT_TOTAL,313,11,25,8,SS_CENTERIMAGE
     LTEXT           "Incoming",IDC_TXT_MESSAGES_IN,43,39,25,8,SS_CENTERIMAGE
     LTEXT           "Incoming",IDC_TXT_FILES_IN,167,41,25,8,SS_CENTERIMAGE
+    LTEXT           "Incoming",IDC_TXT_URLS_IN,249,44,25,8,SS_CENTERIMAGE
     LTEXT           "Incoming",IDC_TXT_TOTAL_IN,325,41,25,8,SS_CENTERIMAGE
     LTEXT           "Outgoing",IDC_TXT_MESSAGES_OUT,45,52,25,8,SS_CENTERIMAGE
     LTEXT           "Outgoing",IDC_TXT_FILES_OUT,169,55,25,8,SS_CENTERIMAGE
+    LTEXT           "Outgoing",IDC_TXT_URLS_OUT,251,57,25,8,SS_CENTERIMAGE
     LTEXT           "Outgoing",IDC_TXT_TOTAL_OUT,327,54,25,8,SS_CENTERIMAGE
     CONTROL         "",IDC_ICO_MESSAGES_IN,"MButtonClass",WS_TABSTOP,17,36,16,14
     CONTROL         "",IDC_ICO_MESSAGES_OUT,"MButtonClass",WS_TABSTOP,17,52,16,14
     CONTROL         "",IDC_ICO_FILES_IN,"MButtonClass",WS_TABSTOP,143,36,16,14
     CONTROL         "",IDC_ICO_FILES_OUT,"MButtonClass",WS_TABSTOP,143,52,16,14
-    CONTROL         "",IDC_ICO_TOTAL_IN,"MButtonClass",WS_TABSTOP,305,36,16,14
-    CONTROL         "",IDC_ICO_TOTAL_OUT,"MButtonClass",WS_TABSTOP,305,52,16,14
-    ICON            "",IDC_ICO_URLS,205,9,20,20
-    LTEXT           "URLs",IDC_TXT_URLS,237,15,25,8,SS_CENTERIMAGE
-    LTEXT           "Incoming",IDC_TXT_URLS_IN,249,44,25,8,SS_CENTERIMAGE
-    LTEXT           "Outgoing",IDC_TXT_URLS_OUT,251,57,25,8,SS_CENTERIMAGE
     CONTROL         "",IDC_ICO_URLS_IN,"MButtonClass",WS_TABSTOP,225,38,16,14
     CONTROL         "",IDC_ICO_URLS_OUT,"MButtonClass",WS_TABSTOP,225,54,16,14
+    CONTROL         "",IDC_ICO_TOTAL_IN,"MButtonClass",WS_TABSTOP,305,36,16,14
+    CONTROL         "",IDC_ICO_TOTAL_OUT,"MButtonClass",WS_TABSTOP,305,52,16,14
     CONTROL         "DateTimePicker1",IDC_DATE_TO,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_TABSTOP,246,94,90,15
     CONTROL         "DateTimePicker1",IDC_DATE_FROM,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_TABSTOP,247,76,90,15
     CONTROL         "since",IDC_CHK_DATE_FROM,"Button",BS_AUTOCHECKBOX | BS_RIGHT | BS_VCENTER | BS_FLAT | WS_TABSTOP,209,80,33,10,WS_EX_TRANSPARENT | WS_EX_RIGHT
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index e6ba3c3c4c..e9dc7ace1d 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -5,114 +5,114 @@
 #define IDD_HISTORY                     101
 #define IDD_OPT_TEMPLATES               102
 #define IDD_OPT_ADVANCED                103
+#define IDD_CALENDARTOOL                104
+#define IDR_POPUPS                      105
 #define IDR_CONTEXTMENU                 106
-#define IDR_POPUPS                      113
-#define IDD_CALENDARTOOL                118
-#define ICO_NEWSTORY                    127
-#define ICO_USERINFO                    128
-#define ICO_USERMENU                    129
-#define ICO_SEARCH                      130
-#define ICO_OPTIONS                     131
-#define ICO_FILTER                      132
-#define ICO_EXPORT                      133
-#define ICO_COPY                        134
-#define ICO_SENDMSG                     135
-#define ICO_MSGIN                       137
-#define ICO_MSGOUT                      138
-#define ICO_SIGNIN                      139
-#define ICO_FILE                        140
-#define ICO_URL                         141
-#define ICO_UNKNOWN                     142
-#define ICO_FINDPREV                    143
-#define ICO_FINDNEXT                    144
-#define ICO_CALENDAR                    147
-#define ICO_TPLGROUP                    148
-#define ICO_RESET                       149
-#define ICO_PREVIEW                     150
-#define ICO_VARHELP                     151
-#define ICO_TIMETREE                    152
-#define IDC_GPREVIEW                    1000
-#define IDC_HISTORYCONTROL              1001
-#define IDC_SEARCHTEXT                  1004
-#define IDC_RESET                       1005
-#define IDC_MESSAGE                     1010
-#define IDC_USERINFO                    1011
-#define IDC_USERMENU                    1012
-#define IDC_SEARCH                      1013
-#define IDC_EXPORT                      1014
-#define IDC_COPY                        1015
-#define IDC_FILTER                      1016
-#define IDC_FINDNEXT                    1017
-#define IDC_LOGOPTIONS                  1018
-#define IDC_FINDPREV                    1019
-#define IDC_SEARCHICON                  1020
-#define IDC_DATEPOPUP                   1024
-#define IDC_ICO_MESSAGES_IN             1025
-#define IDC_ICO_MESSAGES_OUT            1026
-#define IDC_ICO_FILES_IN                1027
-#define IDC_ICO_FILES_OUT               1028
-#define IDC_ICO_TOTAL_IN                1029
-#define IDC_ICO_TOTAL_OUT               1030
-#define IDC_ICO_URLS_IN                 1031
-#define IDC_ICO_URLS_OUT                1032
-#define IDC_PREVIEW                     1033
-#define IDC_DELETE                      1034
-#define IDC_TIMETREEVIEW                1035
-#define IDC_TIMETREE                    1039
-#define IDC_MONTHCALENDAR               1044
-#define IDC_TEMPLATES                   1057
-#define IDC_VARHELP                     1058
-#define IDC_DISCARD                     1060
-#define IDC_UPDATEPREVIEW               1061
-#define IDC_EDITTEMPLATE                1072
-#define IDC_ICO_MESSAGES                1078
-#define IDC_ICO_FILES                   1079
-#define IDC_ICO_URLS                    1080
-#define IDC_ICO_TOTAL                   1081
-#define IDC_TXT_MESSAGES                1090
-#define IDC_TXT_FILES                   1091
-#define IDC_TXT_TOTAL                   1092
-#define IDC_IB_SEPARATOR                1093
-#define IDC_TXT_URLS                    1094
-#define IDC_TXT_MESSAGES_IN             1095
-#define IDC_TXT_FILES_IN                1096
-#define IDC_TXT_TOTAL_IN                1097
-#define IDC_TXT_MESSAGES_OUT            1098
-#define IDC_TXT_FILES_OUT               1099
-#define IDC_TXT_TOTAL_OUT               1100
-#define IDC_TXT_URLS_IN                 1101
-#define IDC_TXT_URLS_OUT                1102
-#define IDC_DATE_FROM                   1103
-#define IDC_DATE_TO                     1104
-#define IDC_CHK_DATE_FROM               1105
-#define IDC_CHK_DATE_TO                 1106
-#define IDC_GROUPING                    1107
-#define ID_FILTER_INCOMING              40003
-#define ID_FILTER_OUTGOING              40004
-#define ID_FILTER_MESSAGES              40006
+#define ICO_NEWSTORY                    107
+#define ICO_USERINFO                    108
+#define ICO_USERMENU                    109
+#define ICO_SEARCH                      110
+#define ICO_OPTIONS                     111
+#define ICO_FILTER                      112
+#define ICO_EXPORT                      113
+#define ICO_COPY                        114
+#define ICO_SENDMSG                     115
+#define ICO_MSGIN                       116
+#define ICO_MSGOUT                      117
+#define ICO_SIGNIN                      118
+#define ICO_FILE                        119
+#define ICO_URL                         120
+#define ICO_UNKNOWN                     121
+#define ICO_FINDPREV                    122
+#define ICO_FINDNEXT                    123
+#define ICO_CALENDAR                    124
+#define ICO_TPLGROUP                    125
+#define ICO_RESET                       126
+#define ICO_PREVIEW                     127
+#define ICO_VARHELP                     128
+#define ICO_TIMETREE                    129
+#define IDC_USERINFO                    1000
+#define IDC_USERMENU                    1001
+#define IDC_MESSAGE                     1002
+#define IDC_SEARCH                      1003
+#define IDC_COPY                        1004
+#define IDC_EXPORT                      1005
+#define IDC_DELETE                      1006
+#define IDC_TIMETREE                    1007
+#define IDC_FILTER                      1008
+#define IDC_FINDPREV                    1009
+#define IDC_FINDNEXT                    1010
+#define IDC_SEARCHTEXT                  1011
+#define IDC_SEARCHICON                  1012
+#define IDC_LOGOPTIONS                  1013
+#define IDC_TIMETREEVIEW                1014
+#define IDC_DATEPOPUP                   1015
+#define IDC_HISTORYCONTROL              1016
+#define IDC_IB_SEPARATOR                1017
+#define IDC_ICO_MESSAGES                1018
+#define IDC_ICO_FILES                   1019
+#define IDC_ICO_URLS                    1020
+#define IDC_ICO_TOTAL                   1021
+#define IDC_TXT_MESSAGES                1022
+#define IDC_TXT_FILES                   1023
+#define IDC_TXT_URLS                    1024
+#define IDC_TXT_TOTAL                   1025
+#define IDC_TXT_MESSAGES_IN             1026
+#define IDC_TXT_FILES_IN                1027
+#define IDC_TXT_URLS_IN                 1028
+#define IDC_TXT_TOTAL_IN                1029
+#define IDC_TXT_MESSAGES_OUT            1030
+#define IDC_TXT_FILES_OUT               1031
+#define IDC_TXT_URLS_OUT                1032
+#define IDC_TXT_TOTAL_OUT               1033
+#define IDC_ICO_MESSAGES_IN             1034
+#define IDC_ICO_MESSAGES_OUT            1035
+#define IDC_ICO_FILES_IN                1036
+#define IDC_ICO_FILES_OUT               1037
+#define IDC_ICO_URLS_IN                 1038
+#define IDC_ICO_URLS_OUT                1039
+#define IDC_ICO_TOTAL_IN                1040
+#define IDC_ICO_TOTAL_OUT               1041
+#define IDC_DATE_FROM                   1042
+#define IDC_DATE_TO                     1043
+#define IDC_CHK_DATE_FROM               1044
+#define IDC_CHK_DATE_TO                 1045
+#define IDC_MONTHCALENDAR               1046
+#define IDC_GROUPING                    1047
+#define IDC_TEMPLATES                   1048
+#define IDC_EDITTEMPLATE                1049
+#define IDC_PREVIEW                     1050
+#define IDC_GPREVIEW                    1051
+#define IDC_RESET                       1052
+#define IDC_DISCARD                     1053
+#define IDC_UPDATEPREVIEW               1054
+#define IDC_VARHELP                     1055
+#define ID_FILTER_SHOWALLEVENTS         40001
+#define ID_FILTER_SHOWINCOMINGEVENTSONLY 40002
+#define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40003
+#define ID_FILTER_USECUSTOMFILTER       40004
+#define ID_FILTER_INCOMING              40005
+#define ID_FILTER_OUTGOING              40006
+#define ID_FILTER_MESSAGES              40007
 #define ID_FILTER_FILES                 40008
 #define ID_FILTER_URLS                  40009
 #define ID_FILTER_STATUS                40010
 #define ID_FILTER_OTHER                 40011
-#define ID_CONTEXT_COPY                 40012
-#define ID_FILTER_AUTO                  40022
-#define ID_LOGOPTIONS_TEMPLATES         40023
-#define ID_LOGOPTIONS_OPTIONS           40024
-#define ID_CONTEXT_EDIT                 40025
-#define ID_CONTEXT_DELETE               40026
-#define ID_CONTEXT_SELECTALL            40027
-#define ID_FILTER_SHOWALLEVENTS         40036
-#define ID_FILTER_SHOWINCOMINGEVENTSONLY 40037
-#define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40038
-#define ID_FILTER_USECUSTOMFILTER       40039
+#define ID_FILTER_AUTO                  40012
+#define ID_LOGOPTIONS_OPTIONS           40013
+#define ID_LOGOPTIONS_TEMPLATES         40014
+#define ID_CONTEXT_COPY                 40015
+#define ID_CONTEXT_EDIT                 40016
+#define ID_CONTEXT_DELETE               40017
+#define ID_CONTEXT_SELECTALL            40018
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        129
-#define _APS_NEXT_COMMAND_VALUE         40041
-#define _APS_NEXT_CONTROL_VALUE         1108
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         40019
+#define _APS_NEXT_CONTROL_VALUE         1056
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif