From 8f4efb126beadf492bede23db11d6dfe31127c4f Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 22 Jan 2014 16:26:15 +0000 Subject: [PATCH] Added linux support for wildcards when using kdialog. --- .../juce_gui_basics/native/juce_linux_FileChooser.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/juce_gui_basics/native/juce_linux_FileChooser.cpp b/modules/juce_gui_basics/native/juce_linux_FileChooser.cpp index 5d8028a39f..d7a5083d88 100644 --- a/modules/juce_gui_basics/native/juce_linux_FileChooser.cpp +++ b/modules/juce_gui_basics/native/juce_linux_FileChooser.cpp @@ -41,7 +41,7 @@ bool FileChooser::isPlatformDialogAvailable() void FileChooser::showPlatformDialog (Array& results, const String& title, const File& file, - const String& /* filters */, + const String& filters, bool isDirectory, bool /* selectsFiles */, bool isSave, @@ -80,10 +80,14 @@ void FileChooser::showPlatformDialog (Array& results, String startPath; - if (file.exists() || file.getParentDirectory().exists()) + if (file.exists()) { startPath = file.getFullPathName(); } + else if (file.getParentDirectory().exists()) + { + startPath = file.getParentDirectory().getFullPathName(); + } else { startPath = File::getSpecialLocation (File::userHomeDirectory).getFullPathName(); @@ -93,6 +97,8 @@ void FileChooser::showPlatformDialog (Array& results, } args.add (startPath); + args.add (filters.replaceCharacter (';', ' ')); + args.add ("2>/dev/null"); } else {