From 3f50b4c6bfa2a2ec0e4ffb5d1cc7f7685193eced Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Sat, 18 Feb 2023 18:58:42 +0100
Subject: [PATCH] Fixed resource compilation

---
 CMakeLists.txt               |  6 ++++--
 DeviceTypesSettingsPage.qml  | 14 +++-----------
 devicetyperegistersmodel.cpp | 19 ++++++++++---------
 devicetyperegistersmodel.h   |  1 +
 main.cpp                     |  3 +++
 resources.qrc                |  7 -------
 6 files changed, 21 insertions(+), 29 deletions(-)
 delete mode 100644 resources.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd70dd5..bd0092d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,12 @@ project(lightcontrol VERSION 0.1 LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
 find_package(Qt6 6.2 REQUIRED COMPONENTS SerialPort Quick)
 
 qt_add_executable(applightcontrol
-    resources.qrc
     main.cpp
     devicetypesmodel.h devicetypesmodel.cpp
     dmxcontroller.h dmxcontroller.cpp
@@ -23,6 +21,10 @@ qt_add_executable(applightcontrol
 
 qt_add_qml_module(applightcontrol
     URI lightcontrol
+    RESOURCES
+        icons/movinghead.png
+        icons/nebelmaschine.png
+        icons/rgbstrahler.png
     VERSION 1.0
     QML_FILES
         main.qml
diff --git a/DeviceTypesSettingsPage.qml b/DeviceTypesSettingsPage.qml
index 3c8a976..eb235b8 100644
--- a/DeviceTypesSettingsPage.qml
+++ b/DeviceTypesSettingsPage.qml
@@ -8,14 +8,6 @@ ColumnLayout {
     Label {
         text: qsTr("Device Types Settings")
     }
-    Image {
-        height: 64
-        width: 64
-        source: ":/lightcontrol/icons/movinghead.png"
-        onStatusChanged: console.log(status)
-        Component.onCompleted: console.log(status)
-    }
-
     RowLayout {
         //Layout.fillWidth: true
         Layout.fillHeight: true
@@ -70,9 +62,9 @@ ColumnLayout {
                             }
                     model: ListModel {
                                 id: cbItems
-                                ListElement { imageSource: ":/lightcontrol/icons/movinghead.png"  }
-                                ListElement { imageSource: ":/lightcontrol/icons/nebelmaschine.png"  }
-                                ListElement { imageSource: ":/lightcontrol/icons/rgbstrahler.png"  }
+                                ListElement { imageSource: "qrc:/lightcontrol/icons/movinghead.png"  }
+                                ListElement { imageSource: "qrc:/lightcontrol/icons/nebelmaschine.png"  }
+                                ListElement { imageSource: "qrc:/lightcontrol/icons/rgbstrahler.png"  }
                             }
                 }
                 Label { text: qsTr("Registers:") }
diff --git a/devicetyperegistersmodel.cpp b/devicetyperegistersmodel.cpp
index e589dd5..040d813 100644
--- a/devicetyperegistersmodel.cpp
+++ b/devicetyperegistersmodel.cpp
@@ -172,26 +172,26 @@ bool DeviceTypeRegistersModel::setData(const QModelIndex &index, const QVariant
     if (!index.isValid())
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
     if (!m_controller)
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
     if (m_deviceTypeId == -1)
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
     auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(m_deviceTypeId);
     if (!deviceTypePtr)
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
     auto &deviceType = *deviceTypePtr;
@@ -199,24 +199,25 @@ bool DeviceTypeRegistersModel::setData(const QModelIndex &index, const QVariant
     if (index.row() < 0 || index.row() >= deviceType.registers.size())
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
     if (index.column() != 0)
     {
         qWarning() << "hilfe" << __LINE__;
-        return {};
+        return true;
     }
 
-    qDebug() << value.value<DeviceTypeRegisterType>();
-
     auto &deviceTypeRegister = deviceType.registers.at(index.row());
 
     deviceTypeRegister.type = value.value<DeviceTypeRegisterType>();
     emit dataChanged(index, index, { Qt::DisplayRole, Qt::EditRole });
     return true;
+}
+
+bool DeviceTypeRegistersModel::removeRows(int row, int count, const QModelIndex &parent)
+{
 
-    return false;
 }
 
 namespace {
diff --git a/devicetyperegistersmodel.h b/devicetyperegistersmodel.h
index ab6c403..29b2eba 100644
--- a/devicetyperegistersmodel.h
+++ b/devicetyperegistersmodel.h
@@ -26,6 +26,7 @@ public:
     QHash<int, QByteArray> roleNames() const override;
 
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    bool removeRows(int row, int count, const QModelIndex &parent) override;
 
 signals:
     void controllerChanged(DmxController *controller);
diff --git a/main.cpp b/main.cpp
index 5461e6c..4f893d6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QDebug>
+#include <QDir>
 
 #include "dmxcontroller.h"
 
@@ -23,6 +24,8 @@ int main(int argc, char *argv[])
 
     QGuiApplication app{argc, argv};
 
+    qDebug() << QDir{":/lightcontrol"}.entryInfoList();
+
     QCommandLineParser parser;
     parser.addHelpOption();
     parser.addVersionOption();
diff --git a/resources.qrc b/resources.qrc
deleted file mode 100644
index 3380dd6..0000000
--- a/resources.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/lightcontrol">
-        <file>icons/movinghead.png</file>
-        <file>icons/nebelmaschine.png</file>
-        <file>icons/rgbstrahler.png</file>
-    </qresource>
-</RCC>