From 1eb056effa7f25b1e047697988a747325fcbd9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Tue, 21 Mar 2023 19:00:56 +0800 Subject: Reorganise default home files --- Counter.ui.qml | 71 -------- Home/Default.ui.qml | 374 ++++++++++++++++++++++++++++++++++++++++++ Home/Default/Counter.ui.qml | 62 +++++++ HomeDefault.qrc | 6 + HomeDefault.ui.qml | 386 -------------------------------------------- Qeduport.qmlproject | 2 +- imports/Eduport/Eduport.qml | 11 +- 7 files changed, 452 insertions(+), 460 deletions(-) delete mode 100644 Counter.ui.qml create mode 100644 Home/Default.ui.qml create mode 100644 Home/Default/Counter.ui.qml create mode 100644 HomeDefault.qrc delete mode 100644 HomeDefault.ui.qml diff --git a/Counter.ui.qml b/Counter.ui.qml deleted file mode 100644 index f75b2ce..0000000 --- a/Counter.ui.qml +++ /dev/null @@ -1,71 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 - -Item { - Rectangle { - color: bgColor - radius: 8 - anchors { - fill: parent - topMargin: 25.6 - leftMargin: 12.8 - rightMargin: 12.8 - } - - Item { - anchors { - fill: parent - margins: 25.6 - } - - Image { - id: image - source: icon - sourceSize.height: column.height * 3 / 4 - fillMode: Image.PreserveAspectFit - x: (parent.width - (width + column.width + 25.6)) / 2 - anchors.verticalCenter: parent.verticalCenter - } - - ColumnLayout { - id: column - spacing: 0 - anchors { - left: image.right - leftMargin: 25.6 - } - - FontLoader { - id: bold - source: "Heebo/Heebo-Bold.ttf" - } - - Label { - text: count - font { - family: bold.name - pointSize: 20.1 - weight: Font.Bold - } - Layout.fillWidth: true - } - - FontLoader { - id: medium - source: "Heebo/Heebo-Medium.ttf" - } - - Label { - text: title - font { - family: medium.name - pointSize: 15 - weight: Font.Medium - } - Layout.fillWidth: true - } - } - } - } -} diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml new file mode 100644 index 0000000..fc3de8c --- /dev/null +++ b/Home/Default.ui.qml @@ -0,0 +1,374 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import Bootstrap 5.3 +import Eduport 1.0 +import ".." +import "Default" as Default + +Flickable { + property string bannerTitleText: qsTr("Limitless learning at your fingertips") + property string bannerContentText: qsTr("Online learning and teaching marketplace with 5K+ courses & 10M students. Taught by experts to help you acquire new skills.") + property string imageSource: "https://eduport.webestica.com/assets/images/element/07.png" + property alias counter: counter + property alias tabs: tabs + property alias tabsContent: tabsContent + property alias getStarted: getStarted + contentHeight: body.height + + ColumnLayout { + id: body + anchors { + top: parent.top + left: parent.left + right: parent.right + } + + GridLayout { + id: banner + columns: width < 992 ? 1 : 2 + rows: width < 992 ? 2 : 1 + Layout.leftMargin: -9 + Layout.rightMargin: -9 + Layout.bottomMargin: 48 + + ColumnLayout { + Layout.topMargin: 48 + Layout.leftMargin: 15 + Layout.rightMargin: 15 + Layout.bottomMargin: 48 + Layout.maximumWidth: body.width < 992 + ? body.width : body.width / 2 + + Label { + text: bannerTitleText + color: "#24292d" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + font { + family: Eduport.hFont.family + pointSize: 23.6 + .0432 * width + } + } + + Label { + text: bannerContentText + color: "#747579" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + font { + family: Bootstrap.bodyFont + .family + pointSize: Eduport.fontSizeLead + } + } + + Button { + id: getStarted + Layout.alignment: Qt.AlignHCenter + Layout.leftMargin: 24 + Layout.rightMargin: 24 + Layout.bottomMargin: 25.6 + horizontalPadding: 24 + verticalPadding: 12.8 + contentItem: Text { + color: getStarted.down + ? "#ffffff" + : "#d6293e" + text: qsTr("Get Started") + horizontalAlignment: Text + .AlignHCenter + verticalAlignment: Text + .AlignVCenter + font { + family: Bootstrap + .btnFont + .family + pointSize: Bootstrap + .btnFont + .pointSize + weight: Font.Medium + } + } + background: Rectangle { + radius: 8 + color: getStarted.down + ? "#d6293e" + : Qt.rgba(.839, .16, + .243, .1) + border { + color: + getStarted.down + ? "#d6293e" + : "transparent" + width: 1 + } + } + } + } + + Item { + Layout.topMargin: 48 + Layout.leftMargin: 24 + Layout.rightMargin: 24 + Layout.fillWidth: true + implicitHeight: image.height + + DropShadow { + source: angularRectangle + anchors.fill: angularRectangle + color: Qt.rgba(.113, .227, .325, .15) + } + + Rectangle { + id: angularRectangle + radius: 8 + implicitWidth: angularImage.width + 16 + implicitHeight: angularImage.height + 16 + anchors { + top: parent.top + right: parent.right + rightMargin: 24 + } + + Image { + id: angularImage + source: "https://eduport.webestica.com/assets/images/client/angular.svg" + anchors.centerIn: parent + } + } + + Image { + id: image + source: imageSource + width: parent.width + fillMode: Image.PreserveAspectFit + } + } + } + + GridView { + id: counter + interactive: false + cellWidth: width < 576 ? width + : width < 1200 ? width / 2 + : width / 4 + cellHeight: 125.6 + Layout.fillWidth: true + implicitHeight: width < 576 + ? cellHeight * count + : width < 1200 ? cellHeight * count / 2 + : cellHeight + + model: ListModel { + ListElement { + icon: "../../Font-Awesome/svgs/solid/tv.svg" + count: "10K" + title: qsTr("Online Courses") + bgColor: "#26f7c32e" + } + ListElement { + icon: "../../Font-Awesome/svgs/solid/user-tie.svg" + count: "200+" + title: qsTr("Expert Tutors") + bgColor: "#1a1d3b53" + } + ListElement { + icon: "../../Font-Awesome/svgs/solid/user-graduate.svg" + count: "60K+" + title: qsTr("Online Students") + bgColor: "#1a6f42c1" + } + ListElement { + icon: "../../Bootstrap/icons/patch-check-fill.svg" + count: "6K+" + title: qsTr("Certified Courses") + bgColor: "#1a17a2b8" + } + } + + delegate: Default.Counter { + implicitWidth: counter.cellWidth + implicitHeight: counter.cellHeight + } + } + + ColumnLayout { + Layout.topMargin: 64 + Layout.leftMargin: 15 + Layout.rightMargin: 15 + Layout.bottomMargin: 48 + + ColumnLayout { + Layout.bottomMargin: 25.6 + + Label { + text: qsTr("Most Popular Courses") + color: "#24292d" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + Layout.bottomMargin: 8 + font { + family: Eduport.hFont.family + pointSize: 22.5 + .01875 + * parent.width + } + } + + Label { + text: qsTr("Choose from hundreds of courses from specialist organizations") + color: "#747579" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + font { + family: Bootstrap.bodyFont + .family + pointSize: Bootstrap.bodyFont + .pointSize + } + } + } + + Rectangle { + color: Qt.rgba(.0235, .416, .788, .1) + radius: 10 + implicitHeight: tabs.height + 20 + Layout.fillWidth: true + Layout.bottomMargin: 25.6 + + GridView { + id: tabs + interactive: false + anchors { + left: parent.left + leftMargin: 16 + right: parent.right + rightMargin: 16 + verticalCenter: parent.verticalCenter + } + cellWidth: 142 + cellHeight: 46 + implicitHeight: Math.ceil(count / Math.floor(count / (cellWidth * count / width))) * cellHeight + model: ["Web Design", "Development", "Graphic Design", "Marketing", "Finance"] + delegate: TabItem {} + } + } + + StackLayout { + currentIndex: tabs.currentIndex + property real preservedAspectHeight: width * 1.6 + Layout.leftMargin: -12.8 + Layout.rightMargin: -12.8 + Layout.preferredHeight: width < 576 + ? preservedAspectHeight * tabsContent.currentCount + : width < 768 + ? preservedAspectHeight / 2 * Math.ceil(tabsContent.currentCount / 2) + : width < 992 + ? preservedAspectHeight / 3 * Math.ceil(tabsContent.currentCount / 3) + : preservedAspectHeight / 4 * Math.ceil(tabsContent.currentCount / 4) + + Repeater { + id: tabsContent + property int currentCount: 8 + model: ListModel { + ListElement { + content: [ + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/08.jpg" + level: "All level" + levelColor: "#ff6f42c1" + levelBackgroundColor: "#1a6f42c1" + title: "Sketch from A to Z: for app designer" + truncated: "Proposal indulged no do sociable he throwing settling." + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/02.jpg" + level: "Beginner" + levelColor: "#ff0cbc87" + levelBackgroundColor: "#1a0cbc87" + title: "Graphic Design Masterclass" + truncated: "Rooms oh fully taken by worse do Points afraid but may end Rooms" + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/03.jpg" + level: "Beginner" + levelColor: "#ff0cbc87" + levelBackgroundColor: "#1a0cbc87" + title: "Create a Design System in Figma" + truncated: "Rooms oh fully taken by worse do. Points afraid but may end afraid but may end." + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/07.jpg" + level: "Beginner" + levelColor: "#ff0cbc87" + levelBackgroundColor: "#1a0cbc87" + title: "Deep Learning with React-Native" + truncated: "Far advanced settling say finished raillery. Offered chiefly farther" + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/11.jpg" + level: "All level" + levelColor: "#ff6f42c1" + levelBackgroundColor: "#1a6f42c1" + title: "Build Responsive Websites with HTML" + truncated: "Far advanced settling say finished raillery. Offered chiefly farther" + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/12.jpg" + level: "Beginner" + levelColor: "#ff0cbc87" + levelBackgroundColor: "#1a0cbc87" + title: "Build Websites with CSS" + truncated: "Far advanced settling say finished raillery. Offered chiefly farther" + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/04.jpg" + level: "All level" + levelColor: "#ff6f42c1" + levelBackgroundColor: "#1a6f42c1" + title: "Learn Invision" + truncated: "Arrived off she elderly beloved him Course regard to up he hardly." + }, + ListElement { + image: "https://eduport.webestica.com/assets/images/courses/4by3/09.jpg" + level: "All level" + levelColor: "#ff6f42c1" + levelBackgroundColor: "#1a6f42c1" + title: "JavaScript: Full Understanding" + truncated: "Far advanced settling say finished raillery. Offered chiefly farther" + } + ] + } + } + + GridView { + id: tabPane + interactive: false + cellWidth: width < 576 ? width + : width < 768 ? width / 2 + : width < 992 ? width / 3 + : width / 4 + cellHeight: cellWidth + * 400 / 533 + 273.35 + model: content + delegate: CardGrid { + width: tabPane.cellWidth + height: tabPane.cellHeight + imageSource: image + badgeText: level + badgeColor: levelColor + badgeBackgroundColor: levelBackgroundColor + titleText: title + truncatedText: truncated + } + } + } + } + } + } +} diff --git a/Home/Default/Counter.ui.qml b/Home/Default/Counter.ui.qml new file mode 100644 index 0000000..293b9ef --- /dev/null +++ b/Home/Default/Counter.ui.qml @@ -0,0 +1,62 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import Eduport 1.0 + +Item { + Rectangle { + color: bgColor + radius: 8 + anchors { + fill: parent + topMargin: 25.6 + leftMargin: 12.8 + rightMargin: 12.8 + } + + Item { + anchors { + fill: parent + margins: 25.6 + } + + Image { + id: image + source: icon + sourceSize.height: column.height * 3 / 4 + fillMode: Image.PreserveAspectFit + x: (parent.width - (width + column.width + 25.6)) / 2 + anchors.verticalCenter: parent.verticalCenter + } + + ColumnLayout { + id: column + spacing: 0 + anchors { + left: image.right + leftMargin: 25.6 + } + + Label { + text: count + font { + family: Eduport.hFont.family + pointSize: 20.1 + + .00075 * parent.width + } + Layout.fillWidth: true + } + + Label { + text: title + font { + family: Eduport.normalFont + .family + pointSize: h6FontSize + } + Layout.fillWidth: true + } + } + } + } +} diff --git a/HomeDefault.qrc b/HomeDefault.qrc new file mode 100644 index 0000000..843290c --- /dev/null +++ b/HomeDefault.qrc @@ -0,0 +1,6 @@ + + + Home/Default.ui.qml + Home/Default/Counter.ui.qml + + diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml deleted file mode 100644 index 39cdc7b..0000000 --- a/HomeDefault.ui.qml +++ /dev/null @@ -1,386 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 - -Flickable { - property string bannerTitleText: qsTr("Limitless learning at your fingertips") - property string bannerContentText: qsTr("Online learning and teaching marketplace with 5K+ courses & 10M students. Taught by experts to help you acquire new skills.") - property string imageSource: "https://eduport.webestica.com/assets/images/element/07.png" - property alias counter: counter - property alias tabs: tabs - property alias tabsContent: tabsContent - property alias getStarted: getStarted - property bool doesntEmbed: Qt.platform.os === "android" - || Qt.platform.os === "linux" - || Qt.platform.os === "osx" - || Qt.platform.os === "unix" - || Qt.platform.os === "windows" - contentHeight: body.height - - FontLoader { - id: regular - source: doesntEmbed ? "" : "Roboto/Roboto-Regular.ttf" - } - - ColumnLayout { - id: body - anchors { - top: parent.top - left: parent.left - right: parent.right - } - - GridLayout { - id: banner - columns: width < 992 ? 1 : 2 - rows: width < 992 ? 2 : 1 - Layout.leftMargin: -9 - Layout.rightMargin: -9 - Layout.bottomMargin: 48 - - ColumnLayout { - Layout.topMargin: 48 - Layout.leftMargin: 15 - Layout.rightMargin: 15 - Layout.bottomMargin: 48 - Layout.maximumWidth: body.width < 992 - ? body.width : body.width / 2 - - FontLoader { - id: heebo - source: "Heebo/Heebo-Bold.ttf" - } - - Label { - text: bannerTitleText - color: "#24292d" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - font { - family: heebo.name - pointSize: 23.6 + .0432 * width - } - } - - FontLoader { - id: medium - source: doesntEmbed ? "" - : "Roboto/Roboto-Medium.ttf" - } - - Label { - text: bannerContentText - color: "#747579" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - font { - family: doesntEmbed ? "Roboto" - : medium.name - pointSize: 18.75 - } - } - - Button { - id: getStarted - Layout.alignment: Qt.AlignHCenter - Layout.leftMargin: 24 - Layout.rightMargin: 24 - Layout.bottomMargin: 25.6 - horizontalPadding: 24 - verticalPadding: 12.8 - contentItem: Text { - color: getStarted.down - ? "#ffffff" - : "#d6293e" - text: qsTr("Get Started") - horizontalAlignment: Text - .AlignHCenter - verticalAlignment: Text - .AlignVCenter - font { - family: doesntEmbed - ? "Roboto" - : medium.name - pixelSize: 16 - weight: Font.Medium - } - } - background: Rectangle { - radius: 8 - color: getStarted.down - ? "#d6293e" - : Qt.rgba(.839, .16, - .243, .1) - border { - color: - getStarted.down - ? "#d6293e" - : "transparent" - width: 1 - } - } - } - } - - Item { - Layout.topMargin: 48 - Layout.leftMargin: 24 - Layout.rightMargin: 24 - Layout.fillWidth: true - implicitHeight: image.height - - DropShadow { - source: angularRectangle - anchors.fill: angularRectangle - color: Qt.rgba(.113, .227, .325, .15) - } - - Rectangle { - id: angularRectangle - radius: 8 - implicitWidth: angularImage.width + 16 - implicitHeight: angularImage.height + 16 - anchors { - top: parent.top - right: parent.right - rightMargin: 24 - } - - Image { - id: angularImage - source: "https://eduport.webestica.com/assets/images/client/angular.svg" - anchors.centerIn: parent - } - } - - Image { - id: image - source: imageSource - width: parent.width - fillMode: Image.PreserveAspectFit - } - } - } - - GridView { - id: counter - interactive: false - cellWidth: width < 576 ? width - : width < 1200 ? width / 2 - : width / 4 - cellHeight: 125.6 - Layout.fillWidth: true - implicitHeight: width < 576 - ? cellHeight * count - : width < 1200 ? cellHeight * count / 2 - : cellHeight - - model: ListModel { - ListElement { - icon: "Font-Awesome/svgs/solid/tv.svg" - count: "10K" - title: qsTr("Online Courses") - bgColor: "#26f7c32e" - } - ListElement { - icon: "Font-Awesome/svgs/solid/user-tie.svg" - count: "200+" - title: qsTr("Expert Tutors") - bgColor: "#1a1d3b53" - } - ListElement { - icon: "Font-Awesome/svgs/solid/user-graduate.svg" - count: "60K+" - title: qsTr("Online Students") - bgColor: "#1a6f42c1" - } - ListElement { - icon: "Bootstrap/icons/patch-check-fill.svg" - count: "6K+" - title: qsTr("Certified Courses") - bgColor: "#1a17a2b8" - } - } - - delegate: Counter { - implicitWidth: counter.cellWidth - implicitHeight: counter.cellHeight - } - } - - ColumnLayout { - Layout.topMargin: 64 - Layout.leftMargin: 15 - Layout.rightMargin: 15 - Layout.bottomMargin: 48 - - ColumnLayout { - Layout.bottomMargin: 25.6 - - Label { - text: qsTr("Most Popular Courses") - color: "#24292d" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - Layout.bottomMargin: 8 - font { - family: heebo.name - pointSize: 22.5 + .01875 * parent.width - } - } - - Label { - text: qsTr("Choose from hundreds of courses from specialist organizations") - color: "#747579" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - font { - family: doesntEmbed ? "Roboto" : medium.name - pointSize: 15 - } - } - } - - Rectangle { - color: Qt.rgba(.0235, .416, .788, .1) - radius: 10 - implicitHeight: tabs.height + 20 - Layout.fillWidth: true - Layout.bottomMargin: 25.6 - - GridView { - id: tabs - interactive: false - anchors { - left: parent.left - leftMargin: 16 - right: parent.right - rightMargin: 16 - verticalCenter: parent.verticalCenter - } - cellWidth: 142 - cellHeight: 46 - implicitHeight: Math.ceil(count / Math.floor(count / (cellWidth * count / width))) * cellHeight - model: ["Web Design", "Development", "Graphic Design", "Marketing", "Finance"] - delegate: TabItem {} - } - } - - StackLayout { - currentIndex: tabs.currentIndex - property real preservedAspectHeight: width * 1.6 - Layout.leftMargin: -12.8 - Layout.rightMargin: -12.8 - Layout.preferredHeight: width < 576 - ? preservedAspectHeight * tabsContent.currentCount - : width < 768 - ? preservedAspectHeight / 2 * Math.ceil(tabsContent.currentCount / 2) - : width < 992 - ? preservedAspectHeight / 3 * Math.ceil(tabsContent.currentCount / 3) - : preservedAspectHeight / 4 * Math.ceil(tabsContent.currentCount / 4) - - Repeater { - id: tabsContent - property int currentCount: 8 - model: ListModel { - ListElement { - content: [ - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/08.jpg" - level: "All level" - levelColor: "#ff6f42c1" - levelBackgroundColor: "#1a6f42c1" - title: "Sketch from A to Z: for app designer" - truncated: "Proposal indulged no do sociable he throwing settling." - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/02.jpg" - level: "Beginner" - levelColor: "#ff0cbc87" - levelBackgroundColor: "#1a0cbc87" - title: "Graphic Design Masterclass" - truncated: "Rooms oh fully taken by worse do Points afraid but may end Rooms" - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/03.jpg" - level: "Beginner" - levelColor: "#ff0cbc87" - levelBackgroundColor: "#1a0cbc87" - title: "Create a Design System in Figma" - truncated: "Rooms oh fully taken by worse do. Points afraid but may end afraid but may end." - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/07.jpg" - level: "Beginner" - levelColor: "#ff0cbc87" - levelBackgroundColor: "#1a0cbc87" - title: "Deep Learning with React-Native" - truncated: "Far advanced settling say finished raillery. Offered chiefly farther" - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/11.jpg" - level: "All level" - levelColor: "#ff6f42c1" - levelBackgroundColor: "#1a6f42c1" - title: "Build Responsive Websites with HTML" - truncated: "Far advanced settling say finished raillery. Offered chiefly farther" - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/12.jpg" - level: "Beginner" - levelColor: "#ff0cbc87" - levelBackgroundColor: "#1a0cbc87" - title: "Build Websites with CSS" - truncated: "Far advanced settling say finished raillery. Offered chiefly farther" - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/04.jpg" - level: "All level" - levelColor: "#ff6f42c1" - levelBackgroundColor: "#1a6f42c1" - title: "Learn Invision" - truncated: "Arrived off she elderly beloved him Course regard to up he hardly." - }, - ListElement { - image: "https://eduport.webestica.com/assets/images/courses/4by3/09.jpg" - level: "All level" - levelColor: "#ff6f42c1" - levelBackgroundColor: "#1a6f42c1" - title: "JavaScript: Full Understanding" - truncated: "Far advanced settling say finished raillery. Offered chiefly farther" - } - ] - } - } - - GridView { - id: tabPane - interactive: false - cellWidth: width < 576 ? width - : width < 768 ? width / 2 - : width < 992 ? width / 3 - : width / 4 - cellHeight: cellWidth - * 400 / 533 + 273.35 - model: content - delegate: CardGrid { - width: tabPane.cellWidth - height: tabPane.cellHeight - imageSource: image - badgeText: level - badgeColor: levelColor - badgeBackgroundColor: levelBackgroundColor - titleText: title - truncatedText: truncated - } - } - } - } - } - } -} diff --git a/Qeduport.qmlproject b/Qeduport.qmlproject index b88797b..6677499 100644 --- a/Qeduport.qmlproject +++ b/Qeduport.qmlproject @@ -1,7 +1,7 @@ import QmlProject 1.1 Project { - mainUiFile: "HomeDefault.ui.qml" + mainUiFile: "Home/Default.ui.qml" QmlFiles { directory: "." diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index b966920..e2dbed3 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -4,12 +4,19 @@ import QtQuick 2.15 QtObject { readonly property real fontSizeLead: 18.75 readonly property real fontSizeFormControl: 16 + readonly property real h6FontSize: 15 readonly property real fontSizeFormText: 14 - readonly property FontLoader heebo: FontLoader { + readonly property FontLoader bold: FontLoader { source: "../../Heebo/Heebo-Bold.ttf" } + readonly property FontLoader medium: FontLoader { + source: "../../Heebo/Heebo-Medium.ttf" + } readonly property font hFont: Qt.font({ - family: heebo.name + family: bold.name + }) + readonly property font normalFont: Qt.font({ + family: medium.name }) } -- cgit v1.2.3