Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4911 commits 20 branches 240 tags 30 MiB
Commit graph

4911 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Andy2
63893b8a0d add stream_getPtr() and use to remove a couple of allocs, including 
one per message sent.
 2011-09-18 16:54:36 -07:00
Andy2
b579bb0bca first step in implementing lookup of words: add button and browser 
launch to single website for hard-coded word.
 2011-09-16 06:44:25 -07:00
Andy2
131bb561bc cache reference to prefs 2011-09-15 18:59:39 -07:00
Andy2
6bd72a54bf rename php scripts so their URLs are a bit more helpful when the user 
has to see them, as happens when invitation is send via SMS.
 2011-09-15 18:52:15 -07:00
Eric House
35b2ae0f42 remove dead strings. Move app-name to common_rsrc.xml since it's not 
translated.
 2011-09-15 18:08:00 -07:00
Eric House
df82578d5a add a ton of comments -- I think I'm done. No changes to any string here. 2011-09-15 18:07:07 -07:00
Eric House
a676b5beb0 comment out dead code referencing strings 2011-09-15 18:06:12 -07:00
Eric House
ced5da45a5 remove unused string ref 2011-09-15 18:05:45 -07:00
Andy2
8cb49ad8a3 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 
Conflicts:
	xwords4/android/scripts/strings_check.sh
 2011-09-14 06:51:10 -07:00
Andy2
25f7c72994 add some comments and rearrange 2011-09-14 06:46:52 -07:00
eehouse@eehouse.org
11cedd1373 Merge branch 'french_xlation' into android_branch 2011-09-14 06:40:03 -07:00
Andy2
d69bbfed97 copy over from french_xlation branch 2011-09-14 06:39:23 -07:00
Andy2
05deb115f4 remove tab; fix dict->wordlist change missed earlier 2011-09-14 06:36:05 -07:00
Andy2
2436ea1211 Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-09-14 06:23:14 -07:00
Andy2
c3f9fc6f7b remove unused strings 2011-09-14 06:13:32 -07:00
Andy2
2ee4ec12d5 toward merge with french_xlation: remove unused and move debugging 
strings.
 2011-09-14 05:50:55 -07:00
Andy2
5eb6ba2637 remove echoing 2011-09-14 05:45:32 -07:00
Andy2
1167ebe15e script for printing file per branch or revision -- like svn cat 2011-09-14 05:37:48 -07:00
Andy2
45bf34fdc1 just copy it over from french_xlation branch -- screw history 2011-09-13 19:01:16 -07:00
Andy2
b6cfdbbb37 print strings as single lines for easy comparison 
Conflicts:

	xwords4/android/scripts/strings_check.sh
 2011-09-13 18:59:14 -07:00
eehouse@eehouse.org
777c409599 Merge branch 'android_branch' into french_xlation 2011-09-13 18:55:40 -07:00
Andy2
7edf615b40 add comment noting that this release breaks old games configure not to 
use English.  (Specifically, they've been played in English until now
and played letters will be reinterpreted in the right language for the
first time.)
 2011-09-13 18:33:30 -07:00
Eric House
9d7ab36433 remove unused strings 2011-09-13 18:18:28 -07:00
Eric House
75aaec676c print strings as single lines for easy comparison 2011-09-13 18:18:13 -07:00
Eric House
b0e6f24bda fix comment syntax 2011-09-12 22:14:35 -07:00
Eric House
0bd9500033 add options to be used comparing across branches 2011-09-12 22:09:11 -07:00
Andy2
4c2d21f6bc Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-09-12 20:09:56 -07:00
Andy2
9f6391ba34 cache the most recently loaded game's byte[] data. Saves about 2/3 of 
the reads from the DB.
 2011-09-12 19:52:18 -07:00
Andy2
99498a8568 use static HashMap to track what language views are open and closed. 
As long as I'm not reloaded user choice will be preserved.  Good
enough.
 2011-09-12 19:00:13 -07:00
Andy2
72d769910b expand children after a delete (to be consistent, though it'd be 
better to rememeber state)
 2011-09-12 18:37:04 -07:00