diff options
author | Andrew Dolgov <[email protected]> | 2011-11-29 20:00:37 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-11-29 20:00:37 +0300 |
commit | 574aaebb900b8420b3adcf05a7bc971c002ed327 (patch) | |
tree | 3469e51b9ec9da7fbf75c6e2464edb26992c5639 /res | |
parent | a36e2e8d0c9496ecefb5cc1ed525932c7a5f77d1 (diff) |
properly use context menu for operations on selected headlines
Diffstat (limited to 'res')
-rw-r--r-- | res/menu/headlines_menu.xml | 21 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 29 | ||||
-rw-r--r-- | res/values/strings.xml | 13 |
3 files changed, 37 insertions, 26 deletions
diff --git a/res/menu/headlines_menu.xml b/res/menu/headlines_menu.xml new file mode 100644 index 00000000..ac614810 --- /dev/null +++ b/res/menu/headlines_menu.xml @@ -0,0 +1,21 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/selection_toggle_unread" + android:icon="@android:drawable/ic_menu_recent_history" + android:showAsAction="" + android:title="@string/selection_toggle_unread"/> + + <item + android:id="@+id/selection_toggle_marked" + android:icon="@android:drawable/star_off" + android:showAsAction="" + android:title="@string/selection_toggle_marked"/> + + <item + android:id="@+id/selection_toggle_published" + android:icon="@drawable/ic_menu_rss" + android:showAsAction="" + android:title="@string/selection_toggle_published"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index a23bcb61..2d2e2998 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -38,11 +38,18 @@ android:title="@string/load_more_articles"/> <item + android:id="@+id/catchup_and_load" + android:icon="@android:drawable/ic_menu_rotate" + android:showAsAction="ifRoom|withText" + android:title="@string/catchup_and_load"/> + + <item android:id="@+id/show_all_articles" android:icon="@android:drawable/ic_menu_agenda" android:showAsAction="" android:title="@string/show_all_articles"/> + <item android:id="@+id/headlines_select_all" android:title="@string/headlines_select_all"/> @@ -50,30 +57,10 @@ <item android:id="@+id/headlines_select_unread" android:title="@string/headlines_select_unread"/> - + <item android:id="@+id/headlines_select_none" android:title="@string/headlines_select_none"/> - - <item - android:id="@+id/selection_toggle_unread" - android:icon="@android:drawable/ic_menu_recent_history" - android:showAsAction="" - android:title="@string/selection_toggle_unread"/> - - <item - android:id="@+id/selection_toggle_marked" - android:icon="@android:drawable/star_off" - android:showAsAction="" - android:title="@string/selection_toggle_marked"/> - - <item - android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_rss" - android:showAsAction="" - android:title="@string/selection_toggle_published"/> - - </group> <group android:id="@+id/menu_group_article" > diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c80ddcf..853f9036 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,8 @@ <string name="preferences">Preferences</string> <string name="theme_light">Light</string> <string name="connection">Connection</string> + <string name="headline_context_multiple">Selection toggle</string> + <string name="headline_context_single">Article toggle</string> <string name="http_authentication">HTTP Authentication</string> <string name="login_success">Logged in.</string> <string name="no_unread_feeds">No unread feeds.</string> @@ -34,7 +36,7 @@ <string name="share_article">Share article</string> <string name="catchup">Mark as read</string> <string name="sort_feeds_by_unread">Sort feeds by unread count</string> - <string name="load_more_articles">Load more...</string> + <string name="load_more_articles">Load more</string> <string name="show_all_articles">Show all articles</string> <string name="show_unread_articles">Show unread articles</string> <string name="ssl_trust_any">Accept any SSL certificate</string> @@ -46,10 +48,10 @@ <string name="toggle_published">Toggle published</string> <string name="headlines_select_all">Select all</string> <string name="headlines_select_none">Select none</string> - <string name="headlines_select_unread">Select unread</string> - <string name="selection_toggle_marked">Toggle starred</string> - <string name="selection_toggle_published">Toggle published</string> - <string name="selection_toggle_unread">Toggle unread</string> + <string name="headlines_select_unread">Unread</string> + <string name="selection_toggle_marked">Starred</string> + <string name="selection_toggle_published">Published</string> + <string name="selection_toggle_unread">Unread</string> <string name="set_unread">Mark unread</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="login_summary">Your tt-rss login. Not needed for single user mode</string> @@ -63,6 +65,7 @@ <string name="no_headlines_to_display">No headlines to display</string> <string name="browse_cats_like_feeds">Browse categories like feeds</string> <string name="browse_cats_like_feeds_summary">You can long-tap on a category to override this setting</string> + <string name="catchup_and_load">Catchup</string> <string name="error_no_error">No error</string> <string name="error_unknown">Error: Unknown error (see log)</string> |