summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Authentication/SignIn.ui.qml15
-rw-r--r--Authentication/SignUp.ui.qml15
-rw-r--r--Course/Detail/Classic.ui.qml3
-rw-r--r--Course/Detail/Classic/Content/Main.ui.qml3
-rw-r--r--Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml6
-rw-r--r--Course/Detail/Classic/Content/Sidebar/Video.ui.qml6
-rw-r--r--Eduport.qrc1
-rw-r--r--Header.ui.qml3
-rw-r--r--Home/Default.ui.qml6
-rw-r--r--Home/Default/Card.ui.qml6
-rw-r--r--Instructor/EditProfile.ui.qml21
-rw-r--r--Label/Body.ui.qml7
-rw-r--r--Shop/Checkout.ui.qml6
-rw-r--r--Shop/Checkout/PersonalInfo.ui.qml24
-rw-r--r--Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml13
-rw-r--r--Shop/Checkout/RightSidebar/OrderSummary.ui.qml6
-rw-r--r--Shop/Course.ui.qml3
-rw-r--r--Shop/ProductDetail/RightSidebar.ui.qml11
18 files changed, 95 insertions, 60 deletions
diff --git a/Authentication/SignIn.ui.qml b/Authentication/SignIn.ui.qml
index 09e671a..2cac614 100644
--- a/Authentication/SignIn.ui.qml
+++ b/Authentication/SignIn.ui.qml
@@ -40,19 +40,21 @@ Flickable {
text: titleHeader
}
- Lbl.Body {
+ Label {
id: titleParagraph
text: qsTr("Nice to see you! Please log in with your account.")
color: "#6c757d"
Layout.fillWidth: true
+ wrapMode: Label.Wrap
font.pointSize: Eduport
.leadFontSize
}
}
ColumnLayout {
- Lbl.Body {
+ Label {
text: emailLabel
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -120,8 +122,9 @@ Flickable {
ColumnLayout {
- Lbl.Body {
+ Label {
text: qsTr("Password *")
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -189,9 +192,10 @@ Flickable {
}
}
- Lbl.Body {
+ Label {
id: passwordHelper
text: qsTr("Your password must be 8 characters at least")
+ wrapMode: Label.Wrap
font.pointSize: Eduport
.formTextFontSize
color: "#6c757d"
@@ -248,8 +252,9 @@ Flickable {
RowLayout {
Layout.alignment: Qt.AlignHCenter
- Lbl.Body {
+ Label {
text: qsTr("Don't have an account?")
+ wrapMode: Label.Wrap
}
Text {
diff --git a/Authentication/SignUp.ui.qml b/Authentication/SignUp.ui.qml
index 6f3df00..c37b50b 100644
--- a/Authentication/SignUp.ui.qml
+++ b/Authentication/SignUp.ui.qml
@@ -41,10 +41,11 @@ Flickable {
text: titleHeader
}
- Lbl.Body {
+ Label {
id: titleParagraph
color: "#6c757d"
text: qsTr("Nice to see you! Please Sign up with your account.")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
font.pointSize: Eduport
.leadFontSize
@@ -53,8 +54,9 @@ Flickable {
ColumnLayout {
- Lbl.Body {
+ Label {
text: emailLabel
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -122,8 +124,9 @@ Flickable {
ColumnLayout {
- Lbl.Body {
+ Label {
text: qsTr("Password *")
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -193,8 +196,9 @@ Flickable {
ColumnLayout {
- Lbl.Body {
+ Label {
text: qsTr("Confirm Password *")
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -301,8 +305,9 @@ Flickable {
RowLayout {
Layout.alignment: Qt.AlignHCenter
- Lbl.Body {
+ Label {
text: qsTr("Already have an account?")
+ wrapMode: Label.Wrap
}
Text {
diff --git a/Course/Detail/Classic.ui.qml b/Course/Detail/Classic.ui.qml
index f2f2e60..710ff59 100644
--- a/Course/Detail/Classic.ui.qml
+++ b/Course/Detail/Classic.ui.qml
@@ -68,9 +68,10 @@ Flickable {
Layout.fillWidth: true
}
- Lbl.Body {
+ Label {
id: introTitleParagraph
text: qsTr("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.")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
}
diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml
index 68627b6..0b1c642 100644
--- a/Course/Detail/Classic/Content/Main.ui.qml
+++ b/Course/Detail/Classic/Content/Main.ui.qml
@@ -103,9 +103,10 @@ ColumnLayout {
Layout.bottomMargin: 16
}
- Lbl.Body {
+ Label {
id: courseDescription
text: qsTr("Welcome to the Digital Marketing Ultimate Course Bundle - 12 Courses in 1 (Over 36 hours of content)")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
}
diff --git a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
index 931e439..bff0110 100644
--- a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
+++ b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml
@@ -30,9 +30,10 @@ ColumnLayout {
text: qsTr("Louis Ferguson")
}
- Lbl.Body {
+ Label {
Layout.bottomMargin: 8
text: qsTr("Instructor of Marketing")
+ wrapMode: Label.Wrap
}
/*
GridLayout {
@@ -59,9 +60,10 @@ ColumnLayout {
text: qsTr("About Instructor")
}
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 16
text: qsTr("Fulfilled direction use continual set him propriety continued. Saw met applauded favorite deficient engrossed concealed and her. Concluded boy perpetual old supposing. Farther related bed and passage comfort civilly. Dashboard see frankness objection abilities. As hastened oh produced prospect formerly up am. Placing forming nay looking old married few has. Margaret disposed of add screened rendered six say his striking confined. As it so contrasted oh estimating instrument. Size like body someone had. Are conduct viewing boy minutes warrant the expense? Tolerably behavior may admit daughters offending her ask own. Praise effect wishes change way and any wanted.")
+ wrapMode: Label.Wrap
}
}
diff --git a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
index 0136221..c6ca75f 100644
--- a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
+++ b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml
@@ -74,9 +74,10 @@ ColumnLayout {
text: priceText
}
- Lbl.Body {
+ Label {
id: initialPrice
text: "$350"
+ wrapMode: Label.Wrap
font.strikeout: true
}
@@ -128,9 +129,10 @@ ColumnLayout {
}
}
- Lbl.Body {
+ Label {
text: qsTr("5 days left at this price")
color: Eduport.bsDanger
+ wrapMode: Label.Wrap
}
}
}
diff --git a/Eduport.qrc b/Eduport.qrc
index 789318c..63f0967 100644
--- a/Eduport.qrc
+++ b/Eduport.qrc
@@ -17,7 +17,6 @@
<file>Button/NavLink.ui.qml</file>
<file>Button/NavLink/TabsLine.ui.qml</file>
<file>DropShadow/Box.ui.qml</file>
- <file>Label/Body.ui.qml</file>
<file>Label/FwLight.ui.qml</file>
<file>Label/H6.ui.qml</file>
<file>Label/H5.ui.qml</file>
diff --git a/Header.ui.qml b/Header.ui.qml
index 8d4b506..cb26c66 100644
--- a/Header.ui.qml
+++ b/Header.ui.qml
@@ -316,9 +316,10 @@ ToolBar {
text: fullNameText
}
- Lbl.Body {
+ Label {
text: emailText
font.pointSize: 14
+ wrapMode: Label.Wrap
color: Eduport
.bsDropdownColor
}
diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml
index 95e0a1f..039063e 100644
--- a/Home/Default.ui.qml
+++ b/Home/Default.ui.qml
@@ -53,11 +53,12 @@ Flickable {
Layout.fillWidth: true
}
- Lbl.Body {
+ Label {
text: bannerContentText
horizontalAlignment: Text.AlignHCenter
Layout.fillWidth: true
font.pointSize: Eduport.leadFontSize
+ wrapMode: Label.Wrap
}
Button {
@@ -199,10 +200,11 @@ Flickable {
Layout.bottomMargin: 8
}
- Lbl.Body {
+ Label {
text: qsTr("Choose from hundreds of courses from specialist organizations")
horizontalAlignment: Text.AlignHCenter
Layout.fillWidth: true
+ wrapMode: Label.Wrap
}
}
diff --git a/Home/Default/Card.ui.qml b/Home/Default/Card.ui.qml
index a87d6cd..72ce3d1 100644
--- a/Home/Default/Card.ui.qml
+++ b/Home/Default/Card.ui.qml
@@ -86,7 +86,7 @@ Item {
Layout.fillWidth: true
Layout.bottomMargin: 8
- Lbl.Body {
+ Label {
id: badge
anchors.left: parent.left
topPadding: 4.463
@@ -94,6 +94,7 @@ Item {
rightPadding: 8.287
bottomPadding: 4.463
text: badgeText
+ wrapMode: Label.Wrap
color: badgeColor
font.pointSize: Eduport.bsBadgeFontSize
background: Rectangle {
@@ -139,11 +140,12 @@ Item {
}
}
- Lbl.Body {
+ Label {
text: truncatedText
elide: Text.ElideRight
maximumLineCount: 2
visible: truncatedVisible
+ wrapMode: Label.Wrap
Layout.fillWidth: true
Layout.bottomMargin: 8
}
diff --git a/Instructor/EditProfile.ui.qml b/Instructor/EditProfile.ui.qml
index 5500bb7..a6d7a21 100644
--- a/Instructor/EditProfile.ui.qml
+++ b/Instructor/EditProfile.ui.qml
@@ -79,10 +79,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Profile picture")
+ wrapMode: Label.Wrap
}
RowLayout {
@@ -135,10 +136,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Full name")
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -189,10 +191,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Username")
+ wrapMode: Label.Wrap
}
Rectangle {
@@ -205,7 +208,7 @@ Flickable {
color: Eduport.bsGray300
}
- Lbl.Body {
+ Label {
id: domainName
text: "Eduport.com"
height: userName.height
@@ -217,6 +220,7 @@ Flickable {
rightPadding: 12
bottomPadding: 6
color: Eduport.bsBodyColor
+ wrapMode: Label.Wrap
background: Rectangle {
color: Eduport.bsTertiaryBg
}
@@ -248,10 +252,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Email id")
+ wrapMode: Label.Wrap
}
TxtFld.Input {
@@ -267,10 +272,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Phone number")
+ wrapMode: Label.Wrap
}
TxtFld.Input {
@@ -286,10 +292,11 @@ Flickable {
Layout.leftMargin: 12.8
Layout.rightMargin: 12.8
- Lbl.Body {
+ Label {
Layout.fillWidth: true
Layout.bottomMargin: 8
text: qsTr("Location")
+ wrapMode: Label.Wrap
}
TxtFld.Input {
diff --git a/Label/Body.ui.qml b/Label/Body.ui.qml
deleted file mode 100644
index b556097..0000000
--- a/Label/Body.ui.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import Eduport 1.4
-
-Label {
- wrapMode: Label.Wrap
-}
diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml
index 84e225c..e500efd 100644
--- a/Shop/Checkout.ui.qml
+++ b/Shop/Checkout.ui.qml
@@ -38,8 +38,9 @@ Flickable {
id: alert
Layout.alignment: Qt.AlignHCenter
- Lbl.Body {
+ Label {
text: qsTr("Already have an account?")
+ wrapMode: Label.Wrap
}
Text {
@@ -119,9 +120,10 @@ Flickable {
Layout.topMargin: 16
}
- Lbl.Body {
+ Label {
text: qsTr("Here is the description of premium features which will allow users to get benefits and save a lot of money")
color: "#ffffff"
+ wrapMode: Label.Wrap
Layout.fillWidth: true
Layout.margins: 16
}
diff --git a/Shop/Checkout/PersonalInfo.ui.qml b/Shop/Checkout/PersonalInfo.ui.qml
index 3bdff82..fe716e8 100644
--- a/Shop/Checkout/PersonalInfo.ui.qml
+++ b/Shop/Checkout/PersonalInfo.ui.qml
@@ -33,8 +33,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Your name *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -58,8 +59,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Email address *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -83,8 +85,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Mobile number *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -109,8 +112,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Select country *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
Rectangle {
@@ -134,8 +138,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Select state *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -160,8 +165,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Postal code *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -186,8 +192,9 @@ ColumnLayout {
ColumnLayout {
- Body {
+ Label {
text: qsTr("Address *")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
@@ -235,9 +242,10 @@ ColumnLayout {
left: parent.left
right: parent.right
}
- Body {
+ Label {
text:
qsTr("Credit or Debit Card")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
padding: 16
}
diff --git a/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml b/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml
index 8200de1..a776ee0 100644
--- a/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml
+++ b/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml
@@ -2,14 +2,13 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import Eduport 1.4
-import "../../../../Label"
ColumnLayout {
property alias banks: banks
- Body {
- text:
- qsTr("Pay with Net Banking")
+ Label {
+ text: qsTr("Pay with Net Banking")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
Layout.rightMargin: 16
Layout.leftMargin: 16
@@ -19,13 +18,15 @@ ColumnLayout {
ColumnLayout {
Layout.margins: 16
- Body {
+ Label {
text: qsTr("In order to complete your transaction, we will transfer you over to Eduport secure servers.")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
- Body {
+ Label {
text: qsTr("Select your bank from the drop-down list and click proceed to continue with your payment.")
+ wrapMode: Label.Wrap
Layout.fillWidth: true
}
diff --git a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml
index 7564106..610a393 100644
--- a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml
+++ b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml
@@ -31,9 +31,10 @@ ColumnLayout {
implicitHeight: codeLabel.implicitHeight
+ codeValue.implicitHeight
- Body {
+ Label {
id: codeLabel
text: qsTr("Transaction code")
+ wrapMode: Label.Wrap
anchors.verticalCenter: parent.verticalCenter
}
@@ -178,9 +179,10 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
}
- Body {
+ Label {
id: discountValue
text: "-$20"
+ wrapMode: Label.Wrap
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
diff --git a/Shop/Course.ui.qml b/Shop/Course.ui.qml
index 502fbab..5aaf8d0 100644
--- a/Shop/Course.ui.qml
+++ b/Shop/Course.ui.qml
@@ -62,13 +62,14 @@ ColumnLayout {
Item {
Layout.fillWidth: true
Layout.topMargin: 16
- Lbl.Body {
+ Label {
anchors {
top: parent.top
left: parent.left
bottom: parent.bottom
}
text: priceText
+ wrapMode: Label.Wrap
}
}
}
diff --git a/Shop/ProductDetail/RightSidebar.ui.qml b/Shop/ProductDetail/RightSidebar.ui.qml
index 1281876..eccb39f 100644
--- a/Shop/ProductDetail/RightSidebar.ui.qml
+++ b/Shop/ProductDetail/RightSidebar.ui.qml
@@ -33,8 +33,9 @@ ColumnLayout {
fillMode: Image.PreserveAspectFit
}
- Body {
+ Label {
text: "Reviews from our buyers"
+ wrapMode: Label.Wrap
}
}
}
@@ -46,9 +47,9 @@ ColumnLayout {
H4 {
text: "Description"
}
- Body {
+ 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. <br><br>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."
- wrapMode: Text.Wrap
+ wrapMode: Label.Wrap
Layout.maximumWidth: parent.width
}
RowLayout {
@@ -56,9 +57,9 @@ ColumnLayout {
text: "Additional info with list group will be here"
}
}
- Body {
+ Label {
text: "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."
- wrapMode: Text.Wrap
+ wrapMode: Label.Wrap
Layout.maximumWidth: parent.width
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 18:10:27 +0000