From 67a4a4ab1412218baaa823cff904ced2fc38b847 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 13 Apr 2019 20:37:44 +0300 Subject: [PATCH] remove deprecated options --reversed, dotsOnActive and threeColors that were related to Latte indicator --- app/view/indicator.cpp | 18 ------------------ app/view/indicator.h | 6 ------ containment/package/contents/config/main.xml | 9 --------- .../package/contents/ui/indicators/Manager.qml | 1 - plasmoid/package/contents/config/main.xml | 3 --- .../contents/ui/config/ConfigAppearance.qml | 7 ------- .../package/contents/ui/indicators/Manager.qml | 1 - .../configuration/pages/EffectsConfig.qml | 11 ----------- 8 files changed, 56 deletions(-) diff --git a/app/view/indicator.cpp b/app/view/indicator.cpp index 2c1b9d08c..6661d5d65 100644 --- a/app/view/indicator.cpp +++ b/app/view/indicator.cpp @@ -49,7 +49,6 @@ Indicator::Indicator(Latte::View *parent) connect(this, &Indicator::enabledChanged, this, &Indicator::saveConfig); connect(this, &Indicator::enabledForAppletsChanged, this, &Indicator::saveConfig); connect(this, &Indicator::paddingChanged, this, &Indicator::saveConfig); - connect(this, &Indicator::reversedChanged, this, &Indicator::saveConfig); connect(this, &Indicator::pluginChanged, this, &Indicator::saveConfig); connect(m_view, &Latte::View::latteTasksArePresentChanged, this, &Indicator::latteTasksArePresentChanged); @@ -142,21 +141,6 @@ void Indicator::setProvidesConfigUi(bool provides) emit providesConfigUiChanged(); } -bool Indicator::reversed() const -{ - return m_reversed; -} - -void Indicator::setReversed(bool reversed) -{ - if (m_reversed == reversed) { - return; - } - - m_reversed = reversed; - emit reversedChanged(); -} - float Indicator::padding() const { return m_padding; @@ -440,7 +424,6 @@ void Indicator::loadConfig() m_enabled = config.readEntry("enabled", true); m_enabledForApplets = config.readEntry("enabledForApplets", true); m_padding = config.readEntry("padding", (float)0.08); - m_reversed = config.readEntry("reversed", false); m_type = config.readEntry("type", "org.kde.latte.default"); } @@ -451,7 +434,6 @@ void Indicator::saveConfig() config.writeEntry("enabled", m_enabled); config.writeEntry("enabledForApplets", m_enabledForApplets); config.writeEntry("padding", m_padding); - config.writeEntry("reversed", m_reversed); config.writeEntry("type", m_type); config.sync(); diff --git a/app/view/indicator.h b/app/view/indicator.h index 38dcac57a..cd5459a39 100644 --- a/app/view/indicator.h +++ b/app/view/indicator.h @@ -56,7 +56,6 @@ class Indicator: public QObject Q_PROPERTY(bool latteTasksArePresent READ latteTasksArePresent NOTIFY latteTasksArePresentChanged) Q_PROPERTY(bool pluginIsReady READ pluginIsReady NOTIFY pluginIsReadyChanged) Q_PROPERTY(bool providesConfigUi READ providesConfigUi NOTIFY providesConfigUiChanged) - Q_PROPERTY(bool reversed READ reversed WRITE setReversed NOTIFY reversedChanged) Q_PROPERTY(float padding READ padding WRITE setPadding NOTIFY paddingChanged) @@ -97,9 +96,6 @@ public: bool pluginIsReady(); - bool reversed() const; - void setReversed(bool reversed); - float padding() const; void setPadding(float padding); @@ -140,7 +136,6 @@ signals: void pluginChanged(); void pluginIsReadyChanged(); void providesConfigUiChanged(); - void reversedChanged(); private: void loadConfig(); @@ -160,7 +155,6 @@ private: bool m_enabledForApplets{true}; bool m_pluginIsReady{false}; bool m_providesConfigUi{true}; - bool m_reversed{false}; float m_padding{0.08}; diff --git a/containment/package/contents/config/main.xml b/containment/package/contents/config/main.xml index 5fff8523e..044e50a31 100644 --- a/containment/package/contents/config/main.xml +++ b/containment/package/contents/config/main.xml @@ -278,15 +278,6 @@ true - - false - - - false - - - false - diff --git a/containment/package/contents/ui/indicators/Manager.qml b/containment/package/contents/ui/indicators/Manager.qml index 5c2ad6cf9..3e531fdbd 100644 --- a/containment/package/contents/ui/indicators/Manager.qml +++ b/containment/package/contents/ui/indicators/Manager.qml @@ -33,7 +33,6 @@ Item{ readonly property bool isEnabled: latteView && latteView.indicator ? (latteView.indicator.enabled && latteView.indicator.pluginIsReady) : false readonly property bool enabledForApplets: latteView && latteView.indicator ? latteView.indicator.enabledForApplets : true - readonly property bool reversed: latteView && latteView.indicator ? latteView.indicator.reversed : false readonly property real padding: Math.max(info.minLengthPadding, latteView && latteView.indicator ? latteView.indicator.padding : 0.08) readonly property string type: latteView && latteView.indicator ? latteView.indicator.type : "org.kde.latte.default" diff --git a/plasmoid/package/contents/config/main.xml b/plasmoid/package/contents/config/main.xml index b097937e0..496cd0b19 100644 --- a/plasmoid/package/contents/config/main.xml +++ b/plasmoid/package/contents/config/main.xml @@ -98,9 +98,6 @@ 2 - - false - false diff --git a/plasmoid/package/contents/ui/config/ConfigAppearance.qml b/plasmoid/package/contents/ui/config/ConfigAppearance.qml index adacac2df..2bedef6e9 100644 --- a/plasmoid/package/contents/ui/config/ConfigAppearance.qml +++ b/plasmoid/package/contents/ui/config/ConfigAppearance.qml @@ -42,7 +42,6 @@ Item { property alias cfg_threeColorsWindows: threeColorsWindows.checked property alias cfg_dotsOnActive: dotsOnActive.checked property alias cfg_durationTime : durationTime.value - property alias cfg_reverseLinesPosition : reverseLinesPosition.checked property alias cfg_isInLatteDock: mainItem.isInLatteDock @@ -172,12 +171,6 @@ Item { text: i18n("Indicator for active window group") enabled: true } - - CheckBox { - id: reverseLinesPosition - text: i18n("Reverse position for lines and dots") - enabled: true - } } } diff --git a/plasmoid/package/contents/ui/indicators/Manager.qml b/plasmoid/package/contents/ui/indicators/Manager.qml index b499147b4..efdb066e0 100644 --- a/plasmoid/package/contents/ui/indicators/Manager.qml +++ b/plasmoid/package/contents/ui/indicators/Manager.qml @@ -34,7 +34,6 @@ Item{ readonly property Item configuration: explicitOptions readonly property bool isEnabled: true - readonly property bool reversed: plasmoid.configuration.reverseLinesPosition readonly property string type: "org.kde.latte.default" readonly property Component indicatorComponent: latteStyleIndicator diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml index 93d5a1251..b83b24207 100644 --- a/shell/package/contents/configuration/pages/EffectsConfig.qml +++ b/shell/package/contents/configuration/pages/EffectsConfig.qml @@ -593,17 +593,6 @@ PlasmaComponents.Page { latteView.indicator.enabledForApplets = !latteView.indicator.enabledForApplets; } } - - LatteComponents.CheckBox { - Layout.maximumWidth: dialog.optionsWidth - text: i18n("Reverse indicator style") - checked: latteView.indicator.reversed - tooltip: i18n("Reverse indicator style e.g. from bottom to top") - - onClicked: { - latteView.indicator.reversed = !latteView.indicator.reversed; - } - } } } }