Updated submodules and fixed SystemTrayIcon menu.

This commit is contained in:
Andrei Smirnov 2021-07-20 07:12:11 +03:00 committed by Iuri Matias
parent b3528bd717
commit 201a87d052
3 changed files with 6 additions and 9 deletions

View File

@ -130,14 +130,13 @@ StatusWindow {
id: systemTray id: systemTray
visible: true visible: true
icon.source: { icon.source: {
if (production){ if (production) {
if(Qt.platform.os == "osx") if (Qt.platform.os == "osx")
return "shared/img/status-logo-round-rect.svg" return "shared/img/status-logo-round-rect.svg"
else else
return "shared/img/status-logo-circle.svg" return "shared/img/status-logo-circle.svg"
} } else {
else { if (Qt.platform.os == "osx")
if(Qt.platform.os == "osx")
return "shared/img/status-logo-dev-round-rect.svg" return "shared/img/status-logo-dev-round-rect.svg"
else else
return "shared/img/status-logo-dev-circle.svg" return "shared/img/status-logo-dev-circle.svg"
@ -152,7 +151,6 @@ StatusWindow {
menu: Menu { menu: Menu {
MenuItem { MenuItem {
visible: !applicationWindow.visible
//% "Open Status" //% "Open Status"
text: qsTrId("open-status") text: qsTrId("open-status")
onTriggered: { onTriggered: {
@ -161,7 +159,6 @@ StatusWindow {
} }
MenuSeparator { MenuSeparator {
visible: !applicationWindow.visible
} }
MenuItem { MenuItem {

2
vendor/DOtherSide vendored

@ -1 +1 @@
Subproject commit 719af38d64d2f61a4e3c858c77a747586fdd58af Subproject commit 9740aabbc842fdb24fe5e8326e6f968ca1589737

2
vendor/nimqml vendored

@ -1 +1 @@
Subproject commit 6a5f0ef32ef63b11258866f6208ccfbd43245fd3 Subproject commit 9b0a477b3b63f0dd7b26ef78c505da4e4d23c4ea