fixing small ui things and making audio picking use portal

src/qml/main.qml

@@ -276,7 +276,7 @@ Kirigami.ApplicationWindow {
     }
 
     function load() {
-        const file = fileHelper.loadFile();
+        const file = fileHelper.loadFile("Load Presentation");
         const loaded = mainPage.serviceItems.load(file);
         loaded ? showPassiveNotification("Loaded: " + file)
             : showPassiveNotification("FAILED!");

src/qml/presenter/DragHandle.qml

@@ -6,23 +6,22 @@ Item {
      id: root
   
      /**
-     * listItem: Item
+      * @brief This property holds the delegate that will be dragged around.
-     * The id of the delegate that we want to drag around, which *must*
+      *
-     * be a child of the actual ListView's delegate
+      * This item *must* be a child of the actual ListView's delegate.
       */
      property Item listItem
   
      /**
-     * listView: Listview
+      * @brief This property holds the ListView that the delegate belong to.
-     * The id of the ListView the delegates belong to.
       */
      property ListView listView
-    property bool containsMouse
   
      /**
-     * Emitted when the drag handle wants to move the item in the model
+      * @brief This signal is emitted when the drag handle wants to move the item in the model.
-     * The following example does the move in the case a ListModel is used
+      *
-     * @code
+      * The following example does the move in the case a ListModel is used:
+      * @code{.qml}
       *  onMoveRequested: listModel.move(oldIndex, newIndex, 1)
       * @endcode
       * @param oldIndex the index the item is currently at
@@ -31,14 +30,13 @@ Item {
      signal moveRequested(int oldIndex, int newIndex)
   
      /**
-     * Emitted when the drag operation is complete and the item has been
+      * @brief This signal is emitted when the drag operation is complete and the item has been
-     * dropped in the new final position
+      * dropped in the new final position.
       */
      signal dropped()
   
-    // Emitted when clicking to activate underneath mousearea
+     implicitWidth: Kirigami.Units.iconSizes.smallMedium
-    signal clicked()
+     implicitHeight: implicitWidth
-    signal rightClicked()
   
      MouseArea {
          id: mouseArea
@@ -47,53 +45,64 @@ Item {
              target: listItem
              axis: Drag.YAxis
              minimumY: 0
-            maximumY: listView.height - listItem.height
-            filterChildren: true
          }
-        /* cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor */
+         cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
   
+         Kirigami.Icon {
+             id: internal
+             source: "handle-sort"
              property int startY
              property int mouseDownY
              property Item originalParent
-        property int autoScrollThreshold: (listView.contentHeight > listView.height) ? listItem.height * 3 : 0
+             opacity: mouseArea.pressed || (!Kirigami.Settings.tabletMode && listItem.hovered) ? 1 : 0.6
+             property int listItemLastY
+             property bool draggingUp
+             color: "white"
   
              function arrangeItem() {
-            var newIndex = listView.indexAt(1,
+                 const newIndex = listView.indexAt(1, listView.contentItem.mapFromItem(mouseArea, 0, internal.mouseDownY).y);
-                                            listView.contentItem.mapFromItem(listItem, 0, 0).y +
-                                            mouseArea.mouseDownY);
   
-            if (Math.abs(listItem.y - mouseArea.startY) > height && newIndex > -1 &&
+                 if (newIndex > -1 && ((internal.draggingUp && newIndex < index) || (!internal.draggingUp && newIndex > index))) {
-                newIndex !== index) {
-                console.log("old index is: " + index + " and new index is: " + newIndex);
                      root.moveRequested(index, newIndex);
                  }
              }
   
-        preventStealing: false
+             anchors.fill: parent
-        onPressed: {
+         }
-            listView.interactive = false;
+         preventStealing: true
-            mouseArea.originalParent = listItem.parent;
+  
+  
+         onPressed: mouse => {
+             internal.originalParent = listItem.parent;
              listItem.parent = listView;
-            listItem.y = mouseArea.originalParent.mapToItem(listItem.parent, listItem.x, listItem.y).y;
+             listItem.y = internal.originalParent.mapToItem(listItem.parent, listItem.x, listItem.y).y;
-            mouseArea.originalParent.z = 99;
+             internal.originalParent.z = 99;
-            mouseArea.startY = listItem.y;
+             internal.startY = listItem.y;
-            mouseArea.mouseDownY = mouse.y;
+             internal.listItemLastY = listItem.y;
+             internal.mouseDownY = mouse.y;
+             // while dragging listItem's height could change
+             // we want a const maximumY during the dragging time
+             mouseArea.drag.maximumY = listView.height - listItem.height;
          }
   
-        onPositionChanged: {
+         onPositionChanged: mouse => {
-            if (!pressed) {
+             if (!pressed || listItem.y === internal.listItemLastY) {
                  return;
              }
-            mouseArea.arrangeItem();
   
-            scrollTimer.interval = 500 * Math.max(0.1, (1-Math.max(mouseArea.autoScrollThreshold - listItem.y, listItem.y - listView.height + mouseArea.autoScrollThreshold + listItem.height) / mouseArea.autoScrollThreshold));
+             internal.draggingUp = listItem.y < internal.listItemLastY
-            scrollTimer.running = (listItem.y < mouseArea.autoScrollThreshold ||
+             internal.listItemLastY = listItem.y;
-                                   listItem.y > listView.height - mouseArea.autoScrollThreshold);
+  
+             internal.arrangeItem();
+  
+              // autoscroll when the dragging item reaches the listView's top/bottom boundary
+             scrollTimer.running = (listView.contentHeight > listView.height)
+                                && ( (listItem.y === 0 && !listView.atYBeginning) ||
+                                     (listItem.y === mouseArea.drag.maximumY && !listView.atYEnd) );
          }
-        onReleased: {
+         onReleased: mouse => {
-            listView.interactive = true;
+             listItem.y = internal.originalParent.mapFromItem(listItem, 0, 0).y;
-            listItem.y = mouseArea.originalParent.mapFromItem(listItem, 0, 0).y;
+             listItem.parent = internal.originalParent;
-            listItem.parent = mouseArea.originalParent;
              dropAnimation.running = true;
              scrollTimer.running = false;
              root.dropped();
@@ -116,31 +125,24 @@ Item {
          }
          Timer {
              id: scrollTimer
-            interval: 500
+             interval: 50
              repeat: true
              onTriggered: {
-                if (listItem.y < mouseArea.autoScrollThreshold) {
+                 if (internal.draggingUp) {
-                    listView.contentY = Math.max(0, listView.contentY - Kirigami.Units.gridUnit)
+                     listView.contentY -= Kirigami.Units.gridUnit;
+                     if (listView.atYBeginning) {
+                         listView.positionViewAtBeginning();
+                         stop();
+                     }
                  } else {
-                    listView.contentY = Math.min(listView.contentHeight - listView.height, listView.contentY + Kirigami.Units.gridUnit)
+                     listView.contentY += Kirigami.Units.gridUnit;
-                }
+                     if (listView.atYEnd) {
-                mouseArea.arrangeItem();
+                         listView.positionViewAtEnd();
+                         stop();
                      }
                  }
-
+                 internal.arrangeItem();
-        MouseArea {
+             }
-            id: clickArea
-            anchors.fill: parent
-            hoverEnabled: true
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-            onEntered: root.containsMouse = true
-            onExited: root.containsMouse = false
-            onClicked: {
-                if (mouse.button === Qt.RightButton)
-                    root.rightClicked();
-                else
-                    root.clicked();
          }
      }
  }
-}

src/qml/presenter/Presentation.qml

@@ -107,6 +107,7 @@ FocusScope {
                     implicitHeight: Kirigami.Units.gridUnit * 10
                     anchors.right: previewSlide.left
                     anchors.verticalCenter: parent.verticalCenter
+                    color: "white"
                     MouseArea {
                         anchors.fill: parent
                         onPressed: previousSlideAction()
@@ -141,6 +142,7 @@ FocusScope {
                     implicitHeight: Kirigami.Units.gridUnit * 10
                     anchors.left: previewSlide.right
                     anchors.verticalCenter: parent.verticalCenter
+                    color: "white"
                     MouseArea {
                         anchors.fill: parent
                         onPressed: nextSlideAction()

src/qml/presenter/ServiceList.qml

@@ -263,7 +263,7 @@ Item {
                                 }
                             }
 
-                            Kirigami.ListItemDragHandle {
+                            Presenter.DragHandle {
                                 id: dragHandle
                                 anchors.left: parent.left
                                 anchors.verticalCenter: parent.verticalCenter

src/qml/presenter/SongEditor.qml

@@ -208,6 +208,23 @@ Item {
                     text: song.vorder
                     padding: 10
                     onEditingFinished: updateVerseOrder(text);
+                    background: Rectangle {
+                        color: songVorderField.enabled ? Kirigami.Theme.backgroundColor :
+                            song.vorder.trim().length === 0 ?
+                            Kirigami.Theme.negativeBackgroundColor :
+                            Kirigami.Theme.backgroundColor
+                        implicitWidth: parent.width
+                        implicitHeight: parent.height
+                        radius: 10
+                        border.color: {
+                            if (song.vorder.trim().length === 0)
+                                return Kirigami.Theme.negativeTextColor
+                            else if (songVorderField.enabled)
+                                return Kirigami.Theme.highlightColor
+                            else
+                                return Kirigami.Theme.positiveColor
+                        }
+                    }
                 }
 
                 Controls.Label {
@@ -251,6 +268,18 @@ Item {
                             editorTimer.running = false;
                         }
                         onPressed: editorTimer.running = true
+                        background: Rectangle {
+                            color: Kirigami.Theme.backgroundColor
+                            implicitWidth: parent.width
+                            implicitHeight: parent.height
+                            radius: 10
+                            border.color: {
+                                if (songVorderField.enabled)
+                                    return Kirigami.Theme.highlightColor
+                                else
+                                    return Kirigami.Theme.positiveColor
+                            }
+                        }
                     }
                 }
 
@@ -325,7 +354,7 @@ Item {
                         Layout.fillHeight: true
                         text: "Audio"
                         icon.name: "folder-music-symbolic"
-                        onClicked: audioFileDialog.open()
+                        onClicked: updateAudioFile()
                     }
                 }
             }
@@ -465,7 +494,8 @@ Item {
         songProxyModel.songModel.updateVerseOrder(songIndex, vorder)
     }
 
-    function updateAudioFile(file) {
+    function updateAudioFile() {
+        const file = fileHelper.loadFile("Pick Audio");
         songProxyModel.songModel.updateAudio(songIndex, file);
     }
 

src/rust/file_helper.rs

@@ -92,10 +92,12 @@ mod file_helper {
         }
 
         #[qinvokable]
-        pub fn load_file(self: Pin<&mut Self>) -> QUrl {
+        pub fn load_file(
-            let file = FileDialog::new()
+            self: Pin<&mut Self>,
-                .set_title("Load Presentation")
+            title: QString,
-                .pick_file();
+        ) -> QUrl {
+            let title = title.to_string();
+            let file = FileDialog::new().set_title(title).pick_file();
             if let Some(file) = file {
                 println!("loading-file: {:?}", file);
                 let mut string =

src/rust/songs/song_model.rs

@@ -859,8 +859,10 @@ pub mod song_model {
                     let mut verse_name = "";
                     debug!(verse = verse);
                     for word in keywords.clone() {
-                        let end_verse = verse.get(1..2).unwrap();
+                        let end_verse =
-                        let beg_verse = verse.get(0..1).unwrap();
+                            verse.get(1..2).unwrap_or_default();
+                        let beg_verse =
+                            verse.get(0..1).unwrap_or_default();
                         println!(
                             "verse: {:?}, beginning: {:?}, end: {:?}, word: {:?}",
                             verse, beg_verse, end_verse, word