mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 22:33:08 +00:00
e196a91c8b
This commit changes the action drawer colorsets to be contextually correct. The panel background would use the window background colors (instead of the view ones), and quicksettings delegates would use colors from the Button color set (rather than the view).
This also changes the background scrim to always be dark even in light mode. I think this is important to do because we have two views (notifications, and quick settings), which currently don't have much in the way of colours to distinguish the two.
This commit also makes some changes to the notifications widget in order for its card foreground to be the standard theme colors.
{width=200}
{width=200}
{width=300}
{width=200}
{width=200}
{width=300}
201 lines
7.6 KiB
QML
201 lines
7.6 KiB
QML
/*
|
|
* SPDX-FileCopyrightText: 2021 Devin Lin <devin@kde.org>
|
|
* SPDX-FileCopyrightText: 2018-2019 Kai Uwe Broulik <kde@privat.broulik.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
import QtQuick 2.15
|
|
import QtQuick.Layouts 1.1
|
|
import QtQuick.Window 2.2
|
|
|
|
import org.kde.plasma.private.mobileshell as MobileShell
|
|
import org.kde.plasma.core as PlasmaCore
|
|
import org.kde.plasma.components 3.0 as PlasmaComponents
|
|
|
|
import org.kde.notificationmanager as NotificationManager
|
|
|
|
import org.kde.kirigami 2.12 as Kirigami
|
|
|
|
import org.kde.coreaddons 1.0 as KCoreAddons
|
|
|
|
// notification properties are in BaseNotificationItem
|
|
BaseNotificationItem {
|
|
id: notificationItem
|
|
implicitHeight: mainCard.implicitHeight + mainCard.anchors.topMargin + notificationHeading.height
|
|
|
|
property bool inLockScreen: false
|
|
property int panelType: MobileShell.PanelBackground.PanelType.Drawer
|
|
|
|
property var cardColorScheme: Kirigami.Theme.View
|
|
|
|
signal dragStart()
|
|
signal dragEnd()
|
|
signal takeFocus()
|
|
|
|
// notification heading for groups with one element
|
|
NotificationGroupHeader {
|
|
id: notificationHeading
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
visible: !notificationItem.inGroup
|
|
height: visible ? implicitHeight : 0
|
|
|
|
applicationName: notificationItem.applicationName
|
|
applicationIconSource: notificationItem.applicationIconSource
|
|
originName: notificationItem.originName
|
|
}
|
|
|
|
// notification
|
|
NotificationCard {
|
|
id: mainCard
|
|
anchors.topMargin: notificationHeading.visible ? Kirigami.Units.largeSpacing : 0
|
|
anchors.top: notificationHeading.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
tapEnabled: notificationItem.hasDefaultAction
|
|
onTapped: notificationItem.actionInvoked("default");
|
|
swipeGestureEnabled: notificationItem.closable
|
|
onDismissRequested: notificationItem.close();
|
|
inLockScreen: notificationItem.inLockScreen
|
|
panelType: notificationItem.panelType
|
|
|
|
onDragStart: notificationItem.dragStart()
|
|
onDragEnd: notificationItem.dragEnd()
|
|
|
|
Kirigami.Theme.inherit: false
|
|
Kirigami.Theme.colorSet: notificationItem.cardColorScheme
|
|
|
|
ColumnLayout {
|
|
id: column
|
|
spacing: 0
|
|
|
|
// notification summary row
|
|
RowLayout {
|
|
Layout.alignment: Qt.AlignRight
|
|
Layout.fillWidth: summaryLabel.visible
|
|
Layout.bottomMargin: Kirigami.Units.smallSpacing
|
|
|
|
// notification summary
|
|
PlasmaComponents.Label {
|
|
id: summaryLabel
|
|
Layout.fillWidth: true
|
|
textFormat: Text.PlainText
|
|
maximumLineCount: 3
|
|
wrapMode: Text.WordWrap
|
|
elide: Text.ElideRight
|
|
font.pointSize: Kirigami.Theme.defaultFont.pointSize
|
|
text: MobileShell.NotificationsUtils.determineNotificationHeadingText(notificationItem)
|
|
visible: text !== ""
|
|
font.weight: Font.DemiBold
|
|
}
|
|
|
|
// notification timestamp
|
|
NotificationTimeText {
|
|
Layout.alignment: Qt.AlignRight | Qt.AlignTop
|
|
notificationType: notificationItem.notificationType
|
|
jobState: notificationItem.jobState
|
|
jobDetails: notificationItem.jobDetails
|
|
|
|
time: notificationItem.time
|
|
timeSource: notificationItem.timeSource
|
|
}
|
|
}
|
|
|
|
// notification contents
|
|
RowLayout {
|
|
Layout.fillWidth: true
|
|
spacing: Kirigami.Units.smallSpacing
|
|
|
|
|
|
// notification text
|
|
NotificationBodyLabel {
|
|
id: bodyLabel
|
|
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
|
|
Layout.preferredWidth: column.width - iconContainer.width - Kirigami.Units.smallSpacing
|
|
|
|
text: ShellUtil.toPlainText(notificationItem.body)
|
|
}
|
|
|
|
// notification icon
|
|
Item {
|
|
id: iconContainer
|
|
Layout.preferredWidth: Kirigami.Units.iconSizes.large
|
|
Layout.preferredHeight: Kirigami.Units.iconSizes.large
|
|
Layout.topMargin: Kirigami.Units.smallSpacing
|
|
Layout.bottomMargin: Kirigami.Units.smallSpacing
|
|
|
|
visible: iconItem.shouldBeShown
|
|
|
|
Kirigami.Icon {
|
|
id: iconItem
|
|
// don't show two identical icons
|
|
readonly property bool shouldBeShown: valid && source != notificationItem.applicationIconSource
|
|
anchors.fill: parent
|
|
smooth: true
|
|
// don't show a generic "info" icon since this is a notification already
|
|
source: notificationItem.icon !== "dialog-information" ? notificationItem.icon : ""
|
|
visible: shouldBeShown
|
|
}
|
|
}
|
|
}
|
|
|
|
// Job progress reporting
|
|
Loader {
|
|
id: jobLoader
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: item ? item.implicitHeight : 0
|
|
active: notificationItem.notificationType === NotificationManager.Notifications.JobType
|
|
visible: active
|
|
sourceComponent: NotificationJobItem {
|
|
iconContainerItem: iconContainer
|
|
|
|
jobState: notificationItem.jobState
|
|
jobError: notificationItem.jobError
|
|
percentage: notificationItem.percentage
|
|
suspendable: notificationItem.suspendable
|
|
killable: notificationItem.killable
|
|
|
|
jobDetails: notificationItem.jobDetails
|
|
|
|
onSuspendJobClicked: notificationItem.suspendJobClicked()
|
|
onResumeJobClicked: notificationItem.resumeJobClicked()
|
|
onKillJobClicked: notificationItem.killJobClicked()
|
|
|
|
onOpenUrl: notificationItem.openUrl(url)
|
|
onFileActionInvoked: notificationItem.fileActionInvoked(action)
|
|
}
|
|
}
|
|
|
|
// notification actions
|
|
NotificationFooterActions {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: Kirigami.Units.smallSpacing
|
|
notification: notificationItem
|
|
onTakeFocus: notificationItem.takeFocus()
|
|
}
|
|
|
|
// thumbnails
|
|
Loader {
|
|
id: thumbnailStripLoader
|
|
Layout.topMargin: Kirigami.Units.largeSpacing
|
|
Layout.fillWidth: true
|
|
active: notificationItem.urls.length > 0
|
|
visible: active
|
|
asynchronous: true
|
|
sourceComponent: ThumbnailStrip {
|
|
leftPadding: -thumbnailStripLoader.Layout.leftMargin
|
|
rightPadding: -thumbnailStripLoader.Layout.rightMargin
|
|
topPadding: -notificationItem.thumbnailTopPadding
|
|
bottomPadding: -thumbnailStripLoader.Layout.bottomMargin
|
|
urls: notificationItem.urls
|
|
onOpenUrl: notificationItem.openUrl(url)
|
|
onFileActionInvoked: notificationItem.fileActionInvoked(action)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|