aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qml.qrc6
-rw-r--r--rwa-support-desktopapp.pro4
-rw-r--r--src/main.cpp10
-rw-r--r--src/main.qml2
-rw-r--r--src/main_qmladaptor.cpp4
-rw-r--r--src/scenes/add_rwahost_wizard/Scene_step_1.qml (renamed from src/scenes/add_server_wizard/Scene_step_1.qml)6
-rw-r--r--src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp (renamed from src/scenes/add_server_wizard/add_server_wizard.cpp)12
-rw-r--r--src/scenes/add_rwahost_wizard/add_rwahost_wizard.h (renamed from src/scenes/add_server_wizard/add_server_wizard.h)8
-rw-r--r--src/scenes/remote_control/remote_control_manager.h4
9 files changed, 28 insertions, 28 deletions
diff --git a/qml.qrc b/qml.qrc
index 35e9142..04ee201 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -29,9 +29,9 @@
<file>src/scenes/Scene_settings.qml</file>
<file>src/scenes/Scene_placeholder.qml</file>
<file>src/scenes/Scene_no_server_available.qml</file>
- <file>src/scenes/add_server_wizard/add_server_wizard.cpp</file>
- <file>src/scenes/add_server_wizard/add_server_wizard.h</file>
- <file>src/scenes/add_server_wizard/Scene_step_1.qml</file>
+ <file>src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp</file>
+ <file>src/scenes/add_rwahost_wizard/add_rwahost_wizard.h</file>
+ <file>src/scenes/add_rwahost_wizard/Scene_step_1.qml</file>
<file>src/scenes/remote_control/remote_control_manager.cpp</file>
<file>src/scenes/remote_control/remote_control_manager.h</file>
<file>src/scenes/remote_control/Scene_remote_control.qml</file>
diff --git a/rwa-support-desktopapp.pro b/rwa-support-desktopapp.pro
index f9a05bf..96ecec3 100644
--- a/rwa-support-desktopapp.pro
+++ b/rwa-support-desktopapp.pro
@@ -52,7 +52,7 @@ SOURCES += src/main.cpp \
src/RWAHost.cpp \
src/DBusAPI.cpp \
src/scenes/remote_control/remote_control_manager.cpp \
- src/scenes/add_server_wizard/add_server_wizard.cpp
+ src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
HEADERS += src/RWADBusAdaptor.h \
src/main_qmladaptor.h \
@@ -63,7 +63,7 @@ HEADERS += src/RWADBusAdaptor.h \
src/RWAHost.h \
src/DBusAPI.h \
src/scenes/remote_control/remote_control_manager.h \
- src/scenes/add_server_wizard/add_server_wizard.h
+ src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
TRANSLATIONS += locales/main_en.ts \
locales/de_DE.ts \
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<Add_Server_wizard> wizard (
- new Add_Server_wizard(&app,
+ // Make 'AddRWAHostWizard' available to QML
+ QScopedPointer<AddRWAHostWizard> 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<RemoteControlManager> remote_mngr (
diff --git a/src/main.qml b/src/main.qml
index af41dd1..a622c18 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -295,7 +295,7 @@ ApplicationWindow {
}
ListItem {
text: " " + qsTr("Add RWA-Server")
- scene_url: "scenes/add_server_wizard/Scene_step_1.qml"
+ scene_url: "scenes/add_rwahost_wizard/Scene_step_1.qml"
onListItemClick: {
header_text.text = qsTr("Server addition wizard")
if (inPortrait) sidebar_drawer.close()
diff --git a/src/main_qmladaptor.cpp b/src/main_qmladaptor.cpp
index d30243d..688b993 100644
--- a/src/main_qmladaptor.cpp
+++ b/src/main_qmladaptor.cpp
@@ -290,9 +290,9 @@ void MainQMLAdaptor::main_content_replace(QString scene) {
QVariant to_cast = main_content->property("currentItem");
QObject *obj = qvariant_cast<QObject *>(to_cast);
if (obj) {
- QString scene_add_server_wizard = "Scene_step_1";
+ QString scene_add_rwahost_wizard = "Scene_step_1";
if (!(scene.contains(obj->objectName()) ||
- scene_add_server_wizard.contains(obj->objectName()))) {
+ scene_add_rwahost_wizard.contains(obj->objectName()))) {
QVariant arg = QVariant::fromValue(scene);
if (!QMetaObject::invokeMethod(window, "main_content_replace",
Q_ARG(QVariant, arg))) {
diff --git a/src/scenes/add_server_wizard/Scene_step_1.qml b/src/scenes/add_rwahost_wizard/Scene_step_1.qml
index bfbe2ae..873e0fd 100644
--- a/src/scenes/add_server_wizard/Scene_step_1.qml
+++ b/src/scenes/add_rwahost_wizard/Scene_step_1.qml
@@ -15,7 +15,7 @@ Item {
objectName: "Scene_step_1"
Connections {
- target: add_server_wizard
+ target: add_rwahost_wizard
function onStep1Success() {
// Go onto the first page of the stack.
main_content_pop(null)
@@ -26,7 +26,7 @@ Item {
}
Connections {
- target: add_server_wizard
+ target: add_rwahost_wizard
function onStep1Failed(reason, toast_type) {
mainqmladaptor.showToast(reason,
5000,
@@ -48,7 +48,7 @@ Item {
anchors.rightMargin: 15
onClicked: {
- add_server_wizard.processStep1(host_url.text, host_alias.text)
+ add_rwahost_wizard.processStep1(host_url.text, host_alias.text)
}
}
diff --git a/src/scenes/add_server_wizard/add_server_wizard.cpp b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
index caac344..7adbdf9 100644
--- a/src/scenes/add_server_wizard/add_server_wizard.cpp
+++ b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
@@ -23,11 +23,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "add_server_wizard.h"
+#include "add_rwahost_wizard.h"
#include "../../RWADBusAdaptor.h"
#include "../../RWAHost.h"
-Add_Server_wizard::Add_Server_wizard(QObject *parent,
+AddRWAHostWizard::AddRWAHostWizard(QObject *parent,
MainQMLAdaptor *main_gui, DBusAPI *dbus_api) : QObject(parent) {
Q_ASSERT(main_gui != nullptr);
Q_ASSERT(dbus_api != nullptr);
@@ -42,7 +42,7 @@ Add_Server_wizard::Add_Server_wizard(QObject *parent,
SLOT(add_web_app_host_response(QJsonDocument*)));
}
-void Add_Server_wizard::processStep1(QString host_url, QString host_alias) {
+void AddRWAHostWizard::processStep1(QString host_url, QString host_alias) {
qDebug() << "Processing Step 1 with args: " << host_url << host_alias;
if(host_alias == "" || host_url == "") {
@@ -55,18 +55,18 @@ void Add_Server_wizard::processStep1(QString host_url, QString host_alias) {
return add_server(host_url, host_alias);
}
-void Add_Server_wizard::processStep2() {
+void AddRWAHostWizard::processStep2() {
qDebug() << "Processing Step 2 with args: No Args.";
emit step2Failed(tr("The features you expected here are not yet implemented."), Toast::ToastType::ToastWarning);
// Just show placeholder scene now.
emit step2Success();
}
-void Add_Server_wizard::add_server(QString host_url, QString host_alias) {
+void AddRWAHostWizard::add_server(QString host_url, QString host_alias) {
_dbus_api->add_web_app_host_request(host_url, host_alias);
}
-void Add_Server_wizard::add_web_app_host_response(QJsonDocument *doc) {
+void AddRWAHostWizard::add_web_app_host_response(QJsonDocument *doc) {
// Q_ASSERT lets the program crash immediatly at startup,
// when the session service is not started.
// Don't use Q_ASSERT(doc != nullptr); instead use:
diff --git a/src/scenes/add_server_wizard/add_server_wizard.h b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
index dc205d1..f019be1 100644
--- a/src/scenes/add_server_wizard/add_server_wizard.h
+++ b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
@@ -23,8 +23,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef ADD_SERVER_WIZARD_H
-#define ADD_SERVER_WIZARD_H
+#ifndef ADD_RWAHOST_WIZARD_H
+#define ADD_RWAHOST_WIZARD_H
#include <QObject>
@@ -32,11 +32,11 @@
#include "../../DBusAPI.h"
#include "../../main_qmladaptor.h"
-class Add_Server_wizard : public QObject
+class AddRWAHostWizard : public QObject
{
Q_OBJECT
public:
- explicit Add_Server_wizard(QObject *parent = nullptr,
+ explicit AddRWAHostWizard(QObject *parent = nullptr,
MainQMLAdaptor *main_gui = nullptr,
DBusAPI *dbus_api = nullptr);
void add_server(QString host_url, QString host_alias);
diff --git a/src/scenes/remote_control/remote_control_manager.h b/src/scenes/remote_control/remote_control_manager.h
index 6f2fbdb..4554724 100644
--- a/src/scenes/remote_control/remote_control_manager.h
+++ b/src/scenes/remote_control/remote_control_manager.h
@@ -1,5 +1,5 @@
-#ifndef REMOTECONTROLMANAGER_H
-#define REMOTECONTROLMANAGER_H
+#ifndef REMOTE_CONTROL_MANAGER_H
+#define REMOTE_CONTROL_MANAGER_H
#include <QObject>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 13:31:11 +0000