turn ntiles dialog into hint config dialog (experimental)

This commit is contained in:
ehouse 2003-12-01 14:34:09 +00:00
parent 56821f9f2a
commit 7854b936af
4 changed files with 34 additions and 22 deletions

View file

@ -46,7 +46,6 @@ BITMAP ID RIGHT_ARROW_RESID "bmps/rightarrow.pbitm" AUTOCOMPRESS
BITMAP ID FLIP_BUTTON_BMP_RES_ID "bmps/flipbutton.pbitm" AUTOCOMPRESS
BITMAP ID VALUE_BUTTON_BMP_RES_ID "bmps/valuebutton.pbitm" AUTOCOMPRESS
BITMAP ID HINT_BUTTON_BMP_RES_ID "bmps/lightbulb.pbitm" AUTOCOMPRESS
BITMAP ID NHINT_BUTTON_BMP_RES_ID "bmps/nhint.pbitm" AUTOCOMPRESS
BITMAP ID TRAY_BUTTONS_BMP_RES_ID "bmps/traybuttons.pbitm" AUTOCOMPRESS
BITMAP ID SHOWTRAY_BUTTON_BMP_RES_ID "bmps/showtray.pbitm" AUTOCOMPRESS
BITMAP ID STAR_BMP_RES_ID "bmps/startmark.pbitm" AUTOCOMPRESS

View file

@ -54,6 +54,7 @@ BEGIN
BEGIN
MENUITEM "Hint" XW_HINT_PULLDOWN_ID "I"
MENUITEM "Next hint" XW_NEXTHINT_PULLDOWN_ID "M"
MENUITEM "Configure hint..." XW_HINTCONFIG_PULLDOWN_ID "C"
MENUITEM SEPARATOR
MENUITEM "Undo cur. move" XW_UNDOCUR_PULLDOWN_ID "U"
MENUITEM "Undo last move" XW_UNDOLAST_PULLDOWN_ID "Z"
@ -124,9 +125,6 @@ BEGIN
BUTTON "" XW_MAIN_HINT_BUTTON_ID
AT (PALM_FLIP_LEFT PREVBOTTOM+2 FLIP_BUTTON_WIDTH
FLIP_BUTTON_HEIGHT+3) NOFRAME
BUTTON "" XW_MAIN_NHINT_BUTTON_ID
AT (PALM_FLIP_LEFT PREVBOTTOM+2 FLIP_BUTTON_WIDTH
FLIP_BUTTON_HEIGHT+3) NOFRAME
SCROLLBAR ID XW_MAIN_SCROLLBAR_ID
AT ( PREVLEFT PREVBOTTOM+5 RECOMMENDED_SBAR_WIDTH
@ -454,16 +452,26 @@ BEGIN
#endif
END
FORM ID XW_ASKNTILES_FORM_ID AT ( 2 60 156 97 ) USABLE MODAL SAVEBEHIND
#define NTILES_TOP 17
#define NTILES_BUTTON_TOP 60
FORM ID XW_HINTCONFIG_FORM_ID AT ( 2 75 156 82 ) USABLE MODAL SAVEBEHIND
BEGIN
TITLE "Number of tiles"
TITLE "Hint parameters"
LABEL "Use how many tiles" AUTOID 10 18 FONT 1 USABLE
LABEL "for this hint?" AUTOID 10 PREVBOTTOM FONT 1 USABLE
LIST "1" "2" "3" "4" "5" "6" "7" ID XW_ASKNTILES_LIST_ID
AT ( 156-20 16 AUTO AUTO) USABLE VISIBLEITEMS 7
LABEL "At least this many tiles:" AUTOID 10 NTILES_TOP FONT 1 USABLE
SELECTORTRIGGER "" XW_HINTCONFIG_MINSELECTOR_ID \
AT (PREVRIGHT+3 NTILES_TOP AUTO AUTO) USABLE LEFTANCHOR
LIST "1" "2" "3" "4" "5" "6" "7" ID XW_HINTCONFIG_MINLIST_ID
AT (PREVRIGHT PREVTOP AUTO AUTO) VISIBLEITEMS 7 NONUSABLE
BUTTON "Ok" AUTOID RIGHT@PREVLEFT-10 PREVBOTTOM-12 AUTO 12
LABEL "No more than this many:" AUTOID 10 PREVTOP+15 FONT 1 USABLE
SELECTORTRIGGER "" XW_HINTCONFIG_MAXSELECTOR_ID \
AT (PREVRIGHT+3 PREVTOP AUTO AUTO) USABLE LEFTANCHOR
LIST "1" "2" "3" "4" "5" "6" "7" ID XW_HINTCONFIG_MAXLIST_ID
AT (PREVRIGHT PREVTOP AUTO AUTO) VISIBLEITEMS 7 NONUSABLE
BUTTON "Ok" XW_HINTCONFIG_OK_ID RIGHT@156-10 NTILES_BUTTON_TOP AUTO 12
BUTTON "Cancel" XW_HINTCONFIG_CANCEL_ID RIGHT@PREVLEFT-10 PREVTOP AUTO 12
END

View file

@ -114,7 +114,8 @@ typedef struct XWords4PreferenceType {
/* New for 0x0405 */
CommonPrefs cp;
/* New for 0x0406 */
XP_U8 lastNTiles;
XP_U8 lastNTilesMin;
XP_U8 lastNTilesMax;
} XWords4PreferenceType;

View file

@ -51,7 +51,7 @@
#define XW_COLORPREF_DIALOG_ID 1007
#define XW_PREFS_FORM 1008
#define XW_SAVEDGAMES_DIALOG_ID 1009
#define XW_ASKNTILES_FORM_ID 1010
#define XW_HINTCONFIG_FORM_ID 1010
#define XW_CONNS_FORM 1011
#ifdef FOR_GREMLINS
# define XW_GREMLIN_WARN_FORM_ID 1012
@ -73,7 +73,6 @@
#define XW_MAIN_HIDE_BUTTON_ID 1023
#endif
#define XW_MAIN_HINT_BUTTON_ID 1024
#define XW_MAIN_NHINT_BUTTON_ID 1025
#define XW_MAIN_SHOWTRAY_BUTTON_ID 1026
//#define XW_MAIN_OK_BUTTON_ID 1026
@ -102,12 +101,13 @@
/* Move menu */
#define XW_HINT_PULLDOWN_ID 1061
#define XW_NEXTHINT_PULLDOWN_ID 1062
#define XW_UNDOCUR_PULLDOWN_ID 1063
#define XW_UNDOLAST_PULLDOWN_ID 1064
#define XW_DONE_PULLDOWN_ID 1065
#define XW_JUGGLE_PULLDOWN_ID 1066
#define XW_TRADEIN_PULLDOWN_ID 1067
#define XW_HIDETRAY_PULLDOWN_ID 1068
#define XW_HINTCONFIG_PULLDOWN_ID 1063
#define XW_UNDOCUR_PULLDOWN_ID 1064
#define XW_UNDOLAST_PULLDOWN_ID 1065
#define XW_DONE_PULLDOWN_ID 1066
#define XW_JUGGLE_PULLDOWN_ID 1067
#define XW_TRADEIN_PULLDOWN_ID 1068
#define XW_HIDETRAY_PULLDOWN_ID 1069
/* debug menu */
#ifdef DEBUG
@ -306,7 +306,12 @@
/*
* selector for number of tiles during hint
*/
#define XW_ASKNTILES_LIST_ID 2950
#define XW_HINTCONFIG_MINLIST_ID 2950
#define XW_HINTCONFIG_MAXLIST_ID 2951
#define XW_HINTCONFIG_MAXSELECTOR_ID 2952
#define XW_HINTCONFIG_MINSELECTOR_ID 2953
#define XW_HINTCONFIG_OK_ID 2954
#define XW_HINTCONFIG_CANCEL_ID 2955
#define PALM_BOARD_TOP 8
#define PALM_GRIDLESS_BOARD_TOP 2
@ -346,7 +351,6 @@
#define FLIP_BUTTON_BMP_RES_ID 1003
#define VALUE_BUTTON_BMP_RES_ID 1004
#define HINT_BUTTON_BMP_RES_ID 1005
#define NHINT_BUTTON_BMP_RES_ID 1006
#define TRAY_BUTTONS_BMP_RES_ID 1007
#define SHOWTRAY_BUTTON_BMP_RES_ID 1008
#define STAR_BMP_RES_ID 1009