From 0e744d41bad7ed65f4013129b8c9e48ded78f43d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 16 Apr 2013 10:48:09 +0400
Subject: further menu-related fixes remove mangled unicode ellipsis in
 articlefragment

---
 res/menu/main_menu.xml    | 21 +++++++++++----------
 res/menu/offline_menu.xml |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'res')

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
@@ -22,15 +22,16 @@
                 android:icon="@drawable/ic_list_light"
                 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=""
@@ -96,11 +97,6 @@
                 android:title="@string/selection_select_none"/>
         </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"
@@ -122,12 +118,17 @@
                 android:icon="@drawable/ic_undo_light"
                 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"/>
 
-- 
cgit v1.2.3-54-g00ecf