Andy2
4bb61401bd
fix crash: src and dest stream params were reversed.
2011-10-10 22:24:44 -07:00
Andy2
92a2fb1a1f
attach newbie info to the lookup button
2011-10-10 18:24:06 -07:00
Andy2
cdf57d3bb7
cleanup
2011-10-10 06:53:46 -07:00
Andy2
d5ca5bbd0d
remove misplaced assert: in network games illegal words may well
...
arrive.
2011-10-10 06:48:07 -07:00
Andy2
c3ba50c905
up strings for beta 35
2011-10-07 18:59:32 -07:00
Andy2
03543c17ea
fix NPE I got once, presumably when activity shutting down.
2011-10-07 18:59:17 -07:00
Andy2
f03699f701
add newbie warning/request for languages with only google as
...
word-lookup site.
2011-10-06 19:03:07 -07:00
Andy2
f084661ec3
Never meant to check in having lookup menuitem at top level.
2011-10-06 18:47:08 -07:00
Andy2
152a9175c6
use dialog theme for lookups -- just works now, though didn't at first.
2011-10-06 18:44:59 -07:00
Andy2
a129f353f5
fix assertion by skipping states only when applicable, and running in
...
a loop so works in either direction. Cleanup -- this is done.
2011-10-06 18:44:24 -07:00
Andy2
0a474804ce
fix to work with bundling, i.e. by removing configChanges entry in
...
AndroidManifest.xml and changing orientation.
2011-10-06 18:25:17 -07:00
Andy2
d8c1e3822b
fix problems with skipping singleton words and URLs; replace window
...
title with TextView.
2011-10-06 17:47:00 -07:00
Andy2
a9b467c903
make adapter based on static array static
2011-10-06 06:31:04 -07:00
Andy2
e292056b9c
add new activity (with layout) to replace dialogs for word lookup.
...
Lots of code moved there from BoardActivity.
2011-10-06 06:26:46 -07:00
Andy2
aaf0ba34e4
add a couple of French word lookup URLs.
2011-10-05 06:55:25 -07:00
Andy2
90f11abc37
add to game state passed into java world whether it's the cur selected
...
player's turn, and use that to enable/disable Pass/Turn done button.
2011-10-05 06:36:01 -07:00
Andy2
179560867f
for symmetry, remove default menu title from res file and set in code
...
either way.
2011-10-05 06:14:48 -07:00
Andy2
c5c0fbccae
remove unused DrawFocusState params from jni interface
2011-10-04 19:03:27 -07:00
Andy2
dc20b04a4c
remove unused param (on the C/jni side)
2011-10-04 18:54:53 -07:00
Andy2
3ec97d5c07
Turn "Turn done" into "Pass" when the pending score is 0. To do that
...
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
2011-10-04 18:48:33 -07:00
Andy2
f4b8b2806e
remove unused parameter
2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea
don't crash if words stream is null, as it will be when turn's a pass.
2011-10-04 06:45:16 -07:00
Andy2
c04f981442
fix new word-list reporting to work for networked games too: create
...
and save a second stream parallel to the existing one reporting the
move scoring. Requires bump in stream version.
2011-10-04 06:44:29 -07:00
Andy2
3cf1d07df3
optimization: set up word-tracking invariants on init rather than each
...
time used
2011-10-04 06:21:02 -07:00
Andy2
5773466fb6
prevent lookup dialogs from coming up before button pressed by not
...
assigning m_words too early.
2011-10-04 06:19:06 -07:00
eehouse@eehouse.org
9152609bdd
Merge branch 'two_phase_lookup' into android_branch
2011-10-03 06:48:12 -07:00
eehouse@eehouse.org
686211843e
Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into two_phase_lookup
2011-10-03 06:47:54 -07:00
eehouse@eehouse.org
fe1bfead87
Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-10-03 06:46:24 -07:00
Andy2
072516655e
Use words list passed into informMove rather than query when user
...
presses button. Include word in button text when there's only one.
2011-10-03 06:43:20 -07:00
Andy2
35e4c21f17
add util_informMove to jni. Use it, but not to advantage yet.
2011-10-02 16:42:10 -07:00
Andy2
77b9fa11a5
improving lookup words experience: replace
...
util_userQuery(QUERY_ROBOT_MOVE) with new util_informMove(), into
which the number of words formed and the words themselves are passed.
The process of consing up the score explanation was already passing
over the model, so storing the words is very little effort, and will
save a call back into the model where the user actually wants to do
the lookup.
2011-10-02 16:21:09 -07:00
Eric House
8a5667f011
add missing language codes
2011-09-22 17:16:27 -07:00
Andy2
b7691d2997
Merge branch 'android_branch' into two_phase_lookup
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
2011-09-22 06:53:45 -07:00
Andy2
fcdbed0920
fix to work with changed C api
2011-09-22 06:49:34 -07:00
Andy2
35a0a3a291
passing pool into word-listing code a mistake as it put tiles back
...
when undoing and so the pool grew each time. Fix, and remove server
API as it's unneeded.
2011-09-22 06:41:48 -07:00
Andy2
d000c430b9
thought there was an internal problem with pool and wrote debug-only
...
code to check. There wasn't, and it's unused, but no point writing it
again.
2011-09-22 06:40:44 -07:00
Andy2
b10453bd25
cleanup
2011-09-22 06:14:22 -07:00
Andy2
e887d0a116
make word lookup two-stage, first a dialog to pick the word then
...
another to pick the URL. Hacky code takes us back to the first after
the second is dismissed while only showing either if there's a choice
to be made. Also add menu item to lookup all words in the game --
useful for testing when robot refuses to play multiple words but maybe
also worth shipping.
2011-09-21 19:04:33 -07:00
Andy2
c44a884184
try another item layout -- need to fix the background instead.
2011-09-21 05:47:12 -07:00
Andy2
617de4eb7e
make lookup dialog two-part, with list of lang-supporting URLs at top
...
and words at bottom. You choose a URL/site, then tap a word, and
repeat until you're done.
2011-09-20 19:01:37 -07:00
Andy2
11d44ba72a
use glib mainloop by default
2011-09-20 06:14:11 -07:00
Andy2
7e0252713c
changes to use glib main loop were incomplete, didn't include timers.
...
Fix that. Now discon_ok2.sh test works with the USE_GLIBLOOP turned
on.
2011-09-19 18:28:19 -07:00
Andy2
c2e2bdf3c5
listen on stdin always -- not sure how the condition got added -- and
...
don't register for OUTbound events when listening -- stdin gets one
and I don't want to sign up to handle it.
2011-09-19 17:56:20 -07:00
Andy2
97334faa95
switch to lookup url that can include language, and include it when
...
French or German in use. Disable button if I don't know how to look a
word up. Later will want to have multiple URLs available, falling
back to googling for the word if I don't know about an online
dictionary.
2011-09-19 07:53:29 -07:00
Andy2
d7a04f87e6
add custom view for wordlist dialog so it doesn't get dismissed the
...
first time you pick a word -- now all can be looked up if desired.
2011-09-19 06:45:15 -07:00
Andy2
ea3e015a8f
use server_listWordsPlayed to implement lookup button: get list from
...
jni, and when it calls back with it launch the browser directly if
there's only one, otherwise put up a choice list. Currently the list
dismisses after launching the browser once: need to fix that, probably
with a custom View. And need to deal with non-English games, and
maybe add other choices for lookup than dictionary.com.
2011-09-18 19:10:12 -07:00
Andy2
dced47e202
export server_listWordsPlayed via jni.
2011-09-18 19:06:23 -07:00
Andy2
43e8bd7879
formatting only
2011-09-18 19:05:29 -07:00
Andy2
26ce5a119a
in model_getWordsPlayed, make '\n' a separator rather than a
...
terminator. Makes it easier to split in the Java world without
getting an extra empty word.
2011-09-18 19:05:00 -07:00
Andy2
9eacdb3856
add server_listWordsPlayed, and implement via function in model.c that
...
uses existing stack and undo features to run a WordNotifierInfo over
some number of scoring passes to gather the words seen. Seems to work
as tested from gtk version. Now need to try from android....
2011-09-18 17:20:01 -07:00
