Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5563 commits 21 branches 243 tags 33 MiB
Commit graph

651 commits

Author SHA1 Message Date
Andy2
9a26ccf1c8 prevent long names from forcing linewrap 2011-12-20 17:10:41 -08:00
Andy2
8eaeb9c2d0 reword SMS invite so URL isn't split across messages (which makes it 
not recognized by recipient as a clickable URL).
 2011-12-18 16:23:14 -08:00
Andy2
d03fc77990 list changes for next release 2011-12-18 12:27:13 -08:00
Andy2
dd8da6d312 tweak wording 2011-12-18 12:22:06 -08:00
Andy2
a86ffa39ba up strings for next beta 2011-12-16 20:59:40 -08:00
Andy2
2ff4338797 Move more oft-used button. Thanks JB. 2011-12-15 18:33:10 -08:00
Andy2
420661bf9f put back the URL in parens. Not all email clients show the link otherwise. 2011-12-14 20:08:38 -08:00
Andy2
0dfc1312ff set up intents to limit choices in sending invites to SMS and email, 
and recast choices offered users from text vs. html to SMS vs. email.
Revert recent change (88986b49d5) adding
visible URL to email as it doesn't seem to be needed now.  Will want
to keep an eye on that.
 2011-12-13 17:24:21 -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
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
Andy2
46efe15f4e up version and change notes for new release 2011-12-07 19:06:03 -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
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
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -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
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
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
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
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
e4aa2ff180 finish changelog 2011-11-07 06:51:27 -08:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -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
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
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
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -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
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
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -07:00
Andy2
b08f9770cf add dictionary browser. For now it just adds items to the list that 
give the position so I can get a feel for how it works.  Will use this
to figure out the right API for a dictionary iterator.
 2011-10-23 19:35:15 -07:00
Andy2
201c32e4db add support for download directory as a place where we look for dicts 
and to/from which dicts can be moved.  Right now it's just
/sdcard/download.  Dunno if that's universal.  There seems not to be
API except in newer SDK versions for finding it.
 2011-10-20 20:22:36 -07:00
Andy2
4eee7f8aa7 Pass selected tiles into new util function, and from there into java 
world, so confirming query can include them.
 2011-10-19 18:34:26 -07:00
Andy2
71fabdac95 add changelist change 2011-10-18 06:35:26 -07:00
Andy2
214debca47 up strings for beta 37 2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c fix brokenness (black-on-black text in lookup dialog) on 2.2 and 
beyond by copying in layout for built-in list items and hard-coding
white text color.  This is risky/fragile but I can't find another fix.
 2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97 cleanup/reformat. No code change. 2011-10-17 20:27:51 -07:00
Andy2
29eec38821 remove unused strings 2011-10-16 17:59:00 -07:00
Andy2
6793742f0f remove option to list all words played in a single lookup dialog, and 
supporting code in the jni/common C.
 2011-10-14 22:32:30 -07:00
Eric House
e848b150b5 rename LookupActivity->LookupView since it's not an Activity any more. 2011-10-14 18:45:47 -07:00
Eric House
0b54b190b6 make lookup dialog a mere dialog rather than an activity to fix 
too-slow transitions to and from it.  Works by keeping code in
separate custom view and not setting buttons or anything else on the
dialog.
 2011-10-14 18:39:39 -07:00
Andy2
01459285d5 show dict as comment beside player name in players list. And since 
dicts change when language does, put language choice above players
list.
 2011-10-12 18:37:31 -07:00
Andy2
9551f29335 up strings for beta 36. I'm skipping b35 rather than try to move the tag. 2011-10-10 22:30:38 -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
c3ba50c905 up strings for beta 35 2011-10-07 18:59:32 -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
d8c1e3822b fix problems with skipping singleton words and URLs; replace window 
title with TextView.
 2011-10-06 17:47:00 -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
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
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
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
Eric House
8a5667f011 add missing language codes 2011-09-22 17:16:27 -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
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
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
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
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
Andy2
25f7c72994 add some comments and rearrange 2011-09-14 06:46:52 -07:00
Andy2
d69bbfed97 copy over from french_xlation branch 2011-09-14 06:39:23 -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
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
Andy2
c9c498786e add to game state whether any tiles selected. Use that to disable 
'commit exchange' button when there's nothing to commit, and get rid
of error message used when committing nothing since it's now
impossible (on Android).
 2011-09-09 19:04:25 -07:00
Andy2
66fb5f87fb don't exit trade mode if no tiles selected; fix warning string to match. 2011-09-09 18:40:19 -07:00
Andy2
06571d0478 up constants and update changes list for new release 2011-09-09 18:17:28 -07:00
Andy2
1d612288d4 add optional param to confirmation dialogs to allow positive button 
other than Ok; add "Delete" and "Reset" for game and dict actions.
 2011-09-09 06:50:00 -07:00
Andy2
fda3207b78 fix inability to tell whether a dict being deleted is in use: add to 
summaries DB list of dicts in the game and a method that queries that.
Pick delete-confirmation message based on the language of dict,
whether there are others in the same language, and whether games are
using that language or that dict.
 2011-09-08 21:36:15 -07:00
Andy2
528db479b5 bunch of changes whose original purpose was to allow me to deal 
correctly with having the same dict stored in more than one place.
Added DictAndLoc with members name and loc to support this, and used
in a bunch of places in place of mere strings, including
DictsActivity.  Also removed code warning when you're deleting a dict
that's not the last in its lang, which incorrectly warned that the
dict was in use when in fact I can't tell that.  The warning "might be
in use" sounds dumb so it's gone for now.
 2011-09-08 19:10:06 -07:00
Andy2
eab067fe32 use autocaps for default player names pref 2011-09-03 21:54:25 -07:00
Andy2
1af358b269 move code to unpack players list into same file as the code packing 
it; add boolean, now always passed as false, to code printing names
for game config list of players to include the dictionary.  It's
useful for debugging, and I think it'd make a good optional setting,
but nobody else thinks so.  Once it's checked in the change can go if
I'm not using it.
 2011-09-03 21:05:08 -07:00
Andy2
3fd0bb056a when there's no move made yet to display after score entry held say 
so.
 2011-09-02 19:24:42 -07:00
Andy2
2f91b8ed3d remove unused strings 2011-09-02 18:37:58 -07:00
Andy2
437e4e21ac There are buttons not menu items for exiting exchange mode so 
reference them in newbie text.  And get rid of string for toast
exiting the mode since we don't show it.
 2011-09-01 18:54:27 -07:00
Andy2
671877cbca implement new util_ methods in jni and java; remove old miniwindow 
stuff.  In java, respond to util_playerScoreHeld() and
util_bonusSquareHeld() by putting up toasts with existing strings.
For util_setInTrade(), fix exchange mode. Add two buttons at bottom
that replace toolbar (and corresponding buttons on menu). Redraw
scoreboard and board with high transparency to make it clear they're
disabled.  Still to do: deal with case where ability to switch which
player's tray is visible is enabled.
 2011-08-31 06:37:33 -07:00
Andy2
45421e8f86 add a bit of space between players column and column to right so 
numbers don't run together.
 2011-08-28 15:44:23 -07:00
Andy2
0a2255a8fe add two recent changes 2011-08-25 18:26:49 -07:00
Andy2
5acc2205be add pref to edit color used to draw bonus hints on cells 2011-08-25 18:13:42 -07:00
Andy2
3537161d3b add change 2011-08-22 18:40:30 -07:00
Andy2
7e6daa5797 move role out of players column to where it can be a full line long, 
preventing it from increasing the size of the item by line-wrapping.
For now it's outside the View that gets hidden, but that may need to
change.
 2011-08-22 07:05:33 -07:00
Andy2
d7a515ca97 display three states of relay connectedness in games list items: 
configured, connected but waiting for players, and game-in-play.
 2011-08-22 07:03:46 -07:00
Andy2
1ee0dfdd6d set wordlist spinner prompt and include language 2011-08-21 22:13:18 -07:00
Eric House
cf6d868bd3 use separate strings for window title and spinner prompt 2011-08-21 18:17:21 -07:00
Andy2
aeafb9cefa Tweak language for moving wordlists to more clearly refer to storage 
locations.
 2011-08-21 15:03:41 -07:00