From 11787ea278bc6ff6d5bc797b597df3f26e2ec9b4 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Tue, 6 Jul 2021 19:55:13 +0200 Subject: Introduce DBusAPI and RWAHost classes --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index f6408b3..f23e2c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,7 @@ #include "RWADBusAdaptor.cpp" #include "session.h" #include "scenes/add_server_wizard/add_server_wizard.h" +#include "RWAHost.h" #define BUILD_TIME __DATE__ " " __TIME__ -- cgit v1.2.3 From 98049d1507a6f2ae232782fd79f4f753ad53eead Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Tue, 6 Jul 2021 20:02:31 +0200 Subject: Fix copyright headers --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index f23e2c9..213a591 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ /* * This file is part of Remote Support Desktop * https://gitlab.das-netzwerkteam.de/RemoteWebApp/rwa.support.desktopapp - * Copyright 2020-2021 Daniel Teichmann - * Copyright 2020-2021 Mike Gabriel + * Copyright 2020, 2021 Daniel Teichmann + * Copyright 2020, 2021 Mike Gabriel * SPDX-License-Identifier: GPL-2.0-or-later * * This program is free software; you can redistribute it and/or modify -- cgit v1.2.3 From 61b4ee3b8f1d4c5d85b7a561551167fa41b12400 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Tue, 6 Jul 2021 20:04:48 +0200 Subject: Tidy up some debug statements or long strings --- src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 213a591..3339840 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,12 +55,12 @@ int main(int argc, char *argv[]) { tmpDir.mkpath("."); } QLockFile lockFile(tmpFilePath); - qDebug() << "Checking for a lockfile at: " + tmpFilePath; + qDebug().noquote() << QString("Checking for a lockfile at: '%0'").arg(tmpFilePath); if(!lockFile.tryLock(100)){ - qDebug() << QObject::tr("You already have this app running."); - qDebug() << QObject::tr("Only one instance is allowed."); - qDebug() << QObject::tr("Closing application now with an error."); + qDebug().noquote() << "You already have this app running.\n" + << "Only one instance is allowed.\n" + << "Closing application now with an error."; return 1; } @@ -71,12 +71,12 @@ int main(int argc, char *argv[]) { QQuickStyle::setStyle("Material"); QTranslator translator; - qDebug() << "Loading locale: qrc:/locales/bin/" + QLocale::system().name(); + qDebug().noquote() << QString("Locales: Loading locale: qrc:/locales/bin/%0").arg(QLocale::system().name()); if(translator.load(":/locales/bin/" + QLocale::system().name())) { app.installTranslator(&translator); - qDebug() << "Loaded: " + QLocale::system().name() + " locale!"; + qDebug().noquote() << "Locales: Loaded: " + QLocale::system().name() + " locale!"; } else { - qDebug() << "Unable to load translation"; + qWarning() << "Locales: Unable to load translation!"; } QQmlApplicationEngine engine(&app); -- cgit v1.2.3 From 54249d9c37ce3994b03123ee6367c7f5519d3b40 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Wed, 7 Jul 2021 15:03:13 +0200 Subject: Introduce RWAHostModel. RWAHost's are now loaded on start. Scene_remote_{view, control} are no longer available if no host is selected. --- src/main.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 3339840..b85c3fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,7 @@ #include "RWADBusAdaptor.cpp" #include "session.h" #include "scenes/add_server_wizard/add_server_wizard.h" +#include "RWAHostModel.h" #include "RWAHost.h" #define BUILD_TIME __DATE__ " " __TIME__ @@ -86,6 +87,13 @@ int main(int argc, char *argv[]) { // Make mainqmladaptor available to QML engine.rootContext()->setContextProperty("mainqmladaptor", main_gui.data()); + QScopedPointer _dbus_api (new DBusAPI()); + QObject::connect(_dbus_api.data(), + SIGNAL(serviceGetWebAppHostsResponse(QJsonDocument*)), + main_gui.data(), + SLOT(get_web_app_hosts_response(QJsonDocument*))); + _dbus_api.data()->get_web_app_hosts_request(); + engine.load(QUrl(QStringLiteral("qrc:/src/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; @@ -102,9 +110,13 @@ int main(int argc, char *argv[]) { engine.rootObjects().takeFirst(), SLOT(showWindow())); - QScopedPointer wizard (new Add_Server_wizard(&app)); + QObject::connect(engine.rootObjects().takeFirst()->findChild("sidebar_drawer"), + SIGNAL(rwaHostSelected(QString)), + main_gui.data(), + SLOT(onRwaHostSelected(QString))); // Make add_server_wizard available to QML + QScopedPointer wizard (new Add_Server_wizard(&app, main_gui.data())); engine.rootContext()->setContextProperty("add_server_wizard", wizard.data()); return app.exec(); -- cgit v1.2.3 From 0ed25cd9cd46ba4c3f64eb5e8866becaa07f5344 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Wed, 7 Jul 2021 15:42:42 +0200 Subject: Various small improvements to readability --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index b85c3fc..a72e42b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,6 +36,7 @@ #include #include +#include "DBusAPI.h" #include "RWADBusAdaptor.cpp" #include "session.h" #include "scenes/add_server_wizard/add_server_wizard.h" @@ -82,9 +83,8 @@ int main(int argc, char *argv[]) { QQmlApplicationEngine engine(&app); - QScopedPointer main_gui (new MainQMLAdaptor(&app, &engine)); - // Make mainqmladaptor available to QML + QScopedPointer main_gui (new MainQMLAdaptor(&app, &engine)); engine.rootContext()->setContextProperty("mainqmladaptor", main_gui.data()); QScopedPointer _dbus_api (new DBusAPI()); -- cgit v1.2.3 From 36dcf4b27450f04ac60a05cd2837c1b58fd5b24a Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Thu, 8 Jul 2021 15:55:53 +0200 Subject: Classes share one specific D-Bus object now. --- src/main.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index a72e42b..7f86b6d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -83,16 +83,18 @@ int main(int argc, char *argv[]) { QQmlApplicationEngine engine(&app); + QScopedPointer dbus_api (new DBusAPI()); + // Make mainqmladaptor available to QML - QScopedPointer main_gui (new MainQMLAdaptor(&app, &engine)); + QScopedPointer main_gui (new MainQMLAdaptor(&app, &engine, dbus_api.data())); engine.rootContext()->setContextProperty("mainqmladaptor", main_gui.data()); - QScopedPointer _dbus_api (new DBusAPI()); - QObject::connect(_dbus_api.data(), + QObject::connect(dbus_api.data(), SIGNAL(serviceGetWebAppHostsResponse(QJsonDocument*)), main_gui.data(), SLOT(get_web_app_hosts_response(QJsonDocument*))); - _dbus_api.data()->get_web_app_hosts_request(); + dbus_api.data()->get_web_app_hosts_request(); + engine.load(QUrl(QStringLiteral("qrc:/src/main.qml"))); if (engine.rootObjects().isEmpty()) @@ -116,7 +118,9 @@ int main(int argc, char *argv[]) { SLOT(onRwaHostSelected(QString))); // Make add_server_wizard available to QML - QScopedPointer wizard (new Add_Server_wizard(&app, main_gui.data())); + QScopedPointer wizard (new Add_Server_wizard(&app, + main_gui.data(), + dbus_api.data())); engine.rootContext()->setContextProperty("add_server_wizard", wizard.data()); return app.exec(); -- cgit v1.2.3 From c48210243cf5ba597ce4e77d6c19edf4384f473b Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Thu, 8 Jul 2021 15:56:36 +0200 Subject: qDebug() -> qCritical() on startup lockfile failure. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7f86b6d..e02db9a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) { qDebug().noquote() << QString("Checking for a lockfile at: '%0'").arg(tmpFilePath); if(!lockFile.tryLock(100)){ - qDebug().noquote() << "You already have this app running.\n" + qCritical().noquote() << "You already have this app running.\n" << "Only one instance is allowed.\n" << "Closing application now with an error."; -- cgit v1.2.3 From 29478a265060c578290eca9e5c43b164aee33267 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Thu, 8 Jul 2021 15:57:03 +0200 Subject: Don't start a session on every startup... --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e02db9a..bb83d45 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -100,7 +100,9 @@ int main(int argc, char *argv[]) { if (engine.rootObjects().isEmpty()) return -1; - QScopedPointer session (new Session(&app, main_gui.data())); + //QScopedPointer rwa_host (new RWAHost("b9e09715-fe1d-4419-9b57-a0bd5b181ff0", "Lokaler Server", "http://localhost:8000")); + //QScopedPointer session (new Session(&app, main_gui.data(), rwa_host.data())); + //session.data()->start(); QObject::connect(main_gui.data(), SIGNAL(minimizeWindow()), -- cgit v1.2.3 From efa44c931674e498c39fc59091cf1f8654ac97a5 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Sun, 1 Aug 2021 01:58:32 +0200 Subject: Fix typos, too long lines, various styling stuff --- src/main.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index bb83d45..7139883 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,13 +40,12 @@ #include "RWADBusAdaptor.cpp" #include "session.h" #include "scenes/add_server_wizard/add_server_wizard.h" +#include "scenes/remote_control/remote_control_manager.h" #include "RWAHostModel.h" #include "RWAHost.h" -#define BUILD_TIME __DATE__ " " __TIME__ - int main(int argc, char *argv[]) { - qDebug() << "This app was built on: " << BUILD_TIME; + qDebug() << "This app was built on: " << __DATE__ << __TIME__; // We don't want users to have multiple instances of this app running QString tmpDirPath = QDir::tempPath() + "/rwa.support.desktopapp"; @@ -85,8 +84,11 @@ int main(int argc, char *argv[]) { QScopedPointer dbus_api (new DBusAPI()); - // Make mainqmladaptor available to QML - QScopedPointer main_gui (new MainQMLAdaptor(&app, &engine, dbus_api.data())); + // Make 'mainqmladaptor' available to QML + QScopedPointer main_gui ( + new MainQMLAdaptor(&app, &engine, dbus_api.data()) + ); + engine.rootContext()->setContextProperty("mainqmladaptor", main_gui.data()); QObject::connect(dbus_api.data(), @@ -100,10 +102,6 @@ int main(int argc, char *argv[]) { if (engine.rootObjects().isEmpty()) return -1; - //QScopedPointer rwa_host (new RWAHost("b9e09715-fe1d-4419-9b57-a0bd5b181ff0", "Lokaler Server", "http://localhost:8000")); - //QScopedPointer session (new Session(&app, main_gui.data(), rwa_host.data())); - //session.data()->start(); - QObject::connect(main_gui.data(), SIGNAL(minimizeWindow()), engine.rootObjects().takeFirst(), @@ -114,7 +112,8 @@ int main(int argc, char *argv[]) { engine.rootObjects().takeFirst(), SLOT(showWindow())); - QObject::connect(engine.rootObjects().takeFirst()->findChild("sidebar_drawer"), + QObject::connect(engine.rootObjects().takeFirst()-> + findChild("sidebar_drawer"), SIGNAL(rwaHostSelected(QString)), main_gui.data(), SLOT(onRwaHostSelected(QString))); -- cgit v1.2.3 From 0a48722a1ddeccfc89f1812c44b7582358671697 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Sun, 1 Aug 2021 02:01:35 +0200 Subject: Introducing remote_control_manager.(h, cpp) The remote_control_manager class takes care of the GUI and the creation, deletion and maintaining of session objects. --- src/main.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7139883..9436a2b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -118,11 +118,23 @@ int main(int argc, char *argv[]) { main_gui.data(), SLOT(onRwaHostSelected(QString))); - // Make add_server_wizard available to QML - QScopedPointer wizard (new Add_Server_wizard(&app, - main_gui.data(), - dbus_api.data())); - engine.rootContext()->setContextProperty("add_server_wizard", wizard.data()); + // Make 'add_server_wizard' available to QML + QScopedPointer wizard ( + new Add_Server_wizard(&app, + main_gui.data(), + dbus_api.data()) + ); + engine.rootContext()-> + setContextProperty("add_server_wizard", wizard.data()); + + // Make 'remote_control_manager' available to QML + QScopedPointer remote_mngr ( + new RemoteControlManager(&engine, + main_gui.data(), + dbus_api.data()) + ); + engine.rootContext()-> + setContextProperty("remote_control_manager", remote_mngr.data()); return app.exec(); } -- cgit v1.2.3 From d75db83442a01dcd003ea39a5ec61baad7d344a0 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Sun, 1 Aug 2021 02:06:58 +0200 Subject: Change translation system to work more out of the box. using ./update-locales.sh now removes any old/obsolete translations. --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 9436a2b..ff5d2a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,8 +72,9 @@ int main(int argc, char *argv[]) { QQuickStyle::setStyle("Material"); QTranslator translator; - qDebug().noquote() << QString("Locales: Loading locale: qrc:/locales/bin/%0").arg(QLocale::system().name()); - if(translator.load(":/locales/bin/" + QLocale::system().name())) { + qDebug().noquote() << QString("Locales: Loading locale: qrc:/locales/%0") + .arg(QLocale::system().name()); + if(translator.load(":/locales/" + QLocale::system().name())) { app.installTranslator(&translator); qDebug().noquote() << "Locales: Loaded: " + QLocale::system().name() + " locale!"; } else { -- cgit v1.2.3 From 0e8f295868e826b89114b55a0aa360cb30d7494f Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Sun, 1 Aug 2021 02:36:42 +0200 Subject: add_server_wizard/add_server_wizard -> add_rwahost_wizard/add_rwahost_wizard --- src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ff5d2a8..e29c8db 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ #include "DBusAPI.h" #include "RWADBusAdaptor.cpp" #include "session.h" -#include "scenes/add_server_wizard/add_server_wizard.h" +#include "scenes/add_rwahost_wizard/add_rwahost_wizard.h" #include "scenes/remote_control/remote_control_manager.h" #include "RWAHostModel.h" #include "RWAHost.h" @@ -119,14 +119,14 @@ int main(int argc, char *argv[]) { main_gui.data(), SLOT(onRwaHostSelected(QString))); - // Make 'add_server_wizard' available to QML - QScopedPointer wizard ( - new Add_Server_wizard(&app, + // Make 'AddRWAHostWizard' available to QML + QScopedPointer wizard ( + new AddRWAHostWizard(&app, main_gui.data(), dbus_api.data()) ); engine.rootContext()-> - setContextProperty("add_server_wizard", wizard.data()); + setContextProperty("add_rwahost_wizard", wizard.data()); // Make 'remote_control_manager' available to QML QScopedPointer remote_mngr ( -- cgit v1.2.3