Merge lp:~tapaal-contributor/tapaal/only-dirs-batch-export-1870887 into lp:tapaal

[Peter Haahr Taankvist]

Make specific function for choosing directories only. New behaviour for windows and old one for Ubuntu.

[Jiri Srba (srba)]

The issues is not fixed for Mac, it is still possible to select a file and it will ask whether it should be overwritten.

Please, remove also the debugging information.

review: Needs Fixing

[Kenneth Yrke Jørgensen (yrke)]

review: Needs Fixing (code)

[Kenneth Yrke Jørgensen (yrke)]

Please also add a comment about why its needed to handle Windows different form other architecture, would be nice if we could linkt something describing the differences in behavior.

[lp:~tapaal-contributor/tapaal/only-dirs-batch-export-1870887]

1053. By Peter Haahr Taankvist on 2020-05-05

Added property that should make filedialog directories only for mac

1054. By Peter Haahr Taankvist on 2020-05-05

Add the new function to NativeFileBrowserFallback

[Peter Haahr Taankvist (ptaank)]

Added a property which should make the filedialog directories only for mac.

Also added some comments describing the need for different behaviour.

review: Needs Resubmitting

[Jiri Srba (srba)]

On Mac the behaviour is better now: it says "Select folder ..." in the dialog but it still allows to select a file - if done so, it will ask only once if it should be rewritten and not twice. If this cannot be fixed any better, it is acceptable.

Has it been tested on Linux?

In the code for mac, the string
apple.awt.fileDialogForDirectories
is set to value "false" after the change. It would be safer to change it to the
previously set value.

review: Needs Fixing

[Peter Haahr Taankvist (ptaank)]

Is it the TAPAAL dialog or your system dialog? If it is the TAPAAL dialog we may be able to suppress it. On Linux files are not shown when saving it seems.

The default value for apple.awt.fileDialogForDirectories is false. When it is false you should be able to choose both files and directories, but when true only directories.

We can also try the same solution for Mac as we used for Windows, but I seem to remember that you did not like the look of JFileChooser on Mac.

[Jiri Srba (srba)]

In 3.6 I get both the system dialog followed by the TAPAAL dialog.
After the fix in the branch I get only the system dialog. The dialog looks
different - it asks to select only directory and in fact files are grayed out,
but they can be still selected and then I get the system warning. It is only
the directory that appears in the path after the selection, so not a big deal
if this cannot be fixed further, I think it is acceptable.

[Peter Haahr Taankvist (ptaank)]

I cannot come up with anything better. Should i prepare a branch for 3.6?

review: Needs Resubmitting

[Jiri Srba (srba)]

Yes, if it works as it should on Linux and Windows (I didn't test it) the I think we can merge it to trunk now. Please, prepare also 3.6 branch for the merge.

[Jiri Srba (srba)]

review: Approve

[Jiri Srba (srba)]

Kenneth, I am gonna merge. The code issues where fixed.

=== modified file 'src/pipe/gui/ExportBatchDialog.java'
--- src/pipe/gui/ExportBatchDialog.java	2020-04-18 16:08:44 +0000
+++ src/pipe/gui/ExportBatchDialog.java	2020-05-05 18:18:57 +0000
@@ -237,7 +237,9 @@
 		JButton destinationPathSelector = new JButton("Select destination folder");
 		destinationPathSelector.addActionListener(e -> {
 			selectDestinationPath();
-			destinationPathField.setText(destinationFile.getParent());
+			if(destinationFile != null) {
+                destinationPathField.setText(lastExportPath);
+            }
 			enableButtons();
 		});
 		chooserPanel.add(destinationPathSelector, gbc);
@@ -450,10 +452,10 @@
 	}
 	
 	private void selectDestinationPath() {
-		String chosenFile = FileBrowser.constructor("Select an export folder", ".", lastExportPath).saveFile("Export");
+		File chosenFile = FileBrowser.constructor("Select an export folder", ".", lastExportPath).saveFileToDir();
 		if(chosenFile != null) {
-			destinationFile = new File(chosenFile);
-			lastExportPath = chosenFile;
+			destinationFile = chosenFile;
+			lastExportPath = destinationFile.getAbsolutePath();
 		}
 		else return;
 	}
@@ -463,7 +465,7 @@
 		initProgressBar();
 		
 		if(destinationFile != null && destinationFile.exists()) {
-    		String destPath = destinationFile.isFile() ? destinationFile.getParent() : destinationFile.getAbsolutePath();
+    		String destPath = destinationFile.isDirectory() ? destinationFile.getAbsolutePath(): destinationFile.getParent();
 			lastExportPath = destPath;
 			progressBarThread.start();
     		for(File file : files) {

=== modified file 'src/pipe/gui/widgets/filebrowser/FileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/FileBrowser.java	2020-04-18 15:39:19 +0000
+++ src/pipe/gui/widgets/filebrowser/FileBrowser.java	2020-05-05 18:18:57 +0000
@@ -11,8 +11,8 @@
     //Default value null makes the open dialog open default folder, For Windows, My Documents, For *nix  ~ , etc
 	//XXX 2018-05-23 moved from CreateGUI, refactor with regards to usage with lastPath local var in this class
     public static String userPath = null;
-    static String lastSavePath = null;
-    static String lastOpenPath = null;
+    static String lastSavePath = ".";
+    static String lastOpenPath = ".";
 
 	public static FileBrowser constructor(String filetype, final String ext) {
 		return constructor(filetype, ext, null);
@@ -48,5 +48,6 @@
 	}
 
 	public abstract String saveFile(String suggestedName);
+	public abstract File saveFileToDir();
 
 }

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-04-18 15:39:19 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-05-05 18:18:57 +0000
@@ -7,8 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.swing.JOptionPane;
-
+import javax.swing.*;
 import pipe.gui.CreateGui;
 
 class NativeFileBrowser extends FileBrowser {
@@ -23,7 +22,7 @@
 	NativeFileBrowser(String filetype, final String ext, final String optionalExt, String path) {
 		fc = new FileDialog(CreateGui.getAppGui(), filetype);
 		this.specifiedPath = path;
-		
+
 		if (filetype == null) {
 			filetype = "file";
 		}
@@ -85,7 +84,7 @@
         lastOpenPath = fc.getDirectory();
             return selectedFiles;
 	}
-	
+
 	public String saveFile(String suggestedName) {
 		if(specifiedPath == null) specifiedPath = lastSavePath;
 		fc.setDirectory(specifiedPath);
@@ -146,5 +145,34 @@
 
 		return file;
 	}
-
+    public File saveFileToDir(){
+	    //In Windows the native FileDialog only works with files
+        //So we make a JFileChooser in which we can control it
+	    if(System.getProperty("os.name").startsWith("Windows")) {
+            File selectedDir = null;
+            if (specifiedPath == null) specifiedPath = lastSavePath;
+            JFileChooser c = new JFileChooser(specifiedPath);
+            c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            c.setDialogTitle("Choose target directory for export");
+            int rVal = c.showSaveDialog(c);
+            if (rVal == JFileChooser.APPROVE_OPTION) {
+                selectedDir = c.getSelectedFile();
+                lastSavePath = selectedDir.getPath();
+            }
+
+            return selectedDir;
+        } else{
+	        //For Mac we can set Directories only
+            //For linux a save dialog only shows directories
+            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+            String selection = saveFile("Choose Directory");
+            System.setProperty("apple.awt.fileDialogForDirectories", "false");
+            if(selection != null) {
+                return new File(fc.getDirectory());
+            } else{
+                return null;
+            }
+        }
+
+    }
 }

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-05-05 18:18:57 +0000
@@ -10,7 +10,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileNameExtensionFilter;
-
 import pipe.gui.CreateGui;
 
 class NativeFileBrowserFallback extends FileBrowser {
@@ -159,4 +158,34 @@
 		}
 		return file;
 	}
+    public File saveFileToDir(){
+        //In Windows the native FileDialog only works with files
+        //So we make a JFileChooser in which we can control it
+        if(System.getProperty("os.name").startsWith("Windows")) {
+            File selectedDir = null;
+            if (specifiedPath == null) specifiedPath = lastSavePath;
+            JFileChooser c = new JFileChooser(specifiedPath);
+            c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            c.setDialogTitle("Choose target directory for export");
+            int rVal = c.showSaveDialog(c);
+            if (rVal == JFileChooser.APPROVE_OPTION) {
+                selectedDir = c.getSelectedFile();
+                lastSavePath = selectedDir.getPath();
+            }
+
+            return selectedDir;
+        } else{
+            //For Mac we can set Directories only
+            //For linux a save dialog only shows directories
+            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+            String selection = saveFile("Choose Directory");
+            System.setProperty("apple.awt.fileDialogForDirectories", "false");
+            if(selection != null) {
+                return new File(fc.getDirectory());
+            } else{
+                return null;
+            }
+        }
+
+    }
 }