summaryrefslogtreecommitdiff
path: root/res/menu
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-02-28 17:43:12 +0100
committerArne Schwabe <arne@rfc2549.org>2013-02-28 17:43:12 +0100
commitc2d2473b1618a9a002344ec6be1e67004fdb1f94 (patch)
tree26e6080ee9aaa63de6d55ec0983d840ed65e423a /res/menu
parent428ef31f6a1de54cd6e3c20264f5ab411a076aaa (diff)
New Layout for main screen
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/configmenu.xml2
-rw-r--r--res/menu/logmenu.xml2
-rw-r--r--res/menu/vpn_context.xml25
3 files changed, 2 insertions, 27 deletions
diff --git a/res/menu/configmenu.xml b/res/menu/configmenu.xml
index 1d47e26b..41130970 100644
--- a/res/menu/configmenu.xml
+++ b/res/menu/configmenu.xml
@@ -5,7 +5,7 @@
android:id="@+id/sendConfig"
android:icon="@android:drawable/ic_menu_share"
android:showAsAction="ifRoom|withText"
- android:title="Send config file"
+ android:title="@string/send_config"
android:titleCondensed="@string/send"/>
</menu> \ No newline at end of file
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 0cc95b69..ee0f86de 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -33,7 +33,7 @@
android:title="@string/edit_vpn"/>
<item
android:id="@+id/toggle_time"
- android:alphabeticShortcut="e"
+ android:alphabeticShortcut="t"
android:icon="@android:drawable/ic_menu_week"
android:showAsAction="withText|ifRoom"
android:title="@string/toggle_timestamps"/>
diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml
deleted file mode 100644
index 239f1577..00000000
--- a/res/menu/vpn_context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/edit_vpn"
- android:alphabeticShortcut="e"
- android:icon="@android:drawable/ic_menu_edit"
- android:showAsAction="withText|ifRoom"
- android:title="@string/edit_vpn"/>
- <item
- android:id="@+id/remove_vpn"
- android:alphabeticShortcut="d"
- android:icon="@android:drawable/ic_menu_delete"
- android:showAsAction="withText|ifRoom"
- android:title="@string/remove_vpn"/>
-
- <!-- does not look good on phone portrait with 3 items :( -->
- <!-- <item
- android:id="@+id/connect_vpn"
- android:alphabeticShortcut="c"
- android:icon="@android:drawable/ic_media_play"
- android:showAsAction="ifRoom|withText"
- android:title="@string/connect"/>
- -->
-</menu> \ No newline at end of file