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

Allow deletion of picked tiles during face-up picking; add string for

Browse source 
attempt to undo tile assignment.
This commit is contained in:
ehouse 2004-05-14 08:59:10 +00:00
parent b07b947c44
commit e1d3b222a4
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/palm/palmmain.c
View file

@ -2956,9 +2956,9 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi,
FrmSetActiveForm( form ); FrmSetActiveForm( form );
#ifdef FEATURE_TRAY_EDIT #ifdef FEATURE_TRAY_EDIT
if ( forBlank ) { disOrEnable( form, XW_BLANK_PICK_BUTTON_ID, !forBlank );
disOrEnable( form, XW_BLANK_PICK_BUTTON_ID, XP_FALSE ); disOrEnable( form, XW_BLANK_BACKUP_BUTTON_ID,
} !forBlank && pi->nCurTiles > 0 );
#endif #endif
lettersList = getActiveObjectPtr( XW_BLANK_LIST_ID ); lettersList = getActiveObjectPtr( XW_BLANK_LIST_ID );
@ -2982,7 +2982,7 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi,
lenSoFar = XP_STRLEN(labelBuf); lenSoFar = XP_STRLEN(labelBuf);
lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar, lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar,
sizeof(labelBuf) - lenSoFar, sizeof(labelBuf) - lenSoFar,
" (%d/%d)\nCur", pi->thisPick, pi->nTotal ); " (%d/%d)\nCur", pi->thisPick+1, pi->nTotal );
for ( i = 0; i < pi->nCurTiles; ++i ) { for ( i = 0; i < pi->nCurTiles; ++i ) {
lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar, lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar,
@ -3004,7 +3004,9 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, PickInfo* pi,
if ( 0 ) { if ( 0 ) {
#ifdef FEATURE_TRAY_EDIT #ifdef FEATURE_TRAY_EDIT
} else if ( tapped == XW_BLANK_PICK_BUTTON_ID ) { } else if ( tapped == XW_BLANK_PICK_BUTTON_ID ) {
chosen = -1; chosen = PICKER_PICKALL;
} else if ( tapped == XW_BLANK_BACKUP_BUTTON_ID ) {
chosen = PICKER_BACKUP;
#endif #endif
} else { } else {
chosen = LstGetSelection( lettersList ); chosen = LstGetSelection( lettersList );
@ -3074,6 +3076,11 @@ palm_util_userError( XW_UtilCtxt* uc, UtilErrID id )
case ERR_TOO_FEW_TILES_LEFT_TO_TRADE: case ERR_TOO_FEW_TILES_LEFT_TO_TRADE:
strID = STR_TOO_FEW_TILES; strID = STR_TOO_FEW_TILES;
break; break;
case ERR_CANT_UNDO_TILEASSIGN:
strID = STR_CANT_UNDO_TILEASSIGN;
break;
default: default:
XP_DEBUGF( "errcode=%d", id ); XP_DEBUGF( "errcode=%d", id );
break; break;