summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/main.cpp5
-rw-r--r--gui/qml/main.qml7
2 files changed, 8 insertions, 4 deletions
diff --git a/gui/main.cpp b/gui/main.cpp
index 7636810..1efa332 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -117,6 +117,7 @@ int main(int argc, char **argv) {
parser.process(app);
bool hideSystray = parser.isSet("no-systray");
+ bool availableSystray = true;
bool installHelpers = parser.isSet("install-helpers");
bool webAPI = parser.isSet("web-api");
QString webPort = parser.value("web-port");
@@ -146,7 +147,8 @@ int main(int argc, char **argv) {
}
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
- qDebug() << "No systray icon available. Things might not work for now, sorry...";
+ qDebug() << "No systray icon available.";
+ availableSystray = false;
}
QTranslator translator;
@@ -174,6 +176,7 @@ int main(int argc, char **argv) {
/* set some useful flags */
ctx->setContextProperty("systrayVisible", !hideSystray);
+ ctx->setContextProperty("systrayAvailable", availableSystray);
engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index 91e3b4e..e0a9a81 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -276,9 +276,10 @@ ApplicationWindow {
loginDone = false
allowEmptyPass = Logic.shouldAllowEmptyPass(providers)
needsRestart = false;
- /* TODO get appVisible flag from backend */
- //app.visible = true
- //app.raise()
+ if (!systrayAvailable) {
+ app.visible = true
+ app.raise()
+ }
}