Removal of init.qml plus minor fixes

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 8c27009808f6eb93ccefbb8cc2711882b4ad023d..caabd6c29c662830e64dc697e6bfb452b5406278 100644 (file)
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -41,7 +41,7 @@ Systray::Systray() // TODO: make singleton, provide ::instance()
     // Create QML tray engine, build component, set C++ backend context used in window.qml
     // Use pointer instead of engine() helper function until Qt 5.12 is minimum standard
     QQmlEngine *engine = new QQmlEngine;
-    QQmlComponent systray(engine, QUrl(QStringLiteral("qrc:/qml/src/gui/tray/init.qml")));
+    QQmlComponent systray(engine, QUrl(QStringLiteral("qrc:/qml/src/gui/tray/window.qml")));
     _trayContext = engine->contextForObject(systray.create());
 
     _accountMenuModel = UserModel::instance();

diff --git a/src/gui/tray/init.qml b/src/gui/tray/init.qml
deleted file mode 100644 (file)
index c918fd9..0000000
--- a/src/gui/tray/init.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick 2.0
-import Qt.labs.platform 1.1
-
-SystemTrayIcon {
-    visible: true
-    //icon.source: "qrc:/client/theme/colored/state-offline-32.png"
-    icon.source: "qrc:/client/theme/colored/state-sync-32.png";
-
-    Component.onCompleted: {
-        showMessage("Desktop Client 2.7", "New QML menu!", 1000)
-    }
-
-    onActivated: {
-        var component = Qt.createComponent("qrc:/qml/src/gui/tray/window.qml")
-        var win = component.createObject()
-        win.show()
-        win.raise()
-        win.requestActivate()
-    }
-}