From b7243d67e5cdee0eb47e75efbb1e12298457cbf3 Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Wed, 10 Jul 2024 19:50:31 +0200 Subject: [PATCH 1/2] native: add LoginScreen --- native/LoginScreen.qml | 117 +++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 50 deletions(-) diff --git a/native/LoginScreen.qml b/native/LoginScreen.qml index c51a224..0005d24 100644 --- a/native/LoginScreen.qml +++ b/native/LoginScreen.qml @@ -1,63 +1,80 @@ -import QtQuick -import QtQuick.Window -import Qt.labs.qmlmodels +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Controls.Basic + +//import "Main.qml" as M + + + Window { + + SystemPalette { id: activeColors; colorGroup: SystemPalette.Active } + SystemPalette { id: inactiveColors; colorGroup: SystemPalette.Inactive } + SystemPalette { id: disabledColors; colorGroup: SystemPalette.Disabled } + + function getColors() { + return root.active ? activeColors : inactiveColors; + } + + width: 400 height: 400 visible: true - TableView { - anchors.fill: parent - columnSpacing: 1 - rowSpacing: 1 - boundsBehavior: Flickable.StopAtBounds + color: getColors().window - model: TableModel { - TableModelColumn { display: "checked" } - TableModelColumn { display: "amount" } - TableModelColumn { display: "fruitType" } - TableModelColumn { display: "fruitName" } - TableModelColumn { display: "fruitPrice" } - - // Each row is one type of fruit that can be ordered - rows: [ - { - // Each property is one cell/column. - checked: false, - amount: 1, - fruitType: "Apple", - fruitName: "Granny Smith", - fruitPrice: 1.50 - }, - { - checked: true, - amount: 4, - fruitType: "Orange", - fruitName: "Navel", - fruitPrice: 2.50 - }, - { - checked: false, - amount: 1, - fruitType: "Banana", - fruitName: "Cavendish", - fruitPrice: 3.50 - } - ] + Label{ + id: loginL + anchors{ + verticalCenter: parent.verticalCenter + verticalCenterOffset: -70 + horizontalCenter: parent.horizontalCenter } - delegate: TextInput { - text: model.display - padding: 12 - selectByMouse: true - onAccepted: model.display = text - Rectangle { - anchors.fill: parent - color: "#efefef" - z: -1 - } + text: qsTr("Login") + font.pointSize: 20 + font.bold: true + + color: getColor().text + + } + + TextField { + + id: nameT + anchors{ + horizontalCenter: parent.horizontalCenter + topMargin: 5 + top: loginL.bottom } + + placeholderText: qsTr("Name") + + } + + TextField { + id: passwordT + anchors{ + horizontalCenter: parent.horizontalCenter + topMargin: 5 + top: nameT.bottom + } + + placeholderText: qsTr("Password") + + echoMode: TextInput.Password + } + + Button { + id: submitB + anchors{ + right: passwordT.right + topMargin: 5 + top: passwordT.bottom + } + + text: qsTr("Submit") } } From 98a30294446aab98c3ca924d2157136285a1f8b6 Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Wed, 10 Jul 2024 19:53:29 +0200 Subject: [PATCH 2/2] native: deleted main.qml.autosave --- native/Main.qml | 1 - native/Main.qml.autosave | 87 ---------------------------------------- 2 files changed, 88 deletions(-) delete mode 100644 native/Main.qml.autosave diff --git a/native/Main.qml b/native/Main.qml index a53c9e3..080c9db 100644 --- a/native/Main.qml +++ b/native/Main.qml @@ -85,6 +85,5 @@ Window { var window = component.createObject(root) window.show() } - } } diff --git a/native/Main.qml.autosave b/native/Main.qml.autosave deleted file mode 100644 index 5549953..0000000 --- a/native/Main.qml.autosave +++ /dev/null @@ -1,87 +0,0 @@ -import QtQuick -import QtQuick.Window -import QtQuick.Layouts -import QtQuick.Controls 2.15 - -Window { - SystemPalette { id: activeColors; colorGroup: SystemPalette.Active } - SystemPalette { id: inactiveColors; colorGroup: SystemPalette.Inactive } - SystemPalette { id: disabledColors; colorGroup: SystemPalette.Disabled } - - function getColors() { - return root.active ? activeColors : inactiveColors; - } - - id: root - width: 640 - height: 480 - visible: true - color: getColors().window - - title: qsTr("Alisa - License Managment") - - Rectangle { - id: s1 - anchors { - top: parent.top - left: parent.left - right: parent.right - } - height: 400 - border.width: 5 - border.color: getColors().accent - color: getColors().midlight - } - - TableView { - anchors.fill: parent - - columnSpacing: 1 - rowSpacing: 1 - clip: true - - model: Data {} - delegate: Rectangle { - color: getColors().base - implicitWidth: 100 - implicitHeight: 50 - border.width: 1 - - Text { - text: display - color: getColors().text - anchors.centerIn: parent - } - } - } - Button { - id: testB - anchors { - bottom: parent.bottom - left: parent.left - } - text: qsTr("Test Window") - - onClicked: { - var component = Qt.createComponent("Test.qml") - var window = component.createObject(root) - window.show() - } - } - Button { - id: loginScreenB - anchors { - left: testB.right - bottom: parent.bottom - - - } - text: qsTr("Login Screen") - onClicked: { - var component = Qt.createComponent("LoginScreen.qml") - var window = component.createObject(root) - window.show() - } - - } -}