summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-01 00:26:54 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-01 00:26:54 +0200
commit61deb1b6598f2816125525c8621b08e047172768 (patch)
tree436cd91b85b5f1f704ea22e041c8d12dfb51ed8f /res
parent370fa3686c7bfa74ed4b26c253ad0ba391bd34c4 (diff)
The real 0.4.6 version as being pushed to the market.
adds working clear and disconnect buttons to log window
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_menu_trash_holo_light.pngbin0 -> 1001 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_trash_holo_light.pngbin0 -> 746 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_trash_holo_light.pngbin0 -> 1279 bytes
-rw-r--r--res/menu/logmenu.xml18
-rw-r--r--res/values/strings.xml4
5 files changed, 17 insertions, 5 deletions
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 0000000..c62295a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_trash_holo_light.png
Binary files 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 0000000..0829185
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_trash_holo_light.png
Binary files 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 0000000..bd3fd78
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_trash_holo_light.png
Binary files differ
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 5fcadae..80331c5 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 7bc7ab9..28863ab 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>