mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-13 08:01:33 +01:00
copy over tall-narrow game info dialog layout from other .rc files
This commit is contained in:
parent
7ca629a2f5
commit
c010a73098
1 changed files with 31 additions and 25 deletions
|
@ -175,6 +175,7 @@ DLL_VERS_RESOURCE
|
|||
#define REPOS_BUTTON_HPAD 2
|
||||
|
||||
// ******** IDD_GAMEINFO DIALOG *********
|
||||
#define GAMEINFO_WIDTH 116
|
||||
#ifdef CEFEATURE_CANSCROLL
|
||||
# define ROW_HEIGHT 10
|
||||
# define ROW_SPACE 12
|
||||
|
@ -190,29 +191,29 @@ DLL_VERS_RESOURCE
|
|||
# define GAME_NAME_WIDTH 56
|
||||
# define GAME_LABEL_WIDTH (GAME_NAME_WIDTH-10)
|
||||
# define GAME_NAME_LEFT LEFT_COL
|
||||
# define ROBOT_LABEL_ADJUST 10
|
||||
# define NAME_LABEL_ADJUST 20
|
||||
# define GAME_ROBOT_LEFT (GAME_NAME_LEFT + GAME_NAME_WIDTH + 5)
|
||||
# define GAME_PWD_LEFT (GAME_ROBOT_LEFT + 15)
|
||||
# define NPLAYERS_ROW 3
|
||||
# define GAME_NAMELABEL_LEFT GAME_NAME_LEFT
|
||||
# define GAME_NAMELABEL_WIDTH (GAME_NAME_WIDTH-ROBOT_LABEL_ADJUST-NAME_LABEL_ADJUST)
|
||||
# define GAME_ROBOTLABEL_LEFT (GAME_ROBOT_LEFT-7)
|
||||
# define GAME_ROBOTLABEL_WIDTH (GAME_PWD_LEFT-GAME_ROBOT_LEFT+ROBOT_LABEL_ADJUST)
|
||||
# define GAME_PWDLABEL_LEFT (GAME_PWD_LEFT)
|
||||
# define GAME_PWDLABEL_WIDTH (GAMEINFO_WIDTH-GAME_PWD_LEFT)
|
||||
# define GAME_PWDLABEL_LEFT (GAME_PWD_LEFT-4)
|
||||
#else
|
||||
# define SERVERROLE_ROW 3
|
||||
# define GAME_NAME_WIDTH 56
|
||||
# define NPLAYERS_ROW (SERVERROLE_ROW+ROW_SPACE+3)
|
||||
# define SERVERCONF_ROW (SERVERROLE_ROW+ROW_SPACE+3)
|
||||
# define NPLAYERS_ROW (SERVERCONF_ROW+ROW_SPACE+3)
|
||||
# define GAME_REMOTE_LEFT 1
|
||||
# define GAME_NAME_LEFT 11
|
||||
# define ROBOT_LABEL_ADJUST 10
|
||||
# define GAME_ROBOT_LEFT (GAME_NAME_LEFT+GAME_NAME_WIDTH+2)
|
||||
# define GAME_PWD_LEFT (GAME_ROBOT_LEFT + CHECK_WIDTH + 4)
|
||||
# define GAME_NAMELABEL_LEFT (GAME_NAME_LEFT + 20)
|
||||
# define GAME_NAMELABEL_WIDTH (GAME_NAME_WIDTH-15)
|
||||
# define GAME_ROBOTLABEL_LEFT (GAME_ROBOT_LEFT-10)
|
||||
# define NAME_LABEL_ADJUST 20
|
||||
# define GAME_NAMELABEL_LEFT (GAME_NAME_LEFT+NAME_LABEL_ADJUST)
|
||||
# define GAME_NAMELABEL_WIDTH (GAME_NAME_WIDTH-ROBOT_LABEL_ADJUST-NAME_LABEL_ADJUST)
|
||||
# define GAME_ROBOTLABEL_LEFT (GAME_ROBOT_LEFT-ROBOT_LABEL_ADJUST)
|
||||
# define GAME_ROBOTLABEL_WIDTH (GAME_PWD_LEFT-GAME_ROBOT_LEFT+ROBOT_LABEL_ADJUST)
|
||||
# define GAME_PWDLABEL_LEFT (GAME_PWD_LEFT)
|
||||
# define GAME_PWDLABEL_WIDTH (GAMEINFO_WIDTH-GAME_PWD_LEFT)
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -221,7 +222,8 @@ DLL_VERS_RESOURCE
|
|||
#define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL)
|
||||
#define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL)
|
||||
#define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL)
|
||||
#define DICTPICK_LAB_ROW (PLAYER_ROW_4+ROW_SPACE+2)
|
||||
#define JUGGLE_ROW (PLAYER_ROW_4+ROW_SPACE)
|
||||
#define DICTPICK_LAB_ROW (JUGGLE_ROW+ROW_SPACE+2)
|
||||
#define DICTPICK_ROW (DICTPICK_LAB_ROW+ROW_SPACE-2)
|
||||
#define PREFS_ROW (DICTPICK_ROW+ROW_SPACE+3)
|
||||
#ifndef _WIN32_WCE
|
||||
|
@ -243,32 +245,33 @@ DLL_VERS_RESOURCE
|
|||
ES_AUTOHSCROLL \
|
||||
CONTROL "",robotCheck,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, \
|
||||
GAME_ROBOT_LEFT,playerRow,CHECK_WIDTH,ROW_HEIGHT \
|
||||
EDITTEXT passEdit,GAME_PWD_LEFT,playerRow,15,ROW_HEIGHT, \
|
||||
EDITTEXT passEdit,GAME_PWD_LEFT,playerRow,13,ROW_HEIGHT, \
|
||||
ES_PASSWORD | ES_AUTOHSCROLL \
|
||||
|
||||
|
||||
IDD_GAMEINFO DIALOG DISCARDABLE 0, 0, 116, GAMEINFO_HEIGHT
|
||||
IDD_GAMEINFO DIALOG DISCARDABLE 0, 0, GAMEINFO_WIDTH, GAMEINFO_HEIGHT
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL
|
||||
CAPTION "Informacje w grze"
|
||||
FONT 8, "System"
|
||||
BEGIN
|
||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
||||
LTEXT "Tryb:",IDC_STATIC,5,SERVERROLE_ROW,20,8
|
||||
LTEXT "Tryb:",IDC_ROLELABEL,LEFT_COL,SERVERROLE_ROW,20,8
|
||||
XWCOMBO(IDC_ROLECOMBO,26,SERVERROLE_ROW,70,ROW_HEIGHT,0,58,0)
|
||||
|
||||
PUSHBUTTON "Ustaw.",GIROLECONF_BUTTON,75,SERVERROLE_ROW,20,ROW_HEIGHT
|
||||
PUSHBUTTON "Ustaw.",GIROLECONF_BUTTON,LEFT_COL+10,
|
||||
SERVERCONF_ROW,60,ROW_HEIGHT
|
||||
|
||||
#endif
|
||||
|
||||
LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,43,8
|
||||
XWCOMBO(IDC_NPLAYERSCOMBO,68,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0)
|
||||
LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,70,8
|
||||
XWCOMBO(IDC_NPLAYERSCOMBO,74,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0)
|
||||
|
||||
PUSHBUTTON "Miesz.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,ROW_HEIGHT
|
||||
|
||||
LTEXT "Imię",IDC_STATIC,GAME_NAMELABEL_LEFT,
|
||||
LTEXT "Imię",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 "Kod",IDC_STATIC,GAME_PWDLABEL_LEFT,LABELS_ROW,16,8
|
||||
LTEXT "Robot",IDC_ROBOTLABEL,GAME_ROBOTLABEL_LEFT,LABELS_ROW,
|
||||
GAME_ROBOTLABEL_WIDTH,8
|
||||
LTEXT "Kod",IDC_PASSWDLABEL,GAME_PWDLABEL_LEFT,LABELS_ROW,
|
||||
GAME_PWDLABEL_WIDTH,8
|
||||
|
||||
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH
|
||||
LTEXT "Zdalny",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,25,8,SS_NOPREFIX
|
||||
|
@ -286,15 +289,18 @@ 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 )
|
||||
|
||||
LTEXT "Słownik:",IDC_DICTLABEL,LEFT_COL,DICTPICK_LAB_ROW,36,8,
|
||||
PUSHBUTTON "Mieszaj",GIJUGGLE_BUTTON,LEFT_COL+10,JUGGLE_ROW,
|
||||
60,BUTTON_HT
|
||||
|
||||
LTEXT "Słownik:",IDC_DICTLABEL,LEFT_COL,DICTPICK_LAB_ROW,50,8,
|
||||
SS_NOPREFIX
|
||||
XWCOMBO(IDC_DICTLIST,LEFT_COL+10,DICTPICK_ROW,80,ROW_HEIGHT,LBS_SORT,58,CBS_SORT)
|
||||
|
||||
PUSHBUTTON "Ustawienia...",OPTIONS_BUTTON,LEFT_COL,PREFS_ROW,55,12
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
PUSHBUTTON "OK",IDOK,29,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
DEFPUSHBUTTON "Anuluj",IDCANCEL,70,BUTTONS_ROW,
|
||||
PUSHBUTTON "OK",IDOK,20,BUTTONS_ROW,REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
DEFPUSHBUTTON "Anuluj",IDCANCEL,50,BUTTONS_ROW,
|
||||
REPOS_BUTTON_WIDTH,REPOS_BUTTON_HT
|
||||
#endif
|
||||
END
|
||||
|
|
Loading…
Reference in a new issue