NewStory: custom colors

1 files changed, 26 insertions, 28 deletions

diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 69b81bcd7f..570d5217c4 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -157,21 +157,31 @@ BEGIN
     CONTROL         "Show event direction",IDC_SHOW_DIRECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,87,289,12
 END
 
-IDD_OPT_TEMPLATES DIALOGEX 0, 0, 307, 223
-STYLE DS_SETFONT | WS_CHILD
+IDD_OPT_TEMPLATES DIALOGEX 0, 0, 307, 234
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "Template list:",IDC_STATIC,7,7,140,8
-    CONTROL         "Tree1",IDC_TEMPLATES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,12,20,135,117
+    CONTROL         "Tree1",IDC_TEMPLATES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,12,20,135,117
     LTEXT           "Edit template:",IDC_STATIC,7,142,293,8
     EDITTEXT        IDC_EDITTEMPLATE,12,155,288,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
     LTEXT           "Text preview:",IDC_STATIC,157,7,143,8
     EDITTEXT        IDC_PREVIEW,162,20,138,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY
     LTEXT           "Graphic preview:",IDC_STATIC,157,67,143,8
     CONTROL         "",IDC_GPREVIEW,"MTextControl",WS_TABSTOP,162,80,138,57
-    CONTROL         "",IDC_RESET,"MButtonClass",WS_TABSTOP,248,202,16,16
-    CONTROL         "",IDC_DISCARD,"MButtonClass",WS_TABSTOP,266,202,16,16
-    CONTROL         "",IDC_VARHELP,"MButtonClass",WS_DISABLED | WS_TABSTOP,284,202,16,16
+    CONTROL         "",IDC_COLOR1,"ColourPicker",WS_TABSTOP,15,200,24,13
+    CONTROL         "",IDC_COLOR2,"ColourPicker",WS_TABSTOP,47,200,24,13
+    CONTROL         "",IDC_COLOR3,"ColourPicker",WS_TABSTOP,79,200,24,13
+    CONTROL         "",IDC_COLOR4,"ColourPicker",WS_TABSTOP,111,200,24,13
+    CONTROL         "",IDC_COLOR5,"ColourPicker",WS_TABSTOP,143,200,24,13
+    CONTROL         "",IDC_RESET,"MButtonClass",WS_TABSTOP,248,201,16,16
+    CONTROL         "",IDC_DISCARD,"MButtonClass",WS_TABSTOP,266,201,16,16
+    CONTROL         "",IDC_VARHELP,"MButtonClass",WS_DISABLED | WS_TABSTOP,284,201,16,16
+    CTEXT           "[c2]",IDC_STATIC,17,216,18,8
+    CTEXT           "[c4]",IDC_STATIC,81,216,18,8
+    CTEXT           "[c6]",IDC_STATIC,145,216,18,8
+    CTEXT           "[c3]",IDC_STATIC,49,216,18,8
+    CTEXT           "[c5]",IDC_STATIC,114,216,18,8
 END
 
 IDD_EMPTYHISTORY DIALOGEX 0, 0, 294, 86
@@ -180,13 +190,15 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Empty history"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "Are you sure to remove selected event(s)?",IDC_TOPLINE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,7,7,270,8
-    CONTROL         "Remove server history", IDC_DELSERVERHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,280,8
+    CONTROL         "Are you sure to remove selected event(s)?",IDC_TOPLINE,
+                    "Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,7,7,270,8
+    CONTROL         "Remove server history",IDC_DELSERVERHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,280,8
     CONTROL         "Remove history for everyone",IDC_BOTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,50,260,8
     PUSHBUTTON      "&Yes",IDOK,149,65,65,14
     DEFPUSHBUTTON   "&No",IDCANCEL,221,65,65,14
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -211,27 +223,8 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 300
-        VERTGUIDE, 12
-        VERTGUIDE, 147
-        VERTGUIDE, 152
-        VERTGUIDE, 157
-        VERTGUIDE, 162
-        VERTGUIDE, 268
-        VERTGUIDE, 284
         TOPMARGIN, 7
-        BOTTOMMARGIN, 216
-        HORZGUIDE, 15
-        HORZGUIDE, 20
-        HORZGUIDE, 62
-        HORZGUIDE, 67
-        HORZGUIDE, 75
-        HORZGUIDE, 80
-        HORZGUIDE, 137
-        HORZGUIDE, 142
-        HORZGUIDE, 150
-        HORZGUIDE, 155
-        HORZGUIDE, 197
-        HORZGUIDE, 202
+        BOTTOMMARGIN, 227
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -311,6 +304,11 @@ BEGIN
     0
 END
 
+IDD_OPT_TEMPLATES AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////