From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 1 Jul 2012 02:06:32 +0000 (+0000)
Subject: Some more renaming of menu options and strings so they are more consistent.
X-Git-Tag: upstream/12.09^2~134
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=971a6bd2a19a40b8c6314290d0b77e4955095f2e;p=debian%2Fopenrocket

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 122de68c..0f8aa934 100644
--- 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 892e0ccd..eafe701e 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="Download">Download</string>
     <string name="About">About</string>
     <string name="Preferences">Preferences</string>
-    <string name="select_series">Change Plot</string>
+    <string name="configurePlot">Change Plot</string>
     <string name="view_events">View Events</string>
     <string name="simulationPlotDialogTitle">Select Series And Events</string>
     <string name="plot">Plot</string>
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
index 48f70762..659ea38c 100644
--- 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) {
 		switch (item.getItemId())
 		{
-		case R.id.simulation_select_series_menu_option:
+		case R.id.simulation_config_plot_menu_option:
 			SimulationPlotConfigDialog seriesDialog = SimulationPlotConfigDialog.newInstance(chart);
 			seriesDialog.show(getFragmentManager(), "AbraCadaver");
 			seriesDialog.setOnConfirmListener(this);
 			return true;
-		case R.id.simulation_select_events_menu_option:
+		case R.id.simulation_view_events_menu_option:
 			SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart);
 			eventsDialog.show(getFragmentManager(), "AbraCadaver");
 			return true;