SDL: Better commandline dialog in options

This commit is contained in:
Sergii Pylypenko
2016-06-08 18:38:35 +03:00
parent d1b9f16f93
commit 026495e13d
6 changed files with 22 additions and 7 deletions

View File

@@ -553,7 +553,11 @@ class SettingsMenuMisc extends SettingsMenu
final EditText edit = new EditText(p);
edit.setFocusableInTouchMode(true);
edit.setFocusable(true);
edit.setText(Globals.CommandLine.replace(" ", "\n").replace(" ", " "));
if (Globals.CommandLine.length() == 0)
Globals.CommandLine = "SDL_app";
if (Globals.CommandLine.indexOf(" ") == -1)
Globals.CommandLine += " ";
edit.setText(Globals.CommandLine.substring(Globals.CommandLine.indexOf(" ")).replace(" ", "\n").replace(" ", " "));
edit.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
edit.setMinLines(2);
//edit.setMaxLines(100);
@@ -563,7 +567,18 @@ class SettingsMenuMisc extends SettingsMenu
{
public void onClick(DialogInterface dialog, int item)
{
Globals.CommandLine = edit.getText().toString().replace(" ", " ").replace("\n", " ");
Globals.CommandLine = "SDL_app";
String args[] = edit.getText().toString().split("\n");
boolean firstArg = true;
for( String arg: args )
{
Globals.CommandLine += " ";
if( firstArg )
Globals.CommandLine += arg;
else
Globals.CommandLine += arg.replace(" ", " ");
firstArg = false;
}
dialog.dismiss();
goBack(p);
}

View File

@@ -22,7 +22,7 @@
<string name="storage_phone">Almacenamiento interno - %d MB libres</string>
<string name="storage_sd">Almacenamiento SD card - %d MB libres</string>
<string name="storage_custom">Especifique el directorio</string>
<string name="storage_commandline">Especifique los parámetros de la línea de comandos</string>
<string name="storage_commandline">Especifique los parámetros de la línea de comandos, one argument per line</string>
<string name="storage_question">Lugar donde guardar los datos de la instalación</string>
<string name="optional_downloads">Descargas</string>
<string name="downloads">Descargas</string>

View File

@@ -19,7 +19,7 @@
<string name="storage_phone">Stockage interne - %d Mo de libre</string>
<string name="storage_sd">Carte SD - %d Mo de libre</string>
<string name="storage_custom">Choisir le répertoire</string>
<string name="storage_commandline">Choisir les paramètres de la ligne de commande</string>
<string name="storage_commandline">Choisir les paramètres de la ligne de commande, one argument per line</string>
<string name="storage_question">Où télécharger les données</string>
<string name="optional_downloads">Téléchargements</string>
<string name="downloads">Téléchargements</string>

View File

@@ -95,7 +95,7 @@
<string name="accel_veryfast">Очень быстро</string>
<string name="remap_screenkb_button_gestures_sensitivity">Чувствительность жеста двумя пальцами по экрану</string>
<string name="storage_custom">Укажите каталог</string>
<string name="storage_commandline">Укажите параметры командной строки</string>
<string name="storage_commandline">Параметры командной строки, каждый аргумент на отдельной строке</string>
<string name="calibrate_touchscreen">Калибровка сенсорного экрана</string>
<string name="calibrate_touchscreen_touch">Дотроньтесь до всех краев экрана, потом нажмите Назад/BACK</string>
<string name="screenkb_custom_layout">Настройка расположения кнопок</string>

View File

@@ -95,7 +95,7 @@
<string name="accel_veryfast">Дуже швидко</string>
<string name="remap_screenkb_button_gestures_sensitivity">Чутливість жесту двома пальцями по екрану</string>
<string name="storage_custom">Вкажіть каталог</string>
<string name="storage_commandline">Вкажіть параметри командного рядка</string>
<string name="storage_commandline">Вкажіть параметри командного рядка, кожен аргумент на окремому рядку</string>
<string name="calibrate_touchscreen">Калібрування сенсорного екрану</string>
<string name="calibrate_touchscreen_touch">Доторкнiться до всіх країв екрану, потiм натисніть Назад/BACK</string>
<string name="screenkb_custom_layout">Налаштування положення кнопок</string>

View File

@@ -22,7 +22,7 @@
<string name="storage_phone">Internal storage - %d MB free</string>
<string name="storage_sd">SD card storage - %d MB free</string>
<string name="storage_custom">Specify directory</string>
<string name="storage_commandline">Specify command line parameters</string>
<string name="storage_commandline">Command line parameters, one argument per line</string>
<string name="storage_question">Data installation location</string>
<string name="optional_downloads">Downloads</string>
<string name="downloads">Downloads</string>