fixed the filepicker dialog and started a window file

TODO.org

@@ -1,11 +1,16 @@
 #+TITLE: Todo List
 * Inbox
-** TODO Fix file dialog using basic QT theme
+** TODO Fix possible bug in arrangingItems in draghandler
-[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]]
+[[file:~/dev/church-presenter/src/qml/presenter/DragHandle.qml::function arrangeItem() {]]
+** TODO [#A] Make Presentation Window follow the presenter component
+[[file:~/dev/church-presenter/src/qml/presenter/MainWindow.qml::Presenter.Slide {]]
+
 ** TODO Make toolbar functional for songeditor
 [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::Controls.ToolBar {]]
+
 ** TODO Finish toolbar
 [[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::Controls.ToolBar {]]
+
 ** TODO Find a way to maths the textsize
 [[file:~/dev/church-presenter/src/qml/presenter/Slide.qml::property real textSize: 50]]
 
@@ -25,3 +30,6 @@
 ** DONE Parse Lyrics to create a list of strings for slides
 SCHEDULED: <2022-03-23 Wed 10:00>
 
+** DONE Fix file dialog using basic QT theme
+[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]]
+

src/main.cpp

@@ -22,10 +22,13 @@
 
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QQuickView>
+#include <qapplication.h>
+#include <qcoreapplication.h>
 #include <qdir.h>
 #include <qglobal.h>
 #include <qguiapplication.h>
 #include <qqml.h>
+#include <qquickstyle.h>
 #include <qsqldatabase.h>
 #include <qsqlquery.h>
 #include <qstringliteral.h>
@@ -67,17 +70,20 @@ static void connectToDatabase() {
 int main(int argc, char *argv[])
 {
   QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-  QGuiApplication app(argc, argv);
+  QApplication app(argc, argv);
-  KLocalizedString::setApplicationDomain("presenter");
+  KLocalizedString::setApplicationDomain("librepresenter");
-  QCoreApplication::setOrganizationName(QStringLiteral("presenter"));
+  QCoreApplication::setOrganizationName(QStringLiteral("librepresenter"));
   QCoreApplication::setOrganizationDomain(QStringLiteral("tfcconnection.org"));
-  QCoreApplication::setApplicationName(QStringLiteral("Church Presenter"));
+  QCoreApplication::setApplicationName(QStringLiteral("Libre Presenter"));
 
 #ifdef Q_OS_WINDOWS
   QIcon::setFallbackThemeName("breeze");
   QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
+  QApplication::setStyle(QStringLiteral("breeze"));
 #else
+  QIcon::setFallbackThemeName("breeze");
   QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
+  QQuickStyle::setFallbackStyle(QStringLiteral("breeze"));
 #endif
 
   QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("system-config-display")));

src/qml/presenter/LeftDock.qml

@@ -108,7 +108,12 @@ ColumnLayout {
                         anchors.fill: parent
                         listItem: serviceItem
                         listView: serviceItemList
-                        onMoveRequested: serviceItemModel.move(oldIndex, newIndex)
+                        onMoveRequested: {
+                            print(oldIndex, newIndex);
+                            serviceItemModel.move(oldIndex, newIndex);
+                        }
+                        onDropped: {
+                        }
                         onClicked: {
                             serviceItemList.currentIndex = index;
                             changeServiceItem(index);

src/qml/presenter/MainWindow.qml

@@ -90,35 +90,7 @@ Controls.Page {
     Loader {
         id: presentLoader
         active: presenting
-        sourceComponent: presentWindowComp
+        source: "PresentationWindow.qml"
-    }
-
-    Component {
-        id: presentWindowComp
-        Window {
-            id: presentationWindow
-            title: "presentation-window"
-            height: maximumHeight
-            width: maximumWidth
-            screen: presentationScreen
-            flags: Qt.X11BypassWindowManagerHint
-            onClosing: presenting = false
-
-            Component.onCompleted: {
-                presentationWindow.showFullScreen();
-                print(screen.name);
-            }
-
-            Presenter.Slide {
-                id: presentationSlide
-                anchors.fill: parent
-                imageSource: imageBackground
-                videoSource: videoBackground
-                text: ""
-
-                Component.onCompleted: slideItem = presentationSlide
-            }
-        }
     }
 
     SongSqlModel {

src/qml/presenter/PresentationWindow.qml

@@ -0,0 +1,33 @@
+import QtQuick 2.13
+import QtQuick.Dialogs 1.0
+import QtQuick.Controls 2.15 as Controls
+import QtQuick.Window 2.13
+import QtQuick.Layouts 1.2
+import org.kde.kirigami 2.13 as Kirigami
+import "./" as Presenter
+import org.presenter 1.0
+
+Window {
+    id: presentationWindow
+    title: "presentation-window"
+    height: maximumHeight
+    width: maximumWidth
+    screen: presentationScreen
+    /* flags: Qt.X11BypassWindowManagerHint */
+    onClosing: presenting = false
+
+    Component.onCompleted: {
+        presentationWindow.showFullScreen();
+        print(screen.name);
+    }
+
+    Presenter.Slide {
+        id: presentationSlide
+        anchors.fill: parent
+        imageSource: imageBackground
+        videoSource: videoBackground
+        text: ""
+
+        Component.onCompleted: slideItem = presentationSlide
+    }
+}

src/qml/presenter/SongEditor.qml

@@ -1,5 +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.2
 import org.kde.kirigami 2.13 as Kirigami

src/serviceitemmodel.cpp

@@ -174,17 +174,15 @@ void ServiceItemModel::removeItem(int index) {
 }
 
 bool ServiceItemModel::move(int sourceIndex, int destIndex) {
-  qDebug() << "starting move";
+  qDebug() << "starting move of: " << "source: " << sourceIndex << "dest: " << destIndex;
+  qDebug() << index(sourceIndex).row();
+  qDebug() << index(destIndex).row();
   QModelIndex parent = index(sourceIndex).parent();
-  bool begsuc = beginMoveRows(parent, sourceIndex, sourceIndex, parent, destIndex);
+  // bool begsuc = beginMoveRows(parent, sourceIndex, sourceIndex, parent, destIndex);
-  qDebug() << begsuc;
+  beginResetModel();
-  if (!begsuc) {
+  m_items.move(sourceIndex, destIndex);
-    qDebug() << "Failed to start moving rows";
+  // endMoveRows();
-    m_items.move(sourceIndex, destIndex);
+  endResetModel();
-    return false;
-  }
-  // bool success = moveRow(index(sourceIndex).parent(), sourceIndex, index(destIndex).parent(), destIndex);
-  endMoveRows();
   // qDebug() << success;
   return true;
 }
@@ -192,11 +190,11 @@ bool ServiceItemModel::move(int sourceIndex, int destIndex) {
 QVariantMap ServiceItemModel::getItem(int index) const {
   QVariantMap data;
   const QModelIndex idx = this->index(index,0);
-  qDebug() << idx;
+  // qDebug() << idx;
   if( !idx.isValid() )
     return data;
   const QHash<int,QByteArray> rn = roleNames();
-  qDebug() << rn;
+  // qDebug() << rn;
   QHashIterator<int,QByteArray> it(rn);
   while (it.hasNext()) {
     it.next();