From 6587112871469c304aa1cfd486631875fd6cf343 Mon Sep 17 00:00:00 2001
From: Konstantin <djtv01@gmail.com>
Date: Fri, 3 Jan 2020 10:34:32 +0300
Subject: [PATCH] [*]edit property
---
widgets/DapButtonForm.ui.qml | 36 ++++++++--------
widgets/DapComboBox.qml | 6 +--
widgets/DapComboBoxForm.ui.qml | 70 +++++++++++++++----------------
widgets/DapRadioButtonForm.ui.qml | 14 +++----
4 files changed, 64 insertions(+), 62 deletions(-)
diff --git a/widgets/DapButtonForm.ui.qml b/widgets/DapButtonForm.ui.qml
index 4428f92..334e2dd 100644
--- a/widgets/DapButtonForm.ui.qml
+++ b/widgets/DapButtonForm.ui.qml
@@ -3,33 +3,35 @@ import QtQuick.Controls 2.0
Button {
///@detalis heightButton Button height.
- property int heightButton: 36 * pt
+ property int heightButton
///@detalis widthButton Button width.
- property int widthButton: 120 * pt
+ property int widthButton
///@detalis normalImageButton The picture on the Button is in normal state.
- property string normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
+ property string normalImageButton
///@detalis hoverImageButton The image on the Button is in the mouseover state.
- property string hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+ property string hoverImageButton
///@detalis widthImageButton Image width.
- property int widthImageButton: 28 * pt
+ property int widthImageButton
///@detalis heightImageButton Image height.
- property int heightImageButton: 28 * pt
+ property int heightImageButton
///@detalis indentImageLeftButton: Indentation of the image from the left edge.
- property int indentImageLeftButton: 10 * pt
+ property int indentImageLeftButton
///@detalis colorBackgroundNormal Button background color in normal state.
- property string colorBackgroundNormal:"#070023"
+ property string colorBackgroundNormal
///@detalis colorBackgroundHover Button background color in hover state.
- property string colorBackgroundHover: "#D51F5D"
+ property string colorBackgroundHover
///@detalis textButton Text button.
- property string textButton: "New Wallet"
+ property string textButton
///@detalis colorButtonTextNormal Button text color in normal state.
- property string colorButtonTextNormal: "#FFFFFF"
+ property string colorButtonTextNormal
///@detalis colorButtonTextHover Button text color in hover state.
- property string colorButtonTextHover: "#FFFFFF"
+ property string colorButtonTextHover
///@detalis indentTextRight: Indentation of the text from the right edge.
- property int indentTextRight: 20 * pt
+ property int indentTextRight
///@detalis fontSizeButton Font size.
- property int fontSizeButton: 14 * pt
+ property int fontSizeButton
+ ///@detalis fontFamily Font family button.
+ property string fontFamily
///@detalis existenceImage Indicates the presence of an image.
property bool existenceImage:true
///@detalis horizontalAligmentText Horizontal alignment.
@@ -39,9 +41,9 @@ Button {
///@detalis colorTextButton This property overrides the color of the text.
property alias colorTextButton: templateText.color
///@detalis borderColorButton Sets the color of the border.
- property string borderColorButton: "#000000"
+ property string borderColorButton
///@detalis borderWidthButton Sets the width of the border.
- property int borderWidthButton: 0
+ property int borderWidthButton
id: dapButton
@@ -61,7 +63,7 @@ Button {
horizontalAlignment: Qt.AlignRight
anchors.rightMargin: indentTextRight
font.pixelSize: fontSizeButton
- font.family: "Roboto"
+ 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 1765c09..b24bd64 100644
--- a/widgets/DapComboBox.qml
+++ b/widgets/DapComboBox.qml
@@ -27,7 +27,7 @@ DapComboBoxForm
anchors.fill: parent
anchors.topMargin: paddingTopItemDelegate
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
- font.family: "Roboto"
+ font.family: fontFamily
font.pixelSize: fontSizeComboBox
text: if(index != currentIndex)
return modelData;
@@ -40,12 +40,12 @@ DapComboBoxForm
background: Rectangle {
anchors.fill: parent
anchors.bottomMargin: {
- if(index == countComboBox - 2)
+ if(index == count - 2)
{
if(index+1 == currentIndex) return bottomIntervalListElement
else return intervalListElement
}
- if (index == countComboBox - 1) return bottomIntervalListElement
+ if (index == count - 1) return bottomIntervalListElement
return intervalListElement
}
color: hovered ? hilightColor : normalColor
diff --git a/widgets/DapComboBoxForm.ui.qml b/widgets/DapComboBoxForm.ui.qml
index 7943c81..dd74205 100644
--- a/widgets/DapComboBoxForm.ui.qml
+++ b/widgets/DapComboBoxForm.ui.qml
@@ -5,70 +5,70 @@ import QtGraphicalEffects 1.0
ComboBox {
///@detalis normalColorText Text color in normal state.
- property string normalColorText: "#070023"
+ property string normalColorText
///@detalis hilightColorText Text color in selected state.
- property string hilightColorText: "#FFFFFF"
+ property string hilightColorText
///@detalis normalColorTopText Text color in the main line in normal state.
- property string normalColorTopText: normalColorText
+ property string normalColorTopText
///@detalis hilightColorTopText Text color in the main line in active state.
- property string hilightColorTopText: normalColorText
+ property string hilightColorTopText
///@detalis normalColor Item color in normal state.
- property string normalColor: "#FFFFFF"
+ property string normalColor
///@detalis hilightColor Item color in selected state.
- property string hilightColor: "#330F54"
+ property string hilightColor
///@detalis normalTopColor Top string color in normal state.
- property string normalTopColor: normalColor
+ property string normalTopColor
///@detalis hilightTopColor Top string color in selected state.
- property string hilightTopColor: normalColor
+ property string hilightTopColor
///@detalis fontSizeComboBox Font size for the entire widget.
- property int fontSizeComboBox: 16 * pt
+ 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: parent.width
+ property int widthPopupComboBoxNormal
///@detalis widthPopupComboBoxActive Width of the ComboBox in the active state.
- property int widthPopupComboBoxActive: widthPopupComboBoxNormal
+ property int widthPopupComboBoxActive
///@detalis heightComboBoxNormal Height of the ComboBox in the normal state.
- property int heightComboBoxNormal: parent.height
+ property int heightComboBoxNormal
///@detalis heightComboBoxActive Height of the ComboBox in the active state.
- property int heightComboBoxActive: heightComboBoxNormal
+ property int heightComboBoxActive
///@detalis sidePaddingNormal: Sets the indent from the edge of the right and left edges of the parent in the normal state.
- property int sidePaddingNormal: 16 * pt
+ property int sidePaddingNormal
///@detalis sidePaddingActive Sets the indent from the edge of the right and left edges of the parent in the active state.
- property int sidePaddingActive: sidePaddingNormal
+ property int sidePaddingActive
///@detalis topIndentNormal Sets the indent from the edge of the upper of the parent in the normal state.
- property int topIndentNormal: 12 * pt
+ property int topIndentNormal
///@detalis topIndentActive Sets the indent from the edge of the upper of the parent in the active state.
- property int topIndentActive: topIndentNormal
+ property int topIndentActive
///@detalis bottomIndentNormal Sets the indent from the edge of the lower of the parent in the normal state.
- property int bottomIndentNormal: 14 * pt
+ property int bottomIndentNormal
///@detalis bottomIndentActive Sets the indent from the edge of the lower of the parent in the active state.
- property int bottomIndentActive: bottomIndentNormal
+ property int bottomIndentActive
///@detalis paddingTopItemDelegate Indent above from item delegate.
- property int paddingTopItemDelegate: 8 * pt
+ property int paddingTopItemDelegate
///@detalis paddingBottomItemDelegate Indent below from item delegate.
- property int paddingBottomItemDelegate: paddingTopItemDelegate
+ property int paddingBottomItemDelegate
///@detalis heightListElement List item height.
- property int heightListElement: 32 * pt
+ property int heightListElement
///@detalis intervalListElement Spacing between items in a list.
- property int intervalListElement: 10 * pt
+ property int intervalListElement
///@detalis bottomIntervalListElement Spacing from bottom to bottom.
- property int bottomIntervalListElement: intervalListElement
+ property int bottomIntervalListElement
///@detalis topEffect Using an effect for the top element.
- property bool topEffect: true
+ property bool topEffect
///@detalis indicatorImageNormal Indicator picture address for normal state.
- property string indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down_dark_blue.png"
+ property string indicatorImageNormal
///@detalis indicatorImageActive Indicator picture address for active state.
- property string indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
+ property string indicatorImageActive
///@detalis indicatorWidth Indicator width.
- property int indicatorWidth: 24 * pt
+ property int indicatorWidth
///@detalis indicatorHeight Indicator height.
- property int indicatorHeight: indicatorWidth
+ property int indicatorHeight
/// colorTopNormalDropShadow Color of the shadow effect of the combo box when minimized.
- property string colorTopNormalDropShadow: "#00000000"
+ property string colorTopNormalDropShadow
///@detalis colorDropShadow Unboxed shadow color in expanded state.
- property string colorDropShadow: "#40ABABAB"
- ///@detalis countComboBox this variable indicates the number of lines in the list for
- ///the delegate in the file DapComboBox.qml.
- property int countComboBox: customComboBox.count
+ property string colorDropShadow
+
id: customComboBox
width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
@@ -97,7 +97,7 @@ ComboBox {
anchors.fill: parent
anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
text: parent.displayText
- font.family: "Roboto"
+ font.family: fontFamily
font.pixelSize: fontSizeComboBox
color: popup.visible ? hilightColorTopText : normalColorTopText
verticalAlignment: Text.AlignVCenter
diff --git a/widgets/DapRadioButtonForm.ui.qml b/widgets/DapRadioButtonForm.ui.qml
index 25eb102..eab7a13 100644
--- a/widgets/DapRadioButtonForm.ui.qml
+++ b/widgets/DapRadioButtonForm.ui.qml
@@ -16,19 +16,19 @@ RadioButton
///@detalis backgroundColor RadioButton background color
property alias backgroundColor:backgroundColor.color
///@detalis spaceIndicatorText The gap between the indicator and the text.
- property int spaceIndicatorText: 15 * pt
+ property int spaceIndicatorText
///@detalis indicatorBorderColor Border color indicator.
- property string indicatorBorderColor:"#3E3853"
+ property string indicatorBorderColor
///@detalis indicatorBackgroundColor Background color indicator.
- property string indicatorBackgroundColor:"transparent"
+ property string indicatorBackgroundColor
///@detalis indicatorInnerColorActiv Color of the inner circle in checked condition.
- property string indicatorInnerColorActiv:indicatorBorderColor
+ property string indicatorInnerColorActiv
///@detalis indicatorInnerColorNormal Color of the inner circle in normal condition.
- property string indicatorInnerColorNormal:indicatorBackgroundColor
+ property string indicatorInnerColorNormal
///@detalis indicatorSize The size of the main circle of the indicator.
- property int indicatorSize: 25 * pt
+ property int indicatorSize
///@detalis indicatorInnerSize The size of the inner circle of the indicator.
- property int indicatorInnerSize: 15 * pt
+ property int indicatorInnerSize
id: customRadioButton
--
GitLab