Use Sailfish.Pickers.FolderPickerPage to configure music directories (#…

…33) * Use Sailfish.Pickers.FolderPickerPage to configure music directories * Detect if Pickers are available. Fallback to old code if the Sailfish.Pickers module is not available in the import path. --------- Co-authored-by: Damien Caliste <[email protected]>
sailfishos-applications · Feb 7, 2024 · 0e29326 · 0e29326
1 parent 34ee039
commit 0e29326
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/FlowPlayer.pro b/FlowPlayer.pro
@@ -78,6 +78,7 @@ OTHER_FILES += \
     qml/pages/SongsPage.qml \
     qml/pages/ManageFolders.qml \
     qml/pages/AddFolder.qml \
+    qml/pages/PickFolder.qml \
     qml/pages/AboutPage.qml \
     qml/pages/SelectPreset.qml \
     qml/pages/LastFM.qml \

diff --git a/qml/pages/ManageFolders.qml b/qml/pages/ManageFolders.qml
@@ -42,7 +42,7 @@ Page {
         PullDownMenu {
             MenuItem {
                 text: qsTr("Add folder")
-                onClicked: pageStack.push("AddFolder.qml")
+                onClicked: pageStack.push(hasPickers ? "PickFolder.qml" : "AddFolder.qml")
             }
         }
 

diff --git a/qml/pages/PickFolder.qml b/qml/pages/PickFolder.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Pickers 1.0
+import FlowPlayer 1.0
+
+FolderPickerPage {
+    dialogTitle: qsTr("Select folder")
+    showSystemFiles: false
+    onSelectedPathChanged: {
+        utils.addFolderToList(selectedPath)
+    }
+}
diff --git a/src/FlowPlayer.cpp b/src/FlowPlayer.cpp
@@ -60,6 +60,11 @@ int main(int argc, char *argv[])
 
     window->engine()->addImportPath("/usr/share/flowplayer/qml");
     window->rootContext()->setContextProperty("appVersion", VERSION);
+    bool hasPickers = false;
+    for (const QString &path : window->engine()->importPathList()) {
+        hasPickers = hasPickers || QFile::exists(path + "/Sailfish/Pickers");
+    }
+    window->rootContext()->setContextProperty("hasPickers", hasPickers);
 
     qmlRegisterType<Utils>("FlowPlayer", 1, 0, "Utils");
     qmlRegisterType<CoverSearch>("FlowPlayer", 1, 0, "CoverSearch");