summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LoginPassword.qml5
-rw-r--r--controller.cxx8
-rw-r--r--main.qml3
3 files changed, 11 insertions, 5 deletions
diff --git a/LoginPassword.qml b/LoginPassword.qml
index d306914..ad5f56c 100644
--- a/LoginPassword.qml
+++ b/LoginPassword.qml
@@ -3,6 +3,11 @@ 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 43e7652..1b0e9f3 100644
--- a/controller.cxx
+++ b/controller.cxx
@@ -63,8 +63,12 @@ Controller::Controller(QObject* parent) : QObject{parent}
connect(client, &Client::ticketSearched, taskList, &TicketList::update);
- connect(taskList, &TicketList::updated, [appWindow]() {
- QMetaObject::invokeMethod(appWindow, "pushHome");
+ connect(client, &Client::loggedIn, [appWindow,this]() {
+ auto loginView = appWindow->findChild<QObject*>("login");
+ connect(taskList, &TicketList::updated, [loginView]() {
+ QMetaObject::invokeMethod(loginView
+ , "pushHome");
+ });
});
connect(appWindow, SIGNAL(ticketHistory(int))
diff --git a/main.qml b/main.qml
index 7c8c5d9..83eb694 100644
--- a/main.qml
+++ b/main.qml
@@ -6,9 +6,6 @@ ApplicationWindow {
signal logIn(string name, string password)
signal ticketHistory(int id)
signal ticketNew(string queue, string requestor)
- function pushHome() {
- pageView.push("Home.qml")
- }
id: window
visible: true