Add snap preference options

Author: CrSjimo

src/plugins/visualeditor/internal/EditorPreference.cpp

@@ -15,6 +15,8 @@ namespace VisualEditor::Internal {
         EditorPreference::ScrollModifier pageModifier{};
         bool usePageModifierAsAlternateAxisZoom{};
         bool middleButtonAutoScroll{};
+        int autoDurationPositionAlignment{48};
+        bool enableTemporarySnapOff{true};
     };
 
     static EditorPreference *m_instance = nullptr;
@@ -46,6 +48,10 @@ namespace VisualEditor::Internal {
         emit usePageModifierAsAlternateAxisZoomChanged();
         d->middleButtonAutoScroll = settings->value("middleButtonAutoScroll", false).toBool();
         emit middleButtonAutoScrollChanged();
+        d->autoDurationPositionAlignment = settings->value("autoDurationPositionAlignment", 48).toInt();
+        emit autoDurationPositionAlignmentChanged();
+        d->enableTemporarySnapOff = settings->value("enableTemporarySnapOff", true).toBool();
+        emit enableTemporarySnapOffChanged();
         settings->endGroup();
     }
 
@@ -58,6 +64,8 @@ namespace VisualEditor::Internal {
         settings->setValue("pageModifier", static_cast<int>(d->pageModifier));
         settings->setValue("usePageModifierAsAlternateAxisZoom", d->usePageModifierAsAlternateAxisZoom);
         settings->setValue("middleButtonAutoScroll", d->middleButtonAutoScroll);
+        settings->setValue("autoDurationPositionAlignment", d->autoDurationPositionAlignment);
+        settings->setValue("enableTemporarySnapOff", d->enableTemporarySnapOff);
         settings->endGroup();
     }
 
@@ -130,4 +138,30 @@ namespace VisualEditor::Internal {
         emit m_instance->middleButtonAutoScrollChanged();
     }
 
+    int EditorPreference::autoDurationPositionAlignment() {
+        M_INSTANCE_D;
+        return d->autoDurationPositionAlignment;
+    }
+
+    void EditorPreference::setAutoDurationPositionAlignment(int autoDurationPositionAlignment) {
+        M_INSTANCE_D;
+        if (d->autoDurationPositionAlignment == autoDurationPositionAlignment)
+            return;
+        d->autoDurationPositionAlignment = autoDurationPositionAlignment;
+        emit m_instance->autoDurationPositionAlignmentChanged();
+    }
+
+    bool EditorPreference::enableTemporarySnapOff() {
+        M_INSTANCE_D;
+        return d->enableTemporarySnapOff;
+    }
+
+    void EditorPreference::setEnableTemporarySnapOff(bool enableTemporarySnapOff) {
+        M_INSTANCE_D;
+        if (d->enableTemporarySnapOff == enableTemporarySnapOff)
+            return;
+        d->enableTemporarySnapOff = enableTemporarySnapOff;
+        emit m_instance->enableTemporarySnapOffChanged();
+    }
+
 }

src/plugins/visualeditor/internal/EditorPreference.h

@@ -24,6 +24,8 @@ namespace VisualEditor::Internal {
         Q_PROPERTY(EditorPreference::ScrollModifier pageModifier READ pageModifier WRITE setPageModifier NOTIFY pageModifierChanged)
         Q_PROPERTY(bool usePageModifierAsAlternateAxisZoom READ usePageModifierAsAlternateAxisZoom WRITE setUsePageModifierAsAlternateAxisZoom NOTIFY usePageModifierAsAlternateAxisZoomChanged)
         Q_PROPERTY(bool middleButtonAutoScroll READ middleButtonAutoScroll WRITE setMiddleButtonAutoScroll NOTIFY middleButtonAutoScrollChanged)
+        Q_PROPERTY(int autoDurationPositionAlignment READ autoDurationPositionAlignment WRITE setAutoDurationPositionAlignment NOTIFY autoDurationPositionAlignmentChanged)
+        Q_PROPERTY(bool enableTemporarySnapOff READ enableTemporarySnapOff WRITE setEnableTemporarySnapOff NOTIFY enableTemporarySnapOffChanged)
 
     public:
         ~EditorPreference() override;
@@ -59,12 +61,20 @@ namespace VisualEditor::Internal {
         static bool middleButtonAutoScroll();
         static void setMiddleButtonAutoScroll(bool middleButtonAutoScroll);
 
+        static int autoDurationPositionAlignment();
+        static void setAutoDurationPositionAlignment(int autoDurationPositionAlignment);
+
+        static bool enableTemporarySnapOff();
+        static void setEnableTemporarySnapOff(bool enableTemporarySnapOff);
+
     Q_SIGNALS:
         void alternateAxisModifierChanged();
         void zoomModifierChanged();
         void pageModifierChanged();
         void usePageModifierAsAlternateAxisZoomChanged();
         void middleButtonAutoScrollChanged();
+        void autoDurationPositionAlignmentChanged();
+        void enableTemporarySnapOffChanged();
 
     private:
         friend class VisualEditorPlugin;

src/plugins/visualeditor/internal/settings/EditorPage.cpp

@@ -55,6 +55,10 @@ namespace VisualEditor::Internal {
         qCDebug(lcEditorPage) << m_widget->property("usePageModifierAsAlternateAxisZoom");
         m_widget->setProperty("middleButtonAutoScroll", EditorPreference::instance()->property("middleButtonAutoScroll"));
         qCDebug(lcEditorPage) << m_widget->property("middleButtonAutoScroll");
+        m_widget->setProperty("autoDurationPositionAlignment", EditorPreference::instance()->property("autoDurationPositionAlignment"));
+        qCDebug(lcEditorPage) << m_widget->property("autoDurationPositionAlignment");
+        m_widget->setProperty("enableTemporarySnapOff", EditorPreference::instance()->property("enableTemporarySnapOff"));
+        qCDebug(lcEditorPage) << m_widget->property("enableTemporarySnapOff");
         m_widget->setProperty("started", true);
         Core::ISettingPage::beginSetting();
     }
@@ -71,6 +75,10 @@ namespace VisualEditor::Internal {
         EditorPreference::instance()->setProperty("usePageModifierAsAlternateAxisZoom", m_widget->property("usePageModifierAsAlternateAxisZoom"));
         qCDebug(lcEditorPage) << "middleButtonAutoScroll" << m_widget->property("middleButtonAutoScroll");
         EditorPreference::instance()->setProperty("middleButtonAutoScroll", m_widget->property("middleButtonAutoScroll"));
+        qCDebug(lcEditorPage) << "autoDurationPositionAlignment" << m_widget->property("autoDurationPositionAlignment");
+        EditorPreference::instance()->setProperty("autoDurationPositionAlignment", m_widget->property("autoDurationPositionAlignment"));
+        qCDebug(lcEditorPage) << "enableTemporarySnapOff" << m_widget->property("enableTemporarySnapOff");
+        EditorPreference::instance()->setProperty("enableTemporarySnapOff", m_widget->property("enableTemporarySnapOff"));
         EditorPreference::instance()->save();
         return Core::ISettingPage::accept();
     }
@@ -89,6 +97,10 @@ namespace VisualEditor::Internal {
         };
     }
 
+    QString EditorPage::shiftText() {
+        return QKeySequence(Qt::Key_Shift).toString(QKeySequence::NativeText);
+    }
+
     bool EditorPage::widgetMatches(const QString &word) {
         widget();
         auto matcher = m_widget->property("matcher").value<QObject *>();

src/plugins/visualeditor/internal/settings/EditorPage.h

@@ -8,6 +8,7 @@ namespace VisualEditor::Internal {
     class EditorPage : public Core::ISettingPage {
         Q_OBJECT
         Q_PROPERTY(QStringList scrollModifierTexts READ scrollModifierTexts CONSTANT)
+        Q_PROPERTY(QString shiftText READ shiftText CONSTANT)
     public:
         explicit EditorPage(QObject *parent = nullptr);
         ~EditorPage() override;
@@ -20,6 +21,7 @@ namespace VisualEditor::Internal {
         void endSetting() override;
 
         static QStringList scrollModifierTexts();
+        static QString shiftText();
 
     private:
         bool widgetMatches(const QString &word);

src/plugins/visualeditor/qml/settings/EditorPage.qml

@@ -18,12 +18,16 @@ ScrollView {
     property int pageModifier: 0
     property bool usePageModifierAsAlternateAxisZoom: false
     property bool middleButtonAutoScroll: false
+    property int autoDurationPositionAlignment: 20
+    property bool enableTemporarySnapOff: false
 
     onAlternateAxisModifierChanged: if (started) pageHandle.markDirty()
     onZoomModifierChanged: if (started) pageHandle.markDirty()
     onPageModifierChanged: if (started) pageHandle.markDirty()
     onUsePageModifierAsAlternateAxisZoomChanged: if (started) pageHandle.markDirty()
     onMiddleButtonAutoScrollChanged: if (started) pageHandle.markDirty()
+    onAutoDurationPositionAlignmentChanged: if (started) pageHandle.markDirty()
+    onEnableTemporarySnapOffChanged: if (started) pageHandle.markDirty()
 
     anchors.fill: parent
     contentWidth: availableWidth
@@ -109,6 +113,51 @@ ScrollView {
                 }
             }
 
+            GroupBox {
+                title: qsTr("Snap")
+                TextMatcherItem on title {
+                    matcher: page.matcher
+                }
+                Layout.fillWidth: true
+
+                GridLayout {
+                    anchors.fill: parent
+                    columns: 3
+
+                    Label {
+                        text: qsTr("Auto-snap length")
+                        TextMatcherItem on text {
+                            matcher: page.matcher
+                        }
+                    }
+                    Slider {
+                        Layout.fillWidth: true
+                        from: 0
+                        to: 80
+
+                        stepSize: 1
+                        snapMode: Slider.SnapAlways
+                        value: page.autoDurationPositionAlignment - 20
+                        onMoved: page.autoDurationPositionAlignment = value + 20
+                    }
+                    SpinBox {
+                        from: 20
+                        to: 100
+                        stepSize: 1
+                        value: page.autoDurationPositionAlignment
+                        onValueModified: page.autoDurationPositionAlignment = value
+                    }
+
+                    CheckBox {
+                        text: qsTr("Temporarily disable snap when pressing %1").arg(page.pageHandle.shiftText)
+                        Layout.columnSpan: 3
+                        checked: page.enableTemporarySnapOff
+                        onClicked: page.enableTemporarySnapOff = checked
+                    }
+
+                }
+            }
+
         }
     }
 }