From f24965c093ec8fe027451a118f2ad31126c53f5a Mon Sep 17 00:00:00 2001 From: ehouse Date: Sat, 10 May 2008 22:33:07 +0000 Subject: [PATCH] Make prefs dialog narrower so fits smartphone screen. --- wince/xwords4.rc | 54 ++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/wince/xwords4.rc b/wince/xwords4.rc index 6e7587809..eeec37259 100755 --- a/wince/xwords4.rc +++ b/wince/xwords4.rc @@ -503,10 +503,21 @@ END #define PR_OK_LEFT ((PR_WIDTH/2)-10-REPOS_BUTTON_WIDTH) #define PR_CANCEL_LEFT ((PR_WIDTH/2)+10) #define PREFS_ROW_HT 9 + +#define PR_SPACING 13 +#define PR_ROW1 5 +#define PR_ROW2 (PR_ROW1+PR_SPACING) +#define PR_ROW3 (PR_ROW2+PR_SPACING) +#define PR_ROW4 (PR_ROW3+PR_SPACING) +#define PR_ROW5 (PR_ROW4+PR_SPACING) +#define PR_ROW6 (PR_ROW5+PR_SPACING) +#define PR_ROW7 (PR_ROW6+PR_SPACING) +#define PR_BUTTONROW (PR_ROW7+PR_SPACING) + #ifdef _WIN32_WCE -# define PREFS_DLG_HT 95 +# define PREFS_DLG_HT PR_BUTTONROW #else -# define PREFS_DLG_HT 112 +# define PREFS_DLG_HT (PR_BUTTONROW+PR_SPACING+3) #endif IDD_OPTIONSDLG DIALOG DISCARDABLE 0, 20, PR_WIDTH, PREFS_DLG_HT @@ -514,48 +525,47 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL CAPTION "Preferences" FONT 8, "System" BEGIN - CONTROL "Global prefs",IDC_RADIOGLOBAL,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,4,5,54,10 - CONTROL "Game prefs",IDC_RADIOLOCAL,"Button",BS_AUTORADIOBUTTON, - 64,5,53,10 + CONTROL "This game",IDC_RADIOLOCAL,"Button", + BS_AUTORADIOBUTTON | WS_GROUP,4,PR_ROW1,45,10 + CONTROL "All games",IDC_RADIOGLOBAL,"Button", + BS_AUTORADIOBUTTON,50,PR_ROW1,53,10 CONTROL "Color played tiles",IDC_CHECKCOLORPLAYED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW2,90,PREFS_ROW_HT CONTROL "Enable cursor",IDC_CHECKSHOWCURSOR,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,35,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,90,PREFS_ROW_HT CONTROL "Explain robot scores",IDC_CHECKROBOTSCORES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,50,90,PREFS_ROW_HT - PUSHBUTTON "Edit colors...",IDC_PREFCOLORS,8,67,60,12 + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW4,90,PREFS_ROW_HT + PUSHBUTTON "Edit colors...",IDC_PREFCOLORS,8,PR_ROW5,60,12 CONTROL "Smart robot",IDC_CHECKSMARTROBOT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW2,90,PREFS_ROW_HT CONTROL "Disallow hints",IDC_CHECKNOHINTS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,35,60,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,60,PREFS_ROW_HT #ifdef XWFEATURE_SEARCHLIMIT CONTROL "Hint limits",IDC_CHECKHINTSLIMITS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,69,35,50,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8+10,PR_ROW4-2,50,10 #endif - CONTROL "Timer on (minutes)",TIMER_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,50,70,PREFS_ROW_HT - EDITTEXT TIMER_EDIT,85,49,20,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Phonies:",PHONIES_LABEL,8,65,28,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,70,PREFS_ROW_HT + EDITTEXT TIMER_EDIT,80,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Phonies:",PHONIES_LABEL,8,PR_ROW6,28,PREFS_ROW_HT #ifdef _WIN32_WCE - LISTBOX PHONIES_COMBO, 38,65,50,12, WS_TABSTOP + LISTBOX PHONIES_COMBO, 38,PR_ROW6,50,12, WS_TABSTOP CONTROL "", IDC_PHONIESUPDOWN, UPDOWN_CLASS, UDS_AUTOBUDDY | UDS_HORZ | UDS_ALIGNRIGHT | UDS_WRAP | /* UDS_ARROWKEYS | */ UDS_SETBUDDYINT | UDS_EXPANDABLE | UDS_NOSCROLL, 0, 0, 0, 0 #else - COMBOBOX PHONIES_COMBO,38,65,67,58,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX PHONIES_COMBO,38,PR_ROW6,40,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif #ifdef FEATURE_TRAY_EDIT CONTROL "Pick tiles face-up", IDC_PICKTILES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,80,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW7,90,PREFS_ROW_HT #else #endif #ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,PR_OK_LEFT,95,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,PR_CANCEL_LEFT,95, + DEFPUSHBUTTON "OK",IDOK,PR_OK_LEFT,PR_BUTTONROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "Cancel",IDCANCEL,PR_CANCEL_LEFT,PR_BUTTONROW, REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT #endif END