From 1cd3e4c1daa4ad59853fc65c8edddab91f2c0c43 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: Thu, 23 Mar 2023 22:12:42 +0800 Subject: Merge Bootstrap properties to Eduport --- Authentication/SignIn.ui.qml | 19 +++--- Authentication/SignUp.ui.qml | 13 ++-- Button/Btn.ui.qml | 18 +++--- Button/NavLink.ui.qml | 10 ++-- Button/NavLink/TabsLine.ui.qml | 8 +-- Button/Primary.ui.qml | 18 +++--- Button/Success.ui.qml | 18 +++--- Course/Detail/Classic/Content/Main.ui.qml | 1 - Course/Detail/Classic/Content/Sidebar.ui.qml | 10 ++-- Eduport.qrc | 2 - Header.ui.qml | 4 +- Home/Default.ui.qml | 3 +- Home/Default/Card.ui.qml | 3 +- Instructor/EditProfile.ui.qml | 4 +- Label/Body.ui.qml | 8 +-- Shop/Checkout.ui.qml | 37 ++++++------ TextField/Input.ui.qml | 5 +- imports/Bootstrap/Bootstrap.qml | 56 ----------------- imports/Bootstrap/qmldir | 2 - imports/Eduport/Eduport.qml | 90 +++++++++++++++++++++------- 20 files changed, 155 insertions(+), 174 deletions(-) delete mode 100644 imports/Bootstrap/Bootstrap.qml delete mode 100644 imports/Bootstrap/qmldir diff --git a/Authentication/SignIn.ui.qml b/Authentication/SignIn.ui.qml index f07bc27..eadc633 100644 --- a/Authentication/SignIn.ui.qml +++ b/Authentication/SignIn.ui.qml @@ -1,7 +1,6 @@ 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 "../TextField" as TxtFld @@ -127,11 +126,11 @@ Flickable { id: rememberCheckBox text: qsTr("Remember me") font { - family: Bootstrap + family: Eduport .bodyFont.family - weight: Bootstrap + weight: Eduport .bodyFont.weight - pointSize: Bootstrap + pointSize: Eduport .bodyFont .pointSize } @@ -148,11 +147,11 @@ Flickable { id: forgotPassword text: "Forgot password?" font { - family: Bootstrap + family: Eduport .bodyFont.family - weight: Bootstrap + weight: Eduport .bodyFont.weight - pointSize: Bootstrap + pointSize: Eduport .bodyFont .pointSize } @@ -181,11 +180,11 @@ Flickable { id: signUp text: "Signup here" font { - family: Bootstrap.bodyFont + family: Eduport.bodyFont .family - weight: Bootstrap.bodyFont + weight: Eduport.bodyFont .weight - pointSize: Bootstrap.bodyFont + pointSize: Eduport.bodyFont .pointSize underline: false } diff --git a/Authentication/SignUp.ui.qml b/Authentication/SignUp.ui.qml index e85f202..0644a96 100644 --- a/Authentication/SignUp.ui.qml +++ b/Authentication/SignUp.ui.qml @@ -1,7 +1,6 @@ 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 "../TextField" as TxtFld @@ -159,11 +158,11 @@ Flickable { id: agreementCheckBox text: "By signing up, you agree to the terms of service" font { - family: Bootstrap + family: Eduport .bodyFont.family - weight: Bootstrap + weight: Eduport .bodyFont.weight - pointSize: Bootstrap + pointSize: Eduport .bodyFont .pointSize } @@ -197,11 +196,11 @@ Flickable { id: signIn text: "Sign in here" font { - family: Bootstrap.bodyFont + family: Eduport.bodyFont .family - weight: Bootstrap.bodyFont + weight: Eduport.bodyFont .weight - pointSize: Bootstrap.bodyFont + pointSize: Eduport.bodyFont .pointSize underline: false } diff --git a/Button/Btn.ui.qml b/Button/Btn.ui.qml index cdf730b..f841b54 100644 --- a/Button/Btn.ui.qml +++ b/Button/Btn.ui.qml @@ -1,25 +1,25 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 Button { id: button - horizontalPadding: Bootstrap.btnPaddingX - verticalPadding: Bootstrap.btnPaddingY - font: Bootstrap.btnFont + horizontalPadding: Eduport.bsBtnPaddingX + verticalPadding: Eduport.bsBtnPaddingY + font: Eduport.bsBtnFont contentItem: Text { text: button.text font: button.font - color: Bootstrap.btnColor + color: Eduport.bsBtnColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } background: Rectangle { - color: Bootstrap.btnBg + color: Eduport.bsBtnBg border { - width: Bootstrap.btnBorderWidth - color: Bootstrap.btnBorderColor + width: Eduport.bsBtnBorderWidth + color: Eduport.bsBtnBorderColor } - radius: Bootstrap.btnBorderRadius + radius: Eduport.bsBtnBorderRadius } } diff --git a/Button/NavLink.ui.qml b/Button/NavLink.ui.qml index 45bffe3..dac7d30 100644 --- a/Button/NavLink.ui.qml +++ b/Button/NavLink.ui.qml @@ -1,21 +1,21 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 Btn { id: button - font: Bootstrap.bodyFont + font: Eduport.bodyFont contentItem: Text { text: modelData font: button.font color: checked - ? Bootstrap.navPillsLinkActiveColor : Bootstrap.primary + ? Eduport.navPillsLinkActiveColor : Eduport.bsPrimary horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } background: Rectangle { color: checked - ? Bootstrap.navPillsLinkActiveBg : Bootstrap.btnBg - radius: Bootstrap.navPillsBorderRadius + ? Eduport.navPillsLinkActiveBg : Eduport.bsBtnBg + radius: Eduport.navPillsBorderRadius } } diff --git a/Button/NavLink/TabsLine.ui.qml b/Button/NavLink/TabsLine.ui.qml index 0d17f21..527f9f2 100644 --- a/Button/NavLink/TabsLine.ui.qml +++ b/Button/NavLink/TabsLine.ui.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 import ".." NavLink { @@ -8,12 +8,12 @@ NavLink { contentItem: Text { text: modelData font: button.font - color: Bootstrap.primary + color: Eduport.bsPrimary horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } background: Rectangle { - color: checked ? "#1a066ac9" : Bootstrap.btnBg - radius: Bootstrap.navPillsBorderRadius + color: checked ? "#1a066ac9" : Eduport.bsBtnBg + radius: Eduport.navPillsBorderRadius } } diff --git a/Button/Primary.ui.qml b/Button/Primary.ui.qml index 7c76e4a..5388eb7 100644 --- a/Button/Primary.ui.qml +++ b/Button/Primary.ui.qml @@ -1,22 +1,22 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 Btn { id: button background: Rectangle { - color: button.down ? Bootstrap.btnPrimaryActiveBG + color: button.down ? Eduport.bsBtnPrimaryActiveBG : button.enabled - ? Bootstrap.btnPrimaryBg - : Bootstrap.btnPrimaryDisabledBg + ? Eduport.bsBtnPrimaryBg + : Eduport.bsBtnPrimaryDisabledBg border { - width: Bootstrap.btnBorderWidth + width: Eduport.bsBtnBorderWidth color: button.down - ? Bootstrap.btnPrimaryActiveBorderColor + ? Eduport.bsBtnPrimaryActiveBorderColor : button.enabled - ? Bootstrap.btnPrimaryBorderColor - : Bootstrap.btnPrimaryDisabledBorderColor + ? Eduport.bsBtnPrimaryBorderColor + : Eduport.bsBtnPrimaryDisabledBorderColor } - radius: Bootstrap.btnBorderRadius + radius: Eduport.bsBtnBorderRadius } } diff --git a/Button/Success.ui.qml b/Button/Success.ui.qml index 41cc498..a8e7b59 100644 --- a/Button/Success.ui.qml +++ b/Button/Success.ui.qml @@ -1,22 +1,22 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 Btn { id: button background: Rectangle { - color: button.down ? Bootstrap.btnSuccessActiveBG + color: button.down ? Eduport.bsBtnSuccessActiveBG : button.enabled - ? Bootstrap.btnSuccessBg - : Bootstrap.btnSuccessDisabledBg + ? Eduport.bsBtnSuccessBg + : Eduport.bsBtnSuccessDisabledBg border { - width: Bootstrap.btnBorderWidth + width: Eduport.bsBtnBorderWidth color: button.down - ? Bootstrap.btnSuccessActiveBorderColor + ? Eduport.bsBtnSuccessActiveBorderColor : button.enabled - ? Bootstrap.btnSuccessBorderColor - : Bootstrap.btnSuccessDisabledBorderColor + ? Eduport.bsBtnSuccessBorderColor + : Eduport.bsBtnSuccessDisabledBorderColor } - radius: Bootstrap.btnBorderRadius + radius: Eduport.bsBtnBorderRadius } } diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml index 91cbce3..25d6c9a 100644 --- a/Course/Detail/Classic/Content/Main.ui.qml +++ b/Course/Detail/Classic/Content/Main.ui.qml @@ -2,7 +2,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 -import Bootstrap 5.3 import "../../../../Label" as Lbl import "../../../../Button/NavLink" as NavLink import "Main/TabContents" as MainTabContents diff --git a/Course/Detail/Classic/Content/Sidebar.ui.qml b/Course/Detail/Classic/Content/Sidebar.ui.qml index 01ab830..919524c 100644 --- a/Course/Detail/Classic/Content/Sidebar.ui.qml +++ b/Course/Detail/Classic/Content/Sidebar.ui.qml @@ -3,7 +3,7 @@ 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 @@ -133,9 +133,9 @@ ColumnLayout { text: qsTr("60% off") color: "white" font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.badgeFontSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bsBadgeFontSize } horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -168,7 +168,7 @@ ColumnLayout { horizontalPadding: 16 verticalPadding: 8 text: qsTr("Free trial") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont contentItem: Text { horizontalAlignment : Text diff --git a/Eduport.qrc b/Eduport.qrc index 3b3f6c5..7d71fad 100644 --- a/Eduport.qrc +++ b/Eduport.qrc @@ -3,8 +3,6 @@ Heebo/Heebo-Bold.ttf Heebo/Heebo-Medium.ttf Heebo/Heebo-Regular.ttf - imports/Bootstrap/Bootstrap.qml - imports/Bootstrap/qmldir imports/Eduport/Eduport.qml imports/Eduport/qmldir Label/Body.ui.qml diff --git a/Header.ui.qml b/Header.ui.qml index e9d599e..1fd1bdb 100644 --- a/Header.ui.qml +++ b/Header.ui.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import Bootstrap 5.3 +import Eduport 1.4 ToolBar { property alias logo: logo @@ -58,7 +58,7 @@ ToolBar { text: qsTr("Sign Out") } delegate: MenuItem { - font: Bootstrap.btnFont + font: Eduport.bsBtnFont } } } diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml index 999b74d..2a9e223 100644 --- a/Home/Default.ui.qml +++ b/Home/Default.ui.qml @@ -2,7 +2,6 @@ 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 @@ -67,7 +66,7 @@ Flickable { horizontalPadding: 24 verticalPadding: 12.8 text: qsTr("Get Started") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont contentItem: Text { horizontalAlignment: Text .AlignHCenter diff --git a/Home/Default/Card.ui.qml b/Home/Default/Card.ui.qml index da56fdb..342bec0 100644 --- a/Home/Default/Card.ui.qml +++ b/Home/Default/Card.ui.qml @@ -2,7 +2,6 @@ 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 @@ -93,7 +92,7 @@ Item { bottomPadding: 4.463 text: badgeText color: badgeColor - font.pointSize: Bootstrap.badgeFontSize + font.pointSize: Eduport.bsBadgeFontSize background: Rectangle { color: badgeBackgroundColor radius: 6 diff --git a/Instructor/EditProfile.ui.qml b/Instructor/EditProfile.ui.qml index c58308b..07e478b 100644 --- a/Instructor/EditProfile.ui.qml +++ b/Instructor/EditProfile.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 Bootstrap 5.3 +import Eduport 1.4 import "../Label" as Lbl import "../TextField" as TxtFld import "../Button" as Btn @@ -106,7 +106,7 @@ Flickable { horizontalPadding: 16 verticalPadding: 8 text: qsTr("Change") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont contentItem: Text { color: uploadButton.down ? "#ffffff" : "#066ac9" text: uploadButton.text diff --git a/Label/Body.ui.qml b/Label/Body.ui.qml index 76d0bbe..3ee93b9 100644 --- a/Label/Body.ui.qml +++ b/Label/Body.ui.qml @@ -1,12 +1,12 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 +import Eduport 1.4 Label { wrapMode: Label.Wrap font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.bodyFont.pointSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bodyFont.pointSize } } diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml index 0409590..c7761c1 100644 --- a/Shop/Checkout.ui.qml +++ b/Shop/Checkout.ui.qml @@ -1,7 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import Bootstrap 5.3 import Eduport 1.4 import "../TextField" as TxtFld import "../Label" as Lbl @@ -57,9 +56,9 @@ Flickable { id: login text: "" + qsTr("Log in") + "" font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.bodyFont.pointSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bodyFont.pointSize underline: false } } @@ -360,9 +359,9 @@ Flickable { contentItem: Text { text: label font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight - pointSize: Bootstrap.bodyFont.pointSize + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight + pointSize: Eduport.bodyFont.pointSize } } } @@ -599,24 +598,24 @@ Flickable { text: qsTr("Place Order") implicitHeight: 36 font { - family: Bootstrap.btnFont.family - weight: Bootstrap.btnFont.weight - pointSize: Bootstrap.btnLgFontSize + family: Eduport.bsBtnFont.family + weight: Eduport.bsBtnFont.weight + pointSize: Eduport.bsBtnLgFontSize } background: Rectangle { - color: placeOrder.down ? Bootstrap.btnSuccessActiveBG + color: placeOrder.down ? Eduport.bsBtnSuccessActiveBG : placeOrder.enabled - ? Bootstrap.btnSuccessBg - : Bootstrap.btnSuccessDisabledBg + ? Eduport.bsBtnSuccessBg + : Eduport.bsBtnSuccessDisabledBg border { - width: Bootstrap.btnBorderWidth + width: Eduport.bsBtnBorderWidth color: placeOrder.down - ? Bootstrap.btnSuccessActiveBorderColor + ? Eduport.bsBtnSuccessActiveBorderColor : placeOrder.enabled - ? Bootstrap.btnSuccessBorderColor - : Bootstrap.btnSuccessDisabledBorderColor + ? Eduport.bsBtnSuccessBorderColor + : Eduport.bsBtnSuccessDisabledBorderColor } - radius: Bootstrap.btnLgBorderRadius + radius: Eduport.bsBtnLgBorderRadius } } } @@ -657,7 +656,7 @@ Flickable { Button { id: premiumButton text: qsTr("Purchase Premium") - font: Bootstrap.btnFont + font: Eduport.bsBtnFont Layout.margins: 16 implicitHeight: 36 contentItem: Text { diff --git a/TextField/Input.ui.qml b/TextField/Input.ui.qml index a161582..d036348 100644 --- a/TextField/Input.ui.qml +++ b/TextField/Input.ui.qml @@ -1,12 +1,11 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import Bootstrap 5.3 import Eduport 1.4 TextField { font { - family: Bootstrap.bodyFont.family - weight: Bootstrap.bodyFont.weight + family: Eduport.bodyFont.family + weight: Eduport.bodyFont.weight pointSize: Eduport.formControlFontSize } background: Rectangle { diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml deleted file mode 100644 index 845e4f1..0000000 --- a/imports/Bootstrap/Bootstrap.qml +++ /dev/null @@ -1,56 +0,0 @@ -pragma Singleton -import QtQuick 2.15 - -QtObject { - readonly property color primary: "#066ac9" - readonly property real badgeFontSize: 13.6 - - readonly property real btnPaddingX: 16 - readonly property real btnPaddingY: 8 - readonly property font btnFont: Qt.font({ - family: haveRoboto ? "Roboto" : medium.name, - weight: Font.Medium, - pointSize: 15 - }) - readonly property color btnColor: "#ffffff" - readonly property color btnBg: "transparent" - readonly property real btnBorderWidth: 1 - readonly property color btnBorderColor: btnBg - readonly property real btnBorderRadius: 5.2 - readonly property real btnLgFontSize: 16 - readonly property real btnLgBorderRadius: 8 - readonly property color btnPrimaryBg: primary - readonly property color btnPrimaryBorderColor: primary - readonly property color btnPrimaryActiveBg: "#0555a1" - readonly property color btnPrimaryActiveBorderColor: "#055097" - readonly property color btnPrimaryDisabledBg: "#a6066ac9" - readonly property color btnPrimaryDisabledBorderColor: btnPrimaryDisabledBg - readonly property color btnSuccessBg: "#0cbc87" - readonly property color btnSuccessBorderColor: btnSuccessBg - readonly property color btnSuccessActiveBg: "#0a966c" - readonly property color btnSuccessActiveBorderColor: "#098d65" - readonly property color btnSuccessDisabledBg: "#a60cbc87" - readonly property color btnSuccessDisabledBorderColor: btnSuccessDisabledBg - - readonly property real navPillsBorderRadius: btnBorderRadius - readonly property color navPillsLinkActiveColor: btnColor - readonly property color navPillsLinkActiveBg: primary - - readonly property font bodyFont: Qt.font({ - family: haveRoboto ? "Roboto" : regular.name, - weight: Font.Normal, - pointSize: 15 - }) - - readonly property bool haveRoboto: Qt.platform.os === "android" - || Qt.platform.os === "linux" - || Qt.platform.os === "osx" - || Qt.platform.os === "unix" - || Qt.platform.os === "windows" - readonly property FontLoader medium: FontLoader { - source: haveRoboto ? "" : "../../Roboto/Roboto-Medium.ttf" - } - readonly property FontLoader regular: FontLoader { - source: haveRoboto ? "" : "../../Roboto/Roboto-Regular.ttf" - } -} diff --git a/imports/Bootstrap/qmldir b/imports/Bootstrap/qmldir deleted file mode 100644 index 53e8824..0000000 --- a/imports/Bootstrap/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module Bootstrap -singleton Bootstrap 5.3 Bootstrap.qml diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index db2a6fa..63cc239 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -7,38 +7,86 @@ QtObject { readonly property real h6FontSize: 15 readonly property real formTextFontSize: 14 - readonly property bool haveRoboto: Qt.platform.os === "android" - || Qt.platform.os === "linux" - || Qt.platform.os === "osx" - || Qt.platform.os === "unix" - || Qt.platform.os === "windows" - readonly property FontLoader roboto: FontLoader { - source: haveRoboto ? "" : "../../Roboto/Roboto-Bold.ttf" - } - readonly property FontLoader bold: FontLoader { - source: "../../Heebo/Heebo-Bold.ttf" - } - readonly property FontLoader medium: FontLoader { - source: "../../Heebo/Heebo-Medium.ttf" - } - readonly property FontLoader regular: FontLoader { - source: "../../Heebo/Heebo-Regular.ttf" - } + readonly property real navPillsBorderRadius: bsBtnBorderRadius + readonly property color navPillsLinkActiveColor: bsBtnColor + readonly property color navPillsLinkActiveBg: bsPrimary + readonly property font baseFont: Qt.font({ - family: haveRoboto ? "Roboto" : roboto.name, + family: haveRoboto ? "Roboto" : robotoBold.name, weight: Font.Bold }) + readonly property font bodyFont: Qt.font({ + family: haveRoboto ? "Roboto" : robotRegular.name, + weight: Font.Normal, + pointSize: 15 + }) readonly property font hxFont: Qt.font({ - family: bold.name, + family: heeboBold.name, weight: Font.Bold, pointSize: h6FontSize }) readonly property font fwNormalFont: Qt.font({ - family: medium.name, + family: heeboMedium.name, weight: Font.Medium }) readonly property font fwLightFont: Qt.font({ - family: regular.name, + family: heeboRegular.name, weight: Font.Normal }) + + readonly property color bsPrimary: "#066ac9" + readonly property real bsBadgeFontSize: 13.6 + + readonly property real bsBtnPaddingX: 16 + readonly property real bsBtnPaddingY: 8 + readonly property font bsBtnFont: Qt.font({ + family: haveRoboto ? "Roboto" : robotoMedium.name, + weight: Font.Medium, + pointSize: 15 + }) + readonly property color bsBtnColor: "#ffffff" + readonly property color bsBtnBg: "transparent" + readonly property real bsBtnBorderWidth: 1 + readonly property color bsBtnBorderColor: bsBtnBg + readonly property real bsBtnBorderRadius: 5.2 + readonly property real bsBtnLgFontSize: 16 + readonly property real bsBtnLgBorderRadius: 8 + readonly property color bsBtnPrimaryBg: bsPrimary + readonly property color bsBtnPrimaryBorderColor: bsPrimary + readonly property color bsBtnPrimaryActiveBg: "#0555a1" + readonly property color bsBtnPrimaryActiveBorderColor: "#055097" + readonly property color bsBtnPrimaryDisabledBg: "#a6066ac9" + readonly property color bsBtnPrimaryDisabledBorderColor: + bsBtnPrimaryDisabledBg + readonly property color bsBtnSuccessBg: "#0cbc87" + readonly property color bsBtnSuccessBorderColor: bsBtnSuccessBg + readonly property color bsBtnSuccessActiveBg: "#0a966c" + readonly property color bsBtnSuccessActiveBorderColor: "#098d65" + readonly property color bsBtnSuccessDisabledBg: "#a60cbc87" + readonly property color bsBtnSuccessDisabledBorderColor: + bsBtnSuccessDisabledBg + + readonly property bool haveRoboto: Qt.platform.os === "android" + || Qt.platform.os === "linux" + || Qt.platform.os === "osx" + || Qt.platform.os === "unix" + || Qt.platform.os === "windows" + readonly property FontLoader robotoBold: FontLoader { + source: haveRoboto ? "" : "../../Roboto/Roboto-Bold.ttf" + } + readonly property FontLoader robotoMedium: FontLoader { + source: haveRoboto ? "" : "../../Roboto/Roboto-Medium.ttf" + } + readonly property FontLoader robotoRegular: FontLoader { + source: haveRoboto ? "" : "../../Roboto/Roboto-Regular.ttf" + } + readonly property FontLoader heeboBold: FontLoader { + source: "../../Heebo/Heebo-Bold.ttf" + } + readonly property FontLoader heeboMedium: FontLoader { + source: "../../Heebo/Heebo-Medium.ttf" + } + readonly property FontLoader heeboRegular: FontLoader { + source: "../../Heebo/Heebo-Regular.ttf" + } } -- cgit v1.2.3