From 0ca6c2c2dcdebc87726a39964dd2a03f5916e0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Wed, 18 Sep 2019 07:26:20 +0800 Subject: Update the ticket search function name --- Login.qml | 4 ++-- controller.cxx | 8 +++++--- pages/CreateProfile.qml | 2 +- pages/Profile.qml | 2 +- qrtclient | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Login.qml b/Login.qml index 6234d83..8a0e7f0 100644 --- a/Login.qml +++ b/Login.qml @@ -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("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("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 index b49d11d..f490a15 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit b49d11dd8da38c2113d063de30c9e904a4f2f454 +Subproject commit f490a15ce4dcb7937f055c7266669502a2f51387 -- cgit v1.2.3