comdlg32: Use the new colordlg.h file and update the resources.

dlls/comdlg32/cdlg.h

@@ -148,28 +148,6 @@ typedef struct {
 #define IDS_COLOR_AQUA                  1054
 #define IDS_COLOR_WHITE                 1055
 
-/* Color dialog controls */
-#define IDC_COLOR_LUMBAR 702
-#define IDC_COLOR_EDIT_H 703
-#define IDC_COLOR_EDIT_S 704
-#define IDC_COLOR_EDIT_L 705
-#define IDC_COLOR_EDIT_R 706
-#define IDC_COLOR_EDIT_G 707
-#define IDC_COLOR_EDIT_B 708
-#define IDC_COLOR_RESULT 709
-#define IDC_COLOR_GRAPH  710
-#define IDC_COLOR_ADD    712
-#define IDC_COLOR_RES    713
-#define IDC_COLOR_DEFINE 719
-#define IDC_COLOR_PREDEF 720
-#define IDC_COLOR_USRDEF 721
-#define IDC_COLOR_HL     723
-#define IDC_COLOR_SL     724
-#define IDC_COLOR_LL     725
-#define IDC_COLOR_RL     726
-#define IDC_COLOR_GL     727
-#define IDC_COLOR_BL     728
-
 #define IDS_FONT_SIZE    1200
 #define IDS_SAVE_BUTTON  1201
 #define IDS_SAVE_IN      1202

dlls/comdlg32/comdlg32.rc

@@ -20,6 +20,7 @@
  */
 
 #include "cdlg.h"
+#include "colordlg.h"
 #include "filedlgbrowser.h"
 
 #pragma makedep po
@@ -277,36 +278,37 @@ FONT 8, "MS Shell Dlg"
 
 
 CHOOSE_COLOR DIALOG 36, 24, 300, 185
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE WS_BORDER| DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Color"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Basic Colors:",   stc1, 4,    4,  140, 10
  LTEXT "&Custom Colors:",  stc2, 4,   106, 140, 10
- LTEXT "Color |  Sol&id",  stc3, 150, 151,  48, 10
- LTEXT   "&Red:", IDC_COLOR_RL /*1094*/,247,126,27,10
- EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Green:", IDC_COLOR_GL /*1095*/,247,140,27,10
- EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blue:", IDC_COLOR_BL /*1096*/,247,154,27,10
- EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10
- EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "#msgctxt#Saturation#&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10
- EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "#msgctxt#Luminance#&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10
- EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ RTEXT "Color", COLOR_SOLID_LEFT, 150, 151,  20, 10
+ LTEXT "|S&olid", COLOR_SOLID_RIGHT, 170, 151,  20, 10
+ LTEXT   "&Red:", COLOR_REDACCEL, 247,126,27,10
+ EDITTEXT COLOR_RED, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Green:", COLOR_GREENACCEL, 247,140,27,10
+ EDITTEXT COLOR_GREEN, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blue:", COLOR_BLUEACCEL, 247,154,27,10
+ EDITTEXT COLOR_BLUE, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" , COLOR_HUEACCEL, 200,126,24,10
+ EDITTEXT COLOR_HUE, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "#msgctxt#Saturation#&Sat:", COLOR_SATACCEL, 200,140,24,10
+ EDITTEXT COLOR_SAT, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "#msgctxt#Luminance#&Lum:", COLOR_LUMACCEL, 200,154,24,10
+ EDITTEXT COLOR_LUM, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" , COLOR_BOX1, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" , COLOR_CUSTOM1, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" , COLOR_RAINBOW, "STATIC",WS_BORDER|SS_SUNKEN|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" , COLOR_LUMSCROLL, "STATIC",SS_SUNKEN|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" , COLOR_CURRENT, "STATIC",SS_SUNKEN|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
  DEFPUSHBUTTON "OK",  IDOK,  4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancel", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Help", pshHelp,100,166, 44, 14
- PUSHBUTTON "&Add to Custom Colors",    IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Define Custom Colors >>", IDC_COLOR_DEFINE /*1025*/,   4, 149, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Color |  Sol&id", IDC_COLOR_RES, 300,200,4,14   /* just a dummy */
+ PUSHBUTTON "&Add to Custom Colors", COLOR_ADD, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Define Custom Colors >>", COLOR_MIX,   4, 149, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "#msgctxt#Solid#&o", COLOR_SOLID, 300,200,4,14, WS_GROUP
 }