updates to fix qml

src/qml/main.qml

@@ -1,5 +1,4 @@
 import QtQuick
-/* import QtQuick.Dialogs */
 import QtQuick.Controls as Controls
 import Qt.labs.platform as Labs
 import QtQuick.Window 

src/qml/presenter/Actions.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.13
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15

src/qml/presenter/Header.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.13
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15

src/qml/presenter/ImageEditor.qml

@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter

src/qml/presenter/LeftDock.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.13
-/* import QtQuick.Dialogs 1.0 */
 import QtQuick.Controls 2.0 as Controls
 /* import QtQuick.Window 2.15 */
 import QtQuick.Layouts 1.15

src/qml/presenter/LoadingSpinner.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 

src/qml/presenter/MainWindow.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.15
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15
@@ -176,13 +175,13 @@ Controls.Page {
     /*     id: pWindow */
     /* } */
 
-    SongProxyModel { id: songProxyModel }
+    /* SongProxyModel { id: songProxyModel } */
-    ImageProxyModel { id: imageProxyModel }
+    /* ImageProxyModel { id: imageProxyModel } */
-    PresentationProxyModel { id: presProxyModel }
+    /* PresentationProxyModel { id: presProxyModel } */
-    VideoProxyModel { id: videoProxyModel }
+    /* VideoProxyModel { id: videoProxyModel } */
-    /* ServiceThing { id: serviceThing } */
+    ServiceThing { id: serviceThing } 
     FileHelper { id: fileHelper } 
-    SlideHelper { id: slideHelper }
+    /* SlideHelper { id: slideHelper } */
     SongEditor {
         id: songEditorModel
         /* songModel: songProxyModel.songModel() */

src/qml/presenter/NewVideo.qml

@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtGraphicalEffects 1.15
 import org.kde.kirigami 2.13 as Kirigami

src/qml/presenter/Presentation.qml

@@ -1,13 +1,12 @@
 import QtQuick 2.15
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15
+import QtMultimedia
 /* import QtAudioEngine 1.15 */
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 import org.presenter 1.0
-import mpv 1.0
 
 FocusScope {
     id: root
@@ -454,13 +453,12 @@ FocusScope {
         onTriggered: root.visible ? keyHandler.forceActiveFocus() : null
     }
 
-    MpvObject {
+    MediaPlayer {
         id: audio
-        useHwdec: true
+        audioOutput: AudioOutput {}
-        enableAudio: true
         // embeded mpv allows to set commandline propertys using the options/<name>
         // syntax. This could be abstracted later, but for now this works.
-        Component.onCompleted: audio.setProperty("options/audio-display", "no");
+        /* Component.onCompleted: audio.setProperty("options/audio-display", "no"); */
     }
 
     function pauseVideo() {

src/qml/presenter/PresentationEditor.qml

@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtWebEngine 1.10
 import org.kde.kirigami 2.13 as Kirigami

src/qml/presenter/PresentationWindow.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.15
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15

src/qml/presenter/PreviewSlide.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15
 import QtMultimedia 5.15
 /* import QtAudioEngine 1.15 */
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 import org.presenter 1.0

src/qml/presenter/ServiceList.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.13
-/* import QtQuick.Dialogs 1.0 */
 import QtQuick.Controls 2.12 as Controls
 /* import QtQuick.Window 2.15 */
 import QtQuick.Layouts 1.15
@@ -8,7 +7,7 @@ import QtQml.Models 2.15
 /* import QtQml.Models 2.12 */
 /* import QtMultimedia 5.15 */
 /* import QtAudioEngine 1.15 */
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 import org.presenter 1.0
@@ -78,9 +77,7 @@ Item {
                 }
             }
 
-            Component {
+            Item {
-                id: delegate
-                Kirigami.AbstractListItem {
                 id: serviceListItem
                 implicitWidth: serviceItemList.width
                 height: Kirigami.Units.gridUnit * 2
@@ -278,6 +275,22 @@ Item {
                         }
 
                     }
+                    Controls.Menu {
+                        id: rightClickMenu
+                        Kirigami.Action {
+                            text: "Copy"
+                        }
+                        Kirigami.Action {
+                            text: "Paste"
+                        }
+                        Kirigami.Action {
+                            text: "Delete"
+                            onTriggered: removeItem(index)
+                        }
+
+                        Controls.MenuSeparator {}
+
+                        
                         Controls.Menu {
                             id: rightClickMenu
                             Kirigami.Action {
@@ -307,6 +320,7 @@ Item {
                                             ObsModel.setScene(modelData);
                                         }
                                     }
+                                }
                                 onObjectAdded: obsMenu.insertAction(index, object)
                                 onObjectRemoved: obsMenu.removeAction(object)
                             }
@@ -314,7 +328,6 @@ Item {
                     }
                 }
             }
-            }
 
             ListView {
                 id: serviceItemList
@@ -345,11 +358,7 @@ Item {
 
                 model: ServiceItemModel
 
-                delegate: Kirigami.DelegateRecycler {
+                delegate: serviceListItem
-                    width: serviceItemList.width
-                    height: Kirigami.Units.gridUnit * 2
-                    sourceComponent: delegate
-                }
                 Kirigami.WheelHandler {
                     id: wheelHandler
                     target: serviceItemList

src/qml/presenter/Settings.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.13
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.13 as Kirigami

src/qml/presenter/Slide.qml

@@ -4,11 +4,10 @@ import QtQuick.Layouts 1.15
 import QtMultimedia
 /* import QtAudioEngine 1.15 */
 import QtWebEngine 1.10
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 import org.presenter 1.0
-import mpv 1.0
 
 Item {
     id: root

src/qml/presenter/SlideEditor.qml

@@ -1,7 +1,6 @@
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtWebEngine 1.10
 import org.kde.kirigami 2.13 as Kirigami

src/qml/presenter/SlidesListView.qml

@@ -3,7 +3,6 @@ import QtQuick.Controls 2.15 as Controls
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter
 import org.presenter 1.0
-import mpv 1.0
 
 ListView {
     // The active items X value from root

src/qml/presenter/SongEditor.qml

@@ -1,7 +1,6 @@
 import QtQuick 2.13
 import QtQuick.Controls 2.15 as Controls
 import Qt.labs.platform 1.1 as Labs
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.13 as Kirigami
 import "./" as Presenter

src/qml/presenter/SongEditorSlideList.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.15
-import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Window 2.15
 import QtQuick.Layouts 1.15

src/qml/presenter/TextBackground.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.13
+import QtQuick
-import QtGraphicalEffects 1.15
+import Qt5Compat.GraphicalEffects
 import org.kde.kirigami 2.13 as Kirigami
 
 Item {

src/qml/presenter/VideoEditor.qml

@@ -1,10 +1,9 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.13 as Kirigami
+import QtMultimedia
 import "./" as Presenter
-import mpv 1.0
 import org.presenter 1.0
 
 Item {
@@ -90,19 +89,10 @@ Item {
             Layout.leftMargin: Kirigami.Units.largeSpacing
             Layout.rightMargin: Kirigami.Units.largeSpacing
 
-            MpvObject {
+            Video {
                 id: videoPreview
                 width: parent.width
                 height: parent.height
-	        objectName: "mpv"
-                useHwdec: true
-                enableAudio: audioOn
-                Component.onCompleted: mpvLoadingTimer.start()
-                onPositionChanged: videoSlider.value = position
-                onFileLoaded: {
-                    /* showPassiveNotification(video.title + " has been loaded"); */
-                    videoPreview.pause();
-                }
             }
 
             RowLayout {
@@ -111,7 +101,7 @@ Item {
                 height: videoTitleField.height
                 spacing: 2
                 Kirigami.Icon {
-                    source: videoPreview.isPlaying ? "media-pause" : "media-play"
+                    source: videoPreview.playbackState == MediaPlayer.PlayingState ? "media-pause" : "media-play"
                     Layout.preferredWidth: 25
                     Layout.preferredHeight: 25
                     color: Kirigami.Theme.textColor
@@ -127,7 +117,7 @@ Item {
                     Layout.preferredHeight: 25
                     from: 0
                     to: videoPreview.duration
-                    /* value: videoPreview.postion */
+                    value: videoPreview.postion
                     live: true
                     onMoved: videoPreview.seek(value);
                 }