Some more renaming of menu options and strings so they are more consistent.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@825 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/menu/simulation_option_menu.xml b/android/res/menu/simulation_option_menu.xml
index 122de68cd5fe3e6540980d48676aa729c29d4111..0f8aa934faab87396e69e873c5e612b034c4be8d 100644 (file)
--- a/android/res/menu/simulation_option_menu.xml
+++ b/android/res/menu/simulation_option_menu.xml
@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/simulation_select_series_menu_option"
-        android:title="@string/select_series"/>
+        android:id="@+id/simulation_config_plot_menu_option"
+        android:title="@string/configurePlot"/>
     <item
-        android:id="@+id/simulation_select_events_menu_option"
+        android:id="@+id/simulation_view_events_menu_option"
         android:title="@string/view_events"/>
 </menu>
\ No newline at end of file

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 892e0ccd072507b8d5c3d44130060d8358ad4bf5..eafe701e209727c143acf6bb7ed347a53e056140 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="Download">Download</string>\r
     <string name="About">About</string>\r
     <string name="Preferences">Preferences</string>\r
-    <string name="select_series">Change Plot</string>\r
+    <string name="configurePlot">Change Plot</string>\r
     <string name="view_events">View Events</string>\r
     <string name="simulationPlotDialogTitle">Select Series And Events</string>\r
     <string name="plot">Plot</string>\r

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
index 48f70762881204a5813c18151aa8c727d781cb23..659ea38c2880cfa9e6ed9f4c2883b979dbcc4f56 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
@@ -62,12 +62,12 @@ public class SimulationViewFragment extends SherlockFragment implements Simulati
        public boolean onOptionsItemSelected(MenuItem item) {\r
                switch (item.getItemId())\r
                {\r
-               case R.id.simulation_select_series_menu_option:\r
+               case R.id.simulation_config_plot_menu_option:\r
                        SimulationPlotConfigDialog seriesDialog = SimulationPlotConfigDialog.newInstance(chart);\r
                        seriesDialog.show(getFragmentManager(), "AbraCadaver");\r
                        seriesDialog.setOnConfirmListener(this);\r
                        return true;\r
-               case R.id.simulation_select_events_menu_option:\r
+               case R.id.simulation_view_events_menu_option:\r
                        SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart);\r
                        eventsDialog.show(getFragmentManager(), "AbraCadaver");\r
                        return true;\r