fix: remove dock style selection

src/appearance.cpp

@@ -47,7 +47,8 @@ Appearance::Appearance(QObject *parent)
     m_dockDirection = m_dockSettings->value("Direction").toInt();
     m_dockVisibility = m_dockSettings->value("Visibility").toInt();
     m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();
-    m_dockStyle = m_dockSettings->value("Style").toInt();
+    // Dock only supports the centered style. Migrate old Full style settings.
+    m_dockSettings->setValue("Style", 0);
 
     m_kwinSettings->beginGroup("Compositing");
     m_systemEffects = !m_kwinSettings->value("OpenGLIsUnsafe", false).toBool();
@@ -159,28 +160,6 @@ void Appearance::setDockRoundedWindow(bool enable)
     m_dockSettings->setValue("RoundedWindow", m_dockRoundedWindow);
 }
 
-int Appearance::dockStyle() const
-{
-    return m_dockStyle;
-}
-
-void Appearance::setDockStyle(int style)
-{
-    if (m_dockStyle != style) {
-        m_dockStyle = style;
-
-        QDBusInterface iface("com.cutefish.Dock",
-                             "/Dock",
-                             "com.cutefish.Dock",
-                             QDBusConnection::sessionBus());
-        if (iface.isValid()) {
-            iface.call("setStyle", style);
-        }
-
-        emit dockStyleChanged();
-    }
-}
-
 void Appearance::setGenericFontFamily(const QString &name)
 {
     if (name.isEmpty())

src/appearance.h

@@ -30,7 +30,6 @@ class Appearance : public QObject
     Q_PROPERTY(int dockIconSize READ dockIconSize WRITE setDockIconSize NOTIFY dockIconSizeChanged)
     Q_PROPERTY(int dockDirection READ dockDirection WRITE setDockDirection NOTIFY dockDirectionChanged)
     Q_PROPERTY(int dockVisibility READ dockVisibility WRITE setDockVisibility NOTIFY dockVisibilityChanged)
-    Q_PROPERTY(int dockStyle READ dockStyle WRITE setDockStyle NOTIFY dockStyleChanged)
     Q_PROPERTY(int fontPointSize READ fontPointSize WRITE setFontPointSize NOTIFY fontPointSizeChanged)
     Q_PROPERTY(bool dimsWallpaper READ dimsWallpaper WRITE setDimsWallpaper NOTIFY dimsWallpaperChanged)
     Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
@@ -58,9 +57,6 @@ public:
     int dockRoundedWindow() const;
     Q_INVOKABLE void setDockRoundedWindow(bool enable);
 
-    int dockStyle() const;
-    Q_INVOKABLE void setDockStyle(int style);
-
     Q_INVOKABLE void setGenericFontFamily(const QString &name);
     Q_INVOKABLE void setFixedFontFamily(const QString &name);
 
@@ -82,7 +78,6 @@ signals:
     void dockIconSizeChanged();
     void dockDirectionChanged();
     void dockVisibilityChanged();
-    void dockStyleChanged();
     void fontPointSizeChanged();
     void dimsWallpaperChanged();
     void devicePixelRatioChanged();
@@ -99,7 +94,6 @@ private:
     int m_dockIconSize;
     int m_dockDirection;
     int m_dockVisibility;
-    int m_dockStyle;
     int m_fontPointSize;
 
     bool m_systemEffects;

src/images/dock_straight.svg

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs>
-  <linearGradient id="linearGradient865" x1=".029174" x2="63.505" y1="32.41" y2="32.396" gradientTransform="translate(-64,-64)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#006DF0" offset="0"/>
-   <stop stop-color="#00E7F0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect transform="scale(-1)" x="-64" y="-64" width="64" height="64" fill="url(#linearGradient865)" stroke-width="4.3194"/>
- <rect transform="scale(-1)" x="-64.001" y="-64" width="64" height="16" rx="3.0684e-15" ry="2.1094e-15" fill="#fff" opacity=".5" stroke-width="4.5584"/>
- <g transform="matrix(-3.7796 0 0 -3.7796 64.001 101)" fill="#f9f9f9" opacity=".6">
-  <rect x="3.4395" y="10.583" width="2.6458" height="2.6458" rx=".52916" ry=".52916"/>
-  <rect x="7.1436" y="10.583" width="2.6458" height="2.6458" rx=".52916" ry=".52916"/>
-  <rect x="10.848" y="10.583" width="2.6458" height="2.6458" rx=".52916" ry=".52916"/>
- </g>
-</svg>

src/qml/Dock/Main.qml

@@ -40,31 +40,6 @@ ItemPage {
             anchors.fill: parent
             spacing: FishUI.Units.largeSpacing * 2
 
-            RoundedItem {
-                Label {
-                    text: qsTr("Style")
-                    color: FishUI.Theme.disabledTextColor
-                }
-
-                RowLayout {
-                    spacing: FishUI.Units.largeSpacing * 2
-
-                    IconCheckBox {
-                        source: "qrc:/images/dock_bottom.svg"
-                        text: qsTr("Center")
-                        checked: appearance.dockStyle === 0
-                        onClicked: appearance.setDockStyle(0)
-                    }
-
-                    IconCheckBox {
-                        source: "qrc:/images/dock_straight.svg"
-                        text: qsTr("Full")
-                        checked: appearance.dockStyle === 1
-                        onClicked: appearance.setDockStyle(1)
-                    }
-                }
-            }
-
             // position
             RoundedItem {
                 Label {

src/resources.qrc

@@ -118,7 +118,6 @@
         <file>qml/Touchpad/Main.qml</file>
         <file>images/sidebar/dark/touchpad.svg</file>
         <file>images/logo.png</file>
-        <file>images/dock_straight.svg</file>
         <file>qml/Bluetooth/PairDialog.qml</file>
         <file>qml/VPN/Main.qml</file>
         <file>qml/Proxy/Main.qml</file>