From 06cd5f5a0ee0d0f0b042e33867441c895ab688de Mon Sep 17 00:00:00 2001 From: ehouse Date: Wed, 21 Oct 2009 03:43:20 +0000 Subject: [PATCH] tweak dialog layout --- xwords4/wince/ceginfo.c | 4 ++-- xwords4/wince/l10n/xwords4_catalan.rc | 16 ++++++++-------- xwords4/wince/l10n/xwords4_english.rc | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xwords4/wince/ceginfo.c b/xwords4/wince/ceginfo.c index ef878c117..9726d43a7 100755 --- a/xwords4/wince/ceginfo.c +++ b/xwords4/wince/ceginfo.c @@ -644,8 +644,8 @@ GameInfo( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) #ifndef XWFEATURE_STANDALONE_ONLY state->configSpacing = ceDistanceBetween( state->dlgHdr.hDlg, - IDC_ROLELABEL, - GIROLECONF_BUTTON ); + GIROLECONF_BUTTON, + IDC_TOTAL_LABEL ); ceDlgComboShowHide( &state->dlgHdr, IDC_ROLECOMBO ); #endif diff --git a/xwords4/wince/l10n/xwords4_catalan.rc b/xwords4/wince/l10n/xwords4_catalan.rc index bc5936636..4c2fe11c0 100644 --- a/xwords4/wince/l10n/xwords4_catalan.rc +++ b/xwords4/wince/l10n/xwords4_catalan.rc @@ -201,8 +201,8 @@ DLL_VERS_RESOURCE # define GAME_PWDLABEL_LEFT GAME_PWD_LEFT #else # define SERVERROLE_ROW 3 -# define GAME_NAME_WIDTH 56 -# define SERVERCONF_ROW (SERVERROLE_ROW+ROW_SPACE+3) +# define GAME_NAME_WIDTH 50 +# define SERVERCONF_ROW (SERVERROLE_ROW+ROW_SPACE) # define NPLAYERS_ROW (SERVERCONF_ROW+ROW_SPACE+3) # define GAME_REMOTE_LEFT 1 # define GAME_NAME_LEFT 11 @@ -258,14 +258,14 @@ FONT 8, "System" BEGIN #ifndef XWFEATURE_STANDALONE_ONLY LTEXT "Rol:",IDC_ROLELABEL,LEFT_COL,SERVERROLE_ROW,20,8 - XWCOMBO(IDC_ROLECOMBO,26,SERVERROLE_ROW,70,ROW_HEIGHT,0,58,0) + XWCOMBO(IDC_ROLECOMBO,26,SERVERROLE_ROW,50,ROW_HEIGHT,0,58,0) PUSHBUTTON "Configura el rol",GIROLECONF_BUTTON,LEFT_COL+10, SERVERCONF_ROW,60,ROW_HEIGHT #endif LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,70,8 - XWCOMBO(IDC_NPLAYERSCOMBO,74,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) + XWCOMBO(IDC_NPLAYERSCOMBO,72,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) LTEXT "Nom",IDC_NAMELABEL,GAME_NAMELABEL_LEFT, LABELS_ROW,GAME_NAMELABEL_WIDTH,8,SS_NOPREFIX @@ -495,8 +495,8 @@ BEGIN HC_MINROW,60,2*ROW_HEIGHT XWCOMBO(HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW,24,ROW_HEIGHT,0,58,0) - LTEXT "Però no més de:",HC_MAX_LABEL,HC_LABELS_COL,HC_MAXROW,60, - ROW_HEIGHT + LTEXT "Però no més de:",HC_MAX_LABEL,HC_LABELS_COL, + HC_MAXROW,60,ROW_HEIGHT XWCOMBO(HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, 0,58,0) #ifndef _WIN32_WCE @@ -840,9 +840,9 @@ CAPTION "Selector d'idioma" FONT 8, "System" BEGIN LTEXT "Trieu la llengua dels menús i els quadres de text. (Podeu baixar-vos els fitxer de llengua necessaris per a més llengües des de xwords.sf.net.)", - LOCALES_LABEL,LEFT_COL,2,80,50 + LOCALES_LABEL,LEFT_COL,2,80,57 - XWCOMBO(LOCALES_COMBO,LEFT_COL,53,70,12,0,58,0) + XWCOMBO(LOCALES_COMBO,LEFT_COL,60,70,12,0,58,0) # ifndef _WIN32_WCE DEFPUSHBUTTON "D'acord",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT diff --git a/xwords4/wince/l10n/xwords4_english.rc b/xwords4/wince/l10n/xwords4_english.rc index b7048478a..48eed0cb7 100755 --- a/xwords4/wince/l10n/xwords4_english.rc +++ b/xwords4/wince/l10n/xwords4_english.rc @@ -266,8 +266,8 @@ BEGIN SERVERCONF_ROW,60,ROW_HEIGHT #endif - LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,63,8 - XWCOMBO(IDC_NPLAYERSCOMBO,66,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) + LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,70,8 + XWCOMBO(IDC_NPLAYERSCOMBO,68,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) LTEXT "Name",IDC_NAMELABEL,GAME_NAMELABEL_LEFT, LABELS_ROW,GAME_NAMELABEL_WIDTH,8,SS_NOPREFIX @@ -277,7 +277,7 @@ BEGIN GAME_PWDLABEL_WIDTH,8 #if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH - LTEXT "Remote",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,25,8,SS_NOPREFIX + LTEXT "Remote",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,28,8,SS_NOPREFIX CONTROL "",REMOTE_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, GAME_REMOTE_LEFT, PLAYER_ROW_1,CHECK_WIDTH,ROW_HEIGHT CONTROL "",REMOTE_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,