diff --git a/ui/main.qml b/ui/main.qml index b2108c7018..d45d7c74a9 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -130,14 +130,13 @@ StatusWindow { id: systemTray visible: true icon.source: { - if (production){ - if(Qt.platform.os == "osx") + if (production) { + if (Qt.platform.os == "osx") return "shared/img/status-logo-round-rect.svg" else return "shared/img/status-logo-circle.svg" - } - else { - if(Qt.platform.os == "osx") + } else { + if (Qt.platform.os == "osx") return "shared/img/status-logo-dev-round-rect.svg" else return "shared/img/status-logo-dev-circle.svg" @@ -152,7 +151,6 @@ StatusWindow { menu: Menu { MenuItem { - visible: !applicationWindow.visible //% "Open Status" text: qsTrId("open-status") onTriggered: { @@ -161,7 +159,6 @@ StatusWindow { } MenuSeparator { - visible: !applicationWindow.visible } MenuItem { diff --git a/vendor/DOtherSide b/vendor/DOtherSide index 719af38d64..9740aabbc8 160000 --- a/vendor/DOtherSide +++ b/vendor/DOtherSide @@ -1 +1 @@ -Subproject commit 719af38d64d2f61a4e3c858c77a747586fdd58af +Subproject commit 9740aabbc842fdb24fe5e8326e6f968ca1589737 diff --git a/vendor/nimqml b/vendor/nimqml index 6a5f0ef32e..9b0a477b3b 160000 --- a/vendor/nimqml +++ b/vendor/nimqml @@ -1 +1 @@ -Subproject commit 6a5f0ef32ef63b11258866f6208ccfbd43245fd3 +Subproject commit 9b0a477b3b63f0dd7b26ef78c505da4e4d23c4ea