diff options
author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2019-10-06 22:04:03 +0800 |
---|---|---|
committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2019-10-06 22:04:03 +0800 |
commit | 6ff76cf996ff4c1c2fd1f4a63ebe6b6177f898d6 (patch) | |
tree | 89c9e56dca54a7c4ac15d7e828c9b81758acd763 | |
parent | fa537da913c67a0a273db862999c0ffed1a5b430 (diff) |
Revert "Move pushHome function to Login Password"
This reverts commit d6c16f40490aef972df55ea101f9eef4eeb31f7b.
# Conflicts:
# controller.cxx
-rw-r--r-- | LoginPassword.qml | 5 | ||||
-rw-r--r-- | controller.cxx | 8 | ||||
-rw-r--r-- | main.qml | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/LoginPassword.qml b/LoginPassword.qml index ad5f56c..d306914 100644 --- a/LoginPassword.qml +++ b/LoginPassword.qml @@ -3,11 +3,6 @@ import KelakonUser 0.1 import "larva/features" LoginPasswordForm { - objectName: "login" - function pushHome() { - pageView.push("Home.qml") - } - emailTextLabel.text: User.name passwordTextField.onTextChanged: if (!passwordTextField.text || !continueButton.enabled) diff --git a/controller.cxx b/controller.cxx index 1d5bb4b..040d163 100644 --- a/controller.cxx +++ b/controller.cxx @@ -67,12 +67,8 @@ Controller::Controller(QObject* parent) connect(client, &Client::searchedTicket, ticketList, &TicketList::update); - connect(client, &Client::loggedIn, [appWindow,this]() { - auto loginView = appWindow->findChild<QObject*>("login"); - connect(ticketList, &TicketList::updated, [loginView]() { - QMetaObject::invokeMethod(loginView - , "pushHome"); - }); + connect(ticketList, &TicketList::updated, [appWindow]() { + QMetaObject::invokeMethod(appWindow, "pushHome"); }); connect(appWindow, SIGNAL(ticketHistory(int, bool)) @@ -6,6 +6,9 @@ ApplicationWindow { signal logIn(string name, string password) signal ticketHistory(int id, bool longFormat) signal ticketNew(string queue, string requestor) + function pushHome() { + pageView.push("Home.qml") + } id: window visible: true |