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

308 commits

Author SHA1 Message Date
Andy2
b1f027ce00 latest from Sarah 2010-07-17 21:50:44 -07:00
Andy2
fb8692fb9f add preference for allowPeek 2010-07-17 07:06:33 -07:00
Andy2
6ffed8750a Make delete button smaller and at other end of screen from text. 2010-07-17 05:58:29 -07:00
eehouse@eehouse.org
f93f6222b2 Merge branch 'android_branch' into toolbar 2010-07-16 21:19:44 -07:00
Andy2
a91c665c45 latest from translator 2010-07-16 21:18:39 -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
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
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
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
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
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
a2e4fd09c4 add missing apostrophe 2010-07-07 18:27:29 -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
c2aaa04517 move colors editing prefs screen into appearance prefs screen 2010-07-04 12:53:45 -07:00
Andy2
6264327d63 formatting change; whitespace only 2010-07-04 12:30:09 -07:00
Andy2
5b336146c8 add preference, as yet unused, to control whether tap drops context 
menu or opens game (as it used to do).
 2010-07-02 18:08:22 -07:00
Andy2
4b14e4aeb9 break most top-level prefs into behavior or appearance 2010-07-02 07:14:48 -07:00
Andy2
e22479ba03 add "play game" item to context menu, and invoke that menu on item 
click.  This fixes problem with users apparently not knowing about
long-tap and context menu and so not knowing they can configure a
game.  Unfortunately I can't figure out how to disable long-tap
also bringing up the context menu.  Yet another preference might be the fix.
 2010-07-02 07:04:37 -07:00
Andy2
650d9f5b45 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2010-07-01 05:54:43 -07:00
Andy2
2b23c50a70 change default phonies key name so upgrading users will still get the 
new value.
 2010-06-30 19:35:18 -07:00
Andy2
769d9a6a23 tweak strings 2010-06-30 06:45:37 -07:00
Andy2
0eab25eec9 make warn-phonies the default. Users are complaining about bogus 
words being accepted; this may may the feature easier to find.
 2010-06-30 06:32:21 -07:00
Andy2
b83867ff13 Configure -> Game settings 2010-06-30 06:16:23 -07:00
Eric House
30087845b5 add preference to hide title bar 2010-06-29 19:25:15 -07:00
Andy2
3998a23f84 add undo button; reorder menus; fix show-values menuitem 2010-06-29 18:26:37 -07:00
Andy2
e218cb7639 add prev hint button triggering notImpl; hide title bar. Really want 
to hide it only for landscape orientation, but that seems impossible
without having separate layout and reloading whole activity on
orientation change.  If you hide it after adding content to the
activity you get a runtime exception.  Better way than hiding title,
BTW, is a theme that hides it in AndroidManifest.xml.
 2010-06-29 06:51:45 -07:00
Andy2
45b5bef414 new prev_hint button with left-facing arrow 2010-06-29 06:48:20 -07:00
Andy2
c9dd0c2ddf use my dummy icons instead of irrelevant builtins 2010-06-28 18:52:20 -07:00
Andy2
cf0c7c9770 "First hint" replaces "Hint" for, I hope, more clarity 2010-06-28 18:49:42 -07:00
Andy2
99d41083bd xml file not needed now that buttons are declared as part of board 2010-06-28 18:48:16 -07:00
Andy2
521852ddf5 more proof-of-concept icons 2010-06-28 18:47:47 -07:00
Andy2
29aa4627e9 get rid of zoom controller. Will be replaced by toolbar button. 2010-06-28 06:29:27 -07:00
Andy2
85679dcb2a (re)add padding on sides and at top 2010-06-28 06:26:49 -07:00
Andy2
4b80dedde7 moving toward ImageButtons rather than (text) Buttons, and toward 
having them declared in the layout rather than added at runtime.  Add
temporary references to built-in ImageButtons, and a one-dimentional
one of my own.  Toolbar reduced to handling the orientation change
(and likely to disappear altogether soon.)
 2010-06-27 21:48:01 -07:00
Andy2
85745d8ab4 add more buttons; rearrange menus on assumption those that duplicate 
button functionality can be burried.
 2010-06-26 22:02:02 -07:00
Andy2
06a7c56ca9 template for toolbar buttons. 2010-06-26 17:53:00 -07:00
Andy2
ad2fce6519 remove built-in buttons from board.xml; add addButton method on 
Toolbar and call it from BoardActivity to produce a working hint
button.  Am using text labels instead of icons for now.
 2010-06-26 17:52:36 -07:00
Andy2
29ba0cf4f2 add Toolbar class and use it to hide whichever toolbar isn't wanted in 
the current screen orientation.
 2010-06-26 12:39:10 -07:00
Andy2
3e9c94118a put toolbars at right and bottom. Next step is to hide the one we 
don't want.
 2010-06-25 20:14:15 -07:00
Andy2
1866c5ccab add toolbar at bottom to test spacing 2010-06-25 08:14:18 -07:00
Andy2
7b52f36925 remove unused string 2010-06-25 08:05:07 -07:00
Andy2
10286e0109 explicit mention in about text that it's FOSS 2010-06-21 07:55:00 -07:00
Andy2
38ef891268 new preference, on by default, controlling sorting of new tray tiles. 2010-06-17 18:51:46 -07:00
Andy2
529f3df726 fix seekbar style so thumb's fully visible on 2.1 (was ok on 1.6); and 
rename style for clarity.
 2010-06-16 18:44:19 -07:00
Andy2
660d86c121 menuitem text change 2010-06-16 18:33:08 -07:00
Andy2
66f4b0d2f6 forgot to add this earlier and git didn't complain... 2010-06-16 18:07:01 -07:00
Andy2
95056db997 change meaning of timer setting to be per-player rather than per-game 
based on information that that's how it's customarily done.  Will need
to communicate change with translators.
 2010-06-16 06:39:27 -07:00
Andy2
ca2aa982a7 update from translator 2010-06-14 18:18:17 -07:00
Andy2
375789cd02 juggle->shuffle; trade->exchange. Strings only; no code change. 2010-06-13 20:40:12 -07:00
Andy2
74c9e9db92 add second prefs menu to restore all prefs 2010-06-10 21:28:38 -07:00
Andy2
57b74391bc remove duplicates that the compiler missed at first 2010-06-10 21:27:17 -07:00
Andy2
f9fbe386f5 add menu and menuitem to prefs dialog (shows up for main screen only) 
to reset colors to defaults
 2010-06-10 21:10:06 -07:00
Andy2
f7c737bcde latest from translator 2010-06-10 19:27:14 -07:00
Andy2
e727fa7a03 first cut at Slovak from translator 2010-06-08 22:06:18 -07:00
Eric House
d7d162d474 rearrange menus, promoting undo and hint and demoting flip and turndone 2010-06-06 13:33:19 -07:00
eehouse@eehouse.org
db2c36eda9 add string 2010-06-06 06:41:45 -07:00
Eric House
d98b2ad5d6 make git version available as a read-only advanced preference. I sure 
hope I never need to ask a user to transcribe this!
 2010-06-05 07:55:40 -07:00
Eric House
cbbaeb57a0 gitignore additions 2010-06-05 07:50:09 -07:00
eehouse
d0b9f0f7aa add Retry button to dialog announcing client failure to find expected 
room on relay.  From handler call new comms_resetSame and existing
code to init client game connecion.
 2010-06-05 03:40:09 +00:00
eehouse
0d7b09cb01 revert 3407; deleted a string I needed 2010-05-27 12:52:48 +00:00
eehouse
c5a0384d79 include name of game in title of game-configure screen 2010-05-27 02:58:27 +00:00
eehouse
cc984f02ab remove unused string 2010-05-27 02:57:57 +00:00
eehouse
282f9ce237 wrap in scrollview so still usable in landscape orientation 2010-05-27 02:57:46 +00:00
eehouse
8c790edd04 add numerical edittexts to left of seekers in color edit view. Not 
yet wired up but layout's ok
 2010-05-27 02:57:21 +00:00
eehouse
8e06ff446a Preferences->Settings; remove duplicated strings. 2010-05-27 02:56:54 +00:00
eehouse
2449962185 add icons to the games list activity menu, three built-in and one with 
a CC license.
 2010-05-27 02:56:36 +00:00
eehouse
b345938e03 dictionary icon adapted from http://icons2.iconarchive.com/icons/mattahan/buuf/48/Dictionary-icon.png using gimp. Original by Mattahan (Paul Davey) license: CC Attribution-Noncommercial-Share Alike 3.0 2010-05-27 02:56:24 +00:00
eehouse
695c5736e5 fix default phonies value; improve some strings related to default timer 2010-05-26 02:51:15 +00:00
eehouse
28d9d4559d add new-game/default prefs for phonies and timer_enabled 2010-05-26 02:27:16 +00:00
eehouse
da7c59a869 subclass ListPreference in order to provide a list of dicts at runtime 
for setting the default.  Remove the hint that says "do it on dicts
screen."
 2010-05-26 02:26:24 +00:00
eehouse
84f76a8c9a Add a summary visible before default dict has been set directing user 
on how to change it.  Goes away when it becomes possible to set
directly in prefs activity.
 2010-05-20 04:28:53 +00:00
eehouse
1ea06352dc latest from translator 2010-05-20 04:28:20 +00:00
eehouse
3863279013 divider follows last item too on real lists; add spacing above and below it. 2010-05-20 04:27:56 +00:00
eehouse
a76fd7b87a contributed icon 2010-05-18 02:33:16 +00:00
ehouse
b38fa6c62e latest from translator (plus my shot at playerf) 2010-05-18 02:31:09 +00:00
eehouse
7913292942 get "Player 1" etc from a resource; don't hard-code! 2010-05-18 02:27:34 +00:00
eehouse
f3f350a12d Create new prefs screen with per-game defaults, adding existing and 
new for dicts; use dict pref when creating new game; add menuitem to
dicts view to set that pref.  I want to launch the dicts activity from
the preference instead (which is information-only right now) but can't
figure out how to do startActivityForResult from a Preference....
 2010-05-18 02:27:14 +00:00
eehouse
4f8c7b3cb8 trying again with the right params to iconv 2010-05-15 03:07:51 +00:00
eehouse
40c25d6137 add initial/default value of gameSeconds as a preference and honor it 
when creating and copying CurGameInfo instances.
 2010-05-14 12:43:17 +00:00
eehouse
c9ca99d3f0 convert (with iconv) to utf8 2010-05-13 04:20:20 +00:00
eehouse
8f0cae4bf2 czech strings as received from translator 2010-05-13 04:16:30 +00:00
eehouse
24c1527232 fix yOffsetChanged to follow new API, but still leave commented out; 
set game file name from resource, and make visible in board title and
as part of games list entries.
 2010-05-12 11:56:01 +00:00
eehouse
1e560bfd42 move the download-url string into non-localizable strings 2010-05-12 11:48:33 +00:00
eehouse
5542350094 comment out Hidden games menuitem; rearrange menuitems; fix missing 
string that compiler didn't notice earlier.
 2010-05-08 19:29:03 +00:00
eehouse
e3b77aa1f1 add dialog confirming delete_all menu 2010-05-08 19:28:38 +00:00
eehouse
0e3411ecd4 modify configure connection button to reflect conn type chosen; add 
role-specifig hints to relay config dialog (in a way it'll be easy to
follow for others.)
 2010-05-08 15:27:32 +00:00
eehouse
2992fd2d1f add connection separator/title; add prompt to Connection dialog 2010-05-08 15:26:47 +00:00
eehouse
a4bc872906 provide different players labels for the three roles 2010-05-08 15:25:54 +00:00
eehouse
c5032b9c4f get rid of whitespace 2010-05-08 15:25:26 +00:00
eehouse
57fe0a6f06 RelativeLayout is broken on 1.5 devices, so add an alternative and use 
it on 1.5.  It might be good enough for the rest too....
 2010-05-08 15:25:13 +00:00
eehouse
7e9be7de11 nuke commented-out dup string 2010-05-08 15:24:26 +00:00
eehouse
b62fcfd5ce improve hint text for Host; call remote players guests where context 
is limited to host's view.
 2010-05-06 12:47:58 +00:00
eehouse
2966939a5a add margins and set text color so hint text matches rest of dialog 2010-05-06 12:47:30 +00:00
eehouse
5a42bd54f0 Add prompt to role spinner. Would really like to add hints to each 
element but don't know how to do that yet.
 2010-05-06 12:47:15 +00:00
eehouse
27222fe336 make it a RelativeLayout, and put dict on same line as state 2010-05-06 12:46:55 +00:00
eehouse
03fedd6cbc remove "State" from state string 2010-05-06 12:46:25 +00:00
eehouse
f03579dd14 break item info into four text areas that can now be positioned to 
look better.
 2010-05-05 04:12:23 +00:00
eehouse
84a98fab4d get rid of carriage returns in strings formerly consed together in one 
text field.
 2010-05-05 04:12:02 +00:00
eehouse
3c7d972d85 specify a layout rather than a simple TextView for game list items, 
step 1 toward better looking list.
 2010-05-04 12:31:14 +00:00
eehouse
e48caca6ac make configure activity default theme like others after finding a 
divider drawable that shows up.
 2010-05-04 12:30:55 +00:00
eehouse
0e60013f59 remove SMS prefs setting 2010-05-04 12:30:39 +00:00
eehouse
34e6b07da2 use built-in list_selector_background to get appearance of list. Works! 2010-05-01 02:49:46 +00:00
eehouse
638ce53661 strings required by new game summary fields 2010-05-01 02:48:57 +00:00
eehouse
6d71b7be02 add summaries to PreferenceScreens 2010-04-25 18:13:41 +00:00
eehouse
6bc3408d8e move resources not requiring localization, both strings and string 
arrays, into new file.  Remove arrays.xml since it's now empty.
 2010-04-25 03:39:13 +00:00
eehouse
9ced0bb154 Give spinners string arrays as resources rather than via code; remove 
headers from above spinners and instead include header info in text.
May want to revisit this latter change
 2010-04-25 03:38:27 +00:00
eehouse
f2e62f74b5 no subcategory needed for prefs 2010-04-25 03:38:05 +00:00
eehouse
ac2b1728a9 first use of a style, for section headings 2010-04-25 03:37:44 +00:00
eehouse
6e626b62cf remove unused setting 2010-04-25 03:37:33 +00:00
eehouse
541cfc9925 raise version to b1 and make it a constant so localized strings don't 
have to change each time.
 2010-04-24 15:14:46 +00:00
eehouse
a219b4ae37 remove game config activity's menu. It was down to one item and that 
(revert) isn't needed if the confirm logic is working.
 2010-04-23 08:57:39 +00:00
eehouse
8ba15776d2 get rid of string for discard menu which is gone 2010-04-23 08:55:39 +00:00
eehouse
f78ff6786a replace menuitem to juggle players with button; place it and add 
player button below player list; remove heading above phonies, adding
"phonies" to each spinner text; add "game settings" heading.  Still
need to find a way to make the headings pop visually.
 2010-04-23 08:54:04 +00:00
eehouse
cdbf68de67 add new advanced pref: default board size. 15x15 is default. Isn't 
used yet.
 2010-04-23 08:49:07 +00:00
eehouse
848342ad7a remove string already removed from english version 2010-04-23 08:46:55 +00:00
eehouse
84675f9786 remove color tiles from game config and CurGameInfo class: it's a 
global pref and was being ignored.
 2010-04-23 08:43:11 +00:00
eehouse
f08f9ac390 put back smart robot string. 2010-04-23 08:40:22 +00:00
eehouse
baac58c090 add summaries to global prefs; remove "hide values" pref since screen 
is big enough we'll never need it.
 2010-04-23 08:39:24 +00:00
eehouse
4d3bab67bb make about box text white for contrast. I don't know why this is 
required when opensudoku seems to be doing the same thing and getting
white text without specifying.  More to learn...
 2010-04-20 02:39:16 +00:00
eehouse
56270dbe7e add missing carriage return (assumed by common code) 2010-04-20 02:38:55 +00:00
eehouse
f04a60c0ea make background color the last color preference. It's least important. 2010-04-17 04:21:07 +00:00
eehouse
70554b869f change string describing color 2010-04-17 04:20:20 +00:00
eehouse
81bdd66250 default background color is white 2010-04-17 04:20:07 +00:00
eehouse
a6a421f550 add preference for empty cell color, which other platforms have. This 
change makes the pref editable and persistent, but doesn't use it to
draw.
 2010-04-17 04:17:49 +00:00
eehouse
9a98c56b2b latest from translator 2010-04-17 04:17:26 +00:00
eehouse
348f3cfef3 up alpha version 2010-04-17 04:16:57 +00:00
eehouse
95ddf7ddd4 add preference controlling whether volume keys or a 
ZoomButtonsController is used to support zooming.  Default is the more
discoverable ZoomButtonsController.
 2010-04-15 03:34:03 +00:00
eehouse
7a5b2e10c3 changes, previously committed, to take advantage of new zoom API: hook 
up to volume key and to ZoomButtonsController, pass from UI thread to
JNI thread and back, dis/enable buttons based on zoomability, and
remove zoom submenu.
 2010-04-15 02:16:30 +00:00
eehouse
805ac26d09 add zoomin/zoomout menuitems. These should become a zoomwindow later. 2010-04-08 04:15:48 +00:00
eehouse
97569ae6d0 add advanced pref to hold dict download url; use it. 2010-04-08 04:12:08 +00:00
eehouse
02a96cdaa6 remove ability to edit host and port when configuring relay. Must use 
prefs/advanced.
 2010-03-21 03:13:16 +00:00
eehouse
a32975362a increase text of color labels -- but they should really be white. 2010-03-21 03:12:38 +00:00
eehouse
815ac74ebe change color prefs key names so won't crash opening older db 2010-03-21 03:12:28 +00:00
eehouse
19f6ec62db add a color sample above the RGB sliders so changes appear in real 
time.
 2010-03-21 03:12:17 +00:00
eehouse
9466203844 use sliders instead of text fields for editing of colors, and store 
them as ints.  This will probably cause older versions to crash.  Need
either to change the names of keys or warn with next release.
 2010-03-21 03:11:49 +00:00
eehouse
b20296fbd2 First cut at a color prefs editor. 2010-03-21 03:11:29 +00:00
eehouse
76926abdbf get rid of "ignored" since passwd no longer is 2010-03-21 03:10:20 +00:00
eehouse
5f6c8fd579 support passwords: save 'em when configuring player, and implement 
askPassword in jni and java code.
 2010-03-21 03:09:47 +00:00
eehouse
f28f5b80d3 include name of dict being downloaded in download progress dialog 2010-03-14 16:24:54 +00:00