diff options
author | Parménides GV <parmegv@sdf.org> | 2014-05-29 10:19:57 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-05-29 10:19:57 +0200 |
commit | f6139feeee3a2e5d68ce2e5848723d4c0a0ffda3 (patch) | |
tree | 7db0a263acfb740b3c19f1d6708b1f176397b480 /app/src/main | |
parent | aba5a16a97b43f95659e0f79f76549b1fe2e9d56 (diff) |
Last ics-openvpn compilation problem fixed.
Forgot to add the menu for the log.
Now we'll strive to fix se.leap.bitmaskclient problems: first compilation, then functionality.
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/res/menu/logmenu.xml | 72 | ||||
-rw-r--r-- | app/src/main/res/values/untranslatable.xml | 19 |
2 files changed, 57 insertions, 34 deletions
diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml index c4087585..c498eefc 100644 --- a/app/src/main/res/menu/logmenu.xml +++ b/app/src/main/res/menu/logmenu.xml @@ -1,34 +1,38 @@ -<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item
- android:id="@+id/clearlog"
- android:icon="@drawable/ic_menu_trash_holo_light"
- android:showAsAction="ifRoom|withText"
- android:title="@string/clear_log"
- android:titleCondensed="@string/clear"/>
- <item
- android:id="@+id/cancel"
- android:icon="@android:drawable/ic_menu_close_clear_cancel"
- android:showAsAction="ifRoom|withText"
- android:title="@string/cancel_connection"
- android:titleCondensed="@string/cancel"/>
- <item
- android:id="@+id/info"
- android:icon="@android:drawable/ic_menu_info_details"
- android:showAsAction="ifRoom|withText"
- android:title="@string/show_connection_details"
- android:titleCondensed="@string/info"/>
-
- <item
- android:id="@+id/send"
- android:icon="@android:drawable/ic_menu_share"
- android:showAsAction="ifRoom|withText"
- android:title="@string/send_logfile"
- android:titleCondensed="@string/send"/>
- <item
- android:alphabeticShortcut="e"
- android:icon="@android:drawable/ic_menu_edit"
- android:showAsAction="withText|ifRoom"
- android:title="@string/edit_vpn"/>
-
-</menu>
+<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + + <item + android:id="@+id/toggle_time" + android:alphabeticShortcut="t" + android:icon="@android:drawable/ic_menu_view" + android:showAsAction="withText|ifRoom" + android:title="@string/logview_options" /> + + <item + android:id="@+id/clearlog" + android:icon="@android:drawable/ic_menu_delete" + android:showAsAction="ifRoom|withText" + android:title="@string/clear_log" + android:titleCondensed="@string/clear"/> + <item + android:id="@+id/send" + android:icon="@android:drawable/ic_menu_share" + android:showAsAction="ifRoom|withText" + android:title="@string/send_logfile" + android:titleCondensed="@string/send"/> + + <item + android:id="@+id/cancel" + android:icon="@android:drawable/ic_menu_close_clear_cancel" + android:showAsAction="ifRoom|withText" + android:title="@string/cancel_connection_long" + android:titleCondensed="@string/cancel_connection"/> + <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"/> + +</menu>
\ No newline at end of file diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index c73ccb05..79c53ff7 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -340,4 +340,23 @@ + + + + + + + + + + + + + + + + + + + </resources>
\ No newline at end of file |