From 0619fd8f3e445f97a6d265a8a8686789d768c8e7 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sat, 9 May 2009 21:12:23 +0000 Subject: [PATCH] dialog tweaks --- xwords4/wince/l10n/xwords4_caps.rc | 31 +++++++++------------ xwords4/wince/l10n/xwords4_french.rc | 40 +++++++++++++++------------- xwords4/wince/rc_incs.h | 1 + xwords4/wince/xwords4.rc | 14 +++++----- 4 files changed, 41 insertions(+), 45 deletions(-) diff --git a/xwords4/wince/l10n/xwords4_caps.rc b/xwords4/wince/l10n/xwords4_caps.rc index 6fbe5aca4..425a01cb6 100644 --- a/xwords4/wince/l10n/xwords4_caps.rc +++ b/xwords4/wince/l10n/xwords4_caps.rc @@ -343,28 +343,21 @@ END #endif -IDD_ASKBLANK DIALOG DISCARDABLE 0, 0, ASKB_DLG_WIDTH, ASKB_DLG_HEIGHT +IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER -CAPTION "TILE PICKER" // <- translate TILE PICKER +CAPTION "Language Picker"// <- translate FONT 8, "System" BEGIN - LTEXT "ENTER A LETTER FOR THIS BLANK TILE.",IDC_BPICK, // <- translate ENTER A LETTER FOR THIS BLANK TILE. - ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT -#ifdef FEATURE_TRAY_EDIT - LTEXT "PICK A TILE FOR YOUR TRAY.",IDC_CPICK, // <- translate PICK A TILE FOR YOUR TRAY - ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT - EDITTEXT IDC_PICKMSG,ASKB_COLLEFT,ASKB_EDITTOP,80,ASKB_EDITHT, - ES_MULTILINE | ES_READONLY + LTEXT "CHOOSE THE LANGUAGE FOR MENUS AND DIALOG TEXT. (YOU CAN DOWNLOAD SUPPORT FILES FOR NEW LANGUAGES FROM xwords.sf.net.)",// <- translate + LOCALES_LABEL,LEFT_COL,2,80,50 - PUSHBUTTON "PUT BACK",IDC_BACKUP,ASKB_COLLEFT,ASKB_PUTTOP,35,14 // <- translate PUT BACK -#endif - - XWCOMBO(BLANKFACE_LIST,ASKB_COMBOLEFT,ASKB_COLLEFT,27,12,LBS_SORT,70,CBS_SORT) - -#ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,80,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT // <- translate OK - PUSHBUTTON "CANCEL",IDCANCEL,20,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT // <- translate CANCEL -#endif + XWCOMBO(LOCALES_COMBO,LEFT_COL,55,70,12,0,58,0) +# ifndef _WIN32_WCE + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, // <- translate + REPOS_BUTTON_HT + PUSHBUTTON "CANCEL",IDCANCEL,40,70,REPOS_BUTTON_WIDTH, // <- translate + REPOS_BUTTON_HT +# endif END #define SVGN_LEFT_COL 2 @@ -833,7 +826,7 @@ BEGIN IDS_DONE "DONE" // <- translate IDS_LANGUAGE_NAME "ENGLISH" // <- translate IDS_NEW_GAME "NEW GAME" // <- translate - IDS_ABOUT "CROSSWORDS 4.4A1 (REV " SVN_REV ") "\ + IDS_ABOUT "CROSSWORDS " ABOUT_VERSION " (REV " SVN_REV ") "\ "FOR WINDOWS MOBILE. COPYRIGHT 1998-2009 BY "\ "ERIC HOUSE. THIS SOFTWARE IS RELEASED UNDER THE GNU "\ "PUBLIC LICENSE.\r\r"\ diff --git a/xwords4/wince/l10n/xwords4_french.rc b/xwords4/wince/l10n/xwords4_french.rc index 9e0cbbe88..286537f06 100644 --- a/xwords4/wince/l10n/xwords4_french.rc +++ b/xwords4/wince/l10n/xwords4_french.rc @@ -551,7 +551,7 @@ BEGIN CONTROL "Détails des points du robot",IDC_CHECKROBOTSCORES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW4,87,PREFS_ROW_HT CONTROL "Cacher valeur des lettres",IDC_HIDETILEVALUES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,85,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,87,PREFS_ROW_HT PUSHBUTTON "Editer les couleurs...",IDC_PREFCOLORS,PR_LEFT,PR_ROW6,70,12 #ifdef ALLOW_CHOOSE_FONTS PUSHBUTTON "Choisir une police...",IDC_PREFFONTS,PR_LEFT,PR_ROW7,60,12 @@ -559,16 +559,17 @@ BEGIN /* Per game */ CONTROL "Robot intelligent",IDC_CHECKSMARTROBOT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,PR_LEFT,PR_ROW2,60, + BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,PR_LEFT,PR_ROW2,70, PREFS_ROW_HT CONTROL "Conseils permis",IDC_CHECKHINTSOK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW3,60,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW3,80,PREFS_ROW_HT #ifdef XWFEATURE_SEARCHLIMIT CONTROL "Limitation des conseils",IDC_CHECKHINTSLIMITS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8+PR_LEFT,PR_ROW4-2,80,10 + BS_AUTOCHECKBOX | WS_TABSTOP,4+PR_LEFT,PR_ROW4-2,85,10 #endif CONTROL "Chrono",TIMER_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,65,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,65, + PREFS_ROW_HT EDITTEXT TIMER_EDIT,65,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Erreurs:",PHONIES_LABEL,PR_LEFT,PR_ROW6,28,PREFS_ROW_HT XWCOMBO(PHONIES_COMBO, 38,PR_ROW6,50,PREFS_ROW_HT,0,58,0) @@ -681,7 +682,7 @@ END #define CLR_ROW_4 (CLR_ROW_3+CLR_SMALL_GAP) #define CLR_ROW_5 (CLR_ROW_4+CLR_LRG_GAP) #define CLR_ROW_6 (CLR_ROW_5+CLR_SMALL_GAP) -#define CLR_ROW_7 (CLR_ROW_6+CLR_SMALL_GAP) +#define CLR_ROW_7 (CLR_ROW_6+CLR_SMALL_GAP+5) #define CLR_ROW_8 (CLR_ROW_7+CLR_LRG_GAP+5) #define CLR_ROW_9 (CLR_ROW_8+CLR_SMALL_GAP) #define CLR_ROW_10 (CLR_ROW_9+CLR_SMALL_GAP) @@ -729,7 +730,9 @@ BEGIN COLOR_SAMPLE(TPLWRD_BUTTON,TPLWRD_SAMPLE,CLR_COL_4,CLR_ROW_4) COLOR_BUTTON("Case vide:",EMPCELL_LABEL,CLR_COL_1,CLR_ROW_5,CLR_LAB_HT) COLOR_SAMPLE(EMPCELL_BUTTON,EMPCELL_SAMPLE,CLR_COL_2,CLR_ROW_5) - COLOR_BUTTON("Fond de lettre:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6,CLR_LAB_HT) + + COLOR_BUTTON("Fond de lettre:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6,CLR_LAB_HT+10) + COLOR_SAMPLE(TBACK_BUTTON,TBACK_SAMPLE,CLR_COL_4,CLR_ROW_6) COLOR_BUTTON("Couleur sélection:",FOCUSCLR_LABEL,CLR_COL_1,CLR_ROW_7,CLR_LAB_HT+10) COLOR_SAMPLE(FOCUSCLR_BUTTON,FOCUSCLR_SAMPLE,CLR_COL_2,CLR_ROW_7+5) @@ -809,20 +812,19 @@ BEGIN END #endif - -IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 120, 115 +IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER -CAPTION "LANGUAGE PICKER" +CAPTION "Language Picker" // <-translate FONT 8, "System" BEGIN - LTEXT "CHOOSE the LANGUAGE for MENUS and DIALOG TEXT.", - LOCALES_LABEL,LEFT_COL,2,100,36 - XWCOMBO(LOCALES_COMBO,LEFT_COL,40,70,12,0,58,0) + LTEXT "Choose the language for menus and dialog text. (You can download support files for new languages from xwords.sf.net.)", // <-translate + LOCALES_LABEL,LEFT_COL,2,80,50 + XWCOMBO(LOCALES_COMBO,LEFT_COL,55,70,12,0,58,0) # ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "Annuler",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, + PUSHBUTTON "Annuler",IDCANCEL,40,70,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT # endif END @@ -846,8 +848,8 @@ BEGIN IDS_OK "OK" IDS_DONE "Terminé" IDS_LANGUAGE_NAME "Français" - IDS_NEW_GAME "NEW GAME" // <- translate - IDS_ABOUT "Crosswords 4.4a1 (REV " SVN_REV ") "\ + IDS_NEW_GAME "New Game" // <- translate + IDS_ABOUT "Crosswords " ABOUT_VERSION " (REV " SVN_REV ") "\ "pour Windows Mobile. Copyright 1998-2009 "\ "Eric House. Ce logiciel est produit sous licence "\ "publique GNU.\r\r"\ @@ -946,10 +948,10 @@ BEGIN IDS_UNTITLED_FORMAT "Sans titre %d" IDS_CONN_RELAY_L "Transmission" IDS_CONN_DIRECT "Connexion directe" - IDS_PASSWDFMT_L "ENTER PASSWORD FOR %ls:" // <- translate + IDS_PASSWDFMT_L "Enter password for %ls:" // <- translate IDS_FILEEXISTSFMT_L "File %s already exists." // <- translate IDS_NEED_TOUCH "This feature requires a touch screen." // <- translate - IDS_EDITCOLOR_FORMAT "EDIT COLOR FOR %s" // <- translate + IDS_EDITCOLOR_FORMAT "Edit color for %s" // <- translate #ifndef XWFEATURE_STANDALONE_ONLY # ifdef XWFEATURE_SMS diff --git a/xwords4/wince/rc_incs.h b/xwords4/wince/rc_incs.h index 0983f2d91..8009c776e 100644 --- a/xwords4/wince/rc_incs.h +++ b/xwords4/wince/rc_incs.h @@ -22,3 +22,4 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | exf2 #endif +#define ABOUT_VERSION "4.2.1 b1" diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc index bb7cccaeb..5fc4c61f2 100755 --- a/xwords4/wince/xwords4.rc +++ b/xwords4/wince/xwords4.rc @@ -817,19 +817,19 @@ BEGIN END #endif -IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 120, 60 +IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Language Picker" FONT 8, "System" BEGIN - LTEXT "Choose the language for menus and dialog text.", - LOCALES_LABEL,LEFT_COL,2,100,36 + LTEXT "Choose the language for menus and dialog text. (You can download support files for new languages from xwords.sf.net.)", + LOCALES_LABEL,LEFT_COL,2,80,50 - XWCOMBO(LOCALES_COMBO,LEFT_COL,40,70,12,0,58,0) + XWCOMBO(LOCALES_COMBO,LEFT_COL,55,70,12,0,58,0) # ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, + PUSHBUTTON "Cancel",IDCANCEL,40,70,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT # endif END @@ -904,7 +904,7 @@ BEGIN IDS_DONE "Done" IDS_LANGUAGE_NAME "English" IDS_NEW_GAME "New Game" - IDS_ABOUT "Crosswords 4.2.1 b1 (rev " SVN_REV ") "\ + IDS_ABOUT "Crosswords " ABOUT_VERSION " (rev " SVN_REV ") "\ "for Windows Mobile. Copyright 1998-2009 by "\ "Eric House. This software is released under the GNU "\ "Public License.\r\r"\