feat: cleanup and clarify settings (#503)

- remove download directory from settings
- remove edit option for game installation directory
- clarify label (de,en) for launcher installation game
- clarify label (de,en) for max heap size
- make "Advanced options" pane closed by default

src/main/java/org/terasology/launcher/gui/javafx/ApplicationController.java

@@ -269,7 +269,7 @@ protected void openSettingsAction() {
             }
 
             final SettingsController settingsController = fxmlLoader.getController();
-            settingsController.initialize(launcherDirectory, downloadDirectory, launcherSettings, packageManager, settingsStage, this);
+            settingsController.initialize(launcherDirectory, launcherSettings, packageManager, settingsStage, this);
 
             Scene scene = new Scene(root);
             settingsStage.setScene(scene);

src/main/java/org/terasology/launcher/gui/javafx/SettingsController.java

@@ -51,7 +51,6 @@ public class SettingsController {
     private static final Logger logger = LoggerFactory.getLogger(SettingsController.class);
 
     private Path launcherDirectory;
-    private Path downloadDirectory;
     private BaseLauncherSettings launcherSettings;
     private PackageManager packageManager;
     private ApplicationController appController;
@@ -70,8 +69,6 @@ public class SettingsController {
     @FXML
     private Button gameDirectoryOpenButton;
     @FXML
-    private Button gameDirectoryEditButton;
-    @FXML
     private Button gameDataDirectoryOpenButton;
     @FXML
     private Button gameDataDirectoryEditButton;
@@ -96,12 +93,8 @@ public class SettingsController {
     @FXML
     private Label launcherDirectoryLabel;
     @FXML
-    private Label downloadDirectoryLabel;
-    @FXML
     private Button launcherDirectoryOpenButton;
     @FXML
-    private Button downloadDirectoryOpenButton;
-    @FXML
     private CheckBox searchForUpdatesBox;
     @FXML
     private Button saveSettingsButton;
@@ -120,8 +113,6 @@ public class SettingsController {
     @FXML
     private TextField launcherDirectoryPath;
     @FXML
-    private TextField downloadDirectoryPath;
-    @FXML
     private TextField userJavaParametersField;
     @FXML
     private TextField userGameParametersField;
@@ -191,21 +182,6 @@ protected void openGameDirectoryAction() {
         GuiUtils.openFileBrowser(stage, gameDirectory, BundleUtils.getLabel("message_error_gameDirectory"));
     }
 
-    @FXML
-    protected void editGameDirectoryAction() {
-        final Path selectedFile = GuiUtils.chooseDirectoryDialog(stage, gameDirectory, BundleUtils.getLabel("settings_game_gameDirectory_edit_title"));
-        if (selectedFile != null) {
-            try {
-                FileUtils.ensureWritableDir(selectedFile);
-                gameDirectory = selectedFile;
-                updateDirectoryPathLabels();
-            } catch (IOException e) {
-                logger.error("The game directory can not be created or used! '{}'", gameDirectory, e);
-                GuiUtils.showErrorMessageDialog(stage, BundleUtils.getLabel("message_error_gameDirectory") + "\n" + gameDirectory);
-            }
-        }
-    }
-
     @FXML
     protected void openGameDataDirectoryAction() {
         GuiUtils.openFileBrowser(stage, gameDataDirectory, BundleUtils.getLabel("message_error_gameDataDirectory"));
@@ -231,11 +207,6 @@ protected void openLauncherDirectoryAction() {
         GuiUtils.openFileBrowser(stage, launcherDirectory, BundleUtils.getLabel("message_error_launcherDirectory"));
     }
 
-    @FXML
-    protected void openDownloadDirectoryAction() {
-        GuiUtils.openFileBrowser(stage, downloadDirectory, BundleUtils.getLabel("message_error_downloadDirectory"));
-    }
-
     @FXML
     protected void updateMaxHeapSizeBox() {
         final JavaHeapSize initialHeapSize = initialHeapSizeBox.getSelectionModel().getSelectedItem();
@@ -254,10 +225,9 @@ protected void updateInitialHeapSizeBox() {
         }
     }
 
-    void initialize(final Path newLauncherDirectory, final Path newDownloadDirectory, final BaseLauncherSettings newLauncherSettings,
+    void initialize(final Path newLauncherDirectory, final BaseLauncherSettings newLauncherSettings,
                     final PackageManager newPackageManager, final Stage newStage, final ApplicationController newAppController) {
         this.launcherDirectory = newLauncherDirectory;
-        this.downloadDirectory = newDownloadDirectory;
         this.launcherSettings = newLauncherSettings;
         this.packageManager = newPackageManager;
         this.stage = newStage;
@@ -292,7 +262,6 @@ private void setLabelStrings() {
         maxHeapSizeLabel.setText(BundleUtils.getLabel("settings_game_maxHeapSize"));
         initialHeapSizeLabel.setText(BundleUtils.getLabel("settings_game_initialHeapSize"));
         gameDirectoryOpenButton.setText(BundleUtils.getLabel("settings_game_gameDirectory_open"));
-        gameDirectoryEditButton.setText(BundleUtils.getLabel("settings_game_gameDirectory_edit"));
         gameDataDirectoryOpenButton.setText(BundleUtils.getLabel("settings_game_gameDataDirectory_open"));
         gameDataDirectoryEditButton.setText(BundleUtils.getLabel("settings_game_gameDataDirectory_edit"));
         gameDirectoryLabel.setText(BundleUtils.getLabel("settings_game_gameDirectory"));
@@ -312,9 +281,7 @@ private void setLabelStrings() {
         closeAfterStartBox.setText(BundleUtils.getLabel("settings_launcher_closeLauncherAfterGameStart"));
         saveDownloadedFilesBox.setText(BundleUtils.getLabel("settings_launcher_saveDownloadedFiles"));
         launcherDirectoryLabel.setText(BundleUtils.getLabel("settings_launcher_launcherDirectory"));
-        downloadDirectoryLabel.setText(BundleUtils.getLabel("settings_launcher_downloadDirectory"));
         launcherDirectoryOpenButton.setText(BundleUtils.getLabel("settings_launcher_launcherDirectory_open"));
-        downloadDirectoryOpenButton.setText(BundleUtils.getLabel("settings_launcher_downloadDirectory_open"));
         searchForUpdatesBox.setText(BundleUtils.getLabel("settings_launcher_searchForLauncherUpdates"));
         saveSettingsButton.setText(BundleUtils.getLabel("settings_save"));
         cancelSettingsButton.setText(BundleUtils.getLabel("settings_cancel"));
@@ -384,7 +351,6 @@ private void updateDirectoryPathLabels() {
         gameDirectoryPath.setText(gameDirectory.toString());
         gameDataDirectoryPath.setText(gameDataDirectory.toString());
         launcherDirectoryPath.setText(launcherDirectory.toString());
-        downloadDirectoryPath.setText(downloadDirectory.toString());
     }
 
     private void updateHeapSizeSelection() {

src/main/resources/org/terasology/launcher/bundle/LabelsBundle.properties

@@ -61,7 +61,6 @@ main_yes=
 message_deleteGame_title=
 message_dialog_title_chooseGameDataDirectory=
 message_dialog_title_chooseGameDirectory=
-message_error_downloadDirectory=
 message_error_gameDataDirectory=
 message_error_gameDirectory=
 message_error_gameDownload_downloadExtract=
@@ -97,8 +96,6 @@ settings_game_gameDataDirectory_edit=
 settings_game_gameDataDirectory_edit_title=
 settings_game_gameDataDirectory_open=
 settings_game_gameDirectory=
-settings_game_gameDirectory_edit=
-settings_game_gameDirectory_edit_title=
 settings_game_gameDirectory_open=
 settings_game_initialHeapSize=
 settings_game_job=
@@ -125,8 +122,6 @@ settings_language_tr=
 settings_language_uk=
 settings_launcher_chooseLanguage=
 settings_launcher_closeLauncherAfterGameStart=
-settings_launcher_downloadDirectory=
-settings_launcher_downloadDirectory_open=
 settings_launcher_launcherDirectory=
 settings_launcher_launcherDirectory_open=
 settings_launcher_saveDownloadedFiles=

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_af.properties

@@ -61,7 +61,6 @@ main_yes=Ja
 message_deleteGame_title=Verwyder ge\u00EFnstalleerde spel
 message_dialog_title_chooseGameDataDirectory=Kies data directory vir die spel
 message_dialog_title_chooseGameDirectory=Kies installasie directory for the game
-message_error_downloadDirectory=
 message_error_gameDataDirectory=
 message_error_gameDirectory=
 message_error_gameDownload_downloadExtract=
@@ -94,8 +93,6 @@ settings_game_gameDataDirectory_edit=Wysig
 settings_game_gameDataDirectory_edit_title=Kies data directory
 settings_game_gameDataDirectory_open=
 settings_game_gameDirectory=
-settings_game_gameDirectory_edit=Wysig
-settings_game_gameDirectory_edit_title=
 settings_game_gameDirectory_open=
 settings_game_initialHeapSize=
 settings_game_job=
@@ -122,8 +119,6 @@ settings_language_tr=Turkish
 settings_language_uk=
 settings_launcher_chooseLanguage=Kies 'n taal
 settings_launcher_closeLauncherAfterGameStart=
-settings_launcher_downloadDirectory=
-settings_launcher_downloadDirectory_open=
 settings_launcher_launcherDirectory=
 settings_launcher_launcherDirectory_open=
 settings_launcher_saveDownloadedFiles=

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_cs.properties

@@ -61,7 +61,6 @@ main_yes=Ano
 message_deleteGame_title=Smazat nainstalovanou hru
 message_dialog_title_chooseGameDataDirectory=Vyberte adres\u00E1\u0159 um\u00EDst\u011Bn\u00ED hern\u00EDch dat
 message_dialog_title_chooseGameDirectory=Vyberte adres\u00E1\u0159 instalace hry
-message_error_downloadDirectory=Nelze vytvo\u0159it nebo pou\u017E\u00EDt adres\u00E1\u0159 stahov\u00E1n\u00ED!
 message_error_gameDataDirectory=Nelze vytvo\u0159it nebo pou\u017E\u00EDt adres\u00E1\u0159 hern\u00EDch dat!
 message_error_gameDirectory=Nelze vytvo\u0159it nebo pou\u017E\u00EDt adres\u00E1\u0159 instalace hry!
 message_error_gameDownload_downloadExtract=Proces sta\u017Een\u00ED a rozbalen\u00ED hry selhal.
@@ -94,8 +93,6 @@ settings_game_gameDataDirectory_edit=Upravit
 settings_game_gameDataDirectory_edit_title=Vybrat adres\u00E1\u0159 hern\u00EDch dat
 settings_game_gameDataDirectory_open=Otev\u0159\u00EDt
 settings_game_gameDirectory=Adres\u00E1\u0159 instalace hry
-settings_game_gameDirectory_edit=Upravit
-settings_game_gameDirectory_edit_title=Vybrat adres\u00E1\u0159 instalace hry
 settings_game_gameDirectory_open=Otev\u0159\u00EDt
 settings_game_initialHeapSize=Po\u010D\u00E1te\u010Dn\u00ED pam\u011B\u0165
 settings_game_job=Typ
@@ -122,8 +119,6 @@ settings_language_tr=Ture\u010Dtina
 settings_language_uk=
 settings_launcher_chooseLanguage=Vyberte jazyk
 settings_launcher_closeLauncherAfterGameStart=Ukon\u010Dit spou\u0161t\u011B\u010D po spu\u0161t\u011Bn\u00ED hry
-settings_launcher_downloadDirectory=Adres\u00E1\u0159 stahov\u00E1n\u00ED
-settings_launcher_downloadDirectory_open=Otev\u0159\u00EDt
 settings_launcher_launcherDirectory=Adres\u00E1\u0159 spou\u0161t\u011B\u010De
 settings_launcher_launcherDirectory_open=Otev\u0159\u00EDt
 settings_launcher_saveDownloadedFiles=Ulo\u017Eit sta\u017Een\u00E9 soubory

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties

@@ -61,7 +61,6 @@ main_yes=Ja
 message_deleteGame_title=Installierte Version deinstallieren und l\u00F6schen
 message_dialog_title_chooseGameDataDirectory=Bitte Verzeichnis f\u00FCr die Spielst\u00E4nde ausw\u00E4hlen
 message_dialog_title_chooseGameDirectory=Bitte ein Installationsverzeichnis ausw\u00E4hlen
-message_error_downloadDirectory=Das Download-Verzeichnis konnte leider nicht erzeugt oder genutzt werden!
 message_error_gameDataDirectory=Das Spielstandverzeichnis konnte leider nicht erzeugt oder genutzt werden!
 message_error_gameDirectory=Das Installationsverzeichnis konnte leider nicht erzeugt oder genutzt werden!
 message_error_gameDownload_downloadExtract=Das Spiel konnte leider nicht heruntergeladen und entpackt werden.
@@ -94,12 +93,10 @@ settings_game_gameDataDirectory_edit=\u00C4ndern
 settings_game_gameDataDirectory_edit_title=Datenverzeichnis ausw\u00E4hlen
 settings_game_gameDataDirectory_open=\u00D6ffnen
 settings_game_gameDirectory=Installationsverzeichnis
-settings_game_gameDirectory_edit=\u00C4ndern
-settings_game_gameDirectory_edit_title=Installationsverzeichnis ausw\u00E4hlen
 settings_game_gameDirectory_open=\u00D6ffnen
-settings_game_initialHeapSize=Initialer Hauptspeicher
+settings_game_initialHeapSize=Initialer Spiel-Hauptspeicher
 settings_game_job=Aktualisierungstyp
-settings_game_maxHeapSize=Maximaler Hauptspeicher
+settings_game_maxHeapSize=Maximaler Spiel-Hauptspeicher
 settings_game_title=Spiel
 settings_game_javaParameters=Java-Parameter
 settings_game_gameParameters=Spiel-Parameter
@@ -122,9 +119,7 @@ settings_language_tr=T\u00FCrkisch
 settings_language_uk=Ukrainisch
 settings_launcher_chooseLanguage=Sprache ausw\u00E4hlen
 settings_launcher_closeLauncherAfterGameStart=Launcher beim Spielstart schlie\u00DFen
-settings_launcher_downloadDirectory=Download-Verzeichnis
-settings_launcher_downloadDirectory_open=\u00D6ffnen
-settings_launcher_launcherDirectory=Verzeichnis
+settings_launcher_launcherDirectory=Launcher Installationsverzeichnis
 settings_launcher_launcherDirectory_open=\u00D6ffnen
 settings_launcher_saveDownloadedFiles=Heruntergeladene Pakete behalten
 settings_launcher_searchForLauncherUpdates=Launcher-Aktualisierungen

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties

@@ -61,7 +61,6 @@ main_yes=Yes
 message_deleteGame_title=Delete installed game
 message_dialog_title_chooseGameDataDirectory=Choose data directory for the game
 message_dialog_title_chooseGameDirectory=Choose installation directory for the game
-message_error_downloadDirectory=Cannot create or use download directory\!
 message_error_gameDataDirectory=Cannot create or use game data directory\!
 message_error_gameDirectory=Cannot create or use game installation directory\!
 message_error_gameDownload_downloadExtract=The game download and extraction process failed.
@@ -96,12 +95,10 @@ settings_game_gameDataDirectory_edit=Edit
 settings_game_gameDataDirectory_edit_title=Choose data directory
 settings_game_gameDataDirectory_open=Open
 settings_game_gameDirectory=Installation directory
-settings_game_gameDirectory_edit=Edit
-settings_game_gameDirectory_edit_title=Choose installation directory
 settings_game_gameDirectory_open=Open
-settings_game_initialHeapSize=Initial Memory
+settings_game_initialHeapSize=Initial Game Memory
 settings_game_job=Type
-settings_game_maxHeapSize=Maximum Memory
+settings_game_maxHeapSize=Maximum Game Memory
 settings_game_title=Game
 settings_game_javaParameters=Java Arguments
 settings_game_gameParameters=Game Arguements
@@ -126,7 +123,7 @@ settings_launcher_chooseLanguage=Choose language
 settings_launcher_closeLauncherAfterGameStart=Close launcher after game start
 settings_launcher_downloadDirectory=Download directory
 settings_launcher_downloadDirectory_open=Open
-settings_launcher_launcherDirectory=Directory
+settings_launcher_launcherDirectory=Launcher Installation Directory
 settings_launcher_launcherDirectory_open=Open
 settings_launcher_saveDownloadedFiles=Save downloaded files
 settings_launcher_searchForLauncherUpdates=Search for launcher updates

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_es.properties

@@ -61,7 +61,6 @@ main_yes=Si
 message_deleteGame_title=Borrar juego instalado
 message_dialog_title_chooseGameDataDirectory=Escoge un directorio de datos para el juego
 message_dialog_title_chooseGameDirectory=Escoge un directorio de instalaci\u00F3n para el juego
-message_error_downloadDirectory=\u00A1No se puede crear o utilizar el directorio de descarga!
 message_error_gameDataDirectory=\u00A1No se ha podido crear o utilizar el directorio donde se almacena los datos del juego!
 message_error_gameDirectory=\u00A1No se ha podido crear o usar el directorio donde se encuentra instalado el juego!
 message_error_gameDownload_downloadExtract=La descarga del juego y su proceso de extracci\u00F3n ha fallado.
@@ -94,8 +93,6 @@ settings_game_gameDataDirectory_edit=Editar
 settings_game_gameDataDirectory_edit_title=Escoge directorio de datos
 settings_game_gameDataDirectory_open=Abrir
 settings_game_gameDirectory=Directorio de Instalaci\u00F3n
-settings_game_gameDirectory_edit=Editar
-settings_game_gameDirectory_edit_title=Escoge un directorio de instalaci\u00F3n
 settings_game_gameDirectory_open=Abrir
 settings_game_initialHeapSize=Memoria Inicial
 settings_game_job=Tipo
@@ -122,8 +119,6 @@ settings_language_tr=Turco
 settings_language_uk=
 settings_launcher_chooseLanguage=Escoger idioma
 settings_launcher_closeLauncherAfterGameStart=Cerrar el launcher al iniciar partida
-settings_launcher_downloadDirectory=Directorio de descarga
-settings_launcher_downloadDirectory_open=Abrir
 settings_launcher_launcherDirectory=Directorio
 settings_launcher_launcherDirectory_open=Abrir
 settings_launcher_saveDownloadedFiles=Guardar fichero de descarga

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_fr.properties

@@ -61,7 +61,6 @@ main_yes=Oui
 message_deleteGame_title=Supprimer le jeu install\u00E9
 message_dialog_title_chooseGameDataDirectory=Choisir le dossier de donn\u00E9es pour le jeu
 message_dialog_title_chooseGameDirectory=Choisir le r\u00E9pertoire d'installation pour le jeu
-message_error_downloadDirectory=Le r\u00E9pertoire de t\u00E9l\u00E9chargement n'a pas pu \u00EAtre cr\u00E9\u00E9 ou utilis\u00E9 !
 message_error_gameDataDirectory=Le r\u00E9petroire du jeu n'a pas pu \u00EAtre cr\u00E9\u00E9 ou utilis\u00E9!
 message_error_gameDirectory=Le r\u00E9pertoire d'installation du jeu n'a pas pu \u00EAtre cr\u00E9\u00E9 ou utilis\u00E9!
 message_error_gameDownload_downloadExtract=Le processus de t\u00E9l\u00E9chargement et d'extraction du jeu a \u00E9chou\u00E9.
@@ -94,8 +93,6 @@ settings_game_gameDataDirectory_edit=Modifier
 settings_game_gameDataDirectory_edit_title=Choisir le r\u00E9pertoire des donn\u00E9es
 settings_game_gameDataDirectory_open=Ouvrir
 settings_game_gameDirectory=R\u00E9pertoire d'installation
-settings_game_gameDirectory_edit=Modifier
-settings_game_gameDirectory_edit_title=Choisir le r\u00E9pertoire d'installation
 settings_game_gameDirectory_open=Ouvrir
 settings_game_initialHeapSize=M\u00E9moire initiale
 settings_game_job=Type
@@ -122,8 +119,6 @@ settings_language_tr=Turc
 settings_language_uk=
 settings_launcher_chooseLanguage=Choisir la langue
 settings_launcher_closeLauncherAfterGameStart=Fermer le lanceur apr\u00E8s le d\u00E9marrage du jeu
-settings_launcher_downloadDirectory=R\u00E9pertoire de t\u00E9l\u00E9chargement
-settings_launcher_downloadDirectory_open=Ouvrir
 settings_launcher_launcherDirectory=R\u00E9pertoire
 settings_launcher_launcherDirectory_open=Ouvrir
 settings_launcher_saveDownloadedFiles=Sauvegarder les fichiers t\u00E9l\u00E9charg\u00E9s

src/main/resources/org/terasology/launcher/bundle/LabelsBundle_gl.properties

@@ -61,7 +61,6 @@ main_yes=Si
 message_deleteGame_title=Eliminar xogo instalado
 message_dialog_title_chooseGameDataDirectory=Escolle o directorio de datos para o xogo
 message_dialog_title_chooseGameDirectory=Escolle o directorio de instalaci\u00F3n do xogo
-message_error_downloadDirectory=Non se puido crear ou usar o directorio de descarga!
 message_error_gameDataDirectory=Non se puido crear ou usar o directorio de datos do xogo!
 message_error_gameDirectory=Non se puido crear ou usar o directorio de instalaci\u00F3n do xogo!
 message_error_gameDownload_downloadExtract=Fallou o proceso de descarga e extracci\u00F3n do xogo.
@@ -94,8 +93,6 @@ settings_game_gameDataDirectory_edit=Editar
 settings_game_gameDataDirectory_edit_title=Escolle o directorio de datos
 settings_game_gameDataDirectory_open=Abrir
 settings_game_gameDirectory=Directorio de instalaci\u00F3n
-settings_game_gameDirectory_edit=Editar
-settings_game_gameDirectory_edit_title=Escolle o directorio de instalaci\u00F3n
 settings_game_gameDirectory_open=Abrir
 settings_game_initialHeapSize=Memoria inicial
 settings_game_job=Tipo
@@ -122,8 +119,6 @@ settings_language_tr=Turco
 settings_language_uk=
 settings_launcher_chooseLanguage=Escolle a lingua
 settings_launcher_closeLauncherAfterGameStart=Pechar o lanzador tras o inicio do xogo
-settings_launcher_downloadDirectory=Directorio de descarga
-settings_launcher_downloadDirectory_open=Abrir
 settings_launcher_launcherDirectory=Directorio
 settings_launcher_launcherDirectory_open=Abrir
 settings_launcher_saveDownloadedFiles=Gardar ficheiros descargados