From 105ce27965b47d623b638fc0e85768a1df1c72c6 Mon Sep 17 00:00:00 2001
From: "tatiana.novikova" <tatiana.novikova@demlabs.net>
Date: Wed, 26 Feb 2020 13:51:37 +0000
Subject: [PATCH] Features 3034
---
DapFont.qml | 36 ++++++++++++++++++++++++++++++++
libdap-qt-ui-qml.qrc | 1 +
widgets/DapButtonForm.ui.qml | 2 +-
widgets/DapComboBox.qml | 1 +
widgets/DapMessageBoxForm.ui.qml | 19 +++++++----------
5 files changed, 47 insertions(+), 12 deletions(-)
create mode 100644 DapFont.qml
diff --git a/DapFont.qml b/DapFont.qml
new file mode 100644
index 0000000..4b237b1
--- /dev/null
+++ b/DapFont.qml
@@ -0,0 +1,36 @@
+import QtQuick 2.0
+import QtQml 2.2
+
+Item
+{
+ ///@details dapFontPath Project path to the font folder
+ property string dapFontPath
+ ///@details dapFontNames Array of names of font files (for example roboto_thin.ttf)
+ property var dapFontNames
+ ///@details dapProjectFonts Array of loaded fonts
+ property var dapProjectFonts
+
+ //Create non-visual items
+ Instantiator
+ {
+ id: fontRepeater
+ model: dapFontNames.length
+ FontLoader
+ {
+ source: dapFontPath + dapFontNames[index]
+ }
+ Component.onCompleted: dapProjectFonts = getFonts(fontRepeater)
+ }
+
+ //To associate dapProjectFonts property with FontLoader objects
+ function getFonts(fontRepeater)
+ {
+ var fonts = [];
+ for(var i = 0; i < fontRepeater.count; i++)
+ {
+ fonts[i] = fontRepeater.objectAt(i)
+ }
+ return fonts;
+ }
+
+}
diff --git a/libdap-qt-ui-qml.qrc b/libdap-qt-ui-qml.qrc
index 5b942bf..5a53677 100644
--- a/libdap-qt-ui-qml.qrc
+++ b/libdap-qt-ui-qml.qrc
@@ -27,5 +27,6 @@
<file>widgets/DapScrollViewHandling.qml</file>
<file>widgets/DapMessageBox.qml</file>
<file>widgets/DapMessageBoxForm.ui.qml</file>
+ <file>DapFont.qml</file>
</qresource>
</RCC>
diff --git a/widgets/DapButtonForm.ui.qml b/widgets/DapButtonForm.ui.qml
index b826ebc..e1f3b62 100644
--- a/widgets/DapButtonForm.ui.qml
+++ b/widgets/DapButtonForm.ui.qml
@@ -30,7 +30,7 @@ Button
///@detalis indentTextRight: Indentation of the text from the right edge.
property int indentTextRight
///@detalis fontButton Font setting.
- property alias fontButton:buttonText.font
+ property alias fontButton: buttonText.font
///@detalis horizontalAligmentText Horizontal alignment.
property alias horizontalAligmentText:buttonText.horizontalAlignment
///@detalis colorBackgroundButton This property overrides the background color.
diff --git a/widgets/DapComboBox.qml b/widgets/DapComboBox.qml
index ee809d5..67452ec 100644
--- a/widgets/DapComboBox.qml
+++ b/widgets/DapComboBox.qml
@@ -149,6 +149,7 @@ DapComboBoxForm
return model.get(rowIndex)[modelRole];
}
+
function updateMainRow(fm, cbIndex, cbCurrentIndex, elTextArray, width)
{
if(cbIndex === cbCurrentIndex)
diff --git a/widgets/DapMessageBoxForm.ui.qml b/widgets/DapMessageBoxForm.ui.qml
index c16711a..ce9413d 100644
--- a/widgets/DapMessageBoxForm.ui.qml
+++ b/widgets/DapMessageBoxForm.ui.qml
@@ -10,6 +10,11 @@ Rectangle
property alias dapContentText: contentText
property alias dapButtonOk: buttonOk
+ ///@details fontMessage Font setting.
+ property font fontMessage
+ ///@details fontButtonText Font setting.
+ property font fontButtonText
+
layer.enabled: true
layer.effect:
DropShadow
@@ -38,10 +43,7 @@ Rectangle
anchors.right: parent.right
anchors.leftMargin: 30 * pt
anchors.rightMargin: 30 * pt
- font.pixelSize: 16 * pt
- font.family: "Roboto"
- font.styleName: "Normal"
- font.weight: Font.Normal
+ font: fontMessage
color: "#FFFFFF"
}
}
@@ -67,10 +69,7 @@ Rectangle
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: buttonOk.top
- font.pixelSize: 16 * pt
- font.family: "Roboto"
- font.styleName: "Normal"
- font.weight: Font.Normal
+ font: fontMessage
color: "#070023"
wrapMode: Text.WordWrap
}
@@ -87,11 +86,9 @@ Rectangle
colorBackgroundHover: "#D51F5D"
colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF"
- fontButton.pixelSize: 14 * pt
+ fontButton: fontButtonText
borderColorButton: "#FFFFFF"
borderWidthButton: 0
- fontButton.family: "Roboto"
- fontButton.weight: Font.Normal
horizontalAligmentText:Qt.AlignCenter
colorTextButton: "#FFFFFF"
}
--
GitLab