From 74726a10d8029edc7bb27c18adc2319ac58d703f Mon Sep 17 00:00:00 2001 From: dorian Date: Mon, 18 Feb 2019 18:05:39 +0100 Subject: [PATCH] minor cleanup --- qml/Pages/LoginPage.qml | 36 +++++++++++++++++++++++++++--------- sources/serverconn.cpp | 2 -- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/qml/Pages/LoginPage.qml b/qml/Pages/LoginPage.qml index be1cae9..f8c63f9 100644 --- a/qml/Pages/LoginPage.qml +++ b/qml/Pages/LoginPage.qml @@ -69,16 +69,22 @@ Page { Label { id: infoText + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width * 0.8 height: parent.height * 0.2 + + horizontalAlignment: Text.AlignHCenter + fontSizeMode: Text.Fit; minimumPixelSize: 10; font.pixelSize: 72 + wrapMode: Text.Wrap + text: "Bitte melde dich mit den Anmeldedaten der Fanny-Webseite an. Weitere Informationen" - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignHCenter + onLinkActivated: { Qt.openUrlExternally(link) } @@ -224,11 +230,14 @@ Page { CheckDelegate { id: cBperm - text: qsTr("Angemeldet bleiben") - checked: true + anchors.horizontalCenter: parent.horizontalCenter height: formCol.rowHeight + + checked: true + + text: qsTr("Angemeldet bleiben") } FancyButton { @@ -242,8 +251,10 @@ Page { height: formCol.rowHeight - text: qsTr("Anmelden") enabled: tiuname.length > 0 & tipasswd.length > 0 + + text: qsTr("Anmelden") + onClicked: root.login(tiuname.text, tipasswd.text, cBperm.checked) } @@ -258,18 +269,25 @@ Page { height: formCol.rowHeight - text: qsTr("Registrieren") enabled: true + + text: qsTr("Registrieren") + onClicked: Qt.openUrlExternally("http://www.fanny-leicht.de/j34/index.php/login?view=registration") } Label { id: laStatus - text: qsTr("") - font.pixelSize: height * 0.3 - color: "red" + anchors.horizontalCenter: parent.horizontalCenter + height: formCol.rowHeight + + font.pixelSize: height * 0.3 + + color: "red" + + text: qsTr("") } } diff --git a/sources/serverconn.cpp b/sources/serverconn.cpp index 9a8facc..f919715 100644 --- a/sources/serverconn.cpp +++ b/sources/serverconn.cpp @@ -154,8 +154,6 @@ int ServerConn::getEvents(QString day) pdata.addQueryItem("mode", pGlobalAppSettings->loadSetting("teacherMode") == "true" ? "1":"0"); pdata.addQueryItem("day", day); - qDebug() << day; - // send the request ReturnData_t ret = this->senddata(QUrl("http://www.fanny-leicht.de/j34/templates/g5_helium/intern/events.php"), pdata);