diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml index 0d252a2db..1e8e89f29 100644 --- a/shell/package/contents/configuration/pages/AppearanceConfig.qml +++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml @@ -346,6 +346,17 @@ PlasmaComponents.Page { enabled: iconMarginSlider.value > 0 } } + + PlasmaComponents.CheckBox { + id: shrinkThickness + Layout.leftMargin: units.smallSpacing * 2 + text: i18n("Shrink thickness margins to minimum") + checked: plasmoid.configuration.shrinkThickMargins + + onClicked: { + plasmoid.configuration.shrinkThickMargins = checked + } + } } //! END: Applet Size @@ -488,6 +499,19 @@ PlasmaComponents.Page { spacing: 2 visible: dialog.expertLevel + PlasmaComponents.Button { + id: panelBlur + Layout.fillWidth: true + text: i18n("Blur") + checked: plasmoid.configuration.blurEnabled + checkable: true + enabled: showBackground.checked + + onClicked: { + plasmoid.configuration.blurEnabled = checked + } + } + PlasmaComponents.Button { id: panelShadows Layout.fillWidth: true @@ -795,52 +819,6 @@ PlasmaComponents.Page { } //! END: Length - //! BEGIN: Appearance - ColumnLayout { - spacing: units.smallSpacing - Layout.rightMargin: units.smallSpacing * 2 - Layout.topMargin: units.smallSpacing - visible: dialog.expertLevel - - LatteExtraControls.Header { - text: i18nc("adjust properties to differentiate", "Adjust") - } - - PlasmaComponents.CheckBox { - id: blurPanel - Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Blur for panel background") - checked: plasmoid.configuration.blurEnabled - - onClicked: { - plasmoid.configuration.blurEnabled = checked - } - } - - PlasmaComponents.CheckBox { - id: titleTooltipsChk - Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Show applets/task title tooltips on hovering") - checked: plasmoid.configuration.titleTooltips - - onClicked: { - plasmoid.configuration.titleTooltips = checked; - } - } - - PlasmaComponents.CheckBox { - id: shrinkThickness - Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Shrink thickness margins to minimum") - checked: plasmoid.configuration.shrinkThickMargins - - onClicked: { - plasmoid.configuration.shrinkThickMargins = checked - } - } - } - //! END: Appearance - //! BEGIN: Dynamic Background ColumnLayout { spacing: units.smallSpacing diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml index 958509034..8f41a7ba6 100644 --- a/shell/package/contents/configuration/pages/BehaviorConfig.qml +++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml @@ -507,55 +507,68 @@ PlasmaComponents.Page { } //! END: Delay - //! BEGIN: Behavior + //! BEGIN: Applets ColumnLayout { spacing: units.smallSpacing Layout.rightMargin: units.smallSpacing * 2 visible: dialog.expertLevel LatteExtraControls.Header { - text: i18nc("adjust properties to differentiate", "Adjust") + text: i18n("Applets") } PlasmaComponents.CheckBox { + id: titleTooltipsChk Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Activate KWin edge after hiding") - checked: latteView.visibility.enableKWinEdges + text: i18n("Show title tooltips on hovering") + checked: plasmoid.configuration.titleTooltips onClicked: { - latteView.visibility.enableKWinEdges = checked; + plasmoid.configuration.titleTooltips = checked; } } PlasmaComponents.CheckBox { Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Decrease applets size when it is needed") + text: i18n("Decrease size automatically when needed") checked: plasmoid.configuration.autoDecreaseIconSize - tooltip: i18n("Applets size is decreased automatically when the contents \nexceed the maximum length \n\nHint: this option is disabled when only plasma taskmanagers are present") + tooltip: i18n("Applets size is decreased automatically when the contents exceed the maximum length \n\nHint: this option is disabled when plasma taskmanagers are present") enabled: !(latteView.tasksPresent() && !latteView.latteTasksPresent()); onClicked: { plasmoid.configuration.autoDecreaseIconSize = checked } } + } + //! END: Applets + + //! BEGIN: Adjust + ColumnLayout { + spacing: units.smallSpacing + Layout.rightMargin: units.smallSpacing * 2 + visible: dialog.expertLevel + + LatteExtraControls.Header { + text: i18n("Environment") + } PlasmaComponents.CheckBox { Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Add launchers only in the corresponding area") - checked: plasmoid.configuration.addLaunchersInTaskManager - tooltip: i18n("Launchers are added only in the taskmanager and not as plasma applets") + text: i18n("Activate KWin edge after hiding") + checked: latteView.visibility.enableKWinEdges + tooltip: i18n("After the view becomes hidden, KWin is informed to track user feedback. For example an edge visual hint is shown whenever the mouse approaches the hidden view") onClicked: { - plasmoid.configuration.addLaunchersInTaskManager = checked; + latteView.visibility.enableKWinEdges = checked; } } PlasmaComponents.CheckBox { Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Prefer for global shortcuts activation") + text: i18n("Prefer this view for global shortcuts activation") checked: latteView.isPreferredForShortcuts - tooltip: i18n("Enable highest priority for global shortcuts activation") + tooltip: i18n("This view is preferred with highest priority for activating global shortcuts") onClicked: { latteView.isPreferredForShortcuts = checked @@ -564,12 +577,12 @@ PlasmaComponents.Page { PlasmaComponents.CheckBox { Layout.leftMargin: units.smallSpacing * 2 - text: i18n("Above fullscreen windows") + text: i18n("Can be above fullscreen windows") checked: latteView.byPassWM enabled: !(latteView.visibility.mode === Latte.Types.AlwaysVisible || latteView.visibility.mode === Latte.Types.WindowsGoBelow) - tooltip: i18n("BypassWindowManagerHint flag for the window.\nThe view will be above all windows even those set as 'Always On Top'") + tooltip: i18n("BypassWindowManagerHint flag for the window. The view will be above all windows even those set as 'Always On Top'") onCheckedChanged: { latteView.byPassWM = checked; @@ -598,7 +611,7 @@ PlasmaComponents.Page { } } } - //! END: Behavior + //! END: Adjust //! Bottom spacer PlasmaComponents.Label{ diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml index 5efaaaa10..ea71c286c 100644 --- a/shell/package/contents/configuration/pages/TasksConfig.qml +++ b/shell/package/contents/configuration/pages/TasksConfig.qml @@ -157,6 +157,17 @@ PlasmaComponents.Page { } } + PlasmaComponents.CheckBox { + Layout.leftMargin: units.smallSpacing * 2 + text: i18n("Add launchers only in the corresponding area") + checked: plasmoid.configuration.addLaunchersInTaskManager + tooltip: i18n("Launchers are added only in the taskmanager and not as plasma applets") + + onClicked: { + plasmoid.configuration.addLaunchersInTaskManager = checked; + } + } + PlasmaComponents.CheckBox { id: groupTasksChk Layout.leftMargin: units.smallSpacing * 2