Model orbit working with all preferences

res/values-es/strings.xml

@@ -324,7 +324,11 @@
     <string name="pref_title_spacecraft_color">Color nave</string>
     <string name="pref_category_orbit">Órbita</string>
     <string name="pref_summary_orbit_color">Color de la línea de órbita</string>
-    <string name="pref_title_orbit_color">color de órbita</string>
+    <string name="pref_title_orbit_color">Color de órbita</string>
+    <string name="pref_summary_show_earth_orbit">Mostrar el planeta Tierra</string>
+    <string name="pref_title_show_earth_orbit">Mostrar la Tierra</string>
+    <string name="pref_summary_show_projection_line">Mostrar la línea de proyección de la nave</string>
+    <string name="pref_title_show_projection_line">Mostrar proyección</string>
     
     <string name="pref_title_target_a_x">Blanco X</string>
     <string name="pref_title_target_a_y">Blanco Y</string>

res/values-fr/strings.xml

@@ -326,6 +326,10 @@
     <string name="pref_category_orbit">Orbite</string>
     <string name="pref_summary_orbit_color">Couleur de la ligne d\'orbite</string>
     <string name="pref_title_orbit_color">couleur d\'orbite</string>
+    <string name="pref_summary_show_earth_orbit">Afficher la planète Terre</string>
+    <string name="pref_title_show_earth_orbit">Afficher la Terre</string>
+    <string name="pref_summary_show_projection_line">Afficher la ligne de projection du vaisseau</string>
+    <string name="pref_title_show_projection_line">Afficher projection</string>
     
     <string name="pref_title_target_a_x">Cible X</string>
     <string name="pref_title_target_a_y">Cible Y</string>

res/values/colors.xml

@@ -9,7 +9,7 @@
     <color name="pref_def_plane_orb">#65ff00</color>
     <color name="pref_def_plane_xy">#ff0094</color>
     <color name="pref_def_orbit_color">#00ff00</color>
-    <color name="pref_def_spacecraft_color">#008800</color>
+    <color name="pref_def_spacecraft_color">#fff200</color>
     <color name="pref_def_color_xy_plane">#ff0094</color>
     
     <color name="panel_clock">#00c100</color>

res/values/keys.xml

@@ -112,6 +112,8 @@
     <string name="pref_key_spacecraft_color">pref_key_spacecraft_color</string>
     <string name="pref_key_show_projection">pref_key_show_projection</string>
     <string name="pref_key_orbit_color">pref_key_orbit_color</string>
+    <string name="pref_key_show_earth_orbit">pref_key_show_earth_orbit</string>
+    <string name="pref_key_show_projection_line">pref_key_show_projection_line</string>
     
     <string name="key_views_ref_frame_xyz">XYZ</string>
     <string name="key_views_ref_frame_x">X</string>

res/values/strings.xml

@@ -326,6 +326,10 @@
     <string name="pref_category_orbit">Orbit</string>
     <string name="pref_summary_orbit_color">Orbit line color</string>
     <string name="pref_title_orbit_color">Orbit color</string>
+    <string name="pref_summary_show_earth_orbit">Show the Earth planet</string>
+    <string name="pref_title_show_earth_orbit">Show Earth</string>
+    <string name="pref_summary_show_projection_line">Show the spacecraft projection line</string>
+    <string name="pref_title_show_projection_line">Show projection</string>
     
     <string name="pref_title_target_a_x">Target X</string>
     <string name="pref_title_target_a_y">Target Y</string>

res/xml/orbit.xml

@@ -8,16 +8,23 @@
             android:key="@string/pref_key_show_earth_axis"
             android:summary="@string/pref_summary_show_earth_axis"
             android:title="@string/pref_title_show_earth_axis"
+            android:defaultValue="true" />        
+        <CheckBoxPreference
+            android:key="@string/pref_key_show_earth_orbit"
+            android:summary="@string/pref_summary_show_earth_orbit"
+            android:title="@string/pref_title_show_earth_orbit"
             android:defaultValue="true" />
         <CheckBoxPreference
             android:key="@string/pref_key_show_earth_atmosphere"
             android:summary="@string/pref_summary_show_earth_atmosphere"
             android:title="@string/pref_title_show_earth_atmosphere"
+            android:dependency="@string/pref_key_show_earth_orbit"
             android:defaultValue="true" />
         <CheckBoxPreference
             android:key="@string/pref_key_show_earth_clouds"
             android:summary="@string/pref_summary_show_earth_clouds"
             android:title="@string/pref_title_show_earth_clouds"
+            android:dependency="@string/pref_key_show_earth_orbit"
             android:defaultValue="true" />
     </PreferenceCategory>
     <PreferenceCategory 
@@ -32,6 +39,7 @@
             android:key="@string/pref_key_color_xy_plane"
             android:summary="@string/pref_summary_color_xy_plane"
             android:title="@string/pref_title_color_xy_plane"
+            android:dependency="@string/pref_key_show_xy_plane"
             android:defaultValue="@color/pref_def_color_xy_plane" />
     </PreferenceCategory>
     <PreferenceCategory 
@@ -56,5 +64,10 @@
             android:summary="@string/pref_summary_orbit_color"
             android:title="@string/pref_title_orbit_color"
             android:defaultValue="@color/pref_def_orbit_color" />
+        <CheckBoxPreference
+            android:key="@string/pref_key_show_projection_line"
+            android:summary="@string/pref_summary_show_projection_line"
+            android:title="@string/pref_title_show_projection_line"
+            android:defaultValue="true" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file

src/cs/si/stavor/model/ModelConfigurationOrbit.java

@@ -28,6 +28,7 @@ public class ModelConfigurationOrbit {
 		show_axis = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_axis), show_axis);
 		show_axis_labels = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_axis_labels), show_axis_labels);
 		
+		show_earth = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_earth_orbit), show_earth);
 		show_earth_axis = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_earth_axis), show_earth_axis);
 		show_earth_atmosphere = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_earth_atmosphere), show_earth_atmosphere);
 		show_earth_clouds = sharedPref.getBoolean(ctx.getString(R.string.pref_key_show_earth_clouds), show_earth_clouds);
@@ -61,15 +62,16 @@ public class ModelConfigurationOrbit {
 	public boolean show_axis = true;
 	public boolean show_axis_labels = true;
 	
+	public boolean show_earth = true;
 	public boolean show_earth_axis = true;
 	public boolean show_earth_atmosphere = true;
 	public boolean show_earth_clouds = true;
 	
-	public boolean show_xy_plane = true;
+	public boolean show_xy_plane = false;
 	public int color_xy_plane = 0xff0094;
 	
 	public boolean show_spacecraft = true;
-	public int spacecraft_color = 0x008800;
+	public int spacecraft_color = 0xfff200;
 	public boolean show_projection = true;
 	
 	public int orbit_color = 0x00ff00;