Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5350 commits 21 branches 243 tags 33 MiB
Commit graph

1774 commits

Author SHA1 Message Date
Andy2
fa39db7fc6 comment out file not being used now 2011-12-12 19:01:04 -08:00
Andy2
f07e1c5ea1 use same email address for both ways you can send to me, and rfc822 
instead of text type to prevent giving handler options that aren't
email clients.
 2011-12-12 19:00:30 -08:00
Andy2
88986b49d5 include visible URLs in parens since something about mailing seems to be 
breaking them inside <a> tags so there's something for a user to tap.
 2011-12-12 07:08:56 -08:00
eehouse@eehouse.org
9e979a9e7f Merge branch 'android_branch' into send_in_background 2011-12-08 20:59:24 -08:00
Eric House
7c9519f80f remove translations of translations of strings no longer there 2011-12-08 18:13:20 -08:00
Eric House
78672c01a3 there's room to spell out length 2011-12-08 18:12:10 -08:00
eehouse@eehouse.org
20fa54ba59 Merge branch 'android_branch' into send_in_background 2011-12-07 19:06:26 -08:00
Andy2
46efe15f4e up version and change notes for new release 2011-12-07 19:06:03 -08:00
Andy2
2992c33396 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
(conflicts were for formatting changes only)
 2011-12-07 18:46:59 -08:00
Andy2
2d7ac8e7b0 use SystemClock.elapsedRealtime() rather than 0 as initial fire time 
when setting background update timer.
 2011-12-07 18:33:26 -08:00
Andy2
c12f64cc03 save pendingMsgLevel flag as part of summary. This fixes reset games 
being displayed with the sync icon if they had it before the reset.
I'm not sure if not saving was an omission or if I've forgotten the
reason.  There *is* separate API for clearing the flags stored in that
variable but it requires a second DB write.
 2011-12-07 18:24:22 -08:00
Andy2
7b985fcbae fix formatting -- no code change 2011-12-07 06:16:11 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-06 19:56:10 -08:00
Andy2
ded7ffc6fe Attempting to fix occasional stalls of background proxy checker. It 
could be caused by the timer not running after an install, so always
launch it when the app is launched.  (There's no notification
available on [re]install.)  So that the check doesn't happen
immediately, which would be silly, make the initial wait same as
interval when not called in response to check-relay menu.
 2011-12-06 19:52:01 -08:00
Andy2
20446bcf32 for style points, don't return from middle of function. No behavior 
change.
 2011-12-06 19:49:41 -08:00
Andy2
5d01de4c0c found a better send email menu icon 2011-12-06 19:24:22 -08:00
Andy2
5d09c7bbed add git describe for version to email body 2011-12-06 19:19:50 -08:00
Andy2
7884246d7a add menu to main screen for sending me email. TODO: find a darker 
menu icon; add git revision to outgoing text.
 2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60 use title rather than a field in custom view for title of lookup 
dialog.
 2011-12-06 18:25:55 -08:00
Andy2
7c76af30b2 remove excessing logging 2011-12-06 18:21:48 -08:00
Andy2
ebca62b25e don't specify text file for view used in Dialog -- device will set it. 
Prevents invisible text on HTC MyTouch.
 2011-12-06 18:21:33 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
Andy2
daa64a19a4 need to generate local.properties now that it's not checked in 2011-12-04 19:32:06 -08:00
Andy2
2918e8f059 need to generate local.properties now that it's not checked in 2011-12-02 21:35:12 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I 
want to play with drawing cells tray-tile-style when they're big
enough.
 2011-12-02 18:58:52 -08:00
Andy2
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -08:00
Andy2
08063d9444 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-01 21:18:37 -08:00
Andy2
4c320a52e7 allow scrolling to go a bit deeper 2011-12-01 21:10:04 -08:00
Eric House
7da7dbc731 shoulda tried compiling before committing a large merge.... 2011-12-01 19:54:56 -08:00
Eric House
9d42e3f4d0 move logf and showf into their own DbgUtils class 2011-12-01 19:51:02 -08:00
Eric House
47884b8387 ignore new tools-generated file 2011-12-01 19:50:22 -08:00
Andy2
577c2c8538 move MultiHandler implementation inside BoardView. 2011-12-01 19:44:22 -08:00
Andy2
15503522f2 implement pinch-to-zoom on board -- and do it in such a way that class 
loader doesn't barf on older versions of the OS that don't provide the
necessary APIs.  Tested only on original Motorola Droid so far (and
emulator running 1.6, which is too old.)
 2011-12-01 18:56:44 -08:00
Andy2
b242d70029 up target SDK to pull in multitouch APIs 2011-12-01 05:40:50 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/relay/rq.c
 2011-11-29 06:45:32 -08:00
Andy2
1575279cd8 replace restore menus in prefs activity with buttons at bottom of 
screen.  The trick involves getting the OS to insert the prefs xml
layout as a ListView, and seems like a hack, but it works so far.
Ought to be tested on several OS versions before next release.
 2011-11-22 19:00:03 -08:00
Andy2
cd23022cde Get rid of int m_msgID, storing all dialog messages as String m_msg. 
The code was getting confused and sometimes set one then tried to
display the other.
 2011-11-22 18:28:57 -08:00
Andy2
cdef8f42f6 add comment about NPEs received when device networking foobared. No 
code change.
 2011-11-22 18:12:21 -08:00
eehouse@eehouse.org
b2a0057d7b Merge branch 'android_branch' into send_in_background 2011-11-21 22:23:25 -08:00
Andy2
91eeee0f72 new file that build.xml comments say should be checked in. 2011-11-21 22:21:28 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/linuxutl.h
 2011-11-21 22:18:52 -08:00
Andy2
a8859599dd update emacs compile-command for new SDK. No code change. 2011-11-21 22:16:33 -08:00
Andy2
795b86e569 when asked to browse empty dict, put up explanatory dialog then exit 
activity.  Required new DlgDelegate method to send event after posting
alert.  Note that eventually when the dict browser shows tile info as
well as words this will change.
 2011-11-21 18:08:51 -08:00
Andy2
e1e9a68d8f fix ptr out-of-bounds test. Was failing an empty dict. 2011-11-21 18:04:20 -08:00
Andy2
c7906c3bd4 prevent min from exceed max by not including values below min as 
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
 2011-11-21 08:19:25 -08:00
Andy2
aba4e02cac use a standard list item for words rather than consing up a TextView 
and having to worry about text size.
 2011-11-21 07:20:12 -08:00
Eric House
1d13f7d1f2 update instructions for building 2011-11-19 20:05:04 -08:00
Eric House
33496914a4 More new SDK fixes: put back script to generate GitVersion.java. 2011-11-19 19:49:15 -08:00
Eric House
e335f5cf61 fix to use new sdk version to generate local.properties 2011-11-19 19:23:58 -08:00
Eric House
d806e3f906 changes made by android tool for compatibility with new SDK version 2011-11-19 19:07:16 -08:00
Andy2
c781bfc29e remove hard-coded 2-15 array for word-len limit spinners and instead 
create at runtime arrays that represent the words actually in the dict
-- e.g. showing a max of 8 when there are no words longer than that.
 2011-11-18 21:24:59 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Andy2
1889fbd78b relaunch activity, with pararms in intent, every time min or max 
changed.  Can't figure any other way to change the list of section
heads, as setListAdapter() is ignored when called a second time.
Note: I got an assertion failure in the jni indexing code so there
may be a bug here.
 2011-11-17 19:52:10 -08:00
Andy2
aab9fd9df2 test the variable that may have been changed, not the one that holds 
the pre-change value.
 2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09 fix compile warning by passing ptr to embedded super 2011-11-17 06:11:42 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Andy2
4edca4ee4c Check for null return from getInfo(), the result when it tries to open 
a corrupt dict.  Such dicts should never get this far, but it doesn't
hurt to be safe.
 2011-11-11 18:30:53 -08:00
Andy2
44c5500ab0 don't crash when empty or corrupt dict file passed in. 2011-11-11 18:29:26 -08:00
Andy2
b334e688bb use getInfo to run sanity check on .xwd files in download directory. 
This prevents deliberately corrupted files from making it into dict
lists.  To the extent that checkSanity() works, it should make use of
that dir safe.
 2011-11-11 07:45:25 -08:00
Andy2
9ff4596667 fix compile warning by passing ptr to embedded super 2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d allow null info ptr so getInfo can be used solely to run sanity check 
on dict.
 2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00
Andy2
284bd2d0c4 turn on sanity checking of dicts in download directory, but from 
DictLangCache rather than when the directory's walked initially.  Need
to test still with bogus dict and make sure it's never shown.
 2011-11-10 19:02:18 -08:00
Andy2
e4aa2ff180 finish changelog 2011-11-07 06:51:27 -08:00
Andy2
995c410b7c revert unintended checkin: logging should not always be on. 2011-11-07 06:49:55 -08:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -07:00
Andy2
ac875894a6 replace assert that occasionally fails with logging. Not sure why it 
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
 2011-11-04 17:19:50 -07:00
Andy2
5123bebe50 don't set dict name to "download more". Just not a good idea. 2011-11-04 17:15:12 -07:00
Andy2
0561ca5ab9 make buttons a bit wider since the bar scrolls now, and rearrange. 2011-11-04 17:14:37 -07:00
Andy2
223d2d6e92 set configchanges on chat activity -- it handles orientations changes fine. 2011-11-04 07:11:34 -07:00
eehouse@eehouse.org
71b09b80ab Merge remote branch 'origin/android_branch' into android_branch 2011-11-04 07:05:56 -07:00
eehouse@eehouse.org
6c1b0e9b58 Merge branch 'android_branch' into android_browsedict 2011-11-04 07:05:16 -07:00
Andy2
61681745c2 sort languages (groups) in dicts activity alphabetically 2011-11-04 07:03:40 -07:00
Andy2
57a1069efe wire min/max through jni: now selecting numbers changes the number and 
length of words selected.  But it's really slow, and indexing seems
broken in some cases.  Not ready for release yet.
 2011-11-04 06:56:59 -07:00
Andy2
fa14f02b69 add ui support for min,max filtering of wordlist. Not yet wired into 
jni.  But: even disabled it seems to lead to much slower scrolling, so
I need to investigate that before taking this any further.
 2011-11-04 06:18:11 -07:00
Andy2
1bba95a985 add minmax compile-time flag, commented-out 2011-11-04 06:17:09 -07:00
Andy2
4e66747bbc fix for changed API 2011-11-03 21:35:17 -07:00
Eric House
30387bc528 up version codes 2011-11-03 21:27:43 -07:00
Andy2
948def8223 replace burried launch-dict-browser menuitem with toolbar button and 
newbie hint.
 2011-11-03 18:14:01 -07:00
Andy2
8db6b0bddd wrap toolbar in a HorizontalScrollView. Comes into action when all 
buttons are enabled.
 2011-11-03 17:24:56 -07:00
Andy2
d19858d6bb add (buried) menuitem to launch dict browser from game. Required 
adding method to get current player from BoardView.
 2011-11-03 05:51:38 -07:00
Andy2
6e58963231 sign up to handle keyboard/orientation changes for dict browser 2011-11-03 05:32:36 -07:00
Andy2
eace89000b save text size rather than figure each time 2011-11-03 05:20:38 -07:00
Andy2
a5498ee33a fix find to return position rather than boolean 2011-11-03 05:20:11 -07:00
Andy2
56fc73e78a don't go straight from tap on dict word to browser: add bool so that 
even if there's only one lookup URL it'll be listed and user can
quickly cancel.
 2011-11-02 18:48:13 -07:00
Andy2
c222f08252 catch up with API changes. 2011-11-02 18:46:06 -07:00
Andy2
7231bd4be3 make dict entries text size bigger 2011-11-02 05:18:10 -07:00
Andy2
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
Andy2
b822f573d6 use getStartsWith() to implement search; add dict name and word count to 
title; change text of menu item that launches dict browser from
Details to Browse
 2011-11-01 18:45:41 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut 
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
 2011-11-01 18:33:29 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in 
other branch before debugging here....
 2011-10-31 18:22:33 -07:00
Andy2
7d1e9c7638 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-10-28 22:27:22 -07:00
Andy2
8f3c4f6426 add config option to enable face-up tile picking 2011-10-28 22:24:47 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI 
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
 2011-10-28 22:15:56 -07:00