diff options
| -rw-r--r-- | Login.qml | 4 | ||||
| -rw-r--r-- | controller.cxx | 8 | ||||
| -rw-r--r-- | pages/CreateProfile.qml | 2 | ||||
| -rw-r--r-- | pages/Profile.qml | 2 | ||||
| m--------- | qrtclient | 0 |
5 files changed, 9 insertions, 7 deletions
@@ -2,9 +2,9 @@ import QtQuick 2.12 LoginForm { signal logIn(string name, string password) - signal signUp(string name, string password, string emailAddress + signal userNew(string name, string password, string emailAddress , string realName) - signal search(string name) + signal ticketSearch(string name) function pushProfile() { stackView.push("qrc:/pages/Profile.qml") } diff --git a/controller.cxx b/controller.cxx index cdd71cd..335834b 100644 --- a/controller.cxx +++ b/controller.cxx @@ -17,11 +17,13 @@ Controller::Controller(QObject* parent) : QObject{parent} auto loginView = appWindow->findChild<QObject*>("login"); connect(loginView, SIGNAL(logIn(QString, QString)) , client, SLOT(logIn(QString, QString))); - connect(loginView, SIGNAL(signUp(QString, QString, QString, QString)) + connect(client, SIGNAL(logged(rtclient_user*)) + , loginView, SLOT(pushProfile())); + connect(loginView, SIGNAL(userNew(QString, QString, QString, QString)) , client, SLOT(userNew(QString, QString, QString , QString))); - connect(client, SIGNAL(logged(rtclient_user*)), loginView, SLOT(pushProfile())); - connect(loginView, SIGNAL(search(QString)), client, SLOT(search(QString))); + connect(loginView, SIGNAL(ticketSearch(QString)) + , client, SLOT(ticketSearch(QString))); using RTClient::User; auto typeId = qmlRegisterSingletonType<User>("KelakonUser", 0, 1, "User" diff --git a/pages/CreateProfile.qml b/pages/CreateProfile.qml index a324149..93cdb0c 100644 --- a/pages/CreateProfile.qml +++ b/pages/CreateProfile.qml @@ -12,7 +12,7 @@ CreateProfileForm { startUsingKelakon.onClicked: { User.name = userNameLabel.text User.realName = enterFullName.text - login.signUp(User.name, User.password, User.emailAddress + login.userNew(User.name, User.password, User.emailAddress , User.realName) } } diff --git a/pages/Profile.qml b/pages/Profile.qml index 89dd09e..46dd468 100644 --- a/pages/Profile.qml +++ b/pages/Profile.qml @@ -6,7 +6,7 @@ CreateProfileForm { height: stackView.height backButton.onClicked: stackView.pop() skipButton.onClicked: { - login.search(User.name) + login.ticketSearch(User.name) stackView.push("qrc:/pages/Home.qml") } enterFullName.text: User.realName diff --git a/qrtclient b/qrtclient -Subproject b49d11dd8da38c2113d063de30c9e904a4f2f45 +Subproject f490a15ce4dcb7937f055c7266669502a2f5138 |