qmlui: begin definition editor save state and instructions

engine/src/qlcchannel.cpp

@@ -845,17 +845,25 @@ uchar QLCChannel::defaultValue() const
 
 void QLCChannel::setDefaultValue(uchar value)
 {
+    if (value == m_defaultValue)
+        return;
+
     m_defaultValue = value;
+    emit defaultValueChanged();
 }
 
-void QLCChannel::setControlByte(ControlByte byte)
+QLCChannel::ControlByte QLCChannel::controlByte() const
 {
-    m_controlByte = byte;
+    return m_controlByte;
 }
 
-QLCChannel::ControlByte QLCChannel::controlByte() const
+void QLCChannel::setControlByte(ControlByte byte)
 {
-    return m_controlByte;
+    if (byte == m_controlByte)
+        return;
+
+    m_controlByte = byte;
+    emit controlByteChanged();
 }
 
 /*****************************************************************************

qmlui/app.cpp

@@ -882,7 +882,6 @@ void App::createFixture()
     if (m_fixtureEditor == nullptr)
     {
         m_fixtureEditor = new FixtureEditor(this, m_doc);
-        //setSource(QUrl("qrc:/FixtureEditor.qml")); // another fucking segfault in QtQuick
         QMetaObject::invokeMethod(rootObject(), "switchToContext",
                                   Q_ARG(QVariant, "FXEDITOR"),
                                   Q_ARG(QVariant, "qrc:/FixtureEditor.qml"));
@@ -896,7 +895,6 @@ void App::editFixture(QString manufacturer, QString model)
     if (m_fixtureEditor == nullptr)
     {
         m_fixtureEditor = new FixtureEditor(this, m_doc);
-        //setSource(QUrl("qrc:/FixtureEditor.qml"));
         QMetaObject::invokeMethod(rootObject(), "switchToContext",
                                   Q_ARG(QVariant, "FXEDITOR"),
                                   Q_ARG(QVariant, "qrc:/FixtureEditor.qml"));

qmlui/fixtureeditor/channeledit.cpp

@@ -27,7 +27,11 @@ ChannelEdit::ChannelEdit(QLCChannel *channel, QObject *parent)
     : QObject(parent)
     , m_channel(channel)
 {
-
+    connect(m_channel, SIGNAL(presetChanged()), this, SIGNAL(channelChanged()));
+    connect(m_channel, SIGNAL(groupChanged()), this, SIGNAL(channelChanged()));
+    connect(m_channel, SIGNAL(nameChanged()), this, SIGNAL(channelChanged()));
+    connect(m_channel, SIGNAL(defaultValueChanged()), this, SIGNAL(channelChanged()));
+    connect(m_channel, SIGNAL(controlByteChanged()), this, SIGNAL(channelChanged()));
 }
 
 ChannelEdit::~ChannelEdit()

qmlui/fixtureeditor/channeledit.h

@@ -60,6 +60,7 @@ class ChannelEdit : public QObject
     Q_INVOKABLE QVariant getCapabilityValueAt(int index, int vIndex);
 
 signals:
+    void channelChanged();
     void capabilitiesChanged();
 
 private:

qmlui/fixtureeditor/editorview.cpp

@@ -30,6 +30,7 @@ EditorView::EditorView(QQuickView *view, QLCFixtureDef *fixtureDef, QObject *par
     : QObject(parent)
     , m_view(view)
     , m_fixtureDef(fixtureDef)
+    , m_isModified(false)
     , m_channelEdit(nullptr)
     , m_modeEdit(nullptr)
 {
@@ -45,6 +46,22 @@ EditorView::~EditorView()
         delete m_modeEdit;
 }
 
+bool EditorView::isModified() const
+{
+    return m_isModified;
+}
+
+bool EditorView::isUser() const
+{
+    return m_fixtureDef->isUser();
+}
+
+void EditorView::setModified()
+{
+    m_isModified = true;
+    emit hasChanged();
+}
+
 QString EditorView::manufacturer() const
 {
     return m_fixtureDef->manufacturer();
@@ -57,6 +74,7 @@ void EditorView::setManufacturer(QString manufacturer)
 
     m_fixtureDef->setManufacturer(manufacturer);
     emit manufacturerChanged(manufacturer);
+    setModified();
 }
 
 QString EditorView::model() const
@@ -71,6 +89,7 @@ void EditorView::setModel(QString model)
 
     m_fixtureDef->setModel(model);
     emit modelChanged(model);
+    setModified();
 }
 
 QString EditorView::author() const
@@ -85,6 +104,7 @@ void EditorView::setAuthor(QString author)
 
     m_fixtureDef->setAuthor(author);
     emit authorChanged(author);
+    setModified();
 }
 
 PhysicalEdit *EditorView::globalPhysical()
@@ -120,6 +140,7 @@ ChannelEdit *EditorView::requestChannelEditor(QString name)
         emit channelsChanged();
     }
     m_channelEdit = new ChannelEdit(ch);
+    connect(m_channelEdit, SIGNAL(channelChanged()), this, SLOT(setModified()));
     return m_channelEdit;
 }
 

qmlui/fixtureeditor/editorview.h

@@ -31,6 +31,9 @@ class EditorView : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(bool isModified READ isModified NOTIFY hasChanged)
+    Q_PROPERTY(bool isUser READ isUser CONSTANT)
+
     Q_PROPERTY(QString manufacturer READ manufacturer WRITE setManufacturer NOTIFY manufacturerChanged)
     Q_PROPERTY(QString model READ model WRITE setModel NOTIFY modelChanged)
     Q_PROPERTY(QString author READ author WRITE setAuthor NOTIFY authorChanged)
@@ -44,6 +47,12 @@ class EditorView : public QObject
     EditorView(QQuickView *view, QLCFixtureDef *fixtureDef, QObject *parent = nullptr);
     ~EditorView();
 
+    /** Get the definition modification flag */
+    bool isModified() const;
+
+    /** Get if the definition is user or system */
+    bool isUser() const;
+
     /** Get/Set the fixture manufacturer */
     QString manufacturer() const;
     void setManufacturer(QString manufacturer);
@@ -60,7 +69,11 @@ class EditorView : public QObject
      *  global physical properties */
     PhysicalEdit *globalPhysical();
 
+protected slots:
+    void setModified();
+
 signals:
+    void hasChanged();
     void manufacturerChanged(QString manufacturer);
     void modelChanged(QString model);
     void authorChanged(QString author);
@@ -72,6 +85,8 @@ class EditorView : public QObject
     QLCFixtureDef *m_fixtureDef;
     /** Reference to the global physical properties */
     PhysicalEdit *m_globalPhy;
+    /** Definition modification flag */
+    bool m_isModified;
 
     /************************************************************************
      * Channels

qmlui/fixtureeditor/fixtureeditor.cpp

@@ -46,6 +46,11 @@ FixtureEditor::~FixtureEditor()
 
 }
 
+QString FixtureEditor::userFolder() const
+{
+    return m_doc->fixtureDefCache()->userDefinitionDirectory().absolutePath();
+}
+
 void FixtureEditor::createDefinition()
 {
     m_editors[m_lastId] = new EditorView(m_view, new QLCFixtureDef());

qmlui/fixtureeditor/fixtureeditor.h

@@ -29,13 +29,17 @@ class FixtureEditor : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList editorsList READ editorsList NOTIFY editorsListChanged)
+    Q_PROPERTY(QString userFolder READ userFolder CONSTANT)
 
 public:
     FixtureEditor(QQuickView *view, Doc *doc, QObject *parent = nullptr);
     ~FixtureEditor();
 
+    /** Return the definitions user folder absolute location */
+    QString userFolder() const;
+
     /** Create a new editor and an empty fixture definition */
-    void createDefinition();
+    Q_INVOKABLE void createDefinition();
 
     /** Edit an existing fixture definition */
     void editDefinition(QString manufacturer, QString model);

qmlui/qml/fixtureeditor/ChannelEditor.qml

@@ -28,13 +28,13 @@ GridLayout
 {
     columns: 4
 
-    property EditorRef fixtureEditor: null
+    property EditorRef editorView: null
     property ChannelEdit editor: null
     property QLCChannel channel: null
 
     function setItemName(name)
     {
-        editor = fixtureEditor.requestChannelEditor(name)
+        editor = editorView.requestChannelEditor(name)
         channel = editor.channel
         nameEdit.selectAndFocus()
     }

qmlui/qml/fixtureeditor/EditorView.qml

@@ -29,10 +29,28 @@ Rectangle
     id: editorRoot
 
     property int editorId
-    property EditorRef fixtureEditor: null
+    property EditorRef editorView: null
+    property bool isUser: true
 
     color: "transparent"
 
+    Component.onCompleted:
+    {
+        if (isUser)
+            systemFixturePopup.open()
+    }
+
+    CustomPopupDialog
+    {
+        id: systemFixturePopup
+        standardButtons: Dialog.Ok
+        title: qsTr("!! Warning !!")
+        message: qsTr("You are trying to edit a bundled fixture definition.<br>" +
+                      "If you modify it, a new file will be stored in<br><i>" +
+                      fixtureEditor.userFolder + "</i><br>when saving, with precedence over the bundled file.")
+        onAccepted: systemFixturePopup.close()
+    }
+
     SplitView
     {
         anchors.fill: parent
@@ -74,8 +92,8 @@ Rectangle
                             CustomTextEdit
                             {
                                 Layout.fillWidth: true
-                                text: fixtureEditor ? fixtureEditor.manufacturer : ""
-                                onTextChanged: if (fixtureEditor) fixtureEditor.manufacturer = text
+                                text: editorView ? editorView.manufacturer : ""
+                                onTextChanged: if (editorView) editorView.manufacturer = text
                             }
 
                             // row 1
@@ -121,17 +139,17 @@ Rectangle
                             CustomTextEdit
                             {
                                 Layout.fillWidth: true
-                                text: fixtureEditor ? fixtureEditor.model : ""
-                                onTextChanged: if (fixtureEditor) fixtureEditor.model = text
+                                text: editorView ? editorView.model : ""
+                                onTextChanged: if (editorView) editorView.model = text
                             }
 
                             // row 4
                             RobotoText { label: qsTr("Author") }
                             CustomTextEdit
                             {
                                 Layout.fillWidth: true
-                                text: fixtureEditor ? fixtureEditor.author : ""
-                                onTextChanged: if (fixtureEditor) fixtureEditor.author = text
+                                text: editorView ? editorView.author : ""
+                                onTextChanged: if (editorView) editorView.author = text
                             }
                         }
                 } // SectionBox - General
@@ -146,7 +164,7 @@ Rectangle
                         PhysicalProperties
                         {
                             width: Math.min(editorRoot.width / 2, parent.width)
-                            phy: fixtureEditor ? fixtureEditor.globalPhysical : null
+                            phy: editorView ? editorView.globalPhysical : null
                         }
                 } // SectionBox - Physical
 
@@ -216,7 +234,7 @@ Rectangle
 
                                 property bool dragActive: false
 
-                                model: fixtureEditor ? fixtureEditor.channels : null
+                                model: editorView ? editorView.channels : null
                                 delegate:
                                     Item
                                     {
@@ -366,7 +384,7 @@ Rectangle
                                 boundsBehavior: Flickable.StopAtBounds
                                 currentIndex: -1
 
-                                model: fixtureEditor ? fixtureEditor.modes : null
+                                model: editorView ? editorView.modes : null
                                 delegate:
                                     Item
                                     {
@@ -447,7 +465,7 @@ Rectangle
                 item.width = Qt.binding(function() { return sideEditor.width - 20 })
                 item.height = Qt.binding(function() { return sideEditor.height - 20 })
 
-                item.fixtureEditor = editorRoot.fixtureEditor
+                item.editorView = editorRoot.editorView
                 item.setItemName(itemName)
             }
         }

qmlui/qml/fixtureeditor/FixtureEditor.qml

@@ -26,7 +26,6 @@ import "."
 
 Rectangle
 {
-    id: mainView
     visible: true
     width: 800
     height: 600
@@ -76,7 +75,7 @@ Rectangle
             {
                 imgSource: "qrc:/filenew.svg"
                 entryText: qsTr("New definition")
-                //onPressed: qlcplus.closeFixtureEditor()
+                onPressed: fixtureEditor.createDefinition()
                 autoExclusive: false
                 checkable: false
             }
@@ -137,22 +136,35 @@ Rectangle
                         property string fxManuf: modelData.cRef.manufacturer
                         property string fxModel: modelData.cRef.model
 
+                        //width: contentItem.width + (modIcon.visible ? modIcon.width + 8 : 0)
+
                         entryText: (fxManuf ? fxManuf : qsTr("Unknown")) + " - " + (fxModel ? fxModel : qsTr("Unknown"))
+                        imgSource: modelData.cRef.isModified ? "qrc:/filesave.svg" : ""
+                        iconSize: height * 0.75
                         checkable: true
+                        padding: 5
+
                         onClicked:
                         {
-                            editorView.editorId = modelData.id
-                            editorView.fixtureEditor = modelData.cRef
+                            editor.editorId = modelData.id
+                            editor.editorView = modelData.cRef
+                            editor.isUser = modelData.cRef.isUser
                             checked = true
                         }
                     }
             } // Repeater
+            Rectangle
+            {
+                Layout.fillWidth: true
+                height: parent.height
+                color: "transparent"
+            }
         } // RowLayout
     } // Rectangle
 
     EditorView
     {
-        id: editorView
+        id: editor
         y: mainToolbar.height + feToolbar.height
         width: parent.width
         height: parent.height - (mainToolbar.height + feToolbar.height)

qmlui/qml/fixtureeditor/ModeEditor.qml

@@ -29,12 +29,12 @@ Rectangle
     id: editorRoot
     color: "transparent"
 
-    property EditorRef fixtureEditor: null
+    property EditorRef editorView: null
     property ModeEdit mode: null
 
     function setItemName(name)
     {
-        mode = fixtureEditor.requestModeEditor(name)
+        mode = editorView.requestModeEditor(name)
         nameEdit.selectAndFocus()
     }
 
@@ -229,7 +229,7 @@ Rectangle
                         {
                             width: Math.min(editorRoot.width / 2, parent.width)
                             phy: globalPhyCheck.checked ?
-                                     (fixtureEditor ? fixtureEditor.globalPhysical : null) :
+                                     (editorView ? editorView.globalPhysical : null) :
                                      (mode ? mode.physical : null)
                             enabled: overridePhyCheck.checked
                         }