diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
index 7001b44e..fde6e1ac 100644
--- a/res/layout/activity_fpicker.xml
+++ b/res/layout/activity_fpicker.xml
@@ -1,5 +1,5 @@
-
+ tools:context="in.celest.xash3dVR.FPicker"
+ android:orientation="vertical">
+ android:id="@+id/FileView"
+ android:layout_weight="1"/>
-
+
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index fa08ecca..670c604b 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -97,6 +97,15 @@
android:orientation="vertical"
android:weightSum="1">
+
-->
+
+
-
-
+
@@ -203,7 +231,6 @@
android:layout_marginTop="3dp" />
+
-
+ android:layout_marginTop="3dp"
+ android:text="Pixel format"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
Аргументы командной строки(только для экспертов)
Запустить Xash3D
Включить экранное управление
- Использовать кнопки громкости
+ Действие кнопок громкости
+ Регулировка громкости
+ Использовать в игре
Путь к ресурсам игры
Настройки управления
Ярлык Xash3D
@@ -26,4 +28,6 @@
Настройки
Ярлык Xash3D (тест)
Создать ярлык
+ Выбрать
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19b742ab..0543fed8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,13 +35,14 @@ Special thanks to:\n
• GitHub
About Xash3D Android
Create mod shortcut
- (select)
+ Select folder
Normal
Advanced
Normal settings
Advanced settings
- Gamepad support off!
- Gamepad support active!
+ Volume buttons mode
+ Default action
+ Use in game
Set current folder
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 5c0e1036..92946fe4 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -10,6 +10,8 @@ import android.view.View;
import android.content.Intent;
import android.view.Window;
import android.widget.EditText;
+import android.widget.TextView;
+
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.Button;
@@ -40,6 +42,7 @@ public class LauncherActivity extends Activity {
static EditText resPath;
static SharedPreferences mPref;
static Spinner pixelSpinner;
+ static TextView tvResPath;
String getDefaultPath()
{
File dir = Environment.getExternalStorageDirectory();
@@ -72,12 +75,12 @@ public class LauncherActivity extends Activity {
tabHost.addTab(tabSpec);
final String[] list = {
- "RGBA8888",
- "RGBA888",
- "RGB565",
- "RGBA5551",
- "RGBA4444",
- "RGB332"
+ "32 bit (RGBA8888)",
+ "24 bit (RGB888)",
+ "16 bit (RGB565)",
+ "15 bit (RGBA5551)",
+ "12 bit (RGBA4444)",
+ "8 bit (RGB332)"
};
pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_spinner_item, list);
@@ -117,10 +120,26 @@ public class LauncherActivity extends Activity {
useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
useVolume.setChecked(mPref.getBoolean("usevolume",true));
resPath = ( EditText ) findViewById( R.id.cmdPath );
- resPath.setText(mPref.getString("basedir", getDefaultPath()));
+ tvResPath = ( TextView ) findViewById( R.id.textView_path );
+ updatePath(mPref.getString("basedir", getDefaultPath()));
+ resPath.setOnFocusChangeListener( new View.OnFocusChangeListener()
+
+ {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus)
+ {
+ updatePath( resPath.getText().toString() );
+ }
+ } );
pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
}
+ void updatePath( String text )
+ {
+ tvResPath.setText(getResources().getString(R.string.text_res_path) + ":\n" + text );
+ resPath.setText(text);
+
+ }
public void startXash(View view)
{
Intent intent = new Intent(this, XashActivity.class);
@@ -163,8 +182,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent resultData)
if (resultCode == RESULT_OK) {
try{
- resPath = ( EditText ) findViewById( R.id.cmdPath );
- resPath.setText( resultData.getStringExtra("GetPath"));
+ if( resPath == null )
+ return;
+ updatePath( resultData.getStringExtra("GetPath"));
// final List paths = resultData.getData().getPathSegments();
// String[] parts = paths.get(1).split(":");