Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-17 18:12:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tweak layouts. Wrap color prefs dialog controls in macros so easier to tweak. Up version number.

Browse source
This commit is contained in:
ehouse 2008-03-31 00:17:41 +00:00
parent 9e38eb7336
commit da118a485a
1 changed files with 61 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
xwords4/wince/xwords4.rc
View file

@ -268,30 +268,32 @@ BEGIN
CONTROL "",REMOTE_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, CONTROL "",REMOTE_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_REMOTE_LEFT, PLAYER_ROW_4,CHECK_WIDTH,ROW_HEIGHT GAME_REMOTE_LEFT, PLAYER_ROW_4,CHECK_WIDTH,ROW_HEIGHT
#endif #endif
CONTROL "",ROBOT_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT,PLAYER_ROW_1,CHECK_WIDTH,ROW_HEIGHT
CONTROL "",ROBOT_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT,PLAYER_ROW_2,CHECK_WIDTH,ROW_HEIGHT
CONTROL "",ROBOT_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT,PLAYER_ROW_3,CHECK_WIDTH,ROW_HEIGHT
CONTROL "",ROBOT_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT, PLAYER_ROW_4,CHECK_WIDTH,ROW_HEIGHT
EDITTEXT NAME_EDIT1,GAME_NAME_LEFT,PLAYER_ROW_1,GAME_NAME_WIDTH,ROW_HEIGHT, EDITTEXT NAME_EDIT1,GAME_NAME_LEFT,PLAYER_ROW_1,GAME_NAME_WIDTH,ROW_HEIGHT,
ES_AUTOHSCROLL ES_AUTOHSCROLL
CONTROL "",ROBOT_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT,PLAYER_ROW_1,CHECK_WIDTH,ROW_HEIGHT
EDITTEXT PASS_EDIT1,GAME_PWD_LEFT,PLAYER_ROW_1,15,ROW_HEIGHT,
ES_PASSWORD | ES_AUTOHSCROLL | WS_TABSTOP
EDITTEXT NAME_EDIT2,GAME_NAME_LEFT,PLAYER_ROW_2,GAME_NAME_WIDTH,ROW_HEIGHT, EDITTEXT NAME_EDIT2,GAME_NAME_LEFT,PLAYER_ROW_2,GAME_NAME_WIDTH,ROW_HEIGHT,
ES_AUTOHSCROLL ES_AUTOHSCROLL
EDITTEXT NAME_EDIT3,GAME_NAME_LEFT,PLAYER_ROW_3,GAME_NAME_WIDTH,ROW_HEIGHT, CONTROL "",ROBOT_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
ES_AUTOHSCROLL GAME_ROBOT_LEFT,PLAYER_ROW_2,CHECK_WIDTH,ROW_HEIGHT
EDITTEXT NAME_EDIT4,GAME_NAME_LEFT,PLAYER_ROW_4,GAME_NAME_WIDTH,ROW_HEIGHT,
ES_AUTOHSCROLL | NOT WS_VISIBLE
EDITTEXT PASS_EDIT1,GAME_PWD_LEFT,PLAYER_ROW_1,15,ROW_HEIGHT,
ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT PASS_EDIT2,GAME_PWD_LEFT,PLAYER_ROW_2,15,ROW_HEIGHT, EDITTEXT PASS_EDIT2,GAME_PWD_LEFT,PLAYER_ROW_2,15,ROW_HEIGHT,
ES_PASSWORD | ES_AUTOHSCROLL ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT NAME_EDIT3,GAME_NAME_LEFT,PLAYER_ROW_3,GAME_NAME_WIDTH,ROW_HEIGHT,
ES_AUTOHSCROLL
CONTROL "",ROBOT_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT,PLAYER_ROW_3,CHECK_WIDTH,ROW_HEIGHT
EDITTEXT PASS_EDIT3,GAME_PWD_LEFT,PLAYER_ROW_3,15,ROW_HEIGHT, EDITTEXT PASS_EDIT3,GAME_PWD_LEFT,PLAYER_ROW_3,15,ROW_HEIGHT,
ES_PASSWORD | ES_AUTOHSCROLL ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT NAME_EDIT4,GAME_NAME_LEFT,PLAYER_ROW_4,GAME_NAME_WIDTH,ROW_HEIGHT,
ES_AUTOHSCROLL | NOT WS_VISIBLE
CONTROL "",ROBOT_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
GAME_ROBOT_LEFT, PLAYER_ROW_4,CHECK_WIDTH,ROW_HEIGHT
EDITTEXT PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,15,ROW_HEIGHT, EDITTEXT PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,15,ROW_HEIGHT,
ES_PASSWORD | ES_AUTOHSCROLL ES_PASSWORD | ES_AUTOHSCROLL
@ -370,7 +372,7 @@ END
# define SVGN_DLG_HT (SVGN_ROW_3+BUTTON_HT+3) # define SVGN_DLG_HT (SVGN_ROW_3+BUTTON_HT+3)
#endif #endif
IDD_SAVENAMEDLG DIALOG DISCARDABLE 0, 0, 60, SVGN_DLG_HT IDD_SAVENAMEDLG DIALOG DISCARDABLE 0, 0, 90, SVGN_DLG_HT
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
CAPTION "Game name" CAPTION "Game name"
FONT 8, "System" FONT 8, "System"
@ -389,10 +391,15 @@ END
#define SVGM_LEFT_COL 2 #define SVGM_LEFT_COL 2
#define SVGM_ROW_1 2 #define SVGM_ROW_1 2
#define SVGM_ROW_2 (SVGM_ROW_1+25) #define SVGM_ROW_2 (SVGM_ROW_1+22)
#define SVGM_ROW_3 (SVGM_ROW_2+23) #define SVGM_ROW_3 (SVGM_ROW_2+23)
#define SVGM_ROW_4 (SVGM_ROW_3+30) #define SVGM_ROW_4 (SVGM_ROW_3+30)
#define SVGM_DLG_HT (SVGM_ROW_4 + 18) #ifdef _WIN32_WCE
# define SVGM_DLG_HT (SVGM_ROW_4)
#else
# define SVGM_DLG_HT (SVGM_ROW_4 + 18)
#endif
IDD_SAVEDGAMESDLG DIALOG DISCARDABLE 0, 0, 85, SVGM_DLG_HT IDD_SAVEDGAMESDLG DIALOG DISCARDABLE 0, 0, 85, SVGM_DLG_HT
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
@ -402,24 +409,24 @@ BEGIN
LTEXT "Select a saved game",IDC_SVGM_SELLAB,SVGM_LEFT_COL, LTEXT "Select a saved game",IDC_SVGM_SELLAB,SVGM_LEFT_COL,
SVGM_ROW_1,90,12 SVGM_ROW_1,90,12
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
LISTBOX IDC_SVGM_GAMELIST, SVGM_LEFT_COL+5,SVGM_ROW_1+15,70,12, LISTBOX IDC_SVGM_GAMELIST, SVGM_LEFT_COL+5,SVGM_ROW_1+12,70,12,
WS_TABSTOP WS_TABSTOP
CONTROL "", IDC_SVGM_UPDOWN, UPDOWN_CLASS, CONTROL "", IDC_SVGM_UPDOWN, UPDOWN_CLASS,
UDS_AUTOBUDDY | UDS_HORZ | UDS_ALIGNRIGHT | UDS_WRAP | UDS_AUTOBUDDY | UDS_HORZ | UDS_ALIGNRIGHT | UDS_WRAP |
UDS_SETBUDDYINT | UDS_EXPANDABLE | UDS_NOSCROLL, UDS_SETBUDDYINT | UDS_EXPANDABLE | UDS_NOSCROLL,
0, 0, 0, 0 0, 0, 0, 0
#else #else
COMBOBOX IDC_SVGM_GAMELIST,SVGM_LEFT_COL+5,SVGM_ROW_1+10,70,58, COMBOBOX IDC_SVGM_GAMELIST,SVGM_LEFT_COL+5,SVGM_ROW_1+12,70,58,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
#endif #endif
PUSHBUTTON "Dup.",IDC_SVGM_DUP,SVGM_LEFT_COL,SVGM_ROW_2,20,14 PUSHBUTTON "Dup.",IDC_SVGM_DUP,SVGM_LEFT_COL,SVGM_ROW_2,20,14,WS_DISABLED
PUSHBUTTON "Delete",IDC_SVGM_DEL,SVGM_LEFT_COL+22,SVGM_ROW_2,25,14 PUSHBUTTON "Delete",IDC_SVGM_DEL,SVGM_LEFT_COL+22,SVGM_ROW_2,25,14,WS_DISABLED
PUSHBUTTON "Open",IDC_SVGM_OPEN,SVGM_LEFT_COL+54,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, LTEXT "Edit its name",IDC_SVGM_EDITLAB,SVGM_LEFT_COL,SVGM_ROW_3,
40,12 45,12
PUSHBUTTON "Rename",IDC_SVGM_CHANGE,SVGM_LEFT_COL+46,SVGM_ROW_3,32,12 PUSHBUTTON "Rename",IDC_SVGM_CHANGE,SVGM_LEFT_COL+46,SVGM_ROW_3,32,12,WS_DISABLED
EDITTEXT IDC_SVGM_EDIT,SVGM_LEFT_COL+5,SVGM_ROW_3+15,70,12, EDITTEXT IDC_SVGM_EDIT,SVGM_LEFT_COL+5,SVGM_ROW_3+15,70,12,
ES_AUTOHSCROLL ES_AUTOHSCROLL
@ -645,65 +652,41 @@ END
# define COLORSDLG_HT CLR_BUTTON_ROW + BUTTON_HT + CLR_LRG_GAP # define COLORSDLG_HT CLR_BUTTON_ROW + BUTTON_HT + CLR_LRG_GAP
#endif #endif
#define COLOR_BUTTON(txt,id,xx,yy) \
LTEXT txt,id,xx,yy,CLR_LAB_WIDTH,CLR_LAB_HT
#define COLOR_SAMPLE(id,xx,yy) \
PUSHBUTTON "",id,xx,yy,CLR_BUT_WIDTH,CLR_BUT_HT, \
BS_OWNERDRAW
IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, COLORSDLG_HT IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, COLORSDLG_HT
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
CAPTION "Color preferences" CAPTION "Color preferences"
FONT 8, "System" FONT 8, "System"
BEGIN BEGIN
LTEXT "Double letter:",DLBLTR_LABEL,CLR_COL_1,CLR_ROW_1, COLOR_BUTTON("Double letter:",DLBLTR_LABEL,CLR_COL_1,CLR_ROW_1)
CLR_LAB_WIDTH,CLR_LAB_HT COLOR_SAMPLE(DLBLTR_BUTTON,CLR_COL_2,CLR_ROW_1)
PUSHBUTTON "",DLBLTR_BUTTON,CLR_COL_2,CLR_ROW_1,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Double word:",DBLWRD_LABEL,CLR_COL_1,CLR_ROW_2, COLOR_BUTTON("Double word:",DBLWRD_LABEL,CLR_COL_1,CLR_ROW_2 )
CLR_LAB_WIDTH,CLR_LAB_HT COLOR_SAMPLE(DBLWRD_BUTTON,CLR_COL_2,CLR_ROW_2)
PUSHBUTTON "",DBLWRD_BUTTON,CLR_COL_2,CLR_ROW_2,CLR_BUT_WIDTH, COLOR_BUTTON("Triple letter:",TPLLTR_LABEL,CLR_COL_1,CLR_ROW_3 )
CLR_BUT_HT,BS_OWNERDRAW COLOR_SAMPLE(TPLLTR_BUTTON,CLR_COL_2,CLR_ROW_3)
LTEXT "Triple letter:",TPLLTR_LABEL,CLR_COL_1,CLR_ROW_3, COLOR_BUTTON("Triple word:",TPLWRD_LABEL,CLR_COL_3,CLR_ROW_4)
CLR_LAB_WIDTH,CLR_LAB_HT COLOR_SAMPLE(TPLWRD_BUTTON,CLR_COL_4,CLR_ROW_4)
PUSHBUTTON "",TPLLTR_BUTTON,CLR_COL_2,CLR_ROW_3,CLR_BUT_WIDTH, COLOR_BUTTON("Empty cell:",EMPCELL_LABEL,CLR_COL_1,CLR_ROW_5)
CLR_BUT_HT,BS_OWNERDRAW COLOR_SAMPLE(EMPCELL_BUTTON,CLR_COL_2,CLR_ROW_5)
COLOR_BUTTON("Tile back:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6)
LTEXT "Triple word:",TPLWRD_LABEL,CLR_COL_3,CLR_ROW_4, COLOR_SAMPLE(TBACK_BUTTON,CLR_COL_4,CLR_ROW_6)
CLR_LAB_WIDTH,CLR_LAB_HT COLOR_BUTTON("Focus color:",FOCUSCLR_LABEL,CLR_COL_1,CLR_ROW_7)
PUSHBUTTON "",TPLWRD_BUTTON,CLR_COL_4,CLR_ROW_4,CLR_BUT_WIDTH, COLOR_SAMPLE(FOCUSCLR_BUTTON,CLR_COL_2,CLR_ROW_7)
CLR_BUT_HT,BS_OWNERDRAW COLOR_BUTTON("Player 1:",PLAYER1_LABEL,CLR_COL_1,CLR_ROW_8)
COLOR_SAMPLE(PLAYER1_BUTTON,CLR_COL_2,CLR_ROW_8)
LTEXT "Empty cell:",EMPCELL_LABEL,CLR_COL_1,CLR_ROW_5, COLOR_BUTTON("Player 2:",PLAYER2_LABEL,CLR_COL_3,CLR_ROW_9)
CLR_LAB_WIDTH,CLR_LAB_HT COLOR_SAMPLE(PLAYER2_BUTTON,CLR_COL_4,CLR_ROW_9)
PUSHBUTTON "",EMPCELL_BUTTON,CLR_COL_2,CLR_ROW_5,CLR_BUT_WIDTH, COLOR_BUTTON("Player 3:",PLAYER3_LABEL,CLR_COL_1,CLR_ROW_10)
CLR_BUT_HT,BS_OWNERDRAW COLOR_SAMPLE(PLAYER3_BUTTON,CLR_COL_2,CLR_ROW_10)
COLOR_BUTTON("Player 4:",PLAYER4_LABEL,CLR_COL_3,CLR_ROW_11)
LTEXT "Tile back:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6, COLOR_SAMPLE(PLAYER4_BUTTON,CLR_COL_4,CLR_ROW_11)
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",TBACK_BUTTON,CLR_COL_4,CLR_ROW_6,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Focus color:",FOCUSCLR_LABEL,CLR_COL_1,CLR_ROW_7,
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",FOCUSCLR_BUTTON,CLR_COL_2,CLR_ROW_7,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Player 1:",PLAYER1_LABEL,CLR_COL_1,CLR_ROW_8,
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",PLAYER1_BUTTON,CLR_COL_2,CLR_ROW_8,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Player 2:",PLAYER2_LABEL,CLR_COL_3,CLR_ROW_9,
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",PLAYER2_BUTTON,CLR_COL_4,CLR_ROW_9,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Player 3:",PLAYER3_LABEL,CLR_COL_1,CLR_ROW_10,
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",PLAYER3_BUTTON,CLR_COL_2,CLR_ROW_10,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
LTEXT "Player 4:",PLAYER4_LABEL,CLR_COL_3,CLR_ROW_11,
CLR_LAB_WIDTH,CLR_LAB_HT
PUSHBUTTON "",PLAYER4_BUTTON,CLR_COL_4,CLR_ROW_11,CLR_BUT_WIDTH,
CLR_BUT_HT,BS_OWNERDRAW
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
DEFPUSHBUTTON "OK",IDOK,CLR_OK_LEFT,CLR_BUTTON_ROW, DEFPUSHBUTTON "OK",IDOK,CLR_OK_LEFT,CLR_BUTTON_ROW,
@ -841,7 +824,7 @@ BEGIN
IDS_DUMMY "--" IDS_DUMMY "--"
IDS_CANCEL "Cancel" IDS_CANCEL "Cancel"
IDS_OK "Ok" IDS_OK "Ok"
IDS_ABOUT "Crosswords 4.2b1 (rev " SVN_REV ") "\ IDS_ABOUT "Crosswords 4.2b2 (rev " SVN_REV ") "\
"for PocketPC. Copyright 1998-2008 by "\ "for PocketPC. Copyright 1998-2008 by "\
"Eric House. This software is released under the GNU "\ "Eric House. This software is released under the GNU "\
"Public License.\r\r"\ "Public License.\r\r"\