Update arrangement actions

Author: CrSjimo

src/plugins/visualeditor/core/ArrangementPanelInterface.cpp

@@ -138,6 +138,19 @@ namespace VisualEditor {
         return d->arrangementView;
     }
 
+    ArrangementPanelInterface::Tool ArrangementPanelInterface::tool() const {
+        Q_D(const ArrangementPanelInterface);
+        return d->tool;
+    }
+
+    void ArrangementPanelInterface::setTool(Tool tool) {
+        Q_D(ArrangementPanelInterface);
+        if (d->tool != tool) {
+            d->tool = tool;
+            Q_EMIT toolChanged();
+        }
+    }
+
 }
 
 #include "moc_ArrangementPanelInterface.cpp"

src/plugins/visualeditor/core/ArrangementPanelInterface.h

@@ -38,6 +38,7 @@ namespace VisualEditor {
         Q_PROPERTY(sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel READ scrollBehaviorViewModel CONSTANT)
         Q_PROPERTY(sflow::TimelineInteractionController *timelineInteractionController READ timelineInteractionController CONSTANT)
         Q_PROPERTY(QQuickItem *arrangementView READ arrangementView CONSTANT)
+        Q_PROPERTY(Tool tool READ tool WRITE setTool NOTIFY toolChanged)
 
     public:
         ~ArrangementPanelInterface() override;
@@ -53,6 +54,18 @@ namespace VisualEditor {
 
         QQuickItem *arrangementView() const;
 
+        enum Tool {
+            PointerTool,
+            PencilTool,
+            HandTool,
+        };
+        Q_ENUM(Tool)
+        Tool tool() const;
+        void setTool(Tool tool);
+
+    Q_SIGNALS:
+        void toolChanged();
+
     private:
         friend class Internal::ArrangementAddOn;
         QScopedPointer<ArrangementPanelInterfacePrivate> d_ptr;

src/plugins/visualeditor/core/ArrangementPanelInterface_p.h

@@ -18,6 +18,8 @@ namespace VisualEditor {
 
         QQuickItem *arrangementView;
 
+        ArrangementPanelInterface::Tool tool{ArrangementPanelInterface::PointerTool};
+
         void bindTimeViewModel() const;
         void bindTimeLayoutViewModel() const;
         void bindTimelineInteractionController() const;

src/plugins/visualeditor/internal/addon/ArrangementAddOn.cpp

@@ -19,6 +19,17 @@ namespace VisualEditor::Internal {
     void ArrangementAddOn::initialize() {
         auto windowInterface = windowHandle()->cast<Core::ProjectWindowInterface>();
         new ArrangementPanelInterface(windowInterface);
+        {
+            QQmlComponent component(Core::RuntimeInterface::qmlEngine(), "DiffScope.VisualEditor", "ArrangementAddOnActions");
+            if (component.isError()) {
+                qFatal() << component.errorString();
+            }
+            auto o = component.createWithInitialProperties({
+                {"addOn", QVariant::fromValue(this)},
+            });
+            o->setParent(this);
+            QMetaObject::invokeMethod(o, "registerToContext", windowInterface->actionContext());
+        }
         {
             QQmlComponent component(Core::RuntimeInterface::qmlEngine(), "DiffScope.VisualEditor", "ArrangementPanel", this);
             if (component.isError()) {

src/plugins/visualeditor/qml/actions/ArrangementAddOnActions.qml

@@ -0,0 +1,53 @@
+import QtQml
+import QtQuick
+import QtQuick.Controls
+
+import SVSCraft
+import SVSCraft.UIComponents
+import SVSCraft.UIComponents.impl
+
+import QActionKit
+
+ActionCollection {
+    id: d
+
+    required property QtObject addOn
+    readonly property ArrangementPanelInterface arrangementPanelInterface: addOn?.arrangementPanelInterface ?? null
+
+    ActionItem {
+        actionId: "org.diffscope.visualeditor.arrangementPanel.pointerTool"
+        Action {
+            checkable: true
+            checked: d.arrangementPanelInterface.tool === ArrangementPanelInterface.PointerTool
+            onTriggered: () => {
+                d.arrangementPanelInterface.tool = ArrangementPanelInterface.PointerTool
+                Qt.callLater(() => GlobalHelper.setProperty(this, "checked", true))
+            }
+        }
+    }
+
+    ActionItem {
+        actionId: "org.diffscope.visualeditor.arrangementPanel.pencilTool"
+        Action {
+            checkable: true
+            checked: d.arrangementPanelInterface.tool === ArrangementPanelInterface.PencilTool
+            onTriggered: () => {
+                d.arrangementPanelInterface.tool = ArrangementPanelInterface.PencilTool
+                Qt.callLater(() => GlobalHelper.setProperty(this, "checked", true))
+            }
+        }
+    }
+
+    ActionItem {
+        actionId: "org.diffscope.visualeditor.arrangementPanel.handTool"
+        Action {
+            checkable: true
+            checked: d.arrangementPanelInterface.tool === ArrangementPanelInterface.HandTool
+            onTriggered: () => {
+                d.arrangementPanelInterface.tool = ArrangementPanelInterface.HandTool
+                Qt.callLater(() => GlobalHelper.setProperty(this, "checked", true))
+            }
+        }
+    }
+
+}

src/plugins/visualeditor/qml/panels/ArrangementPanel.qml

@@ -1,8 +1,11 @@
 import QtQml
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Templates as T
 import QtQuick.Layouts
 
+import QActionKit
+
 import SVSCraft
 import SVSCraft.UIComponents
 
@@ -13,6 +16,46 @@ QtObject {
     required property QtObject addOn
 
     readonly property Component arrangementPanelComponent: ActionDockingPane {
+        Component {
+            id: dummyItem
+            Item {}
+        }
+        header: ToolBarContainer {
+            id: toolBar
+            anchors.fill: parent
+            spacing: 4
+            property ActionInstantiator instantiator: ActionInstantiator {
+                actionId: "org.diffscope.visualeditor.arrangementPanelToolBar"
+                context: d.addOn?.windowHandle.actionContext ?? null
+                separatorComponent: ToolBarContainerSeparator {
+                }
+                stretchComponent: ToolBarContainerStretch {
+                }
+                Component.onCompleted: forceUpdateLayouts()
+                onObjectAdded: (index, object) => {
+                    if (object instanceof Item) {
+                        toolBar.insertItem(index, object)
+                    } else if (object instanceof T.Action) {
+                        toolBar.insertAction(index, object)
+                    } else if (object instanceof T.Menu) {
+                        toolBar.insertMenu(index, object)
+                    } else {
+                        toolBar.insertItem(index, dummyItem.createObject(this))
+                    }
+                }
+                onObjectRemoved: (index, object) => {
+                    if (object instanceof Item) {
+                        toolBar.removeItem(object)
+                    } else if (object instanceof Action) {
+                        toolBar.removeAction(object)
+                    } else if (object instanceof Menu) {
+                        toolBar.removeMenu(object)
+                    } else {
+                        toolBar.removeItem(target.itemAt(index))
+                    }
+                }
+            }
+        }
         data: [d.addOn?.arrangementPanelInterface.arrangementView ?? null]
     }
 

src/plugins/visualeditor/res/org.diffscope.visualeditor_actions.xml

@@ -15,11 +15,30 @@
     </configuration>
 
     <items>
+        <action id="org.diffscope.visualeditor.arrangementPanel.pointerTool" shortcut="F5" />
+        <action id="org.diffscope.visualeditor.arrangementPanel.pencilTool" shortcut="F6" />
+        <action id="org.diffscope.visualeditor.arrangementPanel.handTool" shortcut="F7" />
+        <action id="org.diffscope.visualeditor.arrangementPanel.alignment" diffscope:excludeFromCommands="true" />
+
         <action id="org.diffscope.visualeditor.panel.arrangement" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
         <action id="org.diffscope.visualeditor.panel.mixer" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
         <action id="org.diffscope.visualeditor.panel.pianoRoll" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
     </items>
 
+    <layouts>
+        <menu id="org.diffscope.visualeditor.arrangementPanelToolBar">
+            <group id="org.diffscope.visualeditor.arrangementPanelToolBar.toolActions">
+                <action id="org.diffscope.visualeditor.arrangementPanel.pointerTool" />
+                <action id="org.diffscope.visualeditor.arrangementPanel.pencilTool" />
+                <action id="org.diffscope.visualeditor.arrangementPanel.handTool" />
+            </group>
+            <group id="org.diffscope.visualeditor.arrangementPanelToolBar.alignmentActions">
+                <action id="org.diffscope.visualeditor.arrangementPanel.alignment" />
+            </group>
+            <stretch />
+        </menu>
+    </layouts>
+
     <insertions>
 
     </insertions>