From e6b5dd5110c831b6f99eb2a66c74161ce862c1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fu=C4=8Fu=20Dri=C4=8F=C3=A1k?= Date: Wed, 24 Jul 2019 19:17:44 +0200 Subject: [PATCH 1/2] Allow all files instead of MP4 only --- src/ytpplusui/FXMLController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ytpplusui/FXMLController.java b/src/ytpplusui/FXMLController.java index 0bb8022..e5963a7 100644 --- a/src/ytpplusui/FXMLController.java +++ b/src/ytpplusui/FXMLController.java @@ -171,7 +171,7 @@ public class FXMLController { @FXML void addSource(ActionEvent event) { - FileChooser.ExtensionFilter fileFilter = new FileChooser.ExtensionFilter("Video files (*.mp4)", "*.mp4"); + FileChooser.ExtensionFilter fileFilter = new FileChooser.ExtensionFilter("All files (*.*)", "*.*"); FileChooser fileChooser = new FileChooser(); fileChooser.getExtensionFilters().add(fileFilter); fileChooser.setTitle("Choose Source"); From 8e29c65366d70a09f6426dbe06c9524e4929fb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fu=C4=8Fu=20Dri=C4=8F=C3=A1k?= Date: Wed, 24 Jul 2019 21:24:56 +0200 Subject: [PATCH 2/2] Extension filters for FFMPEG & FFProbe automatic-path-setting --- src/ytpplusui/FXMLController.java | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/ytpplusui/FXMLController.java b/src/ytpplusui/FXMLController.java index e5963a7..c81f6b2 100644 --- a/src/ytpplusui/FXMLController.java +++ b/src/ytpplusui/FXMLController.java @@ -304,13 +304,18 @@ void helpMeEffect(ActionEvent event) { void openBrowser(ActionEvent event) { switch (((Control)event.getSource()).getId()) { case "btnBrowseFFMPEG": - actuallyOpenBrowser(tfFFMPEG); + actuallyOpenBrowser(tfFFMPEG,"ffmpeg.exe","exe"); + String fffile=new File(tfFFMPEG.getText()).getParent().replace('\\', '/'); + if(new File(fffile+"/ffprobe.exe").exists()) + { + tfFFPROBE.setText(fffile+"/ffprobe.exe"); + } break; case "btnBrowseFFPROBE": - actuallyOpenBrowser(tfFFPROBE); + actuallyOpenBrowser(tfFFPROBE,"ffprobe.exe","exe"); break; case "btnBrowseMAGICK": - actuallyOpenBrowser(tfMAGICK); + actuallyOpenBrowser(tfMAGICK,"magick.exe","exe"); break; case "btnBrowseTEMP": actuallyOpenDirBrowser(tfTEMP); @@ -332,16 +337,31 @@ void openBrowser(ActionEvent event) { public File LAST_BROWSED; - void actuallyOpenBrowser(TextField toChange) { + void actuallyOpenBrowser(TextField toChange, String defvalue, String extfilter) { FileChooser fileChooser = new FileChooser(); fileChooser.setTitle("Choose File"); + //fileChooser.setInitialFileName(defvalue); + if(defvalue!="") { + fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(defvalue, defvalue)); + } + if(extfilter=="exe") { + fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Executable files (*.exe)", "*.exe")); + } fileChooser.setInitialDirectory(LAST_BROWSED); File selected = fileChooser.showOpenDialog(null); if (selected==null) return; toChange.setText(selected.getAbsolutePath().replace('\\', '/')); LAST_BROWSED = selected.getParentFile(); } - + + void actuallyOpenBrowser(TextField toChange) { + actuallyOpenBrowser(toChange,"",""); + } + void actuallyOpenBrowser(TextField toChange, String defvalue) { + actuallyOpenBrowser(toChange,defvalue,""); + } + + void actuallyOpenDirBrowser(TextField toChange) { DirectoryChooser fileChooser = new DirectoryChooser(); fileChooser.setTitle("Choose File");