v2.44 Update title of "REDUCE Packages Directory" chooser. Tidy some REDUCEConfigDialog code. Make file and directory chooser dialogues movable independently of the main window on Linux by setting the ownerWindow to null. This seems to have no other effect, and no effect at all on Microsoft Windows. Ditto other dialogues and alerts.

Author: fjwright

src/fjwright/runreduce/REDUCEConfigDialog.fxml

@@ -59,7 +59,7 @@
                 <Tooltip text="A directory containing the standard REDUCE packages: alg, algint, arith, etc."/>
             </tooltip>
         </TextField>
-        <Button mnemonicParsing="false" onAction="#packagesRootDirDCButtonAction" text="..." GridPane.columnIndex="2"
+        <Button mnemonicParsing="false" onAction="#packagesDirDCButtonAction" text="..." GridPane.columnIndex="2"
                 GridPane.rowIndex="2"/>
         <Label text="REDUCE Manual Directory" GridPane.rowIndex="3"/>
         <TextField fx:id="manualDirTextField" promptText="Optional" GridPane.columnIndex="1" GridPane.rowIndex="3">

src/fjwright/runreduce/REDUCEConfigDialog.java

@@ -293,14 +293,16 @@ private void commandNameTextFieldAction() {
         listViewObservableList.set(selectedIndex, text);
     }
 
+// Code for the [...] butttons: directory and file choosers =======================================
+
     /**
      * Code run by the directory chooser (DC) buttons.
      */
     private void dcButtonAction(String title, String defaultDir, TextField textField) {
         DirectoryChooser directoryChooser = new DirectoryChooser();
         directoryChooser.setTitle(title);
         directoryChooser.setInitialDirectory(new File(defaultDir));
-        File dir = directoryChooser.showDialog(RunREDUCE.primaryStage);
+        File dir = directoryChooser.showDialog(null);
         if (dir != null) textField.setText(dir.toString());
     }
 
@@ -312,8 +314,8 @@ private void reduceRootDirDCButtonAction() {
     }
 
     @FXML
-    private void packagesRootDirDCButtonAction() {
-        dcButtonAction("Packages Root Directory",
+    private void packagesDirDCButtonAction() {
+        dcButtonAction("REDUCE Packages Directory",
                 RunREDUCE.reduceConfigurationDefault.packagesDir,
                 packagesDirTextField);
     }
@@ -370,11 +372,11 @@ private void commandRootDirDCButtonAction() {
     private void fcButtonAction(String title, TextField textField) {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle(title);
-        String commandRootDir = commandRootDirTextField.getText();
-        String defaultDir = !commandRootDir.isEmpty() ? commandRootDir :
-                RunREDUCE.reduceConfigurationDefault.reduceRootDir;
+        String defaultDir = commandRootDirTextField.getText().trim();
+        if (defaultDir.isEmpty())
+            defaultDir = RunREDUCE.reduceConfigurationDefault.reduceRootDir;
         fileChooser.setInitialDirectory(new File(defaultDir));
-        File file = fileChooser.showOpenDialog(RunREDUCE.primaryStage);
+        File file = fileChooser.showOpenDialog(null);
         if (file != null) textField.setText(file.toString());
     }
 

src/fjwright/runreduce/RunREDUCE.java

@@ -35,7 +35,6 @@
  */
 public class RunREDUCE extends Application {
     static RunREDUCEFrame runREDUCEFrame;
-    static Stage primaryStage;
     static String reduceFontFamilyName;
     static SplitPane splitPane;
     static TabPane tabPane;
@@ -57,7 +56,6 @@ public class RunREDUCE extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        RunREDUCE.primaryStage = primaryStage;
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("RunREDUCEFrame.fxml"));
         Parent root = fxmlLoader.load();
         runREDUCEFrame = fxmlLoader.getController();
@@ -197,7 +195,6 @@ private static void tabOnClosed(Event event) {
     public static void alert(Alert.AlertType alertType, String headerText, String contentText, String... title) {
         Alert alert = new Alert(alertType);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
-        alert.initOwner(primaryStage);
         alert.setHeaderText(headerText);
         alert.setContentText(contentText);
         if (title.length > 0) alert.setTitle(title[0]);

src/fjwright/runreduce/RunREDUCEFrame.java

@@ -217,7 +217,7 @@ private void inputPackageFileMenuItemAction() {
 
     private void inputFile(boolean saveDir) {
         fileChooser.getExtensionFilters().setAll(INPUT_FILE_FILTER, TEXT_FILE_FILTER, ALL_FILE_FILTER);
-        List<File> fileList = fileChooser.showOpenMultipleDialog(RunREDUCE.primaryStage);
+        List<File> fileList = fileChooser.showOpenMultipleDialog(null);
         if (fileList != null) {
             StringBuilder text = new StringBuilder("in \"");
             text.append(fileList.get(0).toString()); // first file
@@ -236,7 +236,7 @@ private void inputFile(boolean saveDir) {
     private void outputNewFileMenuItemAction() {
         fileChooser.setTitle("Output to File...");
         fileChooser.getExtensionFilters().setAll(LOG_FILE_FILTER, TEXT_FILE_FILTER, ALL_FILE_FILTER);
-        File file = fileChooser.showSaveDialog(RunREDUCE.primaryStage);
+        File file = fileChooser.showSaveDialog(null);
         if (file != null) {
             RunREDUCE.reducePanel.sendStringToREDUCEAndEcho("out \"" + file.toString() + "\"$\n");
             RunREDUCE.reducePanel.outputFileList.remove(file); // in case it was already open
@@ -253,7 +253,6 @@ private void outputOpenFileMenuItemAction() {
             // Select output file to shut:
             ChoiceDialog<File> choiceDialog = new ChoiceDialog<>(RunREDUCE.reducePanel.outputFileList.get(0),
                     RunREDUCE.reducePanel.outputFileList);
-            choiceDialog.initOwner(RunREDUCE.primaryStage);
             Optional<File> result = choiceDialog.showAndWait();
             if (result.isPresent()) {
                 File file = result.get();
@@ -333,10 +332,10 @@ private void saveLog(boolean append, boolean raw) {
         File file;
         if (append && !raw) {
             fileChooser.setTitle("Append Session Log...");
-            file = fileChooser.showOpenDialog(RunREDUCE.primaryStage);
+            file = fileChooser.showOpenDialog(null);
         } else {
             fileChooser.setTitle(raw ? "Save Raw Session Log as HTML..." : "Save Session Log...");
-            file = fileChooser.showSaveDialog(RunREDUCE.primaryStage);
+            file = fileChooser.showSaveDialog(null);
         }
         if (file != null) {
             try (Writer out = new BufferedWriter(new FileWriter(file, append))) {
@@ -661,7 +660,7 @@ private void sourceForgeMenuItemAction() {
         RunREDUCE.hostServices.showDocument("https://sourceforge.net/projects/reduce-algebra/");
     }
 
-    static final String VERSION = "2.43";
+    static final String VERSION = "2.44";
 
     @FXML
     private void aboutMenuItemAction() {
@@ -702,7 +701,6 @@ void showDialogAndWait(String dialogTitle, String fxmlFileName, Modality... moda
         } else {
             stage.initModality(modality[0]);
         }
-        stage.initOwner(RunREDUCE.primaryStage);
         stage.setTitle(dialogTitle);
         stage.setScene(new Scene(root));
         stage.showAndWait();