diff options
author | Andrew Dolgov <[email protected]> | 2011-11-30 11:54:42 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-11-30 11:54:42 +0300 |
commit | bc688118d286f71054d9b7b8ce5c6804c94e2412 (patch) | |
tree | 7a4e1005bf99f9fd631e69b46b91ca06c1ce3c95 | |
parent | c60fd7d1fefead0db308f422996d039355f582a6 (diff) |
various menu improvements
-rw-r--r-- | res/menu/main_menu.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 27 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 4 | ||||
-rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 13 |
4 files changed, 31 insertions, 19 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 25917298..607dce2b 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -56,10 +56,10 @@ <group android:id="@+id/menu_group_headlines_selection" > <item - android:id="@+id/selection_mark_as_read" - android:icon="@android:drawable/ic_menu_close_clear_cancel" + android:id="@+id/selection_toggle_unread" + android:icon="@android:drawable/ic_menu_rotate" android:showAsAction="" - android:title="@string/selection_mark_as_read"/> + android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" diff --git a/res/values/strings.xml b/res/values/strings.xml index c8b3fd93..b7cc41be 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -23,8 +23,7 @@ <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="headline_context_multiple">Selected articles</string> <string name="http_authentication">HTTP Authentication</string> <string name="login_success">Logged in.</string> <string name="no_unread_feeds">No unread feeds.</string> @@ -45,20 +44,20 @@ <string name="category_browse_articles">Browse articles</string> <string name="blank"></string> <string name="transport_debugging">Log sent and received data</string> - <string name="article_toggle_marked">Toggle starred</string> - <string name="article_toggle_published">Toggle published</string> + <string name="article_toggle_marked">(Un)Star</string> + <string name="article_toggle_published">(Un)Publish</string> <string name="headlines_select">Select articles</string> <string name="headlines_select_dialog">Select articles</string> - <string name="headlines_select_all">All articles</string> - <string name="headlines_select_unread">Unread articles</string> + <string name="headlines_select_all">Everything</string> + <string name="headlines_select_unread">Unread</string> <string name="headlines_select_none">Deselect all</string> - <string name="selection_toggle_marked">Toggle starred</string> - <string name="selection_toggle_published">Toggle published</string> - <string name="selection_mark_as_read">Mark as read</string> - <string name="context_selection_toggle_marked">Starred</string> - <string name="context_selection_toggle_published">Published</string> - <string name="context_selection_toggle_unread">Unread</string> - <string name="article_set_unread">Mark unread</string> + <string name="selection_toggle_marked">(Un)Star</string> + <string name="selection_toggle_published">(Un)Publish</string> + <string name="selection_toggle_unread">(Un)Read</string> + <string name="context_selection_toggle_marked">(Un)Star</string> + <string name="context_selection_toggle_published">(Un)Publish</string> + <string name="context_selection_toggle_unread">(Un)Read</string> + <string name="article_set_unread">Set 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> <string name="enable_ads">Enable ads</string> @@ -70,7 +69,7 @@ <string name="no_feeds_to_display">No feeds to display</string> <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="browse_cats_like_feeds_summary">Use category context menu 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> diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index beb86a5f..73b6da4a 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -66,7 +66,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener { if (m_selectedArticles.size() > 0) {
menu.setHeaderTitle(R.string.headline_context_multiple);
} else {
- menu.setHeaderTitle(R.string.headline_context_single);
+ AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo;
+ Article article = getArticleAtPosition(info.position);
+ menu.setHeaderTitle(article.title);
}
super.onCreateContextMenu(menu, v, menuInfo);
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index d445e4fb..370c441f 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -632,7 +632,18 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe updateHeadlines(); } return true; - case R.id.selection_mark_as_read: + case R.id.selection_toggle_unread: + if (hf != null) { + ArticleList selected = hf.getSelectedArticles(); + + if (selected.size() > 0) { + for (Article a : selected) + a.unread = !a.unread; + + toggleArticlesUnread(selected); + hf.notifyUpdated(); + } + } return true; case R.id.selection_toggle_marked: if (hf != null) { |