From edb85b7b383fcbe027fac3ed4be5d6ad75ecc912 Mon Sep 17 00:00:00 2001 From: dorian Date: Fri, 6 Jul 2018 14:40:45 +0200 Subject: [PATCH] kleinere grafische Verbesserungen --- android-sources/AndroidManifest.xml | 2 +- qml/LoginPage.qml | 26 ++++++++++++++++++++++++-- qml/main.qml | 22 +++++++++++----------- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml index f162756..69bd8eb 100644 --- a/android-sources/AndroidManifest.xml +++ b/android-sources/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/qml/LoginPage.qml b/qml/LoginPage.qml index a9cc2b2..91ad9e9 100644 --- a/qml/LoginPage.qml +++ b/qml/LoginPage.qml @@ -8,7 +8,11 @@ Page { objectName: "LoginPage"; header: AppToolBar { - + Label { + text: "Anmeldung" + anchors.centerIn: parent + color: "white" + } } Image { @@ -22,12 +26,30 @@ Page { fillMode: Image.PreserveAspectFit } + Label { + id: infoText + text: "Bitte melde dich mit den Anmeldedaten an, die du für den Vertretungsplan erhalten hast. + Weitere Informationen" + wrapMode: Text.Wrap + onLinkActivated: { + Qt.openUrlExternally(link) + } + + anchors { + top: bigLogo.bottom + left: parent.left + right: parent.right + leftMargin: window.width * 0.05 + rightMargin: window.width * 0.05 + } + } + ColumnLayout { spacing: 40 width: parent.width anchors.fill: parent - anchors.topMargin: bigLogo.height + window.height * 0.01 + anchors.topMargin: bigLogo.height + infoText.height + window.height * 0.02 anchors.bottomMargin: window.height * 0.2 TextField { diff --git a/qml/main.qml b/qml/main.qml index 7d13760..4c8369a 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -16,17 +16,17 @@ ApplicationWindow { property string background_color: "white" property string toolbar_color: "#312f38" -// onBeforeRendering: { -// if(!firstinitdone){ -// var isinit = _cppAppSettings.loadSetting("init") -// console.log("getinit"); -// console.log(isinit); -// if(isinit === "0"){ -// stackView.push("qrc:/LoginPage.qml", {}); -// } -// } -// firstinitdone = true -// } + onBeforeRendering: { + if(!firstinitdone){ + var isinit = _cppAppSettings.loadSetting("permanent") + console.log("getinit"); + console.log(isinit); + if(isinit === "0"){ + stackView.push("qrc:/LoginPage.qml", {}); + } + } + firstinitdone = true + } Timer { //runs only one time at applictaion lauch