Skip to content
Snippets Groups Projects
Commit d4a74321 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

Views lang bugfix

parent 6dc8eb38
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/view_selector" android:background="@drawable/view_selector"
android:minHeight="30dp" android:minHeight="30dp"
android:text="@string/view_xyz" android:text="@string/menu_views_ref_frame_xyz"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</FrameLayout> </FrameLayout>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/view_selector" android:background="@drawable/view_selector"
android:minHeight="30dp" android:minHeight="30dp"
android:text="@string/view_xyz" android:text="@string/menu_views_ref_frame_xyz"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</FrameLayout> </FrameLayout>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="views_array">
<item>XYZ</item>
<item>X</item>
<item>-X</item>
<item>Y</item>
<item>-Y</item>
<item>Z</item>
<item>-Z</item>
<item>Earth</item>
<item>Sun</item>
<item>S/C-xyz</item>
<item>S/C-rear</item>
<item>S/C-front</item>
<item>S/C-top</item>
<item>S/C-bottom</item>
<item>S/C-left</item>
<item>S/C-right</item>
</string-array>
<string-array name="basicinds"> <string-array name="basicinds">
<item>Earth</item> <item>Earth</item>
<item>Sun</item> <item>Sun</item>
......
...@@ -92,5 +92,22 @@ ...@@ -92,5 +92,22 @@
<string name="pref_key_vector_a_color">pref_key_vector_a_color</string> <string name="pref_key_vector_a_color">pref_key_vector_a_color</string>
<string name="pref_key_vector_a_limit">pref_key_vector_a_limit</string> <string name="pref_key_vector_a_limit">pref_key_vector_a_limit</string>
<string name="pref_key_direction_a_show">pref_key_direction_a_show</string> <string name="pref_key_direction_a_show">pref_key_direction_a_show</string>
<string name="pref_key_direction_a_color">pref_key_direction_a_color</string> <string name="pref_key_direction_a_color">pref_key_direction_a_color</string>
<string name="key_views_ref_frame_xyz">XYZ</string>
<string name="key_views_ref_frame_x">X</string>
<string name="key_views_ref_frame_xx">-X</string>
<string name="key_views_ref_frame_y">Y</string>
<string name="key_views_ref_frame_yy">-Y</string>
<string name="key_views_ref_frame_z">Z</string>
<string name="key_views_ref_frame_zz">-Z</string>
<string name="key_views_spacecraft_xyz">S/C-XYZ</string>
<string name="key_views_spacecraft_rear">S/C-Rear</string>
<string name="key_views_spacecraft_front">S/C-Front</string>
<string name="key_views_spacecraft_top">S/C-Top</string>
<string name="key_views_spacecraft_bottom">S/C-Bottom</string>
<string name="key_views_spacecraft_left">S/C-Left</string>
<string name="key_views_spacecraft_right">S/C-Right</string>
<string name="key_views_earth">Earth</string>
<string name="key_views_sun">Sun</string>
</resources> </resources>
\ No newline at end of file
...@@ -176,51 +176,61 @@ public final class HudFragment extends Fragment { ...@@ -176,51 +176,61 @@ public final class HudFragment extends Fragment {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
String com_view = (String)item.getTitle(); String com_view = (String)item.getTitle();
String command;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_views_earth: case R.id.menu_views_earth:
command = getString(R.string.key_views_earth);
break; break;
case R.id.menu_views_sun: case R.id.menu_views_sun:
command = getString(R.string.key_views_sun);
break; break;
case R.id.menu_views_ref_frame_xyz: case R.id.menu_views_ref_frame_xyz:
command = getString(R.string.key_views_ref_frame_xyz);
break; break;
case R.id.menu_views_ref_frame_x: case R.id.menu_views_ref_frame_x:
command = getString(R.string.key_views_ref_frame_x);
break; break;
case R.id.menu_views_ref_frame_xx: case R.id.menu_views_ref_frame_xx:
command = getString(R.string.key_views_ref_frame_xx);
break; break;
case R.id.menu_views_ref_frame_y: case R.id.menu_views_ref_frame_y:
command = getString(R.string.key_views_ref_frame_y);
break; break;
case R.id.menu_views_ref_frame_yy: case R.id.menu_views_ref_frame_yy:
command = getString(R.string.key_views_ref_frame_yy);
break; break;
case R.id.menu_views_ref_frame_z: case R.id.menu_views_ref_frame_z:
command = getString(R.string.key_views_ref_frame_z);
break; break;
case R.id.menu_views_ref_frame_zz: case R.id.menu_views_ref_frame_zz:
command = getString(R.string.key_views_ref_frame_zz);
break; break;
case R.id.menu_views_spacecraft_xyz: case R.id.menu_views_spacecraft_xyz:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_xyz);
break; break;
case R.id.menu_views_spacecraft_rear: case R.id.menu_views_spacecraft_rear:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_rear);
break; break;
case R.id.menu_views_spacecraft_front: case R.id.menu_views_spacecraft_front:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_front);
break; break;
case R.id.menu_views_spacecraft_top: case R.id.menu_views_spacecraft_top:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_top);
break; break;
case R.id.menu_views_spacecraft_bottom: case R.id.menu_views_spacecraft_bottom:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_bottom);
break; break;
case R.id.menu_views_spacecraft_left: case R.id.menu_views_spacecraft_left:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_left);
break; break;
case R.id.menu_views_spacecraft_right: case R.id.menu_views_spacecraft_right:
com_view = "S/C-" + com_view; command = getString(R.string.key_views_spacecraft_right);
break; break;
default: default:
return false; return false;
} }
views_menu.setText(com_view); views_menu.setText(com_view);
browser.load("javascript:changeView('"+com_view+"')", null); browser.load("javascript:changeView('"+command+"')", null);
return true; return true;
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment