Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / res / menu / rocket_viewer_option_menu.xml

diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index 0afdcd1463b2e9601f11d427effb617487b499cb..eaf7bc22a260a7d4d1aba19ae9feff27a8ee1262 100644 (file)
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -1,13 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >\r
 \r
+    <item\r
+        android:id="@+id/menu_load"\r
+        android:icon="@drawable/ic_menu_archive"\r
+        android:orderInCategory="1"\r
+        android:showAsAction="ifRoom"\r
+        android:title="@string/load"/>\r
+    <item\r
+        android:id="@+id/menu_save"\r
+        android:icon="@drawable/ic_menu_save"\r
+        android:orderInCategory="0"\r
+        android:showAsAction="ifRoom"\r
+        android:title="@string/save"/>\r
     <item\r
         android:id="@+id/motor_list_menu_option"\r
-        android:title="Motor List"\r
-        android:showAsAction="always"/>\r
+        android:icon="@drawable/ic_motorbrowser"\r
+        android:orderInCategory="10"\r
+        android:showAsAction="ifRoom"\r
+        android:title="@string/viewmotorslabel"/>\r
     <item\r
         android:id="@+id/preference_menu_option"\r
-        android:title="@string/Preferences"\r
-        android:icon="@drawable/ic_menu_preferences"/>\r
+        android:icon="@drawable/ic_menu_preferences"\r
+        android:orderInCategory="10"\r
+        android:title="@string/Preferences"/>\r
+    <item\r
+        android:id="@+id/menu_about"\r
+        android:icon="@drawable/ic_menu_info_details"\r
+        android:orderInCategory="10"\r
+        android:showAsAction="never"\r
+        android:title="@string/About"/>\r
 \r
 </menu>
\ No newline at end of file