From 6638b251e0c712e2ffbba499c95123815e458734 Mon Sep 17 00:00:00 2001 From: ehouse Date: Thu, 23 Apr 2009 12:37:07 +0000 Subject: [PATCH] Give all labels real IDs so can be moved; flesh out locale picker dialog; add macro to replace listbox/combo triplet; rename some ids. --- xwords4/wince/ceresstr.c | 4 +- xwords4/wince/l10n/xwords4_caps.rc | 30 +++---- xwords4/wince/l10n/xwords4_french.rc | 38 ++++---- xwords4/wince/resource.h | 9 +- xwords4/wince/xwords4.rc | 126 ++++++++------------------- 5 files changed, 80 insertions(+), 127 deletions(-) diff --git a/xwords4/wince/ceresstr.c b/xwords4/wince/ceresstr.c index 7121022d9..12db58f25 100644 --- a/xwords4/wince/ceresstr.c +++ b/xwords4/wince/ceresstr.c @@ -282,11 +282,11 @@ DllSelDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) state = (DllSelState*)lParam; state->cancelled = XP_TRUE; - state->dllListID = LB_IF_PPC( state->dlgHdr.globals, DLLS_COMBO ); + state->dllListID = LB_IF_PPC( state->dlgHdr.globals, LOCALES_COMBO ); ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_NONE ); - ceDlgComboShowHide( &state->dlgHdr, DLLS_COMBO ); + ceDlgComboShowHide( &state->dlgHdr, LOCALES_COMBO ); result = TRUE; } else { diff --git a/xwords4/wince/l10n/xwords4_caps.rc b/xwords4/wince/l10n/xwords4_caps.rc index 44f26493e..fe00ad084 100644 --- a/xwords4/wince/l10n/xwords4_caps.rc +++ b/xwords4/wince/l10n/xwords4_caps.rc @@ -264,7 +264,7 @@ CAPTION "GAME INFO" FONT 8, "System" BEGIN #ifndef XWFEATURE_STANDALONE_ONLY - LTEXT "ROLE:",IDC_STATIC,5,SERVERROLE_ROW,20,8 + LTEXT "ROLE:",IDC_ROLELABEL,5,SERVERROLE_ROW,20,8 #ifdef _WIN32_WCE LISTBOX IDC_ROLECOMBO, 26, SERVERROLE_ROW, 70, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS CONTROL "", IDC_ROLEUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, @@ -287,10 +287,10 @@ BEGIN PUSHBUTTON "JUGL.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,ROW_HEIGHT // <- translate JUGL. (juggle) - LTEXT "NAME",IDC_STATIC,GAME_NAMELABEL_LEFT, // <- translate NAME + LTEXT "NAME",IDC_NAMELABEL,GAME_NAMELABEL_LEFT, // <- translate NAME LABELS_ROW,GAME_NAMELABEL_WIDTH,8,SS_NOPREFIX - LTEXT "ROBOT",IDC_STATIC,GAME_ROBOTLABEL_LEFT,LABELS_ROW,22,8 // <- translate ROBOT - LTEXT "PWD",IDC_STATIC,GAME_PWDLABEL_LEFT,LABELS_ROW,16,8 // <- translate PWD (password) + LTEXT "ROBOT",IDC_ROBOTLABEL,GAME_ROBOTLABEL_LEFT,LABELS_ROW,22,8 // <- translate ROBOT + LTEXT "PWD",IDC_PASSWDLABEL,GAME_PWDLABEL_LEFT,LABELS_ROW,16,8 // <- translate PWD (password) #if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH LTEXT "REMOTE",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,25,8,SS_NOPREFIX // <- translate REMOTE @@ -520,7 +520,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "TILE HINT LIMITS" // <- translate TILE HINT LIMITS FONT 8, "System" BEGIN - LTEXT "USE AT LEAST:",IDC_STATIC, // <- translate USE AT LEAST: + LTEXT "USE AT LEAST:",HC_MIN_LABEL, // <- translate USE AT LEAST: HC_LABELS_COL,HC_MINROW,60,ROW_HEIGHT #ifdef _WIN32_WCE LISTBOX HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS @@ -530,7 +530,7 @@ BEGIN COMBOBOX HC_MIN_COMBO_PPC,HC_DROPDOWNS_COL,HC_MINROW,17,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "BUT NO MORE THAN:",IDC_STATIC,HC_LABELS_COL,HC_MAXROW,60,ROW_HEIGHT // <- translate BUT NO MORE THAN + LTEXT "BUT NO MORE THAN:",HC_MAX_LABEL,HC_LABELS_COL,HC_MAXROW,60,ROW_HEIGHT // <- translate BUT NO MORE THAN #ifdef _WIN32_WCE LISTBOX HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS CONTROL "", HC_MAX_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, @@ -861,17 +861,19 @@ 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 #ifdef _WIN32_WCE - LISTBOX DLLS_COMBO, 30,2,70,12, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_DLLSUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, + LISTBOX LOCALES_COMBO, LEFT_COL,40,70,12, LISTBOX_CONTROL_FLAGS + CONTROL "", IDC_LOCALESUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, 0, 0, 0, 0 #endif - COMBOBOX DLLS_COMBO_PPC,30,2,70,58, + COMBOBOX LOCALES_COMBO_PPC,LEFT_COL,40,70,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP # ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,20,100,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "CANCEL",IDCANCEL,100,100,REPOS_BUTTON_WIDTH, + PUSHBUTTON "CANCEL",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT # endif END @@ -886,17 +888,15 @@ STRINGTABLE DISCARDABLE BEGIN #ifdef DEBUG IDS_APP_TITLE "Crossw_dbg" - IDC_XWORDS4 "XWORDS4_DBG" // <- translate #else - IDS_APP_TITLE "Crosswords" // <- translate - IDC_XWORDS4 "XWORDS4" // <- translate + IDS_APP_TITLE "Crosswords" #endif IDS_MENU "MENU" // <- translate IDS_DUMMY "--" IDS_CANCEL "CANCEL" // <- translate IDS_OK "OK" // <- translate IDS_DONE "DONE" // <- translate - IDS_LANGUAGE_NAME "ALL CAPS" // <- translate + IDS_LANGUAGE_NAME "ENGLISH" // <- translate IDS_ABOUT "CROSSWORDS 4.4A1 (REV " SVN_REV ") "\ "FOR WINDOWS MOBILE. COPYRIGHT 1998-2009 BY "\ "ERIC HOUSE. THIS SOFTWARE IS RELEASED UNDER THE GNU "\ diff --git a/xwords4/wince/l10n/xwords4_french.rc b/xwords4/wince/l10n/xwords4_french.rc index 79d57c36f..b451bec71 100644 --- a/xwords4/wince/l10n/xwords4_french.rc +++ b/xwords4/wince/l10n/xwords4_french.rc @@ -186,7 +186,7 @@ END // #define BUTTON_HT 12 #define REPOS_BUTTON_HT BUTTON_HT -#define REPOS_BUTTON_WIDTH 28 +#define REPOS_BUTTON_WIDTH 32 #define REPOS_BUTTON_VPAD 2 #define REPOS_BUTTON_HPAD 2 @@ -264,7 +264,7 @@ CAPTION "Infos partie" FONT 8, "System" BEGIN #ifndef XWFEATURE_STANDALONE_ONLY - LTEXT "Mode:",IDC_STATIC,LEFT_COL,SERVERROLE_ROW,20,8 + LTEXT "Mode:",IDC_ROLELABEL,LEFT_COL,SERVERROLE_ROW,20,8 #ifdef _WIN32_WCE LISTBOX IDC_ROLECOMBO,23,SERVERROLE_ROW,50,ROW_HEIGHT,LISTBOX_CONTROL_FLAGS CONTROL "", IDC_ROLEUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, @@ -287,10 +287,10 @@ BEGIN PUSHBUTTON "Mél.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,ROW_HEIGHT - LTEXT "Nom",IDC_STATIC,GAME_NAMELABEL_LEFT, + LTEXT "Nom",IDC_NAMELABEL,GAME_NAMELABEL_LEFT, LABELS_ROW,GAME_NAMELABEL_WIDTH,8,SS_NOPREFIX - LTEXT "Robot",IDC_STATIC,GAME_ROBOTLABEL_LEFT,LABELS_ROW,22,8 - LTEXT "Mdp",IDC_STATIC,GAME_PWDLABEL_LEFT,LABELS_ROW,16,8 + LTEXT "Robot",IDC_ROBOTLABEL,GAME_ROBOTLABEL_LEFT,LABELS_ROW,22,8 + LTEXT "Mdp",IDC_PASSWDLABEL,GAME_PWDLABEL_LEFT,LABELS_ROW,16,8 #if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH LTEXT "Distant",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,25,8,SS_NOPREFIX @@ -518,19 +518,22 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Longueur des mots conseillés" FONT 8, "System" BEGIN - LTEXT "Utiliser au moins:",IDC_STATIC, + LTEXT "Utiliser au moins:",HC_MIN_LABEL, HC_LABELS_COL,HC_MINROW,60,ROW_HEIGHT #ifdef _WIN32_WCE - LISTBOX HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS + LISTBOX HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW, 24, ROW_HEIGHT, + LISTBOX_CONTROL_FLAGS CONTROL "", HC_MIN_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, 0, 0, 0, 0 #endif COMBOBOX HC_MIN_COMBO_PPC,HC_DROPDOWNS_COL,HC_MINROW,17,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Mais pas plus de:",IDC_STATIC,HC_LABELS_COL,HC_MAXROW,60,ROW_HEIGHT + LTEXT "Mais pas plus de:",HC_MAX_LABEL, + HC_LABELS_COL,HC_MAXROW,60,ROW_HEIGHT #ifdef _WIN32_WCE - LISTBOX HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS + LISTBOX HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, + LISTBOX_CONTROL_FLAGS CONTROL "", HC_MAX_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, 0, 0, 0, 0 #endif @@ -860,17 +863,19 @@ 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 #ifdef _WIN32_WCE - LISTBOX DLLS_COMBO, 30,2,70,12, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_DLLSUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, + LISTBOX LOCALES_COMBO, LEFT_COL,40,70,12, LISTBOX_CONTROL_FLAGS + CONTROL "", IDC_LOCALESUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, 0, 0, 0, 0 #endif - COMBOBOX DLLS_COMBO_PPC,30,2,70,58, + COMBOBOX LOCALES_COMBO_PPC,LEFT_COL,40,70,58, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP # ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,20,100,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "CANCEL",IDCANCEL,100,100,REPOS_BUTTON_WIDTH, + PUSHBUTTON "Annuler",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT # endif END @@ -885,17 +890,16 @@ STRINGTABLE DISCARDABLE BEGIN #ifdef DEBUG IDS_APP_TITLE "Crossw_dbg" - IDC_XWORDS4 "XWORDS4_DBG" #else IDS_APP_TITLE "Crosswords" - IDC_XWORDS4 "XWORDS4" #endif IDS_MENU "Menu" IDS_DUMMY "--" IDS_CANCEL "Annuler" IDS_OK "OK" IDS_DONE "Terminé" - IDS_LANGUAGE_NAME "Français" IDS_ABOUT "Crosswords 4.4a1 (REV " SVN_REV ") "\ + IDS_LANGUAGE_NAME "Français" + IDS_ABOUT "Crosswords 4.4a1 (REV " SVN_REV ") "\ "pour Windows Mobile. Copyright 1998-2009 "\ "Eric House. Ce logiciel est produit sous licence "\ "publique GNU.\r\r"\ diff --git a/xwords4/wince/resource.h b/xwords4/wince/resource.h index 5071bce77..b7b4c7e7b 100755 --- a/xwords4/wince/resource.h +++ b/xwords4/wince/resource.h @@ -164,14 +164,17 @@ #endif /* Dll/language picker */ -#define DLLS_COMBO 1131 -#define IDC_DLLSUPDOWN 1132 -#define DLLS_COMBO_PPC 1133 +#define LOCALES_COMBO 1131 +#define IDC_LOCALESUPDOWN 1132 +#define LOCALES_COMBO_PPC 1133 #define IDC_ROLELABEL 1134 #define IDC_NAMELABEL 1135 #define IDC_ROBOTLABEL 1136 #define IDC_PASSWDLABEL 1137 +#define HC_MIN_LABEL 1138 +#define HC_MAX_LABEL 1139 +#define LOCALES_LABEL 1140 #define IDC_CCONVIA_LAB 1106 diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc index 86420cbc9..dcf0695af 100755 --- a/xwords4/wince/xwords4.rc +++ b/xwords4/wince/xwords4.rc @@ -180,6 +180,18 @@ END UDS_SETBUDDYINT | UDS_EXPANDABLE #endif +#ifdef _WIN32_WCE +# define XWCOMBO(id,xx,yy,ww,ht1,ht2) \ + LISTBOX id, xx,yy,ww,ht1, LISTBOX_CONTROL_FLAGS \ + CONTROL "", id+1, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS,0,0,0,0 \ + COMBOBOX id+2,xx,yy,ww,ht2, \ + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#else +# define XWCOMBO(id,xx,yy,ww,ht1,ht2) \ + COMBOBOX id+2,xx,yy,ww,ht1, \ + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -265,25 +277,13 @@ FONT 8, "System" BEGIN #ifndef XWFEATURE_STANDALONE_ONLY LTEXT "Role:",IDC_ROLELABEL,5,SERVERROLE_ROW,20,8 -#ifdef _WIN32_WCE - LISTBOX IDC_ROLECOMBO, 26, SERVERROLE_ROW, 70, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_ROLEUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX IDC_ROLECOMBO_PPC,25,SERVERROLE_ROW,50,58,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + XWCOMBO(IDC_ROLECOMBO,26,SERVERROLE_ROW,70,ROW_HEIGHT,58) PUSHBUTTON "Conf.",GIROLECONF_BUTTON,75,SERVERROLE_ROW,20,ROW_HEIGHT #endif LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,43,8 -#ifdef _WIN32_WCE - LISTBOX IDC_NPLAYERSCOMBO, 46, NPLAYERS_ROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_NPLAYERSUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX IDC_NPLAYERSCOMBO_PPC,46,NPLAYERS_ROW,24,58,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + XWCOMBO(IDC_NPLAYERSCOMBO,46,NPLAYERS_ROW,24,ROW_HEIGHT,58) PUSHBUTTON "Jugl.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,ROW_HEIGHT @@ -310,13 +310,7 @@ BEGIN LTEXT "Dictionary:",IDC_DICTLABEL,LEFT_COL,DICTPICK_LAB_ROW,36,8, SS_NOPREFIX -#ifdef _WIN32_WCE - LISTBOX IDC_DICTLIST, LEFT_COL+10,DICTPICK_ROW,80,ROW_HEIGHT,LISTBOX_CONTROL_FLAGS|LBS_SORT - CONTROL "", IDC_DICTUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX IDC_DICTLIST_PPC,LEFT_COL+10,DICTPICK_ROW,80,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + XWCOMBO(IDC_DICTLIST, LEFT_COL+10,DICTPICK_ROW,80,ROW_HEIGHT,58) PUSHBUTTON "Preferences...",OPTIONS_BUTTON,LEFT_COL,PREFS_ROW,55,12 @@ -384,14 +378,8 @@ BEGIN PUSHBUTTON "Put back",IDC_BACKUP,ASKB_COLLEFT,ASKB_PUTTOP,35,14 #endif -#ifdef _WIN32_WCE - LISTBOX BLANKFACE_LIST,ASKB_COMBOLEFT,ASKB_COLLEFT,27,12, - LISTBOX_CONTROL_FLAGS | LBS_SORT - CONTROL "", IDC_ASKBLANK_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX BLANKFACE_LIST_PPC,ASKB_COMBOLEFT,ASKB_COLLEFT,27,70, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + XWCOMBO(BLANKFACE_LIST,ASKB_COMBOLEFT,ASKB_COLLEFT,27,12,70) + #ifndef _WIN32_WCE DEFPUSHBUTTON "OK",IDOK,80,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT PUSHBUTTON "Cancel",IDCANCEL,20,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT @@ -450,14 +438,7 @@ BEGIN "Select a saved game. (Some buttons will be disabled when the current game is selected.)", IDC_SVGM_SELLAB,SVGM_LEFT_COL, SVGM_ROW_1,90,35 -#ifdef _WIN32_WCE - LISTBOX IDC_SVGM_GAMELIST, SVGM_LEFT_COL,SVGM_ROW_2,70,ROW_HEIGHT, - LISTBOX_CONTROL_FLAGS | LBS_SORT - CONTROL "", IDC_SVGM_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX IDC_SVGM_GAMELIST_PPC,SVGM_LEFT_COL,SVGM_ROW_2,70,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + XWCOMBO(IDC_SVGM_GAMELIST, SVGM_LEFT_COL,SVGM_ROW_2,70,ROW_HEIGHT,58) PUSHBUTTON "Open",IDC_SVGM_OPEN, SVGM_LEFT_COL,SVGM_ROW_3,40,14,WS_DISABLED @@ -518,23 +499,14 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Tile hint limits" FONT 8, "System" BEGIN - LTEXT "Use at least:",IDC_STATIC,HC_LABELS_COL,HC_MINROW,60,ROW_HEIGHT -#ifdef _WIN32_WCE - LISTBOX HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS - CONTROL "", HC_MIN_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX HC_MIN_COMBO_PPC,HC_DROPDOWNS_COL,HC_MINROW,17,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Use at least:",HC_MIN_LABEL,HC_LABELS_COL,HC_MINROW,60, + ROW_HEIGHT + XWCOMBO(HC_MIN_COMBO, HC_DROPDOWNS_COL,HC_MINROW,24,ROW_HEIGHT,58) + + LTEXT "But no more than:",HC_MAX_LABEL,HC_LABELS_COL,HC_MAXROW,60, + ROW_HEIGHT + XWCOMBO(HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, 58) - LTEXT "But no more than:",IDC_STATIC,HC_LABELS_COL,HC_MAXROW,60,ROW_HEIGHT -#ifdef _WIN32_WCE - LISTBOX HC_MAX_COMBO, HC_DROPDOWNS_COL,HC_MAXROW, 24, ROW_HEIGHT, LISTBOX_CONTROL_FLAGS - CONTROL "", HC_MAX_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX HC_MAX_COMBO_PPC,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, @@ -603,13 +575,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,75,PREFS_ROW_HT EDITTEXT TIMER_EDIT,85,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Phonies:",PHONIES_LABEL,8,PR_ROW6,28,PREFS_ROW_HT -#ifdef _WIN32_WCE - LISTBOX PHONIES_COMBO, 38,PR_ROW6,50,PREFS_ROW_HT, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_PHONIESUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX PHONIES_COMBO_PPC,38,PR_ROW6,40,58,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + XWCOMBO(PHONIES_COMBO, 38,PR_ROW6,50,PREFS_ROW_HT, 58) #ifdef FEATURE_TRAY_EDIT CONTROL "Pick tiles face-up", IDC_PICKTILES, "Button", @@ -652,12 +618,7 @@ FONT 8, "System" BEGIN LTEXT "Connect via:",IDC_CCONVIA_LAB,LAB_COL,CONN_ROW_1,40,ROW_HEIGHT -#ifdef _WIN32_WCE - LISTBOX IDC_CONNECT_COMBO, CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,ROW_HEIGHT, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_CONNECTUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, 0, 0, 0, 0 -#endif - COMBOBOX IDC_CONNECT_COMBO_PPC,CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,ROW_HEIGHT,58) #ifdef XWFEATURE_RELAY LTEXT "Cookie:",IDC_COOKIE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT @@ -856,22 +817,10 @@ FONT 8, "System" BEGIN LTEXT "Fonts:",FONTS_LABEL,5,2,25,12 -#ifdef _WIN32_WCE - LISTBOX FONTS_COMBO, 30,2,70,12, LISTBOX_CONTROL_FLAGS | LBS_SORT - CONTROL "", IDC_FONTSUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX FONTS_COMBO_PPC,30,2,70,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + XWCOMBO(FONTS_COMBO, 30,2,70,12,58) LTEXT "Size:",FONTSIZE_LABEL,5,16,25,12 -#ifdef _WIN32_WCE - LISTBOX FONTSIZE_COMBO, 30,16,25,12, LISTBOX_CONTROL_FLAGS | LBS_SORT - CONTROL "", IDC_FONTSIZEUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX FONTSIZE_COMBO_PPC,30,16,25,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + XWCOMBO(FONTSIZE_COMBO, 30,16,25,12,58) # ifndef _WIN32_WCE DEFPUSHBUTTON "OK",IDOK,20,100,REPOS_BUTTON_WIDTH, @@ -882,22 +831,19 @@ BEGIN END #endif -IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 120, 115 +IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 120, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER CAPTION "Language Picker" FONT 8, "System" BEGIN -#ifdef _WIN32_WCE - LISTBOX DLLS_COMBO, 30,2,70,12, LISTBOX_CONTROL_FLAGS - CONTROL "", IDC_DLLSUPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS, - 0, 0, 0, 0 -#endif - COMBOBOX DLLS_COMBO_PPC,30,2,70,58, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Choose the language for menus and dialog text.", + LOCALES_LABEL,LEFT_COL,2,100,36 + + XWCOMBO(LOCALES_COMBO,LEFT_COL,40,70,12,58) # ifndef _WIN32_WCE - DEFPUSHBUTTON "OK",IDOK,20,100,REPOS_BUTTON_WIDTH, + DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT - PUSHBUTTON "Cancel",IDCANCEL,100,100,REPOS_BUTTON_WIDTH, + PUSHBUTTON "Cancel",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, REPOS_BUTTON_HT # endif END