mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-16 15:41:16 +01:00
Lots of changes for smartphone, in particular removing Ok and cancel
buttons for non-win32 dialogs where they'll be replaced by softkeys. Also, new dialogs to replace OpenFileName etc. that don't exist on Smartphone.
This commit is contained in:
ehouse
parent
7759cc98be
commit
c06434dd5c
1 changed files with 153 additions and 31 deletions
|
|
@ -118,11 +118,11 @@ BEGIN
|
|||
MENUITEM "Full screen", ID_FILE_FULLSCREEN
|
||||
MENUITEM SEPARATOR
|
||||
#endif
|
||||
MENUITEM "New game", ID_FILE_NEWGAME
|
||||
MENUITEM "Open saved game", ID_FILE_SAVEDGAMES
|
||||
MENUITEM "Preferences", ID_FILE_PREFERENCES
|
||||
MENUITEM "New game...", ID_FILE_NEWGAME
|
||||
MENUITEM "Saved games...", ID_FILE_SAVEDGAMES
|
||||
MENUITEM "Preferences...", ID_FILE_PREFERENCES
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "About", ID_FILE_ABOUT
|
||||
MENUITEM "About...", ID_FILE_ABOUT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Exit", ID_FILE_EXIT
|
||||
END
|
||||
|
|
@ -159,7 +159,8 @@ END
|
|||
//
|
||||
// Dialog
|
||||
//
|
||||
#define REPOS_BUTTON_HT 14
|
||||
#define BUTTON_HT 12
|
||||
#define REPOS_BUTTON_HT BUTTON_HT
|
||||
#define REPOS_BUTTON_WIDTH 28
|
||||
#define REPOS_BUTTON_VPAD 2
|
||||
#define REPOS_BUTTON_HPAD 2
|
||||
|
|
@ -202,11 +203,17 @@ END
|
|||
#define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL)
|
||||
#define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL)
|
||||
#define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL)
|
||||
#define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE+2)
|
||||
#define PREFS_ROW (DICTPICK_ROW+ROW_SPACE+2)
|
||||
#define BUTTONS_ROW (PREFS_ROW+ROW_SPACE+3)
|
||||
#define BUTTON_HT 12
|
||||
#define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4)
|
||||
#define DICTPICK_LAB_ROW (PLAYER_ROW_4+ROW_SPACE+2)
|
||||
#define DICTPICK_ROW (DICTPICK_LAB_ROW+ROW_SPACE-2)
|
||||
#define PREFS_ROW (DICTPICK_ROW+ROW_SPACE+3)
|
||||
#ifndef _WIN32_WCE
|
||||
# define BUTTONS_ROW (PREFS_ROW+ROW_SPACE+3)
|
||||
#endif
|
||||
#ifdef _WIN32_WCE
|
||||
# define GAMEINFO_HEIGHT (PREFS_ROW + ROW_SPACE + 4)
|
||||
#else
|
||||
# define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4)
|
||||
#endif
|
||||
|
||||
#define CHECK_WIDTH 10
|
||||
|
||||
|
|
@ -218,8 +225,7 @@ END
|
|||
#define UPDOWN_CLASS "msctls_updown32"
|
||||
|
||||
IDD_GAMEINFO DIALOG DISCARDABLE 0, 0, 116, GAMEINFO_HEIGHT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
/* | WS_VSCROLL */
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Game info"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
|
|
@ -245,7 +251,7 @@ BEGIN
|
|||
|
||||
|
||||
// "R" for rearrange. Go to J if no change becomes possible.
|
||||
PUSHBUTTON "Juggle",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,28,12
|
||||
PUSHBUTTON "Jugl.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,12
|
||||
|
||||
LTEXT "Name",IDC_STATIC,GAME_NAMELABEL_LEFT,
|
||||
LABELS_ROW,19,8,SS_NOPREFIX
|
||||
|
|
@ -289,24 +295,26 @@ BEGIN
|
|||
EDITTEXT PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,15,ROW_HEIGHT,
|
||||
ES_PASSWORD | ES_AUTOHSCROLL
|
||||
|
||||
LTEXT "Dictionary:",IDC_STATIC,LEFT_COL,DICTPICK_ROW,36,8,
|
||||
LTEXT "Dictionary:",IDC_STATIC,LEFT_COL,DICTPICK_LAB_ROW,36,8,
|
||||
SS_NOPREFIX
|
||||
#ifdef _WIN32_WCE
|
||||
LISTBOX IDC_DICTLIST, 38,DICTPICK_ROW,70,12, WS_TABSTOP
|
||||
LISTBOX IDC_DICTLIST, LEFT_COL+10,DICTPICK_ROW,70,12, WS_TABSTOP
|
||||
CONTROL "", IDC_DICTUPDOWN, UPDOWN_CLASS,
|
||||
UDS_AUTOBUDDY | UDS_HORZ | UDS_ALIGNRIGHT | UDS_WRAP | /* UDS_ARROWKEYS | */
|
||||
UDS_SETBUDDYINT | UDS_EXPANDABLE | UDS_NOSCROLL,
|
||||
0, 0, 0, 0
|
||||
#else
|
||||
COMBOBOX IDC_DICTLIST,38,DICTPICK_ROW,70,58,
|
||||
COMBOBOX IDC_DICTLIST,LEFT_COL+10,DICTPICK_ROW,70,58,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
#endif
|
||||
|
||||
PUSHBUTTON "Preferences...",OPTIONS_BUTTON,LEFT_COL,PREFS_ROW,55,12
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
PUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
DEFPUSHBUTTON "Cancel",IDCANCEL,70,BUTTONS_ROW,
|
||||
REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
||||
#define SB_WIDTH 121
|
||||
|
|
@ -314,16 +322,23 @@ END
|
|||
#define SB_OK_LEFT ((SB_WIDTH/2)-10-SB_BUTTON_WIDTH)
|
||||
#define SB_CANCEL_LEFT ((SB_WIDTH/2)+10)
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
# define STRBOX_HT 81
|
||||
#else
|
||||
# define STRBOX_HT 97
|
||||
#endif
|
||||
|
||||
IDD_STRBOX DIALOG DISCARDABLE 0, 25, SB_WIDTH, 97
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | /*WS_SYSMENU | */ DS_CENTER
|
||||
IDD_STRBOX DIALOG DISCARDABLE 0, 25, SB_WIDTH, STRBOX_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Dialog"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
EDITTEXT ID_EDITTEXT,3,3,115,76,ES_MULTILINE | ES_READONLY
|
||||
| WS_VSCROLL
|
||||
#ifndef _WIN32_WCE
|
||||
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
|
||||
#endif
|
||||
END
|
||||
|
||||
IDD_ASKBLANK DIALOG DISCARDABLE 0, 0, 131, 90
|
||||
|
|
@ -345,19 +360,98 @@ BEGIN
|
|||
WS_VSCROLL | WS_TABSTOP
|
||||
END
|
||||
|
||||
#define SVGN_LEFT_COL 2
|
||||
#define SVGN_ROW_1 2
|
||||
#define SVGN_ROW_2 (SVGN_ROW_1+46)
|
||||
#define SVGN_ROW_3 (SVGN_ROW_2+18)
|
||||
#ifdef _WIN32_WCE
|
||||
# define SVGN_DLG_HT SVGN_ROW_3
|
||||
#else
|
||||
# define SVGN_DLG_HT (SVGN_ROW_3+BUTTON_HT+3)
|
||||
#endif
|
||||
|
||||
IDD_SAVENAMEDLG DIALOG DISCARDABLE 0, 0, 60, SVGN_DLG_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
CAPTION "Game name"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
LTEXT "To save this game, give it a name. (You can change the name later using the Saved games dialog.)",
|
||||
IDC_SVGN_SELLAB,SVGN_LEFT_COL,SVGN_ROW_1,90,40
|
||||
EDITTEXT IDC_SVGN_EDIT,SVGN_LEFT_COL,SVGN_ROW_2,80,12,
|
||||
ES_AUTOHSCROLL
|
||||
#ifndef _WIN32_WCE
|
||||
DEFPUSHBUTTON "OK",IDOK,SVGN_LEFT_COL,SVGN_ROW_3,REPOS_BUTTON_WIDTH,
|
||||
BUTTON_HT
|
||||
PUSHBUTTON "Cancel",IDCANCEL,SVGN_LEFT_COL+REPOS_BUTTON_WIDTH+10,
|
||||
SVGN_ROW_3,REPOS_BUTTON_WIDTH, BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
||||
#define SVGM_LEFT_COL 2
|
||||
#define SVGM_ROW_1 2
|
||||
#define SVGM_ROW_2 (SVGM_ROW_1+25)
|
||||
#define SVGM_ROW_3 (SVGM_ROW_2+23)
|
||||
#define SVGM_ROW_4 (SVGM_ROW_3+30)
|
||||
#define SVGM_DLG_HT (SVGM_ROW_4 + 18)
|
||||
|
||||
IDD_SAVEDGAMESDLG DIALOG DISCARDABLE 0, 0, 85, SVGM_DLG_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Saved Games"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
LTEXT "Select a saved game",IDC_SVGM_SELLAB,SVGM_LEFT_COL,
|
||||
SVGM_ROW_1,90,12
|
||||
#ifdef _WIN32_WCE
|
||||
LISTBOX IDC_SVGM_GAMELIST, SVGM_LEFT_COL+5,SVGM_ROW_1+15,70,12,
|
||||
WS_TABSTOP
|
||||
CONTROL "", IDC_SVGM_UPDOWN, UPDOWN_CLASS,
|
||||
UDS_AUTOBUDDY | UDS_HORZ | UDS_ALIGNRIGHT | UDS_WRAP |
|
||||
UDS_SETBUDDYINT | UDS_EXPANDABLE | UDS_NOSCROLL,
|
||||
0, 0, 0, 0
|
||||
#else
|
||||
COMBOBOX IDC_SVGM_GAMELIST,SVGM_LEFT_COL+5,SVGM_ROW_1+10,70,58,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
#endif
|
||||
|
||||
PUSHBUTTON "Dup.",IDC_SVGM_DUP,SVGM_LEFT_COL,SVGM_ROW_2,20,14
|
||||
PUSHBUTTON "Delete",IDC_SVGM_DEL,SVGM_LEFT_COL+22,SVGM_ROW_2,25,14
|
||||
PUSHBUTTON "Open",IDC_SVGM_OPEN,SVGM_LEFT_COL+54,SVGM_ROW_2,25,14
|
||||
|
||||
LTEXT "Edit its name",IDC_SVGM_EDITLAB,SVGM_LEFT_COL,SVGM_ROW_3,
|
||||
40,12
|
||||
PUSHBUTTON "Rename",IDC_SVGM_CHANGE,SVGM_LEFT_COL+46,SVGM_ROW_3,32,12
|
||||
EDITTEXT IDC_SVGM_EDIT,SVGM_LEFT_COL+5,SVGM_ROW_3+15,70,12,
|
||||
ES_AUTOHSCROLL
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
DEFPUSHBUTTON "OK",IDOK,SVGM_LEFT_COL,SVGM_ROW_4,REPOS_BUTTON_WIDTH,
|
||||
BUTTON_HT
|
||||
PUSHBUTTON "Cancel",IDCANCEL,SVGM_LEFT_COL+REPOS_BUTTON_WIDTH+10,
|
||||
SVGM_ROW_4,REPOS_BUTTON_WIDTH, BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
||||
#define PW_WIDTH 104
|
||||
#define PW_OK_LEFT ((PW_WIDTH/2)-10-REPOS_BUTTON_WIDTH)
|
||||
#define PW_CANCEL_LEFT ((PW_WIDTH/2)+10)
|
||||
|
||||
IDD_ASKPASS DIALOG DISCARDABLE 0, 0, PW_WIDTH, 50
|
||||
#ifdef _WIN32_WCE
|
||||
# define ASKPASS_HT 32
|
||||
#else
|
||||
# define ASKPASS_HT 50
|
||||
#endif
|
||||
|
||||
IDD_ASKPASS DIALOG DISCARDABLE 0, 0, PW_WIDTH, ASKPASS_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
CAPTION "Password"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
LTEXT "",IDC_PWDLABEL,5,8,67,24
|
||||
EDITTEXT PASS_EDIT,76,8,23,12,ES_PASSWORD | ES_AUTOHSCROLL
|
||||
#ifndef _WIN32_WCE
|
||||
DEFPUSHBUTTON "OK",IDOK,PW_OK_LEFT,32,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
PUSHBUTTON "Cancel",IDCANCEL,PW_CANCEL_LEFT,32,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
||||
#ifdef XWFEATURE_SEARCHLIMIT
|
||||
|
|
@ -369,8 +463,13 @@ END
|
|||
#define HC_OK_LEFT ((HC_WIDTH/2)-10-REPOS_BUTTON_WIDTH)
|
||||
#define HC_CANCEL_LEFT ((HC_WIDTH/2)+10)
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
# define ASKHINTLIMTS_HT 31
|
||||
#else
|
||||
# define ASKHINTLIMTS_HT 47
|
||||
#endif
|
||||
|
||||
IDD_ASKHINTLIMTS DIALOG DISCARDABLE 0, 0, HC_WIDTH, 47
|
||||
IDD_ASKHINTLIMTS DIALOG DISCARDABLE 0, 0, HC_WIDTH, ASKHINTLIMTS_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
CAPTION "Tile hint limits"
|
||||
FONT 8, "System"
|
||||
|
|
@ -382,9 +481,11 @@ BEGIN
|
|||
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
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
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
|
||||
PUSHBUTTON "Cancel",IDCANCEL,HC_CANCEL_LEFT,31,REPOS_BUTTON_WIDTH,
|
||||
REPOS_BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
#endif
|
||||
|
||||
|
|
@ -392,10 +493,14 @@ 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
|
||||
#ifdef _WIN32_WCE
|
||||
# define PREFS_DLG_HT 95
|
||||
#else
|
||||
# define PREFS_DLG_HT 112
|
||||
#endif
|
||||
|
||||
IDD_OPTIONSDLG DIALOG DISCARDABLE 0, 20, PR_WIDTH, 112
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
| WS_VSCROLL
|
||||
IDD_OPTIONSDLG DIALOG DISCARDABLE 0, 20, PR_WIDTH, PREFS_DLG_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Preferences"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
|
|
@ -438,9 +543,11 @@ BEGIN
|
|||
BS_AUTOCHECKBOX | WS_TABSTOP,8,80,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,
|
||||
REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
||||
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH
|
||||
|
|
@ -525,16 +632,21 @@ END
|
|||
#define CLR_ROW_10 (CLR_ROW_9+CLR_SMALL_GAP)
|
||||
#define CLR_ROW_11 (CLR_ROW_10+CLR_SMALL_GAP)
|
||||
|
||||
#define CLR_BUTTON_ROW 81
|
||||
#define CLR_BUTTON_ROW CLR_ROW_11 + CLR_LRG_GAP
|
||||
#define CLR_COL_1 7
|
||||
#define CLR_COL_2 (CLR_COL_1 + CLR_LAB_WIDTH+2)
|
||||
/* #define CLR_COL_3 58 */
|
||||
/* #define CLR_COL_4 99 */
|
||||
#define CLR_COL_3 CLR_COL_1
|
||||
#define CLR_COL_4 CLR_COL_2
|
||||
#ifdef _WIN32_WCE
|
||||
# define COLORSDLG_HT CLR_BUTTON_ROW
|
||||
#else
|
||||
# define COLORSDLG_HT CLR_BUTTON_ROW + BUTTON_HT + CLR_LRG_GAP
|
||||
#endif
|
||||
|
||||
IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, 96
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, COLORSDLG_HT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Color preferences"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
|
|
@ -593,10 +705,12 @@ BEGIN
|
|||
PUSHBUTTON "",PLAYER4_BUTTON,CLR_COL_4,CLR_ROW_11,CLR_BUT_WIDTH,
|
||||
CLR_BUT_HT,BS_OWNERDRAW
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
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
|
||||
#endif
|
||||
END
|
||||
|
||||
//
|
||||
|
|
@ -616,6 +730,11 @@ END
|
|||
#define CLRE_WIDTH 112
|
||||
#define CLRE_OK_LEFT ((CLRE_WIDTH/2)-10-REPOS_BUTTON_WIDTH)
|
||||
#define CLRE_CANCEL_LEFT ((CLRE_WIDTH/2)+10)
|
||||
#ifdef _WIN32_WCE
|
||||
# define COLOREDITDLG_HT 56
|
||||
#else
|
||||
# define COLOREDITDLG_HT 72
|
||||
#endif
|
||||
|
||||
IDD_COLOREDITDLG DIALOG DISCARDABLE 0, 0, CLRE_WIDTH, 72
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
|
||||
|
|
@ -645,9 +764,12 @@ BEGIN
|
|||
CONTROL "",CLREDT_SLIDER3,"msctls_trackbar32",
|
||||
TBS_BOTH|TBS_NOTICKS|WS_TABSTOP,
|
||||
CLRESLIDER_COL,CLREDIT_ROW_3,SLIDER_WIDTH,15
|
||||
|
||||
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
|
||||
#ifndef _WIN32_WCE
|
||||
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
|
||||
#endif
|
||||
END
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue