From 35158bf204facfeebe2acb5e215dcf29a00003b5 Mon Sep 17 00:00:00 2001
From: Konstantin <djtv01@gmail.com>
Date: Fri, 3 Jan 2020 14:54:18 +0300
Subject: [PATCH] [*]Edit fonts
---
widgets/DapButtonForm.ui.qml | 15 +++++----------
widgets/DapComboBox.qml | 6 ++++--
widgets/DapComboBoxForm.ui.qml | 13 +++++--------
widgets/DapRadioButtonForm.ui.qml | 9 ++++-----
4 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/widgets/DapButtonForm.ui.qml b/widgets/DapButtonForm.ui.qml
index 334e2dd..f9dcd68 100644
--- a/widgets/DapButtonForm.ui.qml
+++ b/widgets/DapButtonForm.ui.qml
@@ -28,18 +28,16 @@ Button {
property string colorButtonTextHover
///@detalis indentTextRight: Indentation of the text from the right edge.
property int indentTextRight
- ///@detalis fontSizeButton Font size.
- property int fontSizeButton
- ///@detalis fontFamily Font family button.
- property string fontFamily
+ ///@detalis fontButton Font setting.
+ property alias fontButton:buttonText.font
///@detalis existenceImage Indicates the presence of an image.
property bool existenceImage:true
///@detalis horizontalAligmentText Horizontal alignment.
- property alias horizontalAligmentText:templateText.horizontalAlignment
+ property alias horizontalAligmentText:buttonText.horizontalAlignment
///@detalis colorBackgroundButton This property overrides the background color.
property alias colorBackgroundButton: dapBackgroundButton.color
///@detalis colorTextButton This property overrides the color of the text.
- property alias colorTextButton: templateText.color
+ property alias colorTextButton: buttonText.color
///@detalis borderColorButton Sets the color of the border.
property string borderColorButton
///@detalis borderWidthButton Sets the width of the border.
@@ -57,14 +55,11 @@ Button {
border.width: borderWidthButton
///button text
Text {
- id: templateText
+ id: buttonText
anchors.fill: parent
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignRight
anchors.rightMargin: indentTextRight
- font.pixelSize: fontSizeButton
- font.family: fontFamily
- font.weight: Font.Normal
color: dapButton.hovered ? colorButtonTextHover : colorButtonTextNormal
text: qsTr(textButton)
}
diff --git a/widgets/DapComboBox.qml b/widgets/DapComboBox.qml
index b24bd64..6837e99 100644
--- a/widgets/DapComboBox.qml
+++ b/widgets/DapComboBox.qml
@@ -3,8 +3,11 @@ import QtQuick.Controls 2.0
DapComboBoxForm
{
+ id:dapComboBox
+
delegate:ItemDelegate
{
+
width: parent.width
//Adjusting the height of the line, taking into account that the second element from the end may be the last
@@ -27,8 +30,7 @@ DapComboBoxForm
anchors.fill: parent
anchors.topMargin: paddingTopItemDelegate
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
- font.family: fontFamily
- font.pixelSize: fontSizeComboBox
+ font:dapComboBox.font
text: if(index != currentIndex)
return modelData;
else return ""
diff --git a/widgets/DapComboBoxForm.ui.qml b/widgets/DapComboBoxForm.ui.qml
index dd74205..1db0138 100644
--- a/widgets/DapComboBoxForm.ui.qml
+++ b/widgets/DapComboBoxForm.ui.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
@@ -20,10 +20,6 @@ ComboBox {
property string normalTopColor
///@detalis hilightTopColor Top string color in selected state.
property string hilightTopColor
- ///@detalis fontSizeComboBox Font size for the entire widget.
- property int fontSizeComboBox
- ///@detalis fontFamely Font family ComboBox.
- property string fontFamily
///@detalis widthPopupComboBoxNormal Width of the combo box in the normal state.
property int widthPopupComboBoxNormal
///@detalis widthPopupComboBoxActive Width of the ComboBox in the active state.
@@ -68,7 +64,8 @@ ComboBox {
property string colorTopNormalDropShadow
///@detalis colorDropShadow Unboxed shadow color in expanded state.
property string colorDropShadow
-
+ ///@detalis fontComboBox Font setting combobox.
+ property alias fontComboBox:customComboBox.font
id: customComboBox
width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
@@ -94,11 +91,11 @@ ComboBox {
}
//Main line text settings
contentItem: Text {
+ id:textTopComboBox
anchors.fill: parent
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
text: parent.displayText
- font.family: fontFamily
- font.pixelSize: fontSizeComboBox
+ font: parent.font
color: popup.visible ? hilightColorTopText : normalColorTopText
verticalAlignment: Text.AlignVCenter
}
diff --git a/widgets/DapRadioButtonForm.ui.qml b/widgets/DapRadioButtonForm.ui.qml
index eab7a13..9cdbb9d 100644
--- a/widgets/DapRadioButtonForm.ui.qml
+++ b/widgets/DapRadioButtonForm.ui.qml
@@ -5,10 +5,10 @@ RadioButton
{
///@detalis textButton Text RadioButton.
property alias nameRadioButton: nameButton.text
+ ///@detalis fontText Font setting.
+ property alias fontRadioButton:nameButton.font
///@detalis nameTextColor Text color.
property alias nameTextColor: nameButton.color
- ///@detalis nameTextPixelSize Text size(px).
- property alias nameTextPixelSize: nameButton.font.pixelSize
///@detalis widthRadioButton Width RadioButton.
property alias widthRadioButton: customRadioButton.implicitWidth
///@detalis heightRadioButton Height RadioButton.
@@ -28,7 +28,8 @@ RadioButton
///@detalis indicatorSize The size of the main circle of the indicator.
property int indicatorSize
///@detalis indicatorInnerSize The size of the inner circle of the indicator.
- property int indicatorInnerSize
+ property int indicatorInnerSize
+
id: customRadioButton
@@ -41,8 +42,6 @@ RadioButton
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
color: "#3E3853"
- font.pixelSize: 16 * pt
- font.family: "Roboto"
horizontalAlignment: Text.AlignLeft
text: qsTr("template")
}
--
GitLab