diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 1881dba..4e9dd13 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -19,11 +19,9 @@ qt_add_qml_module(alisa Main.qml Data.qml Test.qml - LoginScreen.qml RESOURCES Assets/Icons/turbo.svg - ) set_target_properties(alisa PROPERTIES diff --git a/native/LoginScreen.qml b/native/LoginScreen.qml deleted file mode 100644 index c51a224..0000000 --- a/native/LoginScreen.qml +++ /dev/null @@ -1,63 +0,0 @@ -import QtQuick -import QtQuick.Window -import Qt.labs.qmlmodels - -Window { - width: 400 - height: 400 - visible: true - - TableView { - anchors.fill: parent - columnSpacing: 1 - rowSpacing: 1 - boundsBehavior: Flickable.StopAtBounds - - 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 - } - ] - } - delegate: TextInput { - text: model.display - padding: 12 - selectByMouse: true - - onAccepted: model.display = text - - Rectangle { - anchors.fill: parent - color: "#efefef" - z: -1 - } - } - } -} diff --git a/native/Main.qml b/native/Main.qml index a53c9e3..4f93b00 100644 --- a/native/Main.qml +++ b/native/Main.qml @@ -56,12 +56,11 @@ Window { } } Button { - id: testB anchors { bottom: parent.bottom - left: parent.left + right: parent.right } - text: qsTr("Test Window") + text: qsTr("Click me") onClicked: { var component = Qt.createComponent("Test.qml") @@ -69,22 +68,4 @@ Window { 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() - } - - } } 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() - } - - } -}