From ca7038043afd36e474c5df40f62ec4a35e1268d5 Mon Sep 17 00:00:00 2001 From: ehouse Date: Fri, 16 Oct 2009 03:35:31 +0000 Subject: [PATCH] a few tweaks to dialog layout --- xwords4/wince/l10n/xwords4_catalan.rc | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/xwords4/wince/l10n/xwords4_catalan.rc b/xwords4/wince/l10n/xwords4_catalan.rc index 9a8a37a5d..1305556c2 100644 --- a/xwords4/wince/l10n/xwords4_catalan.rc +++ b/xwords4/wince/l10n/xwords4_catalan.rc @@ -172,7 +172,7 @@ DLL_VERS_RESOURCE // #define BUTTON_HT 12 #define REPOS_BUTTON_HT BUTTON_HT -#define REPOS_BUTTON_WIDTH 28 +#define REPOS_BUTTON_WIDTH 36 #define REPOS_BUTTON_VPAD 2 #define REPOS_BUTTON_HPAD 2 @@ -290,8 +290,8 @@ BEGIN CE_PLAYER_ROW( NAME_EDIT3, PLAYER_ROW_3, ROBOT_CHECK3, PASS_EDIT3 ) CE_PLAYER_ROW( NAME_EDIT4, PLAYER_ROW_4, ROBOT_CHECK4, PASS_EDIT4 ) - PUSHBUTTON "Remena les posicions de joc",GIJUGGLE_BUTTON,LEFT_COL+10,JUGGLE_ROW, - 60,BUTTON_HT + PUSHBUTTON "Remena les posicions de joc",GIJUGGLE_BUTTON,LEFT_COL+10, + JUGGLE_ROW,86,BUTTON_HT LTEXT "Diccionari:",IDC_DICTLABEL,LEFT_COL,DICTPICK_LAB_ROW,36,8, SS_NOPREFIX @@ -301,14 +301,15 @@ BEGIN 55,BUTTON_HT #ifndef _WIN32_WCE - PUSHBUTTON "D'acord",IDOK,20,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - DEFPUSHBUTTON "Cancel·la",IDCANCEL,50,BUTTONS_ROW, - REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "D'acord",IDOK,15,BUTTONS_ROW,REPOS_BUTTON_WIDTH, + REPOS_BUTTON_HT + DEFPUSHBUTTON "Cancel·la",IDCANCEL,55,BUTTONS_ROW, + REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT #endif END #define SB_WIDTH 121 -#define SB_BUTTON_WIDTH 19 +#define SB_BUTTON_WIDTH REPOS_BUTTON_WIDTH #define SB_OK_LEFT ((SB_WIDTH/2)-10-SB_BUTTON_WIDTH) #define SB_CANCEL_LEFT ((SB_WIDTH/2)+10) @@ -326,8 +327,10 @@ BEGIN EDITTEXT ID_EDITTEXT,3,3,115,76,ES_MULTILINE | ES_READONLY | WS_VSCROLL #ifndef _WIN32_WCE - PUSHBUTTON "D'acord",IDOK, SB_OK_LEFT,81,SB_BUTTON_WIDTH,REPOS_BUTTON_HT - DEFPUSHBUTTON "Cancel·la",IDCANCEL,SB_CANCEL_LEFT,81,SB_BUTTON_WIDTH,REPOS_BUTTON_HT + PUSHBUTTON "D'acord",IDOK, SB_OK_LEFT,81,SB_BUTTON_WIDTH, + REPOS_BUTTON_HT + DEFPUSHBUTTON "Cancel·la",IDCANCEL,SB_CANCEL_LEFT,81,SB_BUTTON_WIDTH, + REPOS_BUTTON_HT #endif END @@ -469,7 +472,7 @@ END #define HC_LABELS_COL 5 #define HC_DROPDOWNS_COL 70 #define HC_MINROW 3 -#define HC_MAXROW 16 +#define HC_MAXROW 24 #define HC_WIDTH 98 #define HC_OK_LEFT ((HC_WIDTH/2)-10-REPOS_BUTTON_WIDTH) #define HC_CANCEL_LEFT ((HC_WIDTH/2)+10) @@ -485,8 +488,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Límits de les pistes" FONT 8, "System" BEGIN - LTEXT "Com a mínim mostra'n:",HC_MIN_LABEL,HC_LABELS_COL,HC_MINROW,60, - ROW_HEIGHT + LTEXT "Com a mínim mostra'n:",HC_MIN_LABEL,HC_LABELS_COL, + 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, @@ -494,8 +497,9 @@ BEGIN XWCOMBO(HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, 0,58,0) #ifndef _WIN32_WCE - DEFPUSHBUTTON "D'acord",IDOK,HC_OK_LEFT,31,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT - PUSHBUTTON "Cancel·la",IDCANCEL,HC_CANCEL_LEFT,31,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "D'acord",IDOK,HC_OK_LEFT,40,REPOS_BUTTON_WIDTH, + REPOS_BUTTON_HT + PUSHBUTTON "Cancel·la",IDCANCEL,HC_CANCEL_LEFT,40,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT #endif END