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

add messageToBuf (debug-only ); change newgame's J button to R (for

Browse source 
"rearrange"); tweak locations of various dialog widgets for better
layout.
This commit is contained in:
ehouse 2006-07-02 00:42:41 +00:00
parent f8aea3b953
commit 501e1f7a5f
3 changed files with 53 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
xwords4/wince/cemain.c
View file

@ -2285,6 +2285,46 @@ wince_debugf(XP_UCHAR* format, ...)
} }
#endif #endif
} /* wince_debugf */ } /* wince_debugf */
void
messageToBuf( UINT message, char* buf, int bufSize )
{
char* str = NULL;
#define STRCASE(s) case s : str = #s; break
switch( message ) {
STRCASE(WM_TIMER);
STRCASE(WM_SETCURSOR);
STRCASE(WM_NCHITTEST);
STRCASE(WM_MOUSEMOVE);
STRCASE(WM_SYSKEYDOWN);
STRCASE(WM_SYSKEYUP);
STRCASE(WM_SYSCHAR);
STRCASE(WM_SYSCOMMAND);
STRCASE(WM_ENTERMENULOOP);
STRCASE(WM_INITMENU);
STRCASE(WM_MENUSELECT);
STRCASE(WM_COMMAND);
STRCASE(WM_SETTEXT);
STRCASE(WM_QUERYNEWPALETTE);
STRCASE(WM_NCACTIVATE);
STRCASE(WM_ACTIVATE);
STRCASE(WM_SHOWWINDOW);
STRCASE(WM_CTLCOLOREDIT);
STRCASE(WM_MOUSEACTIVATE);
STRCASE(WM_CTLCOLORBTN);
STRCASE(WM_PASTE);
STRCASE(WM_WINDOWPOSCHANGING);
STRCASE(WM_SETFOCUS);
STRCASE(WM_WINDOWPOSCHANGED);
default:
snprintf( buf, bufSize, "%d", message );
return;
}
#undef STRCASE
if ( !!str ) {
snprintf( buf, bufSize, "%s", str );
}
}
#endif #endif
XP_U16 XP_U16
@ -2712,10 +2752,10 @@ ce_util_getUserString( XW_UtilCtxt* uc, XP_U16 stringCode )
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
case STR_LOCALPLAYERS: case STR_LOCALPLAYERS:
return (XP_UCHAR*)"Local playrs"; return (XP_UCHAR*)"Locl playrs:";
#endif #endif
case STR_TOTALPLAYERS: case STR_TOTALPLAYERS:
return (XP_UCHAR*)"Player count"; return (XP_UCHAR*)"Player count:";
case STRS_VALUES_HEADER: case STRS_VALUES_HEADER:
return (XP_UCHAR*)"%s counts/values:" XP_CR; return (XP_UCHAR*)"%s counts/values:" XP_CR;

1
xwords4/wince/cemain.h
View file

@ -157,6 +157,7 @@ void ce_drawctxt_update( DrawCtx* dctx, CEAppGlobals* globals );
#ifdef DEBUG #ifdef DEBUG
void logLastError( const char* comment ); void logLastError( const char* comment );
void messageToBuf( UINT message, char* buf, int bufSize );
#else #else
# define logLastError(c) # define logLastError(c)
#endif #endif

19
xwords4/wince/xwords4.rc
View file

@ -188,12 +188,12 @@ END
#endif #endif
#define LABELS_ROW (NPLAYERS_ROW+ROW_SPACE) #define LABELS_ROW (NPLAYERS_ROW+ROW_SPACE+3)
#define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE) #define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE_PL)
#define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL) #define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL)
#define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL) #define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL)
#define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL) #define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL)
#define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE) #define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE+2)
#define BUTTONS_ROW (DICTPICK_ROW+ROW_SPACE+3) #define BUTTONS_ROW (DICTPICK_ROW+ROW_SPACE+3)
#define BUTTON_HT 12 #define BUTTON_HT 12
#define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4) #define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4)
@ -211,13 +211,14 @@ BEGIN
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
#endif #endif
LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,40,8 LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,43,8
COMBOBOX IDC_NPLAYERSCOMBO,45,NPLAYERS_ROW,18,58,CBS_DROPDOWNLIST | COMBOBOX IDC_NPLAYERSCOMBO,46,NPLAYERS_ROW,17,58,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "J",GIJUGGLE_BUTTON,65,NPLAYERS_ROW,12,12 // "R" for rearrange. Go to J if no change becomes possible.
PUSHBUTTON "R",GIJUGGLE_BUTTON,65,NPLAYERS_ROW,12,12
PUSHBUTTON "Preferences...",OPTIONS_BUTTON,79,NPLAYERS_ROW,51,12 PUSHBUTTON "Preferences...",OPTIONS_BUTTON,80,NPLAYERS_ROW,50,12
LTEXT "Name",IDC_STATIC,GAME_NAMELABEL_LEFT, LTEXT "Name",IDC_STATIC,GAME_NAMELABEL_LEFT,
LABELS_ROW,19,8,SS_NOPREFIX LABELS_ROW,19,8,SS_NOPREFIX
LTEXT "Robot",IDC_STATIC,GAME_ROBOTLABEL_LEFT,LABELS_ROW,20,8 LTEXT "Robot",IDC_STATIC,GAME_ROBOTLABEL_LEFT,LABELS_ROW,20,8
@ -372,10 +373,10 @@ BEGIN
CONTROL "Smart robot",IDC_CHECKSMARTROBOT,"Button", CONTROL "Smart robot",IDC_CHECKSMARTROBOT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,10 BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,10
CONTROL "Disallow hints",IDC_CHECKNOHINTS,"Button", CONTROL "Disallow hints",IDC_CHECKNOHINTS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,8,35,54,10 BS_AUTOCHECKBOX | WS_TABSTOP,8,35,60,10
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
CONTROL "Hint limits",IDC_CHECKHINTSLIMITS,"Button", CONTROL "Hint limits",IDC_CHECKHINTSLIMITS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,64,35,50,10 BS_AUTOCHECKBOX | WS_TABSTOP,69,35,50,10
#endif #endif
CONTROL "Timer on (minutes)",TIMER_CHECK,"Button", CONTROL "Timer on (minutes)",TIMER_CHECK,"Button",