diff --git a/containment/package/contents/config/main.xml b/containment/package/contents/config/main.xml index 6a5413cf4..a2e2d55f6 100644 --- a/containment/package/contents/config/main.xml +++ b/containment/package/contents/config/main.xml @@ -328,6 +328,9 @@ true + + false + true diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 6f9578e26..86d64954e 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -436,6 +436,7 @@ Item { property bool showProgressBadge: plasmoid.configuration.showProgressBadge property bool showAudioBadge: plasmoid.configuration.showAudioBadge property bool audioBadgeActionsEnabled: plasmoid.configuration.audioBadgeActionsEnabled + property bool infoBadgeProminentColorEnabled: plasmoid.configuration.infoBadgeProminentColorEnabled property bool scrollTasksEnabled: plasmoid.configuration.scrollTasksEnabled property bool autoScrollTasksEnabled: plasmoid.configuration.autoScrollTasksEnabled diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 2f4961f60..3fba13dd6 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -178,6 +178,7 @@ Item { property bool showInfoBadge: latteView ? latteView.showInfoBadge : plasmoid.configuration.showInfoBadge property bool showProgressBadge: latteView ? latteView.showProgressBadge : plasmoid.configuration.showInfoBadge property bool showAudioBadge: latteView ? latteView.showAudioBadge : plasmoid.configuration.showAudioBadge + property bool infoBadgeProminentColorEnabled: latteView ? latteView.infoBadgeProminentColorEnabled : false property bool audioBadgeActionsEnabled: latteView ? latteView.audioBadgeActionsEnabled : true property bool showOnlyCurrentScreen: latteView ? latteView.showOnlyCurrentScreen : plasmoid.configuration.showOnlyCurrentScreen property bool showOnlyCurrentDesktop: latteView ? latteView.showOnlyCurrentDesktop : plasmoid.configuration.showOnlyCurrentDesktop diff --git a/plasmoid/package/contents/ui/task/ProgressOverlay.qml b/plasmoid/package/contents/ui/task/ProgressOverlay.qml index f492721dc..51b9cfbab 100644 --- a/plasmoid/package/contents/ui/task/ProgressOverlay.qml +++ b/plasmoid/package/contents/ui/task/ProgressOverlay.qml @@ -83,12 +83,18 @@ Item { showNumber: true color: theme.backgroundColor - textColor: showsInfoBadge ? root.lightTextColor : theme.textColor + textColor: { + if (showsInfoBadge) { + return root.infoBadgeProminentColorEnabled ? root.lightTextColor : theme.highlightedTextColor + } + + return theme.textColor; + } borderColor: root.lightTextColor highlightedColor: { if (showsInfoBadge) { - return theme.negativeTextColor + return root.infoBadgeProminentColorEnabled ? theme.negativeTextColor : theme.highlightColor } return theme.buttonFocusColor; diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml index 49b9f6110..7e8cab33b 100644 --- a/shell/package/contents/configuration/pages/AppearanceConfig.qml +++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml @@ -1006,11 +1006,5 @@ PlasmaComponents.Page { } } //! END: Background - - //! Bottom spacer - PlasmaComponents.Label{ - id: bottomMarginSpacer - text:" " - } } } diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml index 6f3333ce1..486008f9a 100644 --- a/shell/package/contents/configuration/pages/BehaviorConfig.qml +++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml @@ -775,10 +775,5 @@ PlasmaComponents.Page { } //! END: Adjust - //! Bottom spacer - PlasmaComponents.Label{ - id: bottomMarginSpacer - text:" " - } } } diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml index 077600046..21c97b42d 100644 --- a/shell/package/contents/configuration/pages/TasksConfig.qml +++ b/shell/package/contents/configuration/pages/TasksConfig.qml @@ -93,6 +93,18 @@ PlasmaComponents.Page { } } + LatteComponents.CheckBox { + Layout.maximumWidth: dialog.optionsWidth + text: i18n("Prominent color for notification badge") + checked: plasmoid.configuration.infoBadgeProminentColorEnabled + enabled: plasmoid.configuration.showInfoBadge + tooltip: i18n("Notification badge uses a more prominent background which is usually red") + + onClicked: { + plasmoid.configuration.infoBadgeProminentColorEnabled = !plasmoid.configuration.infoBadgeProminentColorEnabled; + } + } + LatteComponents.CheckBox { Layout.maximumWidth: dialog.optionsWidth text: i18n("Change volume when scrolling audio badge") @@ -615,11 +627,5 @@ PlasmaComponents.Page { } } } - - //! Bottom spacer - PlasmaComponents.Label{ - id: bottomMarginSpacer - text:" " - } } }