From fe48567251988440ed62e57af8dbdf25d68e2e34 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Thu, 5 Sep 2013 09:05:05 +0000
Subject: [PATCH] Android: new values files
---
.../Android/res/values-sw600dp/refs.xml | 5 ++++
contrib/mobile/Android/res/values/strings.xml | 24 ++++++++-----------
.../org/geuz/onelab/OptionsModelFragment.java | 2 --
3 files changed, 15 insertions(+), 16 deletions(-)
create mode 100644 contrib/mobile/Android/res/values-sw600dp/refs.xml
diff --git a/contrib/mobile/Android/res/values-sw600dp/refs.xml b/contrib/mobile/Android/res/values-sw600dp/refs.xml
new file mode 100644
index 0000000000..398bcc8216
--- /dev/null
+++ b/contrib/mobile/Android/res/values-sw600dp/refs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <item type="layout" name="main_activity_layout">@layout/activity_twopane</item>
+
+</resources>
\ No newline at end of file
diff --git a/contrib/mobile/Android/res/values/strings.xml b/contrib/mobile/Android/res/values/strings.xml
index eaf9831ea8..5677f9fbba 100644
--- a/contrib/mobile/Android/res/values/strings.xml
+++ b/contrib/mobile/Android/res/values/strings.xml
@@ -1,25 +1,21 @@
<resources>
<string name="app_name">Onelab</string>
- <string name="button_open_external_file">Open MSH file on external storage</string>
+ <string name="button_open_external_file">Open file from external storage</string>
<string name="button_ok">OK</string>
<string name="button_recalculate_param">Recalulate with new parameters</string>
- <string name="dialog_title_choosefile">Choose a MSH file</string>
+ <string name="dialog_title_choosefile">Choose a file</string>
<string name="error_nosdcard">No SDcard found on your device</string>
<string name="title_parameter">Settings</string>
<string name="title_activity_main">Onelab</string>
<string name="error_nomshfile">No compatible files or directories in this folder</string>
- <string name="menu_list">Load a model</string>
- <string name="menu_settings">Settings</string>
<string name="menu_model">Show the model</string>
- <string name="menu_postpro">Post-processing</string>
- <string name="menu_hidebar">Hide the top bar</string>
- <string name="menu_showbar">Show the top bar</string>
- <string name="menu_view">Change the view</string>
- <string name="menu_view_x">Set X view</string>
- <string name="menu_view_y">Set Y view</string>
- <string name="menu_view_z">Set Z view</string>
- <string name="menu_view_scale">Reset unit scale</string>
- <string name="menu_view_translation">Center the model</string>
-
+ <string name="menu_parameters">Parameters</string>
+ <string name="menu_parameters_model">Model</string>
+ <string name="menu_parameters_display">Display</string>
+ <string name="menu_run">Run</string>
+ <string name="menu_stop">Stop</string>
+ <string name="postpro_intervalstype">Intervals type</string>
+ <string name="postpro_intervals">Intervals</string>
+ <string name="postpro_raizez">Raise (Z)</string>
</resources>
\ No newline at end of file
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
index 1c06970f08..cd6782ee39 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
@@ -3,8 +3,6 @@ package org.geuz.onelab;
import java.util.ArrayList;
import java.util.List;
-import org.geuz.onelab.OptionsFragment.OnOptionsChangedListener;
-
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
--
GitLab