status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: notification through notify-send on Linux 

plus some minor UI changes in the Notifications settings; notably
toggling the exemptions was broken

Closes #2520
This commit is contained in:
Lukáš Tinkl 2022-10-13 13:08:43 +02:00 committed by Lukáš Tinkl
parent 5d60045549
commit 813dbc57c0
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/app/AppLayouts/Profile/popups/ExemptionNotificationsModal.qml
View File

@ -35,15 +35,13 @@ StatusModal {
// Theme.palette.userCustomizationColors[Utils.colorIdForPubkey(root.item.itemId)] : // Theme.palette.userCustomizationColors[Utils.colorIdForPubkey(root.item.itemId)] :
// root.item.color // root.item.color
// until then the following is used // until then the following is used
bgColor: root.item.type === Constants.settingsSection.exemptions.oneToOneChat? bgColor: d.isOneToOneChat ? Utils.colorForPubkey(root.item.itemId) : root.item.color
Utils.colorForPubkey(root.item.itemId) :
root.item.color
name: root.item.image name: root.item.image
isImage: !!root.item.image isImage: !!root.item.image
charactersLen: root.item.type === Constants.settingsSection.exemptions.oneToOneChat? 2 : 1 charactersLen: d.isOneToOneChat ? 2 : 1
isLetterIdenticon: root.item.image === "" isLetterIdenticon: root.item.image === ""
height: isLetterIdenticon ? 40 : 20 height: 40
width: isLetterIdenticon ? 40 : 20 width: 40
} }
QtObject { QtObject {
@ -67,7 +65,6 @@ StatusModal {
StatusListItem { StatusListItem {
width: parent.width width: parent.width
title: qsTr("Mute all messages") title: qsTr("Mute all messages")
enabled: false
components: [ components: [
StatusSwitch { StatusSwitch {
id: muteAllMessagesSwitch id: muteAllMessagesSwitch
@ -89,7 +86,6 @@ StatusModal {
StatusListItem { StatusListItem {
width: parent.width width: parent.width
title: qsTr("Personal @ Mentions") title: qsTr("Personal @ Mentions")
enabled: false
visible: !d.isOneToOneChat visible: !d.isOneToOneChat
components: [ components: [
NotificationSelect { NotificationSelect {
@ -104,7 +100,6 @@ StatusModal {
StatusListItem { StatusListItem {
width: parent.width width: parent.width
title: qsTr("Global @ Mentions") title: qsTr("Global @ Mentions")
enabled: false
visible: !d.isOneToOneChat visible: !d.isOneToOneChat
components: [ components: [
NotificationSelect { NotificationSelect {
@ -119,7 +114,6 @@ StatusModal {
StatusListItem { StatusListItem {
width: parent.width width: parent.width
title: qsTr("Other Messages") title: qsTr("Other Messages")
enabled: false
visible: !d.isOneToOneChat visible: !d.isOneToOneChat
components: [ components: [
NotificationSelect { NotificationSelect {

12
ui/app/AppLayouts/Profile/views/NotificationsView.qml
View File

@ -128,15 +128,14 @@ SettingsContentBase {
model.color model.color
charactersLen: model.type === Constants.settingsSection.exemptions.oneToOneChat? 2 : 1 charactersLen: model.type === Constants.settingsSection.exemptions.oneToOneChat? 2 : 1
isLetterIdenticon: !model.image || model.image === "" isLetterIdenticon: !model.image || model.image === ""
height: isImage ? 40 : 20 height: 40
width: isImage ? 40 : 20 width: 40
} }
components: [ components: [
StatusIcon { StatusIcon {
visible: model.customized visible: model.customized
icon: "chevron-down" icon: "next"
rotation: 270
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -149,7 +148,6 @@ SettingsContentBase {
StatusIcon { StatusIcon {
visible: !model.customized visible: !model.customized
icon: "add" icon: "add"
rotation: 270
color: Theme.palette.primaryColor1 color: Theme.palette.primaryColor1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -184,13 +182,11 @@ SettingsContentBase {
lineHeight: Constants.settingsSection.infoLineHeight lineHeight: Constants.settingsSection.infoLineHeight
lineHeightMode: Text.FixedHeight lineHeightMode: Text.FixedHeight
color: Theme.palette.primaryColor1 color: Theme.palette.primaryColor1
} }
StatusBaseText { StatusBaseText {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
text: qsTr("To receive Status notifications, make sure you've enabled them in" + text: qsTr("To receive Status notifications, make sure you've enabled them in your computer's settings under <b>System Preferences > Notifications</b>")
" your computer's settings under <b>System Preferences > Notifications</b>")
font.pixelSize: Constants.settingsSection.infoFontSize font.pixelSize: Constants.settingsSection.infoFontSize
lineHeight: Constants.settingsSection.infoLineHeight lineHeight: Constants.settingsSection.infoLineHeight
lineHeightMode: Text.FixedHeight lineHeightMode: Text.FixedHeight

2
vendor/DOtherSide vendored

@ -1 +1 @@
Subproject commit 9feb81883c3d663c376369426968f1f0deaf06f8 Subproject commit 328c56cee2cbf3c41619cda54d820a653483b498