From f26bdab76d0632aa0f1489c58e9ccc28bf1c74ba Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 1 May 2012 00:26:54 +0200
Subject: The real 0.4.6 version as being pushed to the market.

adds working clear and disconnect buttons to log window
---
 res/drawable-hdpi/ic_menu_trash_holo_light.png  | Bin 0 -> 1001 bytes
 res/drawable-mdpi/ic_menu_trash_holo_light.png  | Bin 0 -> 746 bytes
 res/drawable-xhdpi/ic_menu_trash_holo_light.png | Bin 0 -> 1279 bytes
 res/menu/logmenu.xml                            |  18 +++++++++++++-----
 res/values/strings.xml                          |   4 ++++
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_trash_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_menu_trash_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_menu_trash_holo_light.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_menu_trash_holo_light.png b/res/drawable-hdpi/ic_menu_trash_holo_light.png
new file mode 100644
index 00000000..c62295aa
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_trash_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_trash_holo_light.png b/res/drawable-mdpi/ic_menu_trash_holo_light.png
new file mode 100644
index 00000000..08291855
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_trash_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_trash_holo_light.png b/res/drawable-xhdpi/ic_menu_trash_holo_light.png
new file mode 100644
index 00000000..bd3fd784
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_trash_holo_light.png differ
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 5fcadae0..80331c5e 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-<item android:id="@+id/clearlog"
-    android:icon="@android:drawable/ic_menu_crop"
-    android:title="clear log"
-    android:showAsAction="ifRoom"
-    />
+
+    <item
+        android:id="@+id/clearlog"
+        android:icon="@drawable/ic_menu_trash_holo_light"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/clear_log"/>
+    
+    <item android:id="@+id/cancel"
+        android:icon="@android:drawable/ic_menu_close_clear_cancel"
+        android:showAsAction="ifRoom|withText"
+        android:title="@string/cancel_connection"
+        />
+    
 
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7bc7ab95..28863ab9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -113,4 +113,8 @@
     <string name="custom_config_summary">Specify custom options. Use with care!</string>
     <string name="route_rejected">Route rejected by Android</string>
     <string formatted="false" name="ip_not_cidr">Cannot make sense of %s and %s as IP and CIDR netmask, assuming P2P for local address (/32)</string>
+    <string name="cancel_connection">cancel</string>
+    <string name="clear_log">clear log</string>
+    <string name="title_cancel">Cancel Confirmation</string>
+    <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
 </resources>
-- 
cgit v1.2.3