From 9a60deb26c6db9dec64b4814fb75ac39f04c5b27 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: Wed, 12 Apr 2023 22:49:29 +0800 Subject: Heading attached property is used instead of Hx --- Authentication/SignIn.ui.qml | 6 +++-- Authentication/SignUp.ui.qml | 6 +++-- Course/Detail/Classic.ui.qml | 10 +++++--- Course/Detail/Classic/Content/Main.ui.qml | 6 +++-- .../Content/Main/TabContents/Instructor.ui.qml | 10 +++++--- Course/Detail/Classic/Content/Sidebar/Video.ui.qml | 6 +++-- Eduport.qrc | 5 ---- Header.ui.qml | 9 ++++--- Header/CartItem.ui.qml | 6 +++-- Home/Default.ui.qml | 5 +++- Home/Default/Card.ui.qml | 5 +++- Home/Default/Counter.ui.qml | 6 +++-- Instructor/EditProfile.ui.qml | 6 +++-- Label/H1.ui.qml | 6 ----- Label/H2.ui.qml | 6 ----- Label/H3.ui.qml | 6 ----- Label/H4.ui.qml | 6 ----- Label/H5.ui.qml | 6 ----- Shop/Checkout.ui.qml | 6 +++-- Shop/Checkout/PersonalInfo.ui.qml | 10 +++++--- Shop/Checkout/RightSidebar/OrderSummary.ui.qml | 30 ++++++++++++++++------ Shop/Course.ui.qml | 6 +++-- Shop/ProductDetail/RightSidebar.ui.qml | 13 ++++++---- Shop/cart/Table/CourseItem.ui.qml | 10 +++++--- qtquickcontrols2.conf | 10 +++++++- 25 files changed, 116 insertions(+), 85 deletions(-) delete mode 100644 Label/H1.ui.qml delete mode 100644 Label/H2.ui.qml delete mode 100644 Label/H3.ui.qml delete mode 100644 Label/H4.ui.qml delete mode 100644 Label/H5.ui.qml diff --git a/Authentication/SignIn.ui.qml b/Authentication/SignIn.ui.qml index 2cac614..dcd6ceb 100644 --- a/Authentication/SignIn.ui.qml +++ b/Authentication/SignIn.ui.qml @@ -2,8 +2,8 @@ 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.4 -import "../Label" as Lbl import "../TextField" as TxtFld import "../Button" as Btn @@ -35,9 +35,11 @@ Flickable { ColumnLayout { id: columnLayout - Lbl.H2 { + Label { Layout.fillWidth: true text: titleHeader + wrapMode: Label.Wrap + Bootstrap.heading: 2 } Label { diff --git a/Authentication/SignUp.ui.qml b/Authentication/SignUp.ui.qml index c37b50b..bad6c31 100644 --- a/Authentication/SignUp.ui.qml +++ b/Authentication/SignUp.ui.qml @@ -2,8 +2,8 @@ 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.4 -import "../Label" as Lbl import "../TextField" as TxtFld import "../Button" as Btn @@ -36,9 +36,11 @@ Flickable { ColumnLayout { id: columnLayout - Lbl.H2 { + Label { Layout.fillWidth: true text: titleHeader + wrapMode: Label.Wrap + Bootstrap.heading: 2 } Label { diff --git a/Course/Detail/Classic.ui.qml b/Course/Detail/Classic.ui.qml index 710ff59..04f94b9 100644 --- a/Course/Detail/Classic.ui.qml +++ b/Course/Detail/Classic.ui.qml @@ -2,9 +2,9 @@ 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.4 import "../../DropShadow" as DrpShdw -import "../../Label" as Lbl import "Classic/Content" as Content import "Classic/Content/Sidebar" as ContentSidebar @@ -45,9 +45,11 @@ Flickable { implicitHeight: introBadge.height radius: 5.2 color: Qt.rgba( .0235, .416, .788, 1.0) - Lbl.H6 { + Label { id: introBadge text: qsTr("Digital Marketing") + Bootstrap.heading: 6 + wrapMode: Label.Wrap color: "white" font.family: Eduport.baseFont .family @@ -62,9 +64,11 @@ Flickable { } } - Lbl.H1 { + Label { id: introTitleHeader text: qsTr("The Complete Digital Marketing Course - 12 Courses in 1") + wrapMode: Label.Wrap + Bootstrap.heading: 1 Layout.fillWidth: true } diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml index 0b1c642..c4217a1 100644 --- a/Course/Detail/Classic/Content/Main.ui.qml +++ b/Course/Detail/Classic/Content/Main.ui.qml @@ -2,9 +2,9 @@ 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.4 import "../../../../DropShadow" as DrpShdw -import "../../../../Label" as Lbl import "../../../../Button/NavLink" as NavLink import "Main/TabContents" as MainTabContents @@ -97,8 +97,10 @@ ColumnLayout { ColumnLayout { id: overview - Lbl.H5 { + Label { text: qsTr("Course Description") + wrapMode: Label.Wrap + Bootstrap.heading: 5 Layout.fillWidth: true Layout.bottomMargin: 16 } diff --git a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml index bff0110..42e2d97 100644 --- a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml +++ b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import "../../../../../../Label" as Lbl +import Bootstrap 5.3 import "Instructor" ColumnLayout { @@ -26,8 +26,10 @@ ColumnLayout { Layout.bottomMargin: 16 spacing: 0 - Lbl.H3 { + Label { text: qsTr("Louis Ferguson") + wrapMode: Label.Wrap + Bootstrap.heading: 3 } Label { @@ -55,9 +57,11 @@ ColumnLayout { } } - Lbl.H5 { + Label { Layout.bottomMargin: 16 text: qsTr("About Instructor") + wrapMode: Label.Wrap + Bootstrap.heading: 5 } Label { diff --git a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml index c6ca75f..3bd67d6 100644 --- a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml +++ b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml @@ -3,8 +3,8 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 import QtMultimedia 5.15 +import Bootstrap 5.3 import Eduport 1.4 -import "../../../../../Label" as Lbl import "../../../../../Button" as Btn import "../../../../../Button/Outline" as BtnOutline @@ -70,8 +70,10 @@ ColumnLayout { RowLayout { spacing: 8 - Lbl.H3 { + Label { text: priceText + wrapMode: Label.Wrap + Bootstrap.heading: 3 } Label { diff --git a/Eduport.qrc b/Eduport.qrc index 63f0967..1e06005 100644 --- a/Eduport.qrc +++ b/Eduport.qrc @@ -19,11 +19,6 @@ DropShadow/Box.ui.qml Label/FwLight.ui.qml Label/H6.ui.qml - Label/H5.ui.qml - Label/H4.ui.qml - Label/H3.ui.qml - Label/H2.ui.qml - Label/H1.ui.qml Label/Display6.ui.qml TextField/Input.ui.qml Header/CartItem.ui.qml diff --git a/Header.ui.qml b/Header.ui.qml index cb26c66..ccdff46 100644 --- a/Header.ui.qml +++ b/Header.ui.qml @@ -6,7 +6,6 @@ import Bootstrap 5.3 import Eduport 1.4 import "DropShadow" as DrpShdw import "Button" as Btn -import "Label" as Lbl import "Header" ToolBar { @@ -137,8 +136,10 @@ ToolBar { sourceComponent: background } - Lbl.H5 { + Label { text: qsTr("Cart items") + wrapMode: Label.Wrap + Bootstrap.heading: 5 topPadding: 25.6 leftPadding: 16 rightPadding: 16 @@ -312,8 +313,10 @@ ToolBar { ColumnLayout { spacing: 0 - Lbl.H6 { + Label { text: fullNameText + wrapMode: Label.Wrap + Bootstrap.heading: 6 } Label { diff --git a/Header/CartItem.ui.qml b/Header/CartItem.ui.qml index d9373bd..ad9703d 100644 --- a/Header/CartItem.ui.qml +++ b/Header/CartItem.ui.qml @@ -2,8 +2,8 @@ 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.4 -import "../Label" as Lbl ColumnLayout { property string imageSource: @@ -49,8 +49,10 @@ ColumnLayout { RowLayout { spacing: 0 - Lbl.H6 { + Label { text: titleText + wrapMode: Label.Wrap + Bootstrap.heading: 6 Layout.fillWidth: true } diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml index 039063e..e47b074 100644 --- a/Home/Default.ui.qml +++ b/Home/Default.ui.qml @@ -2,6 +2,7 @@ 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.4 import ".." import "../Label" as Lbl @@ -193,8 +194,10 @@ Flickable { ColumnLayout { Layout.bottomMargin: 25.6 - Lbl.H1 { + Label { text: qsTr("Most Popular Courses") + wrapMode: Label.Wrap + Bootstrap.heading: 1 horizontalAlignment: Text.AlignHCenter Layout.fillWidth: true Layout.bottomMargin: 8 diff --git a/Home/Default/Card.ui.qml b/Home/Default/Card.ui.qml index 72ce3d1..50f348c 100644 --- a/Home/Default/Card.ui.qml +++ b/Home/Default/Card.ui.qml @@ -2,6 +2,7 @@ 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.4 import "../../DropShadow" as DrpShdw import "../../Label" as Lbl @@ -127,9 +128,11 @@ Item { } } - Lbl.H5 { + Label { id: title text: titleText + wrapMode: Label.Wrap + Bootstrap.heading: 5 color: Eduport.bsCardTitleColor Layout.fillWidth: true Layout.bottomMargin: 8 diff --git a/Home/Default/Counter.ui.qml b/Home/Default/Counter.ui.qml index 41d79f4..16873e2 100644 --- a/Home/Default/Counter.ui.qml +++ b/Home/Default/Counter.ui.qml @@ -1,8 +1,8 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import Bootstrap 5.3 import Eduport 1.4 -import "../../Label" as Lbl Item { Rectangle { @@ -38,8 +38,10 @@ Item { leftMargin: 25.6 } - Lbl.H5 { + Label { text: count + wrapMode: Label.Wrap + Bootstrap.heading: 5 Layout.fillWidth: true } diff --git a/Instructor/EditProfile.ui.qml b/Instructor/EditProfile.ui.qml index a6d7a21..74e2636 100644 --- a/Instructor/EditProfile.ui.qml +++ b/Instructor/EditProfile.ui.qml @@ -2,8 +2,8 @@ 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.4 -import "../Label" as Lbl import "../TextField" as TxtFld import "../Button" as Btn @@ -48,11 +48,13 @@ Flickable { right: parent.right } - Lbl.H3 { + Label { id: cardHeader Layout.fillWidth: true text: qsTr("Edit Profile") + wrapMode: Label.Wrap + Bootstrap.heading: 3 padding: 16 } diff --git a/Label/H1.ui.qml b/Label/H1.ui.qml deleted file mode 100644 index 3fde189..0000000 --- a/Label/H1.ui.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -H6 { - font.pointSize: 22.5 + .01875 * parent.width -} diff --git a/Label/H2.ui.qml b/Label/H2.ui.qml deleted file mode 100644 index 99451d3..0000000 --- a/Label/H2.ui.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -H6 { - font.pointSize: 21.75 + .013125 * parent.width -} diff --git a/Label/H3.ui.qml b/Label/H3.ui.qml deleted file mode 100644 index 1edd590..0000000 --- a/Label/H3.ui.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -H6 { - font.pointSize: 21 + .0075 * parent.width -} diff --git a/Label/H4.ui.qml b/Label/H4.ui.qml deleted file mode 100644 index 39dc0ca..0000000 --- a/Label/H4.ui.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -H6 { - font.pointSize: 20.625 + .0046875 * parent.width -} diff --git a/Label/H5.ui.qml b/Label/H5.ui.qml deleted file mode 100644 index 24c5abe..0000000 --- a/Label/H5.ui.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -H6 { - font.pointSize: 20.1 + .00075 * parent.width -} diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml index e500efd..bafebfe 100644 --- a/Shop/Checkout.ui.qml +++ b/Shop/Checkout.ui.qml @@ -1,8 +1,8 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import Bootstrap 5.3 import Eduport 1.4 -import "../Label" as Lbl import "../Button" as Btn import "Checkout" import "Checkout/RightSidebar" @@ -111,8 +111,10 @@ Flickable { } Layout.margins: 16 - Lbl.H5 { + Label { text: qsTr("Access 25K Online courses from 120 institutions, Start today!") + wrapMode: Label.Wrap + Bootstrap.heading: 5 color: "#ffffff" Layout.fillWidth: true Layout.rightMargin: 16 diff --git a/Shop/Checkout/PersonalInfo.ui.qml b/Shop/Checkout/PersonalInfo.ui.qml index fe716e8..534120e 100644 --- a/Shop/Checkout/PersonalInfo.ui.qml +++ b/Shop/Checkout/PersonalInfo.ui.qml @@ -1,9 +1,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import Bootstrap 5.3 import Eduport 1.4 import "../../TextField" -import "../../Label" import "PersonalInfo/PaymentMethod" ColumnLayout { @@ -16,8 +16,10 @@ ColumnLayout { property alias address: address property alias paymentMethodNetBanking: paymentMethodNetBanking - H5 { + Label { text: qsTr("Personal Details") + wrapMode: Label.Wrap + Bootstrap.heading: 5 Layout.fillWidth: true Layout.rightMargin: 16 Layout.leftMargin: 16 @@ -219,8 +221,10 @@ ColumnLayout { ColumnLayout { - H5 { + Label { text: qsTr("Payment method") + wrapMode: Label.Wrap + Bootstrap.heading: 5 Layout.fillWidth: true Layout.margins: 16 } diff --git a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml index 610a393..faf136f 100644 --- a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml +++ b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml @@ -1,9 +1,9 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import Bootstrap 5.3 import Eduport 1.4 import "../../../TextField" -import "../../../Label" import "../../../Button" import "../.." @@ -14,8 +14,10 @@ ColumnLayout { property alias totalValue: totalValue property alias placeOrder: placeOrder - H4 { + Label { text: qsTr("Order Summary") + wrapMode: Label.Wrap + Bootstrap.heading: 4 Layout.fillWidth: true Layout.rightMargin: 16 Layout.leftMargin: 16 @@ -38,9 +40,11 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter } - H6 { + Label { id: codeValue text: "AB12365E" + wrapMode: Label.Wrap + Bootstrap.heading: 6 font { family: Eduport.fwLightFont.family weight: Eduport.fwLightFont.weight @@ -142,9 +146,11 @@ ColumnLayout { implicitHeight: priceLabel.implicitHeight + priceValue.implicitHeight - H6 { + Label { id: priceLabel text: qsTr("Original Price") + wrapMode: Label.Wrap + Bootstrap.heading: 6 font { family: Eduport.fwLightFont.family weight: Eduport.fwLightFont.weight @@ -153,9 +159,11 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter } - H6 { + Label { id: priceValue text: "$500" + wrapMode: Label.Wrap + Bootstrap.heading: 6 anchors { right: parent.right verticalCenter: parent.verticalCenter @@ -168,9 +176,11 @@ ColumnLayout { implicitHeight: discountLabel.implicitHeight + discountValue.implicitHeight - H6 { + Label { id: discountLabel text: qsTr("Coupon Discount") + wrapMode: Label.Wrap + Bootstrap.heading: 6 font { family: Eduport.fwLightFont.family weight: Eduport.fwLightFont.weight @@ -195,15 +205,19 @@ ColumnLayout { implicitHeight: totalLabel.implicitHeight + totalValue.implicitHeight - H5 { + Label { id: totalLabel text: qsTr("Total") + wrapMode: Label.Wrap + Bootstrap.heading: 5 anchors.verticalCenter: parent.verticalCenter } - H5 { + Label { id: totalValue text: "$480" + wrapMode: Label.Wrap + Bootstrap.heading: 5 anchors { right: parent.right verticalCenter: parent.verticalCenter diff --git a/Shop/Course.ui.qml b/Shop/Course.ui.qml index 5aaf8d0..277a50b 100644 --- a/Shop/Course.ui.qml +++ b/Shop/Course.ui.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 -import "../Label" as Lbl +import Bootstrap 5.3 ColumnLayout { property string imageSource: "https://eduport.webestica.com/assets/images/courses/4by3/08.jpg" @@ -54,9 +54,11 @@ ColumnLayout { ColumnLayout { Layout.topMargin: 16 - Lbl.H6 { + Label { Layout.fillWidth: true text: titleText + wrapMode: Label.Wrap + Bootstrap.heading: 6 } Item { diff --git a/Shop/ProductDetail/RightSidebar.ui.qml b/Shop/ProductDetail/RightSidebar.ui.qml index eccb39f..3f1ea8a 100644 --- a/Shop/ProductDetail/RightSidebar.ui.qml +++ b/Shop/ProductDetail/RightSidebar.ui.qml @@ -2,26 +2,28 @@ 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.4 import "../../Button" import "../../DropShadow" -import "../../Label" ColumnLayout { id: mainContent spacing: 16 - H1 { + Label { id: title text: "HTML and CSS: Design and Build Websites (Paperback)" - wrapMode: Text.Wrap + wrapMode: Label.Wrap + Bootstrap.heading: 1 Layout.maximumWidth: parent.width } RowLayout { id: rating spacing: 0 - H2 { + Label { id: ratingScore text: "4.5" + Bootstrap.heading: 2 } ColumnLayout { id: ratingInformation @@ -44,8 +46,9 @@ ColumnLayout { text: "checkable radio will be here" } } - H4 { + Label { text: "Description" + Bootstrap.heading: 4 } Label { text: "Satisfied conveying a dependent contented he gentleman agreeable do be. Warrant private blushes removed an in equally totally if. Delivered dejection necessary objection do Mr prevailed. Mr feeling does chiefly cordial in do.

We focus a great deal on the understanding of behavioral psychology and influence triggers which are crucial for becoming a well-rounded Digital Marketer. We understand that theory is important to build a solid foundation, we understand that theory alone isn't going to get the job done so that's why this course is packed with practical hands-on examples that you can follow step by step." diff --git a/Shop/cart/Table/CourseItem.ui.qml b/Shop/cart/Table/CourseItem.ui.qml index ded50d2..62ae107 100644 --- a/Shop/cart/Table/CourseItem.ui.qml +++ b/Shop/cart/Table/CourseItem.ui.qml @@ -2,9 +2,9 @@ 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.4 import "../../../TextField" -import "../../../Label" import "../../../Button" GridLayout { @@ -38,13 +38,15 @@ GridLayout { } } - H6 { + Label { id: courseItemTitle text: "Course Item Title" - Layout.maximumHeight: courseItemImage.height + wrapMode: Label.Wrap + Bootstrap.heading: 6 + Layout.maximumHeight: courseItemImage.height Layout.alignment: parent.width < 990 ? Qt.AlignTop | Qt.AlignHCenter : Qt.AlignLeft | Qt.AlignVCenter Layout.fillWidth: true Layout.fillHeight: parent.width < 990 ? true : false } -} \ No newline at end of file +} diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf index 04317d9..3cdae4d 100644 --- a/qtquickcontrols2.conf +++ b/qtquickcontrols2.conf @@ -6,5 +6,13 @@ BodyFontFamily = "Roboto" BodyFontSize = 15.0 BodyColors = ["#747579", "#a1a1a8"] BodyBgs = ["#fff", "#222529"] -HeadingColors = ["#24292d", "#fff"] BorderColors = ["#eff1f2", "#12ffffff"] +HeadingFontFamily = "Heebo" +HeadingFontWeight = 75 +HeadingColors = ["#24292d", "#fff"] +H1FontSize = [1.40625, 1.875] +H2FontSize = [1.359375, 1.3125] +H3FontSize = [1.3125, 0.75] +H4FontSize = [1.2890625, 0.46875] +H5FontSize = [1.25625, 0.075] +H6FontSize = [0.9375, 0.0] -- cgit v1.2.3