| @@ -0,0 +1,36 @@ | |||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" > | |||
| <group | |||
| android:id="@+id/groupInfo" | |||
| android:menuCategory="system" | |||
| android:orderInCategory="1" > | |||
| <item | |||
| android:id="@+id/itemAbout" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_info_details" | |||
| android:menuCategory="container" | |||
| android:orderInCategory="1" | |||
| android:title="@string/menuAbout" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/itemSettings" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_preferences" | |||
| android:menuCategory="container" | |||
| android:orderInCategory="2" | |||
| android:title="@string/menuSettings" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/itemUserGuide" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_help" | |||
| android:menuCategory="container" | |||
| android:orderInCategory="3" | |||
| android:title="@string/menuUserGuide" | |||
| android:visible="true"> | |||
| </item> | |||
| </group> | |||
| </menu> | |||
| @@ -1,25 +1,41 @@ | |||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" > | |||
| <item | |||
| android:id="@+id/itemAbout" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_info_details" | |||
| android:title="@string/menuAbout" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/itemSettings" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_preferences" | |||
| android:title="@string/menuSettings" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/itemUserGuide" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_help" | |||
| android:title="@string/menuUserGuide" | |||
| android:visible="true"> | |||
| </item> | |||
| <group | |||
| android:id="@+id/groupCalculation" | |||
| android:menuCategory="system" | |||
| android:orderInCategory="2" > | |||
| <item | |||
| android:id="@+id/chooseConfiguration" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_edit" | |||
| android:menuCategory="secondary" | |||
| android:orderInCategory="1" | |||
| android:title="@string/menuChooseEquipment" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/doCalculation" | |||
| android:enabled="true" | |||
| android:icon="@drawable/btn_calc" | |||
| android:menuCategory="secondary" | |||
| android:orderInCategory="2" | |||
| android:title="@string/menuDoCalculation" | |||
| android:visible="true"> | |||
| </item> | |||
| <item | |||
| android:id="@+id/moreItems" | |||
| android:enabled="true" | |||
| android:icon="@android:drawable/ic_menu_more" | |||
| android:menuCategory="secondary" | |||
| android:orderInCategory="2" | |||
| android:title="@string/menuMoreItems" | |||
| android:visible="true"> | |||
| <menu> | |||
| <!-- Container der zur Laufzeit gefüllt wird --> | |||
| </menu> | |||
| </item> | |||
| </group> | |||
| </menu> | |||
| @@ -43,8 +43,11 @@ | |||
| <string name="scEvSLbl">EvS [mm]</string> | |||
| <!-- --> | |||
| <string name="menuUserGuide">Benutzeranleitung</string> | |||
| <string name="menuSettings">Einstellungen...</string> | |||
| <string name="menuSettings">Einstellungen…</string> | |||
| <string name="menuAbout">Info</string> | |||
| <string name="menuChooseEquipment">Ausrüstung wählen</string> | |||
| <string name="menuDoCalculation">Berechnen</string> | |||
| <string name="menuMoreItems">Mehr…</string> | |||
| </resources> | |||
| @@ -44,7 +44,10 @@ | |||
| <string name="scEvSLbl">EvS [mm]</string> | |||
| <!-- --> | |||
| <string name="menuUserGuide">User Guide</string> | |||
| <string name="menuSettings">Settings...</string> | |||
| <string name="menuSettings">Settings…</string> | |||
| <string name="menuAbout">Info</string> | |||
| <string name="menuChooseEquipment">Choose Equipment</string> | |||
| <string name="menuDoCalculation">Calculate</string> | |||
| <string name="menuMoreItems">More…</string> | |||
| </resources> | |||
| @@ -7,6 +7,7 @@ import android.content.Intent; | |||
| import android.os.Bundle; | |||
| import android.view.Menu; | |||
| import android.view.MenuItem; | |||
| import android.view.MotionEvent; | |||
| import android.view.View; | |||
| @@ -243,9 +244,16 @@ public class RBSMainActivity extends Activity { | |||
| @Override | |||
| public boolean onCreateOptionsMenu(final Menu menu) { | |||
| getMenuInflater().inflate(R.menu.rbs_main, menu); | |||
| getMenuInflater().inflate(R.menu.rbs_info_menu, menu.getItem(2).getSubMenu()); | |||
| return true; | |||
| } | |||
| @Override | |||
| public boolean onOptionsItemSelected(MenuItem item) { | |||
| return super.onOptionsItemSelected(item); | |||
| } | |||
| @Override | |||
| public boolean onTouchEvent(final MotionEvent touchevent) { | |||
| switch (touchevent.getAction()) { | |||