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

name changes; add button

Browse source
This commit is contained in:
ehouse 2004-04-14 04:02:19 +00:00
parent 801526056d
commit c53a37ea8e
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
xwords4/wince/ceprefs.c
View file

@ -19,6 +19,7 @@
#include "ceprefs.h" #include "ceprefs.h"
#include "cemain.h" #include "cemain.h"
#include "ceclrsel.h"
#include "ceutil.h" #include "ceutil.h"
/* Stuff the strings for phonies. Why can't I put this in the resource? /* Stuff the strings for phonies. Why can't I put this in the resource?
@ -59,10 +60,11 @@ setTimerCtls( HWND hDlg, XP_Bool checked )
} /* setTimerCtls */ } /* setTimerCtls */
static void static void
adjustForChoice( HWND hDlg, PrefsDlgState* state ) adjustForChoice( HWND hDlg, CePrefsDlgState* state )
{ {
XP_U16 goesWithGlobal[] = {IDC_CHECKCOLORPLAYED, IDC_LEFTYCHECK, XP_U16 goesWithGlobal[] = {IDC_CHECKCOLORPLAYED, IDC_LEFTYCHECK,
IDC_CHECKSHOWCURSOR, IDC_CHECKROBOTSCORES}; IDC_CHECKSHOWCURSOR, IDC_CHECKROBOTSCORES,
IDC_PREFCOLORS };
XP_U16 goesWithLocal[] = {IDC_CHECKSMARTROBOT,IDC_CHECKNOHINTS, XP_U16 goesWithLocal[] = {IDC_CHECKSMARTROBOT,IDC_CHECKNOHINTS,
TIMER_CHECK, TIMER_EDIT, PHONIES_LABEL, TIMER_CHECK, TIMER_EDIT, PHONIES_LABEL,
PHONIES_COMBO, IDC_PICKTILES }; PHONIES_COMBO, IDC_PICKTILES };
@ -94,7 +96,7 @@ adjustForChoice( HWND hDlg, PrefsDlgState* state )
*/ */
void void
loadStateFromCurPrefs( const CEAppPrefs* appPrefs, const CurGameInfo* gi, loadStateFromCurPrefs( const CEAppPrefs* appPrefs, const CurGameInfo* gi,
PrefsPrefs* prefsPrefs ) CePrefsPrefs* prefsPrefs )
{ {
prefsPrefs->gp.hintsNotAllowed = gi->hintsNotAllowed; prefsPrefs->gp.hintsNotAllowed = gi->hintsNotAllowed;
prefsPrefs->gp.robotSmartness = gi->robotSmartness; prefsPrefs->gp.robotSmartness = gi->robotSmartness;
@ -107,11 +109,15 @@ loadStateFromCurPrefs( const CEAppPrefs* appPrefs, const CurGameInfo* gi,
prefsPrefs->showColors = appPrefs->showColors; prefsPrefs->showColors = appPrefs->showColors;
XP_MEMCPY( &prefsPrefs->cp, &appPrefs->cp, sizeof(prefsPrefs->cp) ); XP_MEMCPY( &prefsPrefs->cp, &appPrefs->cp, sizeof(prefsPrefs->cp) );
#ifdef XWFEATURE_CE_EDITCOLORS
XP_MEMCPY( &prefsPrefs->colors, &appPrefs->colors,
sizeof(prefsPrefs->colors) );
#endif
} /* loadStateFromCurPrefs */ } /* loadStateFromCurPrefs */
void void
loadCurPrefsFromState( CEAppPrefs* appPrefs, CurGameInfo* gi, loadCurPrefsFromState( CEAppPrefs* appPrefs, CurGameInfo* gi,
const PrefsPrefs* prefsPrefs ) const CePrefsPrefs* prefsPrefs )
{ {
gi->hintsNotAllowed = prefsPrefs->gp.hintsNotAllowed; gi->hintsNotAllowed = prefsPrefs->gp.hintsNotAllowed;
gi->robotSmartness = prefsPrefs->gp.robotSmartness; gi->robotSmartness = prefsPrefs->gp.robotSmartness;
@ -124,14 +130,18 @@ loadCurPrefsFromState( CEAppPrefs* appPrefs, CurGameInfo* gi,
appPrefs->showColors = prefsPrefs->showColors; appPrefs->showColors = prefsPrefs->showColors;
XP_MEMCPY( &appPrefs->cp, &prefsPrefs->cp, sizeof(appPrefs->cp) ); XP_MEMCPY( &appPrefs->cp, &prefsPrefs->cp, sizeof(appPrefs->cp) );
#ifdef XWFEATURE_CE_EDITCOLORS
XP_MEMCPY( &appPrefs->colors, &prefsPrefs->colors,
sizeof(prefsPrefs->colors) );
#endif
} /* loadCurPrefsFromState */ } /* loadCurPrefsFromState */
/* Reflect local state into the controls user will see. /* Reflect local state into the controls user will see.
*/ */
static void static void
loadControlsFromState( HWND hDlg, PrefsDlgState* pState ) loadControlsFromState( HWND hDlg, CePrefsDlgState* pState )
{ {
PrefsPrefs* prefsPrefs = &pState->prefsPrefs; CePrefsPrefs* prefsPrefs = &pState->prefsPrefs;
XP_UCHAR numBuf[10]; XP_UCHAR numBuf[10];
ceSetChecked( hDlg, IDC_CHECKCOLORPLAYED, prefsPrefs->showColors ); ceSetChecked( hDlg, IDC_CHECKCOLORPLAYED, prefsPrefs->showColors );
@ -165,7 +175,7 @@ loadControlsFromState( HWND hDlg, PrefsDlgState* pState )
* the values. * the values.
*/ */
static void static void
ceControlsToPrefs( HWND hDlg, PrefsPrefs* prefsPrefs ) ceControlsToPrefs( HWND hDlg, CePrefsPrefs* prefsPrefs )
{ {
XP_S16 selIndex; XP_S16 selIndex;
@ -204,11 +214,11 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
CEAppGlobals* globals; CEAppGlobals* globals;
XP_U16 id; XP_U16 id;
PrefsDlgState* pState; CePrefsDlgState* pState;
if ( message == WM_INITDIALOG ) { if ( message == WM_INITDIALOG ) {
SetWindowLong( hDlg, GWL_USERDATA, lParam ); SetWindowLong( hDlg, GWL_USERDATA, lParam );
pState = (PrefsDlgState*)lParam; pState = (CePrefsDlgState*)lParam;
globals = pState->globals; globals = pState->globals;
stuffPhoniesList( hDlg ); stuffPhoniesList( hDlg );
@ -220,7 +230,7 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
} else { } else {
XP_Bool timerOn; XP_Bool timerOn;
pState = (PrefsDlgState*)GetWindowLong( hDlg, GWL_USERDATA ); pState = (CePrefsDlgState*)GetWindowLong( hDlg, GWL_USERDATA );
globals = pState->globals; globals = pState->globals;
switch (message) { switch (message) {
@ -239,7 +249,13 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
0, 0 ); 0, 0 );
setTimerCtls( hDlg, timerOn ); setTimerCtls( hDlg, timerOn );
break; break;
#ifdef XWFEATURE_CE_EDITCOLORS
case IDC_PREFCOLORS:
pState->colorsChanged =
ceDoColorsEdit( hDlg, pState->globals,
pState->prefsPrefs.colors );
break;
#endif
case IDOK: case IDOK:
ceControlsToPrefs( hDlg, &pState->prefsPrefs ); ceControlsToPrefs( hDlg, &pState->prefsPrefs );
case IDCANCEL: case IDCANCEL:
@ -248,7 +264,6 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
return TRUE; return TRUE;
} }
} }
} }
return FALSE; return FALSE;
@ -258,8 +273,8 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
state, put up the dialog and return whether it was cancelled. state, put up the dialog and return whether it was cancelled.
*/ */
XP_Bool XP_Bool
WrapPrefsDialog( HWND hDlg, CEAppGlobals* globals, PrefsDlgState* state, WrapPrefsDialog( HWND hDlg, CEAppGlobals* globals, CePrefsDlgState* state,
PrefsPrefs* prefsPrefs, XP_Bool isNewGame ) CePrefsPrefs* prefsPrefs, XP_Bool isNewGame )
{ {
XP_Bool result; XP_Bool result;
XP_MEMSET( state, 0, sizeof(*state) ); XP_MEMSET( state, 0, sizeof(*state) );