diff --git a/wince/xwords4.rc b/wince/xwords4.rc index 3a5bbf81c..68681035c 100755 --- a/wince/xwords4.rc +++ b/wince/xwords4.rc @@ -255,20 +255,26 @@ BEGIN COMBOBOX IDC_DICTCOMBO,43,DICTPICK_ROW,85,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT DEFPUSHBUTTON "Cancel",IDCANCEL,70,BUTTONS_ROW, REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT END -IDD_STRBOX DIALOG DISCARDABLE 0, 25, 121, 97 +#define SB_WIDTH 121 +#define SB_BUTTON_WIDTH 19 +#define SB_OK_LEFT ((SB_WIDTH/2)-10-SB_BUTTON_WIDTH) +#define SB_CANCEL_LEFT ((SB_WIDTH/2)+10) + + +IDD_STRBOX DIALOG DISCARDABLE 0, 25, SB_WIDTH, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | /*WS_SYSMENU | */ DS_CENTER CAPTION "Dialog" FONT 8, "System" BEGIN - EDITTEXT ID_EDITTEXT,3,5,115,76,ES_MULTILINE | ES_READONLY + EDITTEXT ID_EDITTEXT,3,3,115,76,ES_MULTILINE | ES_READONLY | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK, 29,84,19,REPOS_BUTTON_HT - DEFPUSHBUTTON "No",IDCANCEL,70,84,19,REPOS_BUTTON_HT + PUSHBUTTON "OK",IDOK, SB_OK_LEFT,81,SB_BUTTON_WIDTH,REPOS_BUTTON_HT + DEFPUSHBUTTON "No",IDCANCEL,SB_CANCEL_LEFT,81,SB_BUTTON_WIDTH,REPOS_BUTTON_HT END IDD_ASKBLANK DIALOG DISCARDABLE 0, 0, 131, 90 @@ -279,8 +285,8 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,70,70,20,14 LTEXT "Enter a letter for this blank tile.",IDC_BPICK,8,8,63,18 #ifdef FEATURE_TRAY_EDIT - DEFPUSHBUTTON "Pick all!",IDC_PICKALL,8,70,39,14 - DEFPUSHBUTTON "Del",IDC_BACKUP,48,70,18,14 + PUSHBUTTON "Pick all!",IDC_PICKALL,8,70,39,14 + PUSHBUTTON "Del",IDC_BACKUP,48,70,18,14 LTEXT "Pick a tile for your tray.",IDC_CPICK,8,8,63,18 EDITTEXT IDC_PICKMSG,8,28,80,30,ES_MULTILINE | ES_READONLY @@ -302,69 +308,76 @@ BEGIN END #ifdef XWFEATURE_SEARCHLIMIT -#define HC_LABELS_COL 10 -#define HC_DROPDOWNS_COL 80 -#define HC_MINROW 6 -#define HC_MAXROW 20 +#define HC_LABELS_COL 5 +#define HC_DROPDOWNS_COL 70 +#define HC_MINROW 3 +#define HC_MAXROW 16 +#define HC_WIDTH 90 +#define HC_OK_LEFT ((HC_WIDTH/2)-10-REPOS_BUTTON_WIDTH) +#define HC_CANCEL_LEFT ((HC_WIDTH/2)+10) - -IDD_ASKHINTLIMTS DIALOG DISCARDABLE 0, 0, 132, 60 +IDD_ASKHINTLIMTS DIALOG DISCARDABLE 0, 0, HC_WIDTH, 47 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Tile hint limits" FONT 8, "System" BEGIN - LTEXT "Use at least:",IDC_STATIC,HC_LABELS_COL,HC_MINROW,70,8 - COMBOBOX HC_MIN_COMBO,HC_DROPDOWNS_COL,HC_MINROW,30,58, + LTEXT "Use at least:",IDC_STATIC,HC_LABELS_COL,HC_MINROW,60,8 + COMBOBOX HC_MIN_COMBO,HC_DROPDOWNS_COL,HC_MINROW,17,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "But no more than:",IDC_STATIC,HC_LABELS_COL,HC_MAXROW,70,8 - COMBOBOX HC_MAX_COMBO,HC_DROPDOWNS_COL,HC_MAXROW,30,58, + LTEXT "But no more than:",IDC_STATIC,HC_LABELS_COL,HC_MAXROW,60,8 + COMBOBOX HC_MAX_COMBO,HC_DROPDOWNS_COL,HC_MAXROW,17,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,74,38,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,15,38,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + DEFPUSHBUTTON "OK",IDOK,HC_OK_LEFT,31,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "Cancel",IDCANCEL,HC_CANCEL_LEFT,31,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT END #endif -IDD_OPTIONSDLG DIALOG DISCARDABLE 0, 20, 120, 115 +#define PR_WIDTH 118 +#define PR_OK_LEFT ((PR_WIDTH/2)-10-REPOS_BUTTON_WIDTH) +#define PR_CANCEL_LEFT ((PR_WIDTH/2)+10) + +IDD_OPTIONSDLG DIALOG DISCARDABLE 0, 20, PR_WIDTH, 112 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Preferences" FONT 8, "System" BEGIN CONTROL "Global prefs",IDC_RADIOGLOBAL,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,4,7,54,10 + BS_AUTORADIOBUTTON | WS_GROUP,4,5,54,10 CONTROL "Game prefs",IDC_RADIOLOCAL,"Button",BS_AUTORADIOBUTTON, - 64,7,53,10 + 64,5,53,10 CONTROL "Color played tiles",IDC_CHECKCOLORPLAYED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,22,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,10 CONTROL "Enable cursor",IDC_CHECKSHOWCURSOR,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,37,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,35,90,10 CONTROL "Explain robot scores",IDC_CHECKROBOTSCORES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,52,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,50,90,10 PUSHBUTTON "Edit colors...",IDC_PREFCOLORS,8,67,60,12 CONTROL "Smart robot",IDC_CHECKSMARTROBOT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,22,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,10 CONTROL "Disallow hints",IDC_CHECKNOHINTS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,37,54,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,35,54,10 #ifdef XWFEATURE_SEARCHLIMIT CONTROL "Hint limits",IDC_CHECKHINTSLIMITS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,64,37,50,10 + BS_AUTOCHECKBOX | WS_TABSTOP,64,35,50,10 #endif CONTROL "Timer on (minutes)",TIMER_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,52,85,14 + BS_AUTOCHECKBOX | WS_TABSTOP,8,50,85,14 EDITTEXT TIMER_EDIT,93,52,24,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Phonies:",PHONIES_LABEL,8,67,28,8 - COMBOBOX PHONIES_COMBO,38,67,67,58,CBS_DROPDOWNLIST | WS_VSCROLL | + LTEXT "Phonies:",PHONIES_LABEL,8,65,28,8 + COMBOBOX PHONIES_COMBO,38,65,67,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #ifdef FEATURE_TRAY_EDIT CONTROL "Pick tiles face-up", IDC_PICKTILES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,82,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8,80,90,10 #else #endif - DEFPUSHBUTTON "OK",IDOK,9,98,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,70,98,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + DEFPUSHBUTTON "OK",IDOK,PR_OK_LEFT,95,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "Cancel",IDCANCEL,PR_CANCEL_LEFT,95, + REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT END #ifndef XWFEATURE_STANDALONE_ONLY @@ -409,6 +422,9 @@ BEGIN END #endif +#define CLR_WIDTH 114 +#define CLR_OK_LEFT ((CLR_WIDTH/2)-10-REPOS_BUTTON_WIDTH) +#define CLR_CANCEL_LEFT ((CLR_WIDTH/2)+10) #define CLR_LAB_WIDTH 40 #define CLR_LAB_HT 14 #define CLR_BUT_WIDTH 12 @@ -418,64 +434,71 @@ END #define CLR_ROW_3 36 #define CLR_ROW_4 53 #define CLR_ROW_5 67 -#undef BUTTON_ROW -#define BUTTON_ROW 84 +#define CLR_BUTTON_ROW 81 #define CLR_COL_1 2 #define CLR_COL_2 43 #define CLR_COL_3 58 #define CLR_COL_4 99 -IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, 116, 103 +IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, 96 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Color preferences" FONT 8, "System" BEGIN LTEXT "Dbl letter:",DLBLTR_LABEL,CLR_COL_1,CLR_ROW_1, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",DLBLTR_BUTTON,CLR_COL_2,CLR_ROW_1,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",DLBLTR_BUTTON,CLR_COL_2,CLR_ROW_1,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW - LTEXT "Dbl word:",DBLWRD_LABEL,CLR_COL_3,CLR_ROW_1, + LTEXT "Dbl word:",DBLWRD_LABEL,CLR_COL_3,CLR_ROW_1, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",DBLWRD_BUTTON,CLR_COL_4,CLR_ROW_1,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",DBLWRD_BUTTON,CLR_COL_4,CLR_ROW_1,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Triple letter:",TPLLTR_LABEL,CLR_COL_1,CLR_ROW_2, - CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",TPLLTR_BUTTON,CLR_COL_2,CLR_ROW_2,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + CLR_LAB_WIDTH,CLR_LAB_HT + PUSHBUTTON "",TPLLTR_BUTTON,CLR_COL_2,CLR_ROW_2,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Triple word:",TPLWRD_LABEL,CLR_COL_3,CLR_ROW_2, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",TPLWRD_BUTTON,CLR_COL_4,CLR_ROW_2,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW - + PUSHBUTTON "",TPLWRD_BUTTON,CLR_COL_4,CLR_ROW_2,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Empty cell:",EMPTYCELL_LABEL,CLR_COL_1,CLR_ROW_3, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",EMPCELL_BUTTON,CLR_COL_2,CLR_ROW_3,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",EMPCELL_BUTTON,CLR_COL_2,CLR_ROW_3,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Tile bkgnd:",TILEBACK_LABEL,CLR_COL_3,CLR_ROW_3, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",TBACK_BUTTON,CLR_COL_4,CLR_ROW_3,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW - + PUSHBUTTON "",TBACK_BUTTON,CLR_COL_4,CLR_ROW_3,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Player 1:",PLAYER1_LABEL,CLR_COL_1,CLR_ROW_4, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",PLAYER1_BUTTON,CLR_COL_2,CLR_ROW_4,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",PLAYER1_BUTTON,CLR_COL_2,CLR_ROW_4,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Player 2:",PLAYER2_LABEL,CLR_COL_3,CLR_ROW_4, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",PLAYER2_BUTTON,CLR_COL_4,CLR_ROW_4,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",PLAYER2_BUTTON,CLR_COL_4,CLR_ROW_4,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Player 3:",PLAYER3_LABEL,CLR_COL_1,CLR_ROW_5, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",PLAYER3_BUTTON,CLR_COL_2,CLR_ROW_5,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",PLAYER3_BUTTON,CLR_COL_2,CLR_ROW_5,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW LTEXT "Player 4:",PLAYER4_LABEL,CLR_COL_3,CLR_ROW_5, CLR_LAB_WIDTH,CLR_LAB_HT - PUSHBUTTON "",PLAYER4_BUTTON,CLR_COL_4,CLR_ROW_5,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW + PUSHBUTTON "",PLAYER4_BUTTON,CLR_COL_4,CLR_ROW_5,CLR_BUT_WIDTH, + CLR_BUT_HT,BS_OWNERDRAW - - DEFPUSHBUTTON "OK",IDOK,15,BUTTON_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,60,BUTTON_ROW,REPOS_BUTTON_WIDTH, - REPOS_BUTTON_HT + DEFPUSHBUTTON "OK",IDOK,CLR_OK_LEFT,CLR_BUTTON_ROW, + REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "Cancel",IDCANCEL,CLR_CANCEL_LEFT,CLR_BUTTON_ROW, + REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT END // @@ -492,8 +515,11 @@ END # define CLREDIT_ROW_2 21 # define CLREDIT_ROW_3 37 # define SLIDER_WIDTH 46 +#define CLRE_WIDTH 112 +#define CLRE_OK_LEFT ((CLRE_WIDTH/2)-10-REPOS_BUTTON_WIDTH) +#define CLRE_CANCEL_LEFT ((CLRE_WIDTH/2)+10) -IDD_COLOREDITDLG DIALOG DISCARDABLE 0, 0, 112, 75 +IDD_COLOREDITDLG DIALOG DISCARDABLE 0, 0, CLRE_WIDTH, 72 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Edit color" FONT 8, "System" @@ -522,8 +548,8 @@ BEGIN TBS_BOTH|TBS_NOTICKS|WS_TABSTOP, CLRESLIDER_COL,CLREDIT_ROW_3,SLIDER_WIDTH,15 - DEFPUSHBUTTON "OK",IDOK,15,57,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,58,57,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + DEFPUSHBUTTON "OK",IDOK,CLRE_OK_LEFT,56,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "Cancel",IDCANCEL,CLRE_CANCEL_LEFT,56,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT END #endif