From c002af57ec144ebc111693ba6b85a6f7dfa3a6bb Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 29 Aug 2014 18:22:09 +0200 Subject: [PATCH 1/2] FileDialog: Add `/Volume` directory on OS X See issue #1058 --- src/gui/dialogs/FileDialog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp index ad77018cc..fda7ac87b 100644 --- a/src/gui/dialogs/FileDialog.cpp +++ b/src/gui/dialogs/FileDialog.cpp @@ -52,6 +52,12 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption, urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ); urls << QUrl::fromLocalFile( configManager::inst()->workingDir() ); + #ifdef LMMS_BUILD_APPLE + QDir volumesDir( QDir("/Volumes") ); + if ( volumesDir.exists() ) + urls << volumesDir; + #endif + setSidebarUrls(urls); } From fad89f68ce39961040f03ba50fd89b173a5062db Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 29 Aug 2014 23:03:18 +0200 Subject: [PATCH 2/2] FileDialog: Add OS X Volume directory fix --- src/gui/dialogs/FileDialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp index fda7ac87b..a00b41f3c 100644 --- a/src/gui/dialogs/FileDialog.cpp +++ b/src/gui/dialogs/FileDialog.cpp @@ -52,11 +52,13 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption, urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ); urls << QUrl::fromLocalFile( configManager::inst()->workingDir() ); - #ifdef LMMS_BUILD_APPLE - QDir volumesDir( QDir("/Volumes") ); - if ( volumesDir.exists() ) - urls << volumesDir; - #endif + // Add `/Volumes` directory on OS X systems, this allows the user to browse + // external disk drives. +#ifdef LMMS_BUILD_APPLE + QDir volumesDir( QDir("/Volumes") ); + if ( volumesDir.exists() ) + urls << QUrl::fromLocalFile( volumesDir.absolutePath() ); +#endif setSidebarUrls(urls); }