mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-03 23:04:08 +01:00
remove connect info button, instead bring it up every time role
changes to one that needs it.
This commit is contained in:
parent
42a042a289
commit
24ca68e96e
3 changed files with 7 additions and 13 deletions
|
@ -276,10 +276,6 @@ ceAdjustVisibility( HWND hDlg, GameInfoState* giState, XP_Bool counterWins )
|
||||||
result = nDrawn == nToDraw;
|
result = nDrawn == nToDraw;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
|
||||||
ceShowOrHide( hDlg, IDC_CONNBUTTON, serverRole != SERVER_STANDALONE );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
} /* ceAdjustVisibility */
|
} /* ceAdjustVisibility */
|
||||||
|
|
||||||
|
@ -509,6 +505,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifndef XWFEATURE_STANDALONE_ONLY
|
||||||
case IDC_ROLECOMBO:
|
case IDC_ROLECOMBO:
|
||||||
if ( HIWORD(wParam) == CBN_SELCHANGE ) {
|
if ( HIWORD(wParam) == CBN_SELCHANGE ) {
|
||||||
if ( giState->isNewGame ) { /* ignore if in info mode */
|
if ( giState->isNewGame ) { /* ignore if in info mode */
|
||||||
|
@ -518,14 +515,14 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
0L);
|
0L);
|
||||||
giState->curServerHilite = (Connectedness)sel;
|
giState->curServerHilite = (Connectedness)sel;
|
||||||
ceAdjustVisibility( hDlg, giState, XP_FALSE );
|
ceAdjustVisibility( hDlg, giState, XP_FALSE );
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
/* If we've switched to a state where we'll be
|
||||||
case IDC_CONNBUTTON:
|
connecting */
|
||||||
XP_LOGF( "calling handleConnOptionsButton" );
|
if ( sel != SERVER_STANDALONE ) {
|
||||||
handleConnOptionsButton( hDlg, globals, giState );
|
handleConnOptionsButton( hDlg, globals, giState );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,6 @@
|
||||||
#define IDC_PREFCOLORS 1044
|
#define IDC_PREFCOLORS 1044
|
||||||
#define PHONIES_LABEL 1045
|
#define PHONIES_LABEL 1045
|
||||||
#define IDC_ROLECOMBO 1046
|
#define IDC_ROLECOMBO 1046
|
||||||
#define IDC_CONNBUTTON 1047
|
|
||||||
#define IDC_LOCALP_LABEL 1048
|
#define IDC_LOCALP_LABEL 1048
|
||||||
#define IDC_TOTAL_LABEL 1049
|
#define IDC_TOTAL_LABEL 1049
|
||||||
#define IDC_REMOTE_LABEL 1050
|
#define IDC_REMOTE_LABEL 1050
|
||||||
|
|
|
@ -197,8 +197,6 @@ BEGIN
|
||||||
LTEXT "Role:",IDC_STATIC,25,SERVERROLE_ROW,20,8
|
LTEXT "Role:",IDC_STATIC,25,SERVERROLE_ROW,20,8
|
||||||
COMBOBOX IDC_ROLECOMBO,45,SERVERROLE_ROW,50,58,CBS_DROPDOWNLIST |
|
COMBOBOX IDC_ROLECOMBO,45,SERVERROLE_ROW,50,58,CBS_DROPDOWNLIST |
|
||||||
WS_VSCROLL | WS_TABSTOP
|
WS_VSCROLL | WS_TABSTOP
|
||||||
PUSHBUTTON "Conn...",IDC_CONNBUTTON,45+50+2,SERVERROLE_ROW,
|
|
||||||
35, ROW_SPACE
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
LTEXT "local players",IDC_LOCALP_LABEL,LEFT_COL,NPLAYERS_ROW,40,8
|
LTEXT "local players",IDC_LOCALP_LABEL,LEFT_COL,NPLAYERS_ROW,40,8
|
||||||
|
|
Loading…
Reference in a new issue