summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-04-16 10:48:09 +0400
committerAndrew Dolgov <[email protected]>2013-04-16 10:48:09 +0400
commit0e744d41bad7ed65f4013129b8c9e48ded78f43d (patch)
tree689b13d832617f6bbe97e2b82d524ae4334c2afd
parent2bdcdae44fec646ea5ca9cfb0e12d86b7fe6ceef (diff)
further menu-related fixes
remove mangled unicode ellipsis in articlefragment
-rw-r--r--res/menu/main_menu.xml21
-rw-r--r--res/menu/offline_menu.xml1
-rw-r--r--src/org/fox/ttrss/ArticleFragment.java2
3 files changed, 13 insertions, 11 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 16047b33..84adbc8e 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -23,15 +23,16 @@
android:showAsAction="ifRoom"
android:title="@string/menu_all_feeds"/>
<item
+ android:id="@+id/go_offline"
+ android:icon="@drawable/ic_cloud_light"
+ android:showAsAction="ifRoom"
+ android:title="@string/go_offline"/>
+ <item
android:id="@+id/update_feeds"
android:icon="@drawable/ic_refresh_light"
android:showAsAction="ifRoom"
android:title="@string/update_feeds"/>
<item
- android:id="@+id/go_offline"
- android:showAsAction=""
- android:title="@string/go_offline"/>
- <item
android:id="@+id/logout"
android:showAsAction=""
android:title="@string/logout"/>
@@ -97,11 +98,6 @@
</group>
<group android:id="@+id/menu_group_article" >
<item
- android:id="@+id/toggle_attachments"
- android:icon="@drawable/ic_menu_attaches"
- android:showAsAction="ifRoom"
- android:title="@string/attachments_prompt"/>
- <item
android:id="@+id/toggle_marked"
android:icon="@drawable/ic_menu_marked"
android:showAsAction="ifRoom"
@@ -123,11 +119,16 @@
android:showAsAction="ifRoom"
android:title="@string/article_set_unread"/>
<item
+ android:id="@+id/toggle_attachments"
+ android:icon="@drawable/ic_menu_attaches"
+ android:showAsAction="ifRoom"
+ android:title="@string/attachments_prompt"/>
+ <item
android:id="@+id/catchup_above"
android:title="@string/article_mark_read_above"/>
<item
android:id="@+id/set_labels"
- android:showAsAction="ifRoom"
+ android:showAsAction=""
android:icon="@drawable/ic_labels_light"
android:title="@string/article_set_labels"/>
<item
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 93eb5d1a..181cae90 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -4,6 +4,7 @@
<item
android:id="@+id/go_online"
android:showAsAction="ifRoom|withText"
+ android:icon="@drawable/ic_cloud_light"
android:title="@string/go_online"
android:visible="false"/>
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index e84d712d..1fa76bcc 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -110,7 +110,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
String titleStr;
if (m_article.title.length() > 200)
- titleStr = m_article.title.substring(0, 200) + "�";
+ titleStr = m_article.title.substring(0, 200) + "...";
else
titleStr = m_article.title;