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 --- 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 +++++---- 6 files changed, 51 insertions(+), 24 deletions(-) (limited to 'Shop') 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 +} -- cgit v1.2.3