Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix so menugroup hidden; remove elipses

Browse source
This commit is contained in:
Eric House 2022-06-25 10:41:36 -07:00
parent e516dbcf66
commit 3b711ac253
3 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -1747,10 +1747,7 @@ public class GamesListDelegate extends ListDelegateBase
final boolean showDataItems = final boolean showDataItems =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
&& nothingSelected; && nothingSelected;
for ( int item : new int[] { R.id.games_menu_storedb, Utils.setItemVisible( menu, R.id.games_submenu_backup, showDataItems );
R.id.games_menu_loaddb } ) {
Utils.setItemVisible( menu, item, showDataItems );
}
boolean enable = showDbg && nothingSelected; boolean enable = showDbg && nothingSelected;
Utils.setItemVisible( menu, R.id.games_menu_checkupdates, enable ); Utils.setItemVisible( menu, R.id.games_menu_checkupdates, enable );

36
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -84,9 +84,9 @@
############################################################ ############################################################
--> -->
<!-- Brings up the Wordlists (formerly Dictionaries) screen --> <!-- Brings up the Wordlists (formerly Dictionaries) screen -->
<string name="gamel_menu_dicts">Wordlists…</string> <string name="gamel_menu_dicts">Wordlists</string>
<!-- text of menu that brings up the Settings (preferences) dialog --> <!-- text of menu that brings up the Settings (preferences) dialog -->
<string name="menu_prefs">App Settings…</string> <string name="menu_prefs">App Settings</string>
<!-- Text of progress indicator shown while check is being conducted --> <!-- Text of progress indicator shown while check is being conducted -->
<string name="msgs_progress">Checking relay for moves <string name="msgs_progress">Checking relay for moves
etc…</string> etc…</string>
@ -95,7 +95,7 @@
<string name="no_games_to_refresh">No games found that connect via <string name="no_games_to_refresh">No games found that connect via
the relay.</string> the relay.</string>
<!-- Brings up "About CrossWords" dialog --> <!-- Brings up "About CrossWords" dialog -->
<string name="board_menu_file_about">About CrossWords…</string> <string name="board_menu_file_about">About CrossWords</string>
<!-- <!--
############################################################ ############################################################
# :Menus: # :Menus:
@ -104,11 +104,11 @@
--> -->
<!-- ############## menu items ############## --> <!-- ############## menu items ############## -->
<!-- pulls up dialog to configure the selected game --> <!-- pulls up dialog to configure the selected game -->
<string name="list_item_config">Game settings…</string> <string name="list_item_config">Game settings</string>
<!-- pulls up dialog to rename (change name of) the selected game --> <!-- pulls up dialog to rename (change name of) the selected game -->
<string name="list_item_rename">Rename…</string> <string name="list_item_rename">Rename</string>
<!-- pulls up dialog to change the group of the selected game --> <!-- pulls up dialog to change the group of the selected game -->
<string name="list_item_move">Move to group…</string> <string name="list_item_move">Move to group</string>
<!-- pulls up dialog to delete the selected game --> <!-- pulls up dialog to delete the selected game -->
<string name="list_item_delete">Delete game</string> <string name="list_item_delete">Delete game</string>
<!-- pulls up dialog to reset the selected game, that is to remove <!-- pulls up dialog to reset the selected game, that is to remove
@ -126,10 +126,10 @@
<!-- Title of dialog for renaming game (triggered by selecting <!-- Title of dialog for renaming game (triggered by selecting
list_item_rename) --> list_item_rename) -->
<!-- long-tap game list menuitem for showing info about game's connectivity --> <!-- long-tap game list menuitem for showing info about game's connectivity -->
<string name="list_item_netstats">Connections…</string> <string name="list_item_netstats">Connections</string>
<!-- Debug-only menuitem that shows mqtt broker's awareness of <!-- Debug-only menuitem that shows mqtt broker's awareness of
devices in game --> devices in game -->
<string name="list_item_relaypage">Game traffic…</string> <string name="list_item_relaypage">Game traffic</string>
<!-- Debug only: shown when game-view url copied to clipboard as <!-- Debug only: shown when game-view url copied to clipboard as
part of "show traffic" action --> part of "show traffic" action -->
<string name="relaypage_url_copied">Game URL copied to clipboard</string> <string name="relaypage_url_copied">Game URL copied to clipboard</string>
@ -182,7 +182,7 @@
<!-- text of item at bottom of dicts choice spinner. It <!-- text of item at bottom of dicts choice spinner. It
launches the browser pointed at the site where additional launches the browser pointed at the site where additional
wordlists can be found. --> wordlists can be found. -->
<string name="download_more">Download more…</string> <string name="download_more">Download more</string>
<!-- One of the strings used in the right column of the list of <!-- One of the strings used in the right column of the list of
installed wordlists to describe those that are part of installed wordlists to describe those that are part of
CrossWords and that cannot be uninstalled or moved. CrossWords and that cannot be uninstalled or moved.
@ -602,15 +602,15 @@
the language of the game along with how many of each there the language of the game along with how many of each there
are and how many points each is worth. This display is the are and how many points each is worth. This display is the
same throughout the game. --> same throughout the game. -->
<string name="board_menu_game_counts">Counts and values…</string> <string name="board_menu_game_counts">Counts and values</string>
<!-- menu on Game submenu: brings up dialog listing all tiles not <!-- menu on Game submenu: brings up dialog listing all tiles not
yet played and not in the rack of the player whose rack is yet played and not in the rack of the player whose rack is
visible (whose turn it is, generally). This display will visible (whose turn it is, generally). This display will
change as tiles are used and depending on what player is change as tiles are used and depending on what player is
asking. --> asking. -->
<string name="board_menu_game_left">Tiles remaining…</string> <string name="board_menu_game_left">Tiles remaining</string>
<!-- Brings up listing of all moves played so far this game. --> <!-- Brings up listing of all moves played so far this game. -->
<string name="board_menu_game_history">Game history…</string> <string name="board_menu_game_history">Game history</string>
<!-- Brings up explanation of the game's final score. If the game <!-- Brings up explanation of the game's final score. If the game
is not yet over, gives you a choice whether to end it now, is not yet over, gives you a choice whether to end it now,
and if you decline does nothing. --> and if you decline does nothing. -->
@ -1292,7 +1292,7 @@
exist. (I believe this no longer occurs.) --> exist. (I believe this no longer occurs.) -->
<string name="button_retry">Retry</string> <string name="button_retry">Retry</string>
<!-- Title of generic dialog used to display information --> <!-- Title of generic dialog used to display information -->
<string name="info_title">FYI…</string> <string name="info_title">FYI</string>
<!-- title of dialog allowing user to pick tiles "face up". (This <!-- title of dialog allowing user to pick tiles "face up". (This
feature is not yet supported on Android.) --> feature is not yet supported on Android.) -->
<string name="title_blank_picker">Pick tile for blank</string> <string name="title_blank_picker">Pick tile for blank</string>
@ -1326,7 +1326,7 @@
<string name="ids_endnow">Are you sure you want to resign?</string> <string name="ids_endnow">Are you sure you want to resign?</string>
<!-- Title for generic dialog asking a question, usually in the <!-- Title for generic dialog asking a question, usually in the
middle of a game, like "do you want to commit this move?"--> middle of a game, like "do you want to commit this move?"-->
<string name="query_title">A question…</string> <string name="query_title">A question</string>
<!-- <!--
########################################################### ###########################################################
# :Dialogs: # :Dialogs:
@ -1615,7 +1615,7 @@
game is using an older version of CrossWords this setting will game is using an older version of CrossWords this setting will
revert to 7 for everyone in the game.</string> revert to 7 for everyone in the game.</string>
<string name="board_menu_file_email">Email author…</string> <string name="board_menu_file_email">Email author</string>
<!-- --> <!-- -->
<string name="email_author_subject">Comment about CrossWords</string> <string name="email_author_subject">Comment about CrossWords</string>
<!-- appended to email message sending logs (debug only) --> <!-- appended to email message sending logs (debug only) -->
@ -2045,7 +2045,7 @@
<string name="title_studyon">Enable studylists</string> <string name="title_studyon">Enable studylists</string>
<string name="summary_studyon">Offer to add to and display lists <string name="summary_studyon">Offer to add to and display lists
of words to remember</string> of words to remember</string>
<string name="gamel_menu_study">Studylist…</string> <string name="gamel_menu_study">Studylist</string>
<string name="slmenu_copy_sel">Copy to clipboard</string> <string name="slmenu_copy_sel">Copy to clipboard</string>
<string name="slmenu_clear_sel">Delete selected</string> <string name="slmenu_clear_sel">Delete selected</string>
<plurals name="confirm_studylist_clear_fmt"> <plurals name="confirm_studylist_clear_fmt">
@ -2611,7 +2611,7 @@
<string name="invite_choice_mqtt">Internet</string> <string name="invite_choice_mqtt">Internet</string>
<string name="mqtt_invite_title">MQTT Invitation</string> <string name="mqtt_invite_title">MQTT Invitation</string>
<!-- Title of menuitem that launches Known Players viewer --> <!-- Title of menuitem that launches Known Players viewer -->
<string name="gamel_menu_knownplyrs">Known Players…</string> <string name="gamel_menu_knownplyrs">Known Players</string>
<string name="knowns_expl">These are your known remote <string name="knowns_expl">These are your known remote
players. Their names default to what the remote player has chosen, players. Their names default to what the remote player has chosen,
but you can change the names if you want.</string> but you can change the names if you want.</string>
@ -2705,7 +2705,7 @@
you there now. you there now.
</string> </string>
<!-- Button referenced in text above. Should match! --> <!-- Button referenced in text above. Should match! -->
<string name="button_settings">Settings…</string> <string name="button_settings">Settings</string>
<!-- String shown when download of BYOD wordlist succeeds. There's <!-- String shown when download of BYOD wordlist succeeds. There's
also an "Open" button shown in this case --> also an "Open" button shown in this case -->

2
xwords4/android/app/src/main/res/values/tmpstrings.xml
View file

@ -28,7 +28,7 @@
identify your device.</string> identify your device.</string>
<string name="not_again_loaddb">Import settings or game data from a <string name="not_again_loaddb">Import settings or game data from a
file you previously saved here, or copied from another file previously exported from CrossWords on this or another
device.</string> device.</string>
<string name="backup_bad_file_fmt">The file “%1$s” does not <string name="backup_bad_file_fmt">The file “%1$s” does not