mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-17 15:46:44 +00:00
GODT-22: Facelift
- GODT-1199: Add menu to status window - GODT-22: use ColorImage instead of IconLabel - GODT-22: remove banners from MainWindow - GODT-1199: Fix separator width - GODT-1199: Fix StatusWindow button position - GODT-1198: Open main window on startup if no users - GODT-1199: Fix avatar text color - GODT-1198: refactor main window layout - GODT-22: add missing components to qmldir - GODT-22: refactor components having Layout as root item - GODT-22: add more user controls - GODT-1199: Add status window resize and maximum height - GODT-22: WIP: notification arch - GODT-22: Notifications WIP - GODT-22: Fix notification filter, topmost notification - GODT-1199: Add notifications to status window - GODT-22: Add strict typization to colorScheme variable - GODT-1198: WIP Notifications, dialogs and banners - GODT-22: Add backend notifications (Banners & Dialogs) D
This commit is contained in:
@ -22,20 +22,165 @@ import QtQuick.Controls 2.12
|
||||
import QtQuick.Controls.impl 2.12
|
||||
|
||||
import Proton 4.0
|
||||
import Notifications 1.0
|
||||
|
||||
RowLayout {
|
||||
id: layout
|
||||
spacing: 8
|
||||
Item {
|
||||
id: root
|
||||
|
||||
ColorImage {
|
||||
id: image
|
||||
source: "./icons/ic-connected.svg"
|
||||
color: ProtonStyle.currentStyle.signal_success
|
||||
property var backend
|
||||
property var notifications
|
||||
property ColorScheme colorScheme
|
||||
|
||||
property int notificationWhitelist: NotificationFilter.FilterConsts.All
|
||||
property int notificationBlacklist: NotificationFilter.FilterConsts.None
|
||||
|
||||
readonly property Notification activeNotification: notificationFilter.topmost
|
||||
|
||||
implicitHeight: children[0].implicitHeight + children[0].anchors.topMargin + children[0].anchors.bottomMargin
|
||||
implicitWidth: children[0].implicitWidth + children[0].anchors.leftMargin + children[0].anchors.rightMargin
|
||||
|
||||
NotificationFilter {
|
||||
id: notificationFilter
|
||||
|
||||
source: root.notifications.all
|
||||
whitelist: root.notificationWhitelist
|
||||
blacklist: root.notificationBlacklist
|
||||
|
||||
onTopmostChanged: {
|
||||
if (!topmost) {
|
||||
image.source = "./icons/ic-connected.svg"
|
||||
image.color = root.colorScheme.signal_success
|
||||
label.text = qsTr("Connected")
|
||||
label.color = root.colorScheme.signal_success
|
||||
return;
|
||||
}
|
||||
|
||||
image.source = topmost.icon
|
||||
label.text = topmost.text
|
||||
|
||||
switch (topmost.type) {
|
||||
case Notification.NotificationType.Danger:
|
||||
image.color = root.colorScheme.signal_danger
|
||||
label.color = root.colorScheme.signal_danger
|
||||
break;
|
||||
case Notification.NotificationType.Warning:
|
||||
image.color = root.colorScheme.signal_warning
|
||||
label.color = root.colorScheme.signal_warning
|
||||
break;
|
||||
case Notification.NotificationType.Success:
|
||||
image.color = root.colorScheme.signal_success
|
||||
label.color = root.colorScheme.signal_success
|
||||
break;
|
||||
case Notification.NotificationType.Info:
|
||||
image.color = root.colorScheme.signal_info
|
||||
label.color = root.colorScheme.signal_info
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
id: label
|
||||
text: "Connected"
|
||||
color: ProtonStyle.currentStyle.signal_success
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
spacing: 8
|
||||
anchors.margins: 12
|
||||
|
||||
ColorImage {
|
||||
id: image
|
||||
}
|
||||
|
||||
Label {
|
||||
colorScheme: root.colorScheme
|
||||
id: label
|
||||
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
||||
wrapMode: Text.WordWrap
|
||||
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
}
|
||||
|
||||
state: "Connected"
|
||||
states: [
|
||||
State {
|
||||
name: "Connected"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-connected.svg"
|
||||
color: ProtonStyle.currentStyle.signal_success
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("Connected")
|
||||
color: ProtonStyle.currentStyle.signal_success
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "No connection"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-no-connection.svg"
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("No connection")
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "Outdated"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-exclamation-circle-filled.svg"
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("Bridge is outdated")
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "Account changed"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-exclamation-circle-filled.svg"
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("The address list for your account has changed")
|
||||
color: ProtonStyle.currentStyle.signal_danger
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "Auto update failed"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-info-circle-filled.svg"
|
||||
color: ProtonStyle.currentStyle.signal_info
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("Bridge couldn’t update automatically")
|
||||
color: ProtonStyle.currentStyle.signal_info
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "Update ready"
|
||||
PropertyChanges {
|
||||
target: image
|
||||
source: "./icons/ic-info-circle-filled.svg"
|
||||
color: ProtonStyle.currentStyle.signal_info
|
||||
}
|
||||
PropertyChanges {
|
||||
target: label
|
||||
text: qsTr("Bridge update is ready")
|
||||
color: ProtonStyle.currentStyle.signal_info
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user