Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Explicitly import MoneroComponents; prevent namespace pollution

Browse Source
This commit is contained in:
Sander Ferdinand
2018-03-31 03:25:20 +02:00
parent 959c2fcc32
commit e638ed0272
28 changed files with 151 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/DatePicker.qml
View File

@@ -29,9 +29,8 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
import "../components"
import "." 1.0
import "../components" as MoneroComponents
Item {
id: datePicker
@@ -73,11 +72,11 @@ Item {
anchors.top: parent.top
anchors.topMargin: 2
anchors.left: parent.left
font.family: Style.fontLight.name
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 14
font.bold: false
textFormat: Text.RichText
color: Style.defaultFontColor
color: MoneroComponents.Style.defaultFontColor
MouseArea {
anchors.fill: parent
@@ -166,9 +165,9 @@ Item {
id: dayInput
readOnly: true
width: 22
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: datePicker.error ? errorColor : Style.defaultFontColor
color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
maximumLength: 2
horizontalAlignment: TextInput.AlignHCenter
validator: IntValidator{bottom: 01; top: 31;}
@@ -189,9 +188,9 @@ Item {
}
Text {
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: datePicker.error ? errorColor : Style.defaultFontColor
color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
text: "-"
}
@@ -199,9 +198,9 @@ Item {
id: monthInput
readOnly: true
width: 22
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: datePicker.error ? errorColor : Style.defaultFontColor
color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
maximumLength: 2
horizontalAlignment: TextInput.AlignHCenter
validator: IntValidator{bottom: 01; top: 12;}
@@ -221,18 +220,18 @@ Item {
}
Text {
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: datePicker.error ? errorColor : Style.defaultFontColor
color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
text: "-"
}
TextInput {
id: yearInput
width: 44
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: datePicker.error ? errorColor : Style.defaultFontColor
color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
maximumLength: 4
horizontalAlignment: TextInput.AlignHCenter
validator: IntValidator{bottom: 1000; top: 9999;}