From 20a66a8dc20924e688c2afe457f4195daa4b08c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 30 Nov 2011 12:59:23 +0300
Subject: add several menu icons from http://www.androidicons.com/freebies.php

---
 res/drawable-hdpi/ic_menu_database.png | Bin 0 -> 1977 bytes
 res/drawable-hdpi/ic_menu_exit.png     | Bin 0 -> 1704 bytes
 res/drawable-hdpi/ic_menu_tick.png     | Bin 0 -> 3283 bytes
 res/menu/main_menu.xml                 |  16 +++++++++-------
 res/values/strings.xml                 |   4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_database.png
 create mode 100644 res/drawable-hdpi/ic_menu_exit.png
 create mode 100644 res/drawable-hdpi/ic_menu_tick.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_menu_database.png b/res/drawable-hdpi/ic_menu_database.png
new file mode 100644
index 00000000..8f89ade5
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_database.png differ
diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png
new file mode 100644
index 00000000..8e5fab5f
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_exit.png differ
diff --git a/res/drawable-hdpi/ic_menu_tick.png b/res/drawable-hdpi/ic_menu_tick.png
new file mode 100644
index 00000000..9691a11d
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_tick.png differ
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 607dce2b..09a7050d 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -24,32 +24,34 @@
 
             <item
                 android:id="@+id/logout"
+                android:icon="@drawable/ic_menu_exit"
                 android:showAsAction=""
                 android:title="@string/logout"/>
         </group>
 
         <group android:id="@+id/menu_group_headlines" >
 
-            <item
+            <!--  <item
                 android:id="@+id/load_more_articles"
                 android:icon="@android:drawable/ic_menu_more"
                 android:showAsAction="ifRoom|withText"
-                android:title="@string/load_more_articles"/>
+                android:title="@string/load_more_articles"/> -->
 
             <item
-                android:id="@+id/catchup_and_load"
-                android:icon="@android:drawable/ic_menu_rotate"
+                android:id="@+id/headlines_mark_as_read"
+                android:icon="@android:drawable/ic_menu_tick"
                 android:showAsAction="ifRoom|withText"
-                android:title="@string/catchup_and_load"/>
+                android:title="@string/headlines_mark_as_read"/>
 
-            <item
+            <!--  <item
                 android:id="@+id/show_all_articles"
                 android:icon="@android:drawable/ic_menu_agenda"
                 android:showAsAction=""
-                android:title="@string/show_all_articles"/>
+                android:title="@string/show_all_articles"/> -->
 
             <item
                 android:id="@+id/headlines_select"
+                android:icon="@drawable/ic_menu_database"
                 android:title="@string/headlines_select"/>
         </group>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b7cc41be..82793a07 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="update_feeds">Refresh feeds</string>
     <string name="close_article">Close article</string>
     <string name="share_article">Share article</string>
-    <string name="catchup">Mark as read</string>
+    <string name="catchup">Mark read</string>
     <string name="sort_feeds_by_unread">Sort feeds by unread count</string>
     <string name="load_more_articles">Load more</string>
     <string name="show_all_articles">Show all articles</string>
@@ -70,7 +70,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">Use category context menu to override this setting</string>
-    <string name="catchup_and_load">Catchup</string>
+    <string name="headlines_mark_as_read">Mark read</string>
     <string name="error_no_error">No error</string>
     <string name="error_unknown">Error: Unknown error (see log)</string>
     <string name="error_http_unauthorized">Error: 401 unauthorized</string>
-- 
cgit v1.2.3-54-g00ecf