diff --git a/src/Project-Orion/Appheader.qml b/src/Project-Orion/Appheader.qml new file mode 100644 index 0000000..e228d1f --- /dev/null +++ b/src/Project-Orion/Appheader.qml @@ -0,0 +1,35 @@ +import QtQuick +import QtQuick.Controls + + +Rectangle +{ + width: parent.width + height: 50 + color: "black" + + Button + { + id: setDefaultButton + icon.source: "qrc:/resources/tick.svg" + icon.width: 40 + icon.height: 40 + icon.color: "transparent" + width: 50 + height: parent.height - 4 + anchors.right: createNewUserButton.left + } + + Button + { + id: createNewUserButton + icon.source: "qrc:/resources/user.svg" + icon.width: 40 + icon.height: 40 + icon.color: "transparent" + width: 50 + height: parent.height - 4 + anchors.right: parent.right + } +} + diff --git a/src/Project-Orion/CMakeLists.txt b/src/Project-Orion/CMakeLists.txt index c6c0bc9..375ac1f 100644 --- a/src/Project-Orion/CMakeLists.txt +++ b/src/Project-Orion/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.16) project(Project-Orion VERSION 0.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_AUTORCC ON) find_package(Qt6 REQUIRED COMPONENTS Quick) @@ -21,7 +22,9 @@ qt_add_qml_module(appProject-Orion SOURCES userlist.h userlist.cpp SOURCES serialization.h SOURCES serialization.cpp - QML_FILES Button.qml + QML_FILES CustomButton.qml + QML_FILES Appheader.qml + RESOURCES resources.qrc ) # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. diff --git a/src/Project-Orion/Button.qml b/src/Project-Orion/CustomButton.qml similarity index 100% rename from src/Project-Orion/Button.qml rename to src/Project-Orion/CustomButton.qml diff --git a/src/Project-Orion/Main.qml b/src/Project-Orion/Main.qml index 05f1573..5139aec 100644 --- a/src/Project-Orion/Main.qml +++ b/src/Project-Orion/Main.qml @@ -1,4 +1,5 @@ import QtQuick +import QtQuick.Layouts Window { width: 640 @@ -9,11 +10,30 @@ Window { minimumHeight: 150 SystemPalette { id: myPalette; colorGroup: SystemPalette.Active } - color: myPalette.window + id: name - Button + Appheader { - text: "For testing purposes" + id: myHeader + } + + GridLayout { + id: grid + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.top: myHeader.bottom + anchors.leftMargin: 10 + columns: 10 + Repeater { + model: 30 + Rectangle { + width: 30; height: 30 + radius: 50 + border.width: 1 + color: "green" + } + } } } diff --git a/src/Project-Orion/resources.qrc b/src/Project-Orion/resources.qrc new file mode 100644 index 0000000..bbd882d --- /dev/null +++ b/src/Project-Orion/resources.qrc @@ -0,0 +1,6 @@ + + + user.svg + tick.svg + + diff --git a/src/Project-Orion/tick.svg b/src/Project-Orion/tick.svg new file mode 100644 index 0000000..6c45b1c --- /dev/null +++ b/src/Project-Orion/tick.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + diff --git a/src/Project-Orion/user.svg b/src/Project-Orion/user.svg new file mode 100644 index 0000000..e2429fa --- /dev/null +++ b/src/Project-Orion/user.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + +