Commit graph

604 commits

Author SHA1 Message Date
Andy2
2bf3cbd7e2 turn on CROSSHAIRS -- somehow lost during merge. 2010-07-16 19:18:55 -07:00
Andy2
81694f8392 Sarah's latest icons, converted from .psd using imagemagick 2010-07-16 18:18:37 -07:00
Andy2
a99e8142b0 Merge branch 'android_branch' into toolbar
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2010-07-16 06:32:32 -07:00
Andy2
73980a3c50 use delete button in XWListItem instead of context menu item for DictsActivity too. 2010-07-16 06:19:19 -07:00
Andy2
f9a561bd2a first cut at putting a delete button next to players in config list 2010-07-16 05:50:20 -07:00
eehouse@eehouse.org
ea2b6b6df9 Revert "add util_turnChanged"
This reverts commit 55d86b15d2.

zoom isn't set up on this branch to go immediately all the way out, so wait for toolbar branch
2010-07-16 05:19:52 -07:00
Eric House
55d86b15d2 add util_turnChanged 2010-07-15 18:27:00 -07:00
Andy2
f3ffbd94af remove focus-color pref; add crosshairs-color pref in same place 2010-07-14 06:21:55 -07:00
Andy2
55be90dd12 add preference controlling whether bonus "summaries" are shown on top
of bonus squares.
2010-07-13 22:39:45 -07:00
Andy2
7176c7036e add localizable "pts" to the in-tray pending score display 2010-07-13 18:57:48 -07:00
Andy2
15f2a46279 fix miniwindow getting erased as soon as drawn. Problem was that
board code invalidated crosshairs cells in timer callback after
drawing miniwindow but board_draw isn't supposed to get called until
after penup.  But java miniwindow drawing code was pushing DRAW event
to get the canvas updated.  Instead I'm just invalidating the view
which copies the canvas without calling board_draw().
2010-07-13 18:47:29 -07:00
Andy2
6cb2638a50 if tap-to-play is set, remove play-game item from context menu 2010-07-13 18:09:43 -07:00
Andy2
44907a29a6 cleanup: factor to init in loop from an array 2010-07-13 06:36:33 -07:00
Andy2
d4a23bbaca fix spacing (whitespace only) 2010-07-12 21:42:04 -07:00
Eric House
7352cd5449 fix so bonus strings are in right order 2010-07-12 21:40:40 -07:00
Andy2
e55bb462d9 include bonus square summaries in grey
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2010-07-12 21:40:23 -07:00
Andy2
c0819c5a9f up constants for beta 12 2010-07-12 19:16:11 -07:00
Andy2
2f34fc0d35 fix list item not getting updated after its game configuration is changed. 2010-07-12 18:52:11 -07:00
Andy2
de32e514ab cherry-pick three revisions from toolbar branch (d1c7d4097c, f848473c1a and 6484a2fb9b) and manually fix conflicts. 2010-07-12 18:48:03 -07:00
Andy2
19ea138f8e turn on crosshairs feature, which seems to work 2010-07-12 18:24:41 -07:00
Eric House
8d3ea709e0 add CMD_TOGGLEZOOM so zoom state doesn't have to be maintained 2010-07-11 08:05:23 -07:00
Eric House
546ddf33ae add util_turnChanged 2010-07-10 17:05:17 -07:00
Eric House
177af25617 fix so bonus strings are in right order 2010-07-10 16:54:41 -07:00
Eric House
cedc00c9a6 include bonus square summaries in grey 2010-07-10 16:17:13 -07:00
Andy2
d3548aafb2 Make backgrounds transparent. By me: the artist is not to blame. :-) 2010-07-09 23:02:19 -07:00
Andy2
d1c7d4097c remove focus-related code and declarations 2010-07-09 18:52:14 -07:00
Andy2
f848473c1a turn off KEYBOARD_NAV 2010-07-09 06:51:34 -07:00
Andy2
6b9b97231a fix to compile with KEYBOARD_NAV undefined 2010-07-09 06:49:32 -07:00
Andy2
2bbdcf46c3 make progress dialog cancellable. Still may want to abort the search
when it's cancelled.
2010-07-09 06:14:43 -07:00
Andy2
d7110824df make undo button the last; make vertical and horizontal toolbar
orderings the same.  (Really should have just one toolbar and set it's
orientation on the fly.)
2010-07-08 18:42:22 -07:00
Andy2
d68d597c49 Sarah Chu's first cut at icons. 2010-07-08 18:41:03 -07:00
Andy2
3976738990 put up indeterminate progress dialog when engine starts and at least
one blank's involved.  Still needs to be made cancellable.
2010-07-08 18:26:17 -07:00
Andy2
1c218513f1 define SHOW_PROGRESS: when blanks present search takes too long not to
show some sort of progress indicator
2010-07-08 07:04:40 -07:00
Andy2
7595b36037 add engineStopping and engineStarting (stubbed out so far) 2010-07-08 07:03:56 -07:00
Andy2
567d5f4d70 add and connect values button. It's visible when there are any tiles
at all on the board.
2010-07-08 06:39:48 -07:00
Andy2
40323b03d2 board_canFlip -> board_visTileCount 2010-07-08 06:38:51 -07:00
Andy2
f8d1ebd075 use board_canHint to set hint buttons state so buttons don't show for
remote or robot players
2010-07-07 18:48:35 -07:00
Andy2
af2d2c71b5 add board_canHint to jni 2010-07-07 18:47:22 -07:00
Andy2
a2e4fd09c4 add missing apostrophe 2010-07-07 18:27:29 -07:00
Andy2
445f6877b6 fix list item not getting updated after its game configuration is changed. 2010-07-07 18:16:55 -07:00
Andy2
b8c905204e hook up prev hint button -- and finally fix infinite loop that
happened when you clicked hint while a hint was being calculated.
2010-07-07 06:51:46 -07:00
Andy2
07940099ed add new param to board_requestHint 2010-07-07 06:49:36 -07:00
Andy2
210a3f033b disable hint buttons when hint feature's turned off 2010-07-05 09:52:19 -07:00
Andy2
93eca7b936 add layout_weight so buttons expand to fill toolbar. I really want
available space distributed as space between rather than as wider
buttons but this is an improvement.
2010-07-05 09:47:26 -07:00
Andy2
b163b45abe Merge branch 'android_branch' into toolbar
Conflicts:
	xwords4/android/XWords4/AndroidManifest.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/xml/xwprefs.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
2010-07-04 13:28:47 -07:00
Andy2
f0a5fa6034 up version numbers/strings for beta 11 2010-07-04 12:56:59 -07:00
Andy2
c2aaa04517 move colors editing prefs screen into appearance prefs screen 2010-07-04 12:53:45 -07:00
Andy2
dfe1d5f245 break separate menu handling from context-menu stuff so can call from
onclick handler, then use new preference to decide whether to launch
game or drop context menu on click
2010-07-04 12:52:36 -07:00
Andy2
6264327d63 formatting change; whitespace only 2010-07-04 12:30:09 -07:00
Andy2
ce2182e214 fix crash when copying a new game by testing for null scores array 2010-07-04 12:09:22 -07:00