Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add help text explaining room and connect order to conns dialog.

Browse source 
Still need to add for other .rc files and polish the text.
This commit is contained in:
ehouse 2009-12-09 05:11:20 +00:00
parent 015b0d42d8
commit 32634c4847
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/wince/cecondlg.c
View file

@ -217,6 +217,11 @@ ceControlsFromAddrRec( HWND hDlg, const CeConnDlgState* state )
ceSetDlgItemText( hDlg, INVITE_EDIT, ceSetDlgItemText( hDlg, INVITE_EDIT,
state->addrRec.u.ip_relay.invite ); state->addrRec.u.ip_relay.invite );
ids[nIds++] = INVITE_EDIT; ids[nIds++] = INVITE_EDIT;
XP_U16 hideMe = SERVER_ISSERVER == state->role ?
IDC_INVITE_HELP_GUEST : IDC_INVITE_HELP_HOST;
ceShowOrHide( hDlg, hideMe, XP_FALSE );
# ifndef RELAY_NOEDIT_ADDR # ifndef RELAY_NOEDIT_ADDR
ceSetDlgItemText( hDlg, RELAYNAME_EDIT, ceSetDlgItemText( hDlg, RELAYNAME_EDIT,
state->addrRec.u.ip_relay.hostName ); state->addrRec.u.ip_relay.hostName );

22
xwords4/wince/l10n/xwords4_english.rc
View file

@ -599,6 +599,7 @@ END
# define CTRL_COL 15 # define CTRL_COL 15
# define CTRL_COL_WIDTH 80 # define CTRL_COL_WIDTH 80
# define CONN_LABEL_HT (LABEL_ROW_HT*2) /* try to make them all same ht! */ # define CONN_LABEL_HT (LABEL_ROW_HT*2) /* try to make them all same ht! */
# define CONN_HELP_HT 25
# define CONN_LABEL_ROW_1 2 # define CONN_LABEL_ROW_1 2
# define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE) # define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE)
# ifdef NEEDS_CHOOSE_CONNTYPE # ifdef NEEDS_CHOOSE_CONNTYPE
@ -606,16 +607,16 @@ END
# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT) # define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT)
# else # else
# define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1) # define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1)
# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+CONN_LABEL_HT+3) # define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE)
# endif # endif
# ifndef RELAY_NOEDIT_ADDR # ifndef RELAY_NOEDIT_ADDR
# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+ROW_SPACE+5) # define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+CONN_HELP_HT+5)
# define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3) # define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3)
# define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5) # define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5)
# define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3) # define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3)
# define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE) # define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE)
# else # else
# define BUTTON_ROW (CONN_EDIT_ROW_4+ROW_SPACE) # define BUTTON_ROW (CONN_EDIT_ROW_4+CONN_HELP_HT)
#endif #endif
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
@ -634,14 +635,19 @@ BEGIN
#ifdef NEEDS_CHOOSE_CONNTYPE #ifdef NEEDS_CHOOSE_CONNTYPE
LTEXT "Connect via:",IDC_CCONVIA_LAB,LAB_COL,CONN_LABEL_ROW_1, LTEXT "Connect via:",IDC_CCONVIA_LAB,LAB_COL,CONN_LABEL_ROW_1,
40,ROW_HEIGHT 40,ROW_HEIGHT
XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_EDIT_ROW_2,CTRL_COL_WIDTH, XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_EDIT_ROW_2,60,ROW_HEIGHT,0,58,0)
ROW_HEIGHT,0,58,0)
#endif #endif
#if defined XWFEATURE_RELAY #if defined XWFEATURE_RELAY
LTEXT "Room (must match for all devices joining the game):", LTEXT "Room:",
IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,90,CONN_LABEL_HT IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,23,CONN_LABEL_HT
EDITTEXT INVITE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_LABEL_ROW_3,CTRL_COL_WIDTH,
ROW_HEIGHT,ES_AUTOHSCROLL ROW_HEIGHT,ES_AUTOHSCROLL
LTEXT "(As host, you name the room for the game, and must connect first.)",
IDC_INVITE_HELP_HOST,LAB_COL,CONN_EDIT_ROW_4,110,CONN_HELP_HT
LTEXT "(As guest, wait for the host to connect then tell you the room name.)",
IDC_INVITE_HELP_GUEST,LAB_COL,CONN_EDIT_ROW_4,100,CONN_HELP_HT
#ifndef RELAY_NOEDIT_ADDR #ifndef RELAY_NOEDIT_ADDR
LTEXT "Relay name (rarely changes):",IDC_CRELAYNAME_LAB, LTEXT "Relay name (rarely changes):",IDC_CRELAYNAME_LAB,
LAB_COL,CONN_LABEL_ROW_5,90,CONN_LABEL_HT LAB_COL,CONN_LABEL_ROW_5,90,CONN_LABEL_HT

6
xwords4/wince/resource.h
View file

@ -194,9 +194,11 @@
# define IDC_CRELAYPORT_LAB 1109 # define IDC_CRELAYPORT_LAB 1109
# define INVITE_EDIT 1110 # define INVITE_EDIT 1110
# define IDC_INVITE_HELP_HOST 1111
# define IDC_INVITE_HELP_GUEST 1112
# ifndef RELAY_NOEDIT_ADDR # ifndef RELAY_NOEDIT_ADDR
# define RELAYPORT_EDIT 1111 # define RELAYPORT_EDIT 1113
# define RELAYNAME_EDIT 1112 # define RELAYNAME_EDIT 1114
# endif # endif
#endif #endif