From a1323b333d0a477fc55a9935f0dde8903eae4100 Mon Sep 17 00:00:00 2001 From: ehouse Date: Wed, 14 Apr 2004 03:59:36 +0000 Subject: [PATCH] move colors edit from menu to button --- wince/resource.h | 82 +++++++++++++++++++++++------------------------- wince/xwords4.rc | 12 +++---- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/wince/resource.h b/wince/resource.h index 283efa7bf..c7e6b529f 100755 --- a/wince/resource.h +++ b/wince/resource.h @@ -74,54 +74,55 @@ #define IDC_CHECKNOHINTS 1041 #define IDC_CHECKSHOWCURSOR 1042 #define IDC_CHECKROBOTSCORES 1043 -#define PHONIES_LABEL 1044 -#define IDC_ROLECOMBO 1045 -#define IDC_LOCALP_LABEL 1046 -#define IDC_TOTAL_LABEL 1047 -#define IDC_REMOTE_LABEL 1048 -#define IDC_PICKTILES 1049 -#define IDC_BPICK 1050 -#define IDC_PICKMSG 1051 +#define IDC_PREFCOLORS 1044 +#define PHONIES_LABEL 1045 +#define IDC_ROLECOMBO 1046 +#define IDC_LOCALP_LABEL 1047 +#define IDC_TOTAL_LABEL 1048 +#define IDC_REMOTE_LABEL 1049 +#define IDC_PICKTILES 1050 +#define IDC_BPICK 1051 +#define IDC_PICKMSG 1052 #ifdef FEATURE_TRAY_EDIT -# define IDC_CPICK 1052 -# define IDC_PICKALL 1053 +# define IDC_CPICK 1053 +# define IDC_PICKALL 1054 #endif #ifdef XWFEATURE_CE_EDITCOLORS -# define DLBLTR_BUTTON 1054 -# define DBLWRD_BUTTON 1055 -# define TPLLTR_BUTTON 1056 -# define TPLWRD_BUTTON 1057 -# define EMPCELL_BUTTON 1058 -# define TBACK_BUTTON 1059 -# define PLAYER1_BUTTON 1060 -# define PLAYER2_BUTTON 1061 -# define PLAYER3_BUTTON 1062 -# define PLAYER4_BUTTON 1063 -# define PLAYER1_LABEL 1064 -# define PLAYER2_LABEL 1065 -# define PLAYER3_LABEL 1066 -# define PLAYER4_LABEL 1067 -# define DLBLTR_LABEL 1068 -# define DBLWRD_LABEL 1069 -# define TPLLTR_LABEL 1070 -# define TPLWRD_LABEL 1071 -# define EMPTYCELL_LABEL 1072 -# define TILEBACK_LABEL 1073 +# define DLBLTR_BUTTON 1055 +# define DBLWRD_BUTTON 1056 +# define TPLLTR_BUTTON 1057 +# define TPLWRD_BUTTON 1058 +# define EMPCELL_BUTTON 1059 +# define TBACK_BUTTON 1060 +# define PLAYER1_BUTTON 1061 +# define PLAYER2_BUTTON 1062 +# define PLAYER3_BUTTON 1063 +# define PLAYER4_BUTTON 1064 +# define PLAYER1_LABEL 1065 +# define PLAYER2_LABEL 1066 +# define PLAYER3_LABEL 1067 +# define PLAYER4_LABEL 1068 +# define DLBLTR_LABEL 1069 +# define DBLWRD_LABEL 1070 +# define TPLLTR_LABEL 1071 +# define TPLWRD_LABEL 1072 +# define EMPTYCELL_LABEL 1073 +# define TILEBACK_LABEL 1074 /* editor dlg: assumption is that the edit field's ID is one more than the corresponding slider's */ # ifdef MY_COLOR_SEL -# define CLREDT_SLIDER1 1074 -# define RED_EDIT 1075 -# define CLREDT_SLIDER2 1076 -# define GREEN_EDIT 1077 -# define CLREDT_SLIDER3 1078 -# define BLUE_EDIT 1079 +# define CLREDT_SLIDER1 1075 +# define RED_EDIT 1076 +# define CLREDT_SLIDER2 1077 +# define GREEN_EDIT 1078 +# define CLREDT_SLIDER3 1079 +# define BLUE_EDIT 1080 -# define RED_LABEL 1080 -# define GREEN_LABEL 1081 -# define BLUE_LABEL 1082 +# define RED_LABEL 1081 +# define GREEN_LABEL 1082 +# define BLUE_LABEL 1083 # endif // MY_COLOR_SEL #endif // XWFEATURE_CE_EDITCOLORS @@ -144,9 +145,6 @@ #define ID_FILE_SAVEDGAMES 40018 #define ID_EDITTEXT 40019 #define ID_FILE_PREFERENCES 40020 -#ifdef XWFEATURE_CE_EDITCOLORS -# define ID_FILE_EDITCOLORS 40021 -#endif #define ID_FILE_BEAMDICT 40022 #define ID_FILE_BEAMBOARDS 40023 #define ID_GAME_RESENDMSGS 40024 diff --git a/wince/xwords4.rc b/wince/xwords4.rc index 4519907cd..e5a99d1b7 100755 --- a/wince/xwords4.rc +++ b/wince/xwords4.rc @@ -74,10 +74,6 @@ BEGIN MENUITEM "Open &saved game", ID_FILE_SAVEDGAMES MENUITEM "&Preferences", ID_FILE_PREFERENCES MENUITEM SEPARATOR -#ifdef XWFEATURE_CE_EDITCOLORS - MENUITEM "&Colors", ID_FILE_EDITCOLORS - MENUITEM SEPARATOR -#endif #ifndef XWFEATURE_STANDALONE_ONLY MENUITEM "Beam dictionary", ID_FILE_BEAMDICT MENUITEM "Beam boards and colors", ID_FILE_BEAMBOARDS @@ -273,7 +269,9 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,8,37,90,10 CONTROL "Explain robot scores",IDC_CHECKROBOTSCORES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,52,90,10 - +#ifdef XWFEATURE_CE_EDITCOLORS + PUSHBUTTON "Edit colors...",IDC_PREFCOLORS,8,67,69,12 +#endif CONTROL "Smart robot",IDC_CHECKSMARTROBOT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,22,90,10 CONTROL "Disallow hints",IDC_CHECKNOHINTS,"Button", @@ -290,8 +288,8 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,8,82,90,10 #else #endif - DEFPUSHBUTTON "OK",IDOK,9,100,38,14 - PUSHBUTTON "Cancel",IDCANCEL,70,100,39,14 + DEFPUSHBUTTON "OK",IDOK,9,98,38,14 + PUSHBUTTON "Cancel",IDCANCEL,70,98,39,14 END #ifdef XWFEATURE_CE_EDITCOLORS