From 1390275b658b33853c964d8ef1d67781cc97eb49 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 22 Feb 2019 22:26:53 +0200 Subject: [PATCH] move latte indicator settings from Tasks to Effects --- .../configuration/pages/EffectsConfig.qml | 30 ++++++++++++++ .../configuration/pages/TasksConfig.qml | 39 ------------------- 2 files changed, 30 insertions(+), 39 deletions(-) diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml index 3645168ce..44e2bec17 100644 --- a/shell/package/contents/configuration/pages/EffectsConfig.qml +++ b/shell/package/contents/configuration/pages/EffectsConfig.qml @@ -630,6 +630,36 @@ PlasmaComponents.Page { Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 4 } } + + LatteExtraControls.SubHeader { + enabled: plasmoid.configuration.glowOption!==Latte.Types.GlowNone + text: i18n("Improvements") + visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator && latteView.latteTasksPresent() + } + + PlasmaComponents.CheckBox { + id: threeColorsWindows + text: i18n("Different color for minimized windows") + checked: plasmoid.configuration.threeColorsWindows + visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator && latteView.latteTasksPresent() + + onClicked: { + plasmoid.configuration.threeColorsWindows = checked + } + } + + PlasmaComponents.CheckBox { + id: dotsOnActive + text: i18n("Show an extra dot for grouped windows when active") + checked: plasmoid.configuration.dotsOnActive + tooltip: i18n("Grouped windows show both a line and a dot when one of them is active and the Line Active Indicator is enabled") + enabled: plasmoid.configuration.activeIndicatorType === Latte.Types.LineIndicator + visible: plasmoid.configuration.indicatorStyle === Latte.Types.LatteIndicator && latteView.latteTasksPresent() + + onClicked: { + plasmoid.configuration.dotsOnActive = checked + } + } } } //! END: Active Indicator diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml index 48315b37e..de35f8551 100644 --- a/shell/package/contents/configuration/pages/TasksConfig.qml +++ b/shell/package/contents/configuration/pages/TasksConfig.qml @@ -47,45 +47,6 @@ PlasmaComponents.Page { Layout.leftMargin: units.smallSpacing * 2 Layout.rightMargin: units.smallSpacing * 2 - //! BEGIN: Tasks Appearance - ColumnLayout { - spacing: units.smallSpacing - Layout.topMargin: units.smallSpacing - Layout.rightMargin: units.smallSpacing * 2 - enabled: !disableAllWindowsFunctionality - - LatteExtraControls.Header { - text: i18n("Appearance") - } - - PlasmaComponents.CheckBox { - id: threeColorsWindows - Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Different color for minimized windows") - checked: plasmoid.configuration.threeColorsWindows - - onClicked: { - plasmoid.configuration.threeColorsWindows = checked - } - } - - PlasmaComponents.CheckBox { - id: dotsOnActive - Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Show an extra dot for grouped windows when active") - checked: plasmoid.configuration.dotsOnActive - tooltip: i18n("Grouped windows show both a line and a dot when \none of them is active and the Line Active Indicator \nis enabled") - visible: dialog.highLevel - enabled: plasmoid.configuration.activeIndicatorType === Latte.Types.LineIndicator - - onClicked: { - plasmoid.configuration.dotsOnActive = checked - } - } - - } - //! END: Tasks Appearance - //! BEGIN: Badges ColumnLayout { spacing: units.smallSpacing