mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

FileChooser: In Linux FileChoosers, prefer to open files rather than directories if both are requested

Browse source 
Zenity and Kdialog only support opening either files or directories
during a single invocation.
This commit is contained in:
reuk 2021-09-27 12:23:14 +01:00
parent 0feda541e7
commit 7504fa065b
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_gui_basics/filebrowser/juce_FileChooser.cpp
View file

@ -183,7 +183,6 @@ void FileChooser::launchAsync (int flags, std::function<void (const FileChooser&
pimpl->launch(); pimpl->launch();
} }
std::shared_ptr<FileChooser::Pimpl> FileChooser::createPimpl (int flags, FilePreviewComponent* previewComp) std::shared_ptr<FileChooser::Pimpl> FileChooser::createPimpl (int flags, FilePreviewComponent* previewComp)
{ {
results.clear(); results.clear();

15
modules/juce_gui_basics/native/juce_linux_FileChooser.cpp
View file

@ -39,16 +39,23 @@ static bool exeIsAvailable (String executable)
return false; return false;
} }
static bool isSet (int flags, int toCheck)
{
return (flags & toCheck) != 0;
}
class FileChooser::Native : public FileChooser::Pimpl, class FileChooser::Native : public FileChooser::Pimpl,
private Timer private Timer
{ {
public: public:
Native (FileChooser& fileChooser, int flags) Native (FileChooser& fileChooser, int flags)
: owner (fileChooser), : owner (fileChooser),
isDirectory ((flags & FileBrowserComponent::canSelectDirectories) != 0), // kdialog/zenity only support opening either files or directories.
isSave ((flags & FileBrowserComponent::saveMode) != 0), // Files should take precedence, if requested.
selectMultipleFiles ((flags & FileBrowserComponent::canSelectMultipleItems) != 0), isDirectory (isSet (flags, FileBrowserComponent::canSelectDirectories) && ! isSet (flags, FileBrowserComponent::canSelectFiles)),
warnAboutOverwrite ((flags & FileBrowserComponent::warnAboutOverwriting) != 0) isSave (isSet (flags, FileBrowserComponent::saveMode)),
selectMultipleFiles (isSet (flags, FileBrowserComponent::canSelectMultipleItems)),
warnAboutOverwrite (isSet (flags, FileBrowserComponent::warnAboutOverwriting))
{ {
const File previousWorkingDirectory (File::getCurrentWorkingDirectory()); const File previousWorkingDirectory (File::getCurrentWorkingDirectory());