monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-02 11:16:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/CheckBox.qml
View file

@ -28,7 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0
import "../components" as MoneroComponents
RowLayout { RowLayout {
id: checkBox id: checkBox
@ -64,7 +65,6 @@ RowLayout {
anchors.left: parent.left anchors.left: parent.left
width: 25 * scaleRatio width: 25 * scaleRatio
height: checkBox.height - 1 height: checkBox.height - 1
//radius: 4
y: 1 y: 1
color: "transparent" color: "transparent"
@ -85,9 +85,9 @@ RowLayout {
Text { Text {
id: label id: label
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: checkBox.fontSize font.pixelSize: checkBox.fontSize
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.fillWidth: true Layout.fillWidth: true
anchors.left: backgroundRect.right anchors.left: backgroundRect.right

27
components/DatePicker.qml
View file

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

22
components/HistoryTable.qml
View file

@ -29,9 +29,9 @@
import QtQuick 2.0 import QtQuick 2.0
import moneroComponents.Clipboard 1.0 import moneroComponents.Clipboard 1.0
import moneroComponents.AddressBookModel 1.0 import moneroComponents.AddressBookModel 1.0
import "../components" as MoneroComponents import "../components" as MoneroComponents
import "../js/TxUtils.js" as TxUtils import "../js/TxUtils.js" as TxUtils
import "." 1.0
ListView { ListView {
id: listView id: listView
@ -149,7 +149,7 @@ ListView {
id: txrxLabel id: txrxLabel
anchors.left: arrowImage.right anchors.left: arrowImage.right
anchors.leftMargin: 18 * scaleRatio anchors.leftMargin: 18 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
text: isOut ? "Sent" : "Received" text: isOut ? "Sent" : "Received"
color: "#808080" color: "#808080"
@ -161,7 +161,7 @@ ListView {
anchors.leftMargin: 18 * scaleRatio anchors.leftMargin: 18 * scaleRatio
anchors.top: txrxLabel.bottom anchors.top: txrxLabel.bottom
anchors.topMargin: 0 * scaleRatio anchors.topMargin: 0 * scaleRatio
font.family: Style.fontBold.name font.family: MoneroComponents.Style.fontBold.name
font.pixelSize: 18 * scaleRatio font.pixelSize: 18 * scaleRatio
font.bold: true font.bold: true
text: { text: {
@ -187,7 +187,7 @@ ListView {
Text { Text {
id: dateLabel id: dateLabel
anchors.left: parent.left anchors.left: parent.left
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
text: date text: date
color: "#808080" color: "#808080"
@ -211,7 +211,7 @@ ListView {
anchors.left: parent.left anchors.left: parent.left
anchors.top: dateLabel.bottom anchors.top: dateLabel.bottom
anchors.topMargin: 0 anchors.topMargin: 0
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
text: { text: {
if(isOut){ if(isOut){
@ -289,7 +289,7 @@ ListView {
visible: delegate.collapsed visible: delegate.collapsed
// left column // left column
HistoryTableInnerColumn{ MoneroComponents.HistoryTableInnerColumn{
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 30 * scaleRatio anchors.leftMargin: 30 * scaleRatio
@ -299,7 +299,7 @@ ListView {
} }
// right column // right column
HistoryTableInnerColumn{ MoneroComponents.HistoryTableInnerColumn{
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 100 * scaleRatio anchors.rightMargin: 100 * scaleRatio
width: 200 * scaleRatio width: 200 * scaleRatio
@ -337,7 +337,7 @@ ListView {
visible: delegate.collapsed visible: delegate.collapsed
// left column // left column
HistoryTableInnerColumn{ MoneroComponents.HistoryTableInnerColumn{
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 30 * scaleRatio anchors.leftMargin: 30 * scaleRatio
labelHeader: qsTr("Blockheight") labelHeader: qsTr("Blockheight")
@ -357,7 +357,7 @@ ListView {
} }
// right column // right column
HistoryTableInnerColumn { MoneroComponents.HistoryTableInnerColumn {
visible: currentWallet.getUserNote(hash) visible: currentWallet.getUserNote(hash)
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 80 * scaleRatio anchors.rightMargin: 80 * scaleRatio
@ -425,7 +425,7 @@ ListView {
} }
Text { Text {
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: "P" text: "P"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -470,7 +470,7 @@ ListView {
} }
Text { Text {
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: "?" text: "?"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

20
components/HistoryTableInnerColumn.qml
View file

@ -32,8 +32,8 @@ import QtQuick.Dialogs 1.2
import moneroComponents.Clipboard 1.0 import moneroComponents.Clipboard 1.0
import moneroComponents.PendingTransaction 1.0 import moneroComponents.PendingTransaction 1.0
import moneroComponents.Wallet 1.0 import moneroComponents.Wallet 1.0
import "../components"
import "." 1.0 import "../components" as MoneroComponents
Rectangle{ Rectangle{
@ -50,20 +50,20 @@ Rectangle{
Text { Text {
id: label1 id: label1
anchors.left: parent.left anchors.left: parent.left
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
text: labelHeader text: labelHeader
color: Style.greyFontColor color: MoneroComponents.Style.greyFontColor
} }
Text { Text {
id: label2 id: label2
anchors.left: parent.left anchors.left: parent.left
anchors.top: label1.bottom anchors.top: label1.bottom
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
text: labelValue text: labelValue
color: Style.dimmedFontColor color: MoneroComponents.Style.dimmedFontColor
} }
// hover effect / copy value // hover effect / copy value
@ -73,12 +73,12 @@ Rectangle{
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onEntered: { onEntered: {
label1.color = Style.defaultFontColor; label1.color = MoneroComponents.Style.defaultFontColor;
label2.color = Style.defaultFontColor; label2.color = MoneroComponents.Style.defaultFontColor;
} }
onExited: { onExited: {
label1.color = Style.greyFontColor; label1.color = MoneroComponents.Style.greyFontColor;
label2.color = Style.dimmedFontColor; label2.color = MoneroComponents.Style.dimmedFontColor;
} }
onClicked: { onClicked: {
if(copyValue){ if(copyValue){

14
components/HistoryTableMobile.qml
View file

@ -31,6 +31,8 @@ import QtQuick.Layouts 1.1
import moneroComponents.Clipboard 1.0 import moneroComponents.Clipboard 1.0
import moneroComponents.AddressBookModel 1.0 import moneroComponents.AddressBookModel 1.0
import "../components" as MoneroComponents
ListView { ListView {
id: listView id: listView
clip: true clip: true
@ -152,16 +154,16 @@ ListView {
Layout.topMargin: 20 * scaleRatio Layout.topMargin: 20 * scaleRatio
Layout.leftMargin: 10 * scaleRatio Layout.leftMargin: 10 * scaleRatio
Text { Text {
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: date text: date
} }
Text { Text {
font.family: Style.fontRegular.name font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: Style.dimmedFontColor color: MoneroComponents.Style.dimmedFontColor
text: time text: time
} }
@ -169,7 +171,7 @@ ListView {
Text { Text {
visible: confirmations < confirmationsRequired || isPending visible: confirmations < confirmationsRequired || isPending
Layout.leftMargin: 5 * scaleRatio Layout.leftMargin: 5 * scaleRatio
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454" color: (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454"
text: { text: {
@ -193,7 +195,7 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: isOut ? Style.defaultFontColor : "#2eb358" color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
text: isOut ? "↓" : "↑" text: isOut ? "↓" : "↑"
} }
@ -201,7 +203,7 @@ ListView {
id: amountText id: amountText
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 * scaleRatio font.pixelSize: 18 * scaleRatio
color: isOut ? Style.defaultFontColor : "#2eb358" color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
text: displayAmount text: displayAmount
} }
} }

7
components/InlineButton.qml
View file

@ -28,7 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0
import "../components" as MoneroComponents
Item { Item {
id: inlineButton id: inlineButton
@ -51,7 +52,7 @@ Item {
Rectangle{ Rectangle{
id: rect id: rect
color: Style.buttonBackgroundColorDisabled color: MoneroComponents.Style.buttonBackgroundColorDisabled
border.color: "black" border.color: "black"
height: 28 * scaleRatio height: 28 * scaleRatio
width: inlineText.width + 22 * scaleRatio width: inlineText.width + 22 * scaleRatio
@ -62,7 +63,7 @@ Item {
Text { Text {
id: inlineText id: inlineText
font.family: Style.fontBold.name font.family: MoneroComponents.Style.fontBold.name
font.bold: true font.bold: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
color: "black" color: "black"

6
components/Input.qml
View file

@ -28,16 +28,16 @@
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtQuick 2.7 import QtQuick 2.7
import "." 1.0
import "../components" as MoneroComponents
TextField { TextField {
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 18 * scaleRatio font.pixelSize: 18 * scaleRatio
font.bold: true font.bold: true
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
selectByMouse: true selectByMouse: true
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
background: Rectangle { background: Rectangle {
color: "transparent" color: "transparent"

8
components/InputDialog.qml
View file

@ -81,9 +81,9 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
} }
TextField { TextField {
@ -94,13 +94,13 @@ Item {
anchors.left: parent.left anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 24 * scaleRatio font.pixelSize: 24 * scaleRatio
KeyNavigation.tab: okButton KeyNavigation.tab: okButton
bottomPadding: 10 bottomPadding: 10
leftPadding: 10 leftPadding: 10
topPadding: 10 topPadding: 10
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
background: Rectangle { background: Rectangle {
radius: 2 radius: 2

8
components/InputMulti.qml
View file

@ -27,10 +27,10 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtQuick 2.7 import QtQuick 2.7
import "../js/TxUtils.js" as TxUtils import "../js/TxUtils.js" as TxUtils
import "." 1.0 import "../components" as MoneroComponents
TextArea { TextArea {
@ -41,12 +41,12 @@ TextArea {
property bool fontBold: false property bool fontBold: false
id: textArea id: textArea
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: fontSize font.pixelSize: fontSize
font.bold: fontBold font.bold: fontBold
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
selectByMouse: true selectByMouse: true
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
wrapMode: { wrapMode: {
if(wrapAnywhere){ if(wrapAnywhere){

6
components/Label.qml
View file

@ -29,7 +29,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0 import "../components" as MoneroComponents
Item { Item {
id: item id: item
@ -39,7 +39,7 @@ Item {
property string tipText: "" property string tipText: ""
property int fontSize: 16 * scaleRatio property int fontSize: 16 * scaleRatio
property bool fontBold: false property bool fontBold: false
property string fontColor: Style.defaultFontColor property string fontColor: MoneroComponents.Style.defaultFontColor
property string fontFamily: "" property string fontFamily: ""
property alias wrapMode: label.wrapMode property alias wrapMode: label.wrapMode
property alias horizontalAlignment: label.horizontalAlignment property alias horizontalAlignment: label.horizontalAlignment
@ -57,7 +57,7 @@ Item {
if(fontFamily){ if(fontFamily){
return fontFamily; return fontFamily;
} else { } else {
return Style.fontRegular.name; return MoneroComponents.Style.fontRegular.name;
} }
} }
font.pixelSize: fontSize font.pixelSize: fontSize

5
components/LabelButton.qml
View file

@ -28,7 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0
import "../components" as MoneroComponents
Rectangle { Rectangle {
@ -48,7 +49,7 @@ Rectangle {
id: labelButtonText id: labelButtonText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 12 font.pixelSize: 12
font.bold: true font.bold: true
text: "" text: ""

7
components/LabelSubheader.qml
View file

@ -27,7 +27,8 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0 import QtQuick 2.0
import "." 1.0
import "../components" as MoneroComponents
Label { Label {
id: item id: item
@ -39,7 +40,7 @@ Label {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: 2 height: 2
color: Style.dividerColor color: MoneroComponents.Style.dividerColor
opacity: Style.dividerOpacity opacity: MoneroComponents.Style.dividerOpacity
} }
} }

17
components/LineEdit.qml
View file

@ -27,7 +27,8 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0 import QtQuick 2.0
import "." 1.0
import "../components" as MoneroComponents
Item { Item {
id: item id: item
@ -35,10 +36,10 @@ Item {
property alias placeholderText: placeholderLabel.text property alias placeholderText: placeholderLabel.text
property bool placeholderCenter: false property bool placeholderCenter: false
property string placeholderFontFamily: Style.fontRegular.name property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
property bool placeholderFontBold: false property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: Style.defaultFontColor property string placeholderColor: MoneroComponents.Style.defaultFontColor
property real placeholderOpacity: 0.25 property real placeholderOpacity: 0.25
property alias validator: input.validator property alias validator: input.validator
@ -105,11 +106,11 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.topMargin: 2 * scaleRatio anchors.topMargin: 2 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: labelFontSize font.pixelSize: labelFontSize
font.bold: labelFontBold font.bold: labelFontBold
textFormat: Text.RichText textFormat: Text.RichText
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
onLinkActivated: item.labelLinkActivated() onLinkActivated: item.labelLinkActivated()
MouseArea { MouseArea {
@ -119,7 +120,7 @@ Item {
} }
} }
LabelButton { MoneroComponents.LabelButton {
id: copyButtonId id: copyButtonId
text: qsTr("Copy") text: qsTr("Copy")
anchors.right: parent.right anchors.right: parent.right
@ -190,7 +191,7 @@ Item {
visible: false visible: false
} }
Input { MoneroComponents.Input {
id: input id: input
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: inlineIcon.visible ? 38 : 0 anchors.leftMargin: inlineIcon.visible ? 38 : 0
@ -201,7 +202,7 @@ Item {
onTextChanged: item.textUpdated() onTextChanged: item.textUpdated()
} }
InlineButton { MoneroComponents.InlineButton {
id: inlineButtonId id: inlineButtonId
visible: item.inlineButtonText ? true : false visible: item.inlineButtonText ? true : false
anchors.right: parent.right anchors.right: parent.right

16
components/LineEditMulti.qml
View file

@ -28,8 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0
import "../components" as MoneroComponents
ColumnLayout { ColumnLayout {
id: lineditmulti id: lineditmulti
@ -64,21 +64,21 @@ ColumnLayout {
id: inputLabel id: inputLabel
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
font.bold: labelFontBold font.bold: labelFontBold
textFormat: Text.RichText textFormat: Text.RichText
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
onLinkActivated: inputLabelLinkActivated() onLinkActivated: inputLabelLinkActivated()
} }
LabelButton { MoneroComponents.LabelButton {
id: labelButton id: labelButton
onClicked: labelButtonClicked() onClicked: labelButtonClicked()
visible: labelButtonVisible visible: labelButtonVisible
} }
LabelButton { MoneroComponents.LabelButton {
id: copyButtonId id: copyButtonId
visible: copyButton && multiLine.text !== "" visible: copyButton && multiLine.text !== ""
text: qsTr("Copy") text: qsTr("Copy")
@ -94,7 +94,7 @@ ColumnLayout {
} }
} }
InputMulti { MoneroComponents.InputMulti {
id: multiLine id: multiLine
readOnly: false readOnly: false
addressValidation: true addressValidation: true
@ -113,8 +113,8 @@ ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 * scaleRatio anchors.leftMargin: 10 * scaleRatio
opacity: 0.25 opacity: 0.25
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 18 * scaleRatio font.pixelSize: 18 * scaleRatio
text: "" text: ""
z: 3 z: 3

5
components/MenuButton.qml
View file

@ -27,7 +27,8 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.5 import QtQuick 2.5
import "." 1.0
import "../components" as MoneroComponents
Rectangle { Rectangle {
id: button id: button
@ -103,7 +104,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.right anchors.left: parent.right
anchors.leftMargin: 8 * scaleRatio anchors.leftMargin: 8 * scaleRatio
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.bold: true font.bold: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"

3
components/MobileHeader.qml
View file

@ -1,8 +1,9 @@
import QtQuick 2.2 import QtQuick 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import moneroComponents.Wallet 1.0
import moneroComponents.Wallet 1.0
import "../components" as MoneroComponents
// BasicPanel header // BasicPanel header
Rectangle { Rectangle {

7
components/NetworkStatusItem.qml
View file

@ -28,8 +28,9 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import moneroComponents.Wallet 1.0 import moneroComponents.Wallet 1.0
import "." 1.0 import "../components" as MoneroComponents
Rectangle { Rectangle {
id: item id: item
@ -93,7 +94,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 0 anchors.topMargin: 0
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.bold: true font.bold: true
font.pixelSize: 13 * scaleRatio font.pixelSize: 13 * scaleRatio
color: "white" color: "white"
@ -106,7 +107,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 14 anchors.topMargin: 14
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 20 * scaleRatio font.pixelSize: 20 * scaleRatio
color: "white" color: "white"
text: getConnectionStatusString(item.connected) + translationManager.emptyString text: getConnectionStatusString(item.connected) + translationManager.emptyString

16
components/NewPasswordDialog.qml
View file

@ -104,9 +104,9 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
} }
TextField { TextField {
@ -116,13 +116,13 @@ Item {
anchors.left: parent.left anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 24 * scaleRatio font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password echoMode: TextInput.Password
bottomPadding: 10 bottomPadding: 10
leftPadding: 10 leftPadding: 10
topPadding: 10 topPadding: 10
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
KeyNavigation.tab: passwordInput2 KeyNavigation.tab: passwordInput2
background: Rectangle { background: Rectangle {
@ -162,9 +162,9 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
} }
TextField { TextField {
@ -174,14 +174,14 @@ Item {
anchors.left: parent.left anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 24 * scaleRatio font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password echoMode: TextInput.Password
KeyNavigation.tab: okButton KeyNavigation.tab: okButton
bottomPadding: 10 bottomPadding: 10
leftPadding: 10 leftPadding: 10
topPadding: 10 topPadding: 10
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
background: Rectangle { background: Rectangle {
radius: 2 radius: 2

8
components/PasswordDialog.qml
View file

@ -85,9 +85,9 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
} }
TextField { TextField {
@ -97,14 +97,14 @@ Item {
anchors.left: parent.left anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 24 * scaleRatio font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password echoMode: TextInput.Password
KeyNavigation.tab: okButton KeyNavigation.tab: okButton
bottomPadding: 10 bottomPadding: 10
leftPadding: 10 leftPadding: 10
topPadding: 10 topPadding: 10
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
background: Rectangle { background: Rectangle {
radius: 2 radius: 2

7
components/ProgressBar.qml
View file

@ -28,7 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import moneroComponents.Wallet 1.0 import moneroComponents.Wallet 1.0
import "." 1.0
import "../components" as MoneroComponents
Rectangle { Rectangle {
id: item id: item
@ -62,7 +63,7 @@ Rectangle {
id: progressText id: progressText
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 6 anchors.topMargin: 6
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 13 * scaleRatio font.pixelSize: 13 * scaleRatio
font.bold: true font.bold: true
color: "white" color: "white"
@ -75,7 +76,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 6 anchors.topMargin: 6
anchors.right: parent.right anchors.right: parent.right
font.family: Style.fontMedium.name font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 13 * scaleRatio font.pixelSize: 13 * scaleRatio
font.bold: true font.bold: true
color: "white" color: "white"

6
components/RemoteNodeEdit.qml
View file

@ -31,6 +31,8 @@ import QtQuick.Controls.Styles 1.2
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "../components" as MoneroComponents
GridLayout { GridLayout {
columns: (isMobile) ? 1 : 2 columns: (isMobile) ? 1 : 2
columnSpacing: 32 columnSpacing: 32
@ -42,10 +44,10 @@ GridLayout {
// TODO: LEGACY; remove these placeHolder variables when // TODO: LEGACY; remove these placeHolder variables when
// the wizards get redesigned to the black-theme // the wizards get redesigned to the black-theme
property string placeholderFontFamily: Style.fontRegular.name property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
property bool placeholderFontBold: false property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: Style.defaultFontColor property string placeholderColor: MoneroComponents.Style.defaultFontColor
property real placeholderOpacity: 0.25 property real placeholderOpacity: 0.25
property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15) property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)

9
components/SearchInput.qml
View file

@ -28,6 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import "../components" as MoneroComponents
Item { Item {
id: item id: item
signal searchClicked(string text, int option) signal searchClicked(string text, int option)
@ -213,18 +215,13 @@ Item {
} }
} }
StandardButton { MoneroComponents.StandardButton {
id: button id: button
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.margins: 6 anchors.margins: 6
width: 80 width: 80
shadowReleasedColor: "#C60F00"
shadowPressedColor: "#8C0B00"
pressedColor: "#C60F00"
releasedColor: "#FF4F41"
text: qsTr("SEARCH") text: qsTr("SEARCH")
onClicked: item.searchClicked(input.text, droplist.currentOption) onClicked: item.searchClicked(input.text, droplist.currentOption)
} }

9
components/StandardButton.qml
View file

@ -28,13 +28,14 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import "." 1.0
import "../components" as MoneroComponents
Item { Item {
id: button id: button
property string rightIcon: "" property string rightIcon: ""
property string icon: "" property string icon: ""
property string textColor: button.enabled? Style.buttonTextColor: Style.buttonTextColorDisabled property string textColor: button.enabled? MoneroComponents.Style.buttonTextColor: MoneroComponents.Style.buttonTextColorDisabled
property bool small: false property bool small: false
property alias text: label.text property alias text: label.text
property int fontSize: { property int fontSize: {
@ -59,7 +60,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
height: parent.height - 1 height: parent.height - 1
radius: 3 radius: 3
color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled color: parent.enabled ? MoneroComponents.Style.buttonBackgroundColor : MoneroComponents.Style.buttonBackgroundColorDisabled
border.width: parent.focus ? 1 : 0 border.width: parent.focus ? 1 : 0
MouseArea { MouseArea {
@ -87,7 +88,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.family: Style.fontBold.name font.family: MoneroComponents.Style.fontBold.name
font.bold: true font.bold: true
font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize
color: parent.textColor color: parent.textColor

21
components/StandardDialog.qml
View file

@ -34,8 +34,6 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0 import QtQuick.Window 2.0
import "../components" as MoneroComponents import "../components" as MoneroComponents
import "." 1.0
Rectangle { Rectangle {
id: root id: root
@ -104,12 +102,12 @@ Rectangle {
//anchors {fill: parent; margins: 16 } //anchors {fill: parent; margins: 16 }
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Label { MoneroComponents.Label {
id: dialogTitle id: dialogTitle
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
fontSize: 18 * scaleRatio fontSize: 18 * scaleRatio
fontFamily: "Arial" fontFamily: "Arial"
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
} }
} }
@ -120,13 +118,13 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
renderType: Text.QtRendering renderType: Text.QtRendering
font.family: Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
textFormat: TextEdit.AutoText textFormat: TextEdit.AutoText
readOnly: true readOnly: true
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
selectByMouse: false selectByMouse: false
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -175,7 +173,7 @@ Rectangle {
// window borders // window borders
Rectangle{ Rectangle{
width: 1 width: 1
color: Style.grey color: MoneroComponents.Style.grey
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -183,7 +181,7 @@ Rectangle {
Rectangle{ Rectangle{
width: 1 width: 1
color: Style.grey color: MoneroComponents.Style.grey
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -191,7 +189,7 @@ Rectangle {
Rectangle{ Rectangle{
height: 1 height: 1
color: Style.grey color: MoneroComponents.Style.grey
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
@ -199,12 +197,9 @@ Rectangle {
Rectangle{ Rectangle{
height: 1 height: 1
color: Style.grey color: MoneroComponents.Style.grey
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
} }
} }

9
components/StandardDropdown.qml
View file

@ -27,7 +27,8 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0 import QtQuick 2.0
import "." 1.0
import "../components" as MoneroComponents
Item { Item {
id: dropdown id: dropdown
@ -90,7 +91,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 12 * scaleRatio anchors.leftMargin: 12 * scaleRatio
elide: Text.ElideRight elide: Text.ElideRight
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.bold: dropdown.headerFontBold font.bold: dropdown.headerFontBold
font.pixelSize: dropdown.fontHeaderSize font.pixelSize: dropdown.fontHeaderSize
color: "#FFFFFF" color: "#FFFFFF"
@ -183,7 +184,7 @@ Item {
anchors.right: col2Text.left anchors.right: col2Text.left
anchors.leftMargin: 12 * scaleRatio anchors.leftMargin: 12 * scaleRatio
anchors.rightMargin: 0 anchors.rightMargin: 0
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.bold: true font.bold: true
font.pixelSize: fontItemSize font.pixelSize: fontItemSize
color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF" color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
@ -195,7 +196,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 45 * scaleRatio anchors.rightMargin: 45 * scaleRatio
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
text: "" text: ""

16
components/SubaddressTable.qml
View file

@ -28,8 +28,8 @@
import QtQuick 2.0 import QtQuick 2.0
import moneroComponents.Clipboard 1.0 import moneroComponents.Clipboard 1.0
import "../components"
import "." 1.0 import "../components" as MoneroComponents
ListView { ListView {
id: listView id: listView
@ -48,7 +48,7 @@ ListView {
width: listView.width width: listView.width
clip: true clip: true
LineEditMulti { MoneroComponents.LineEditMulti {
id: addressLine id: addressLine
fontSize: 14 fontSize: 14
@ -68,7 +68,7 @@ ListView {
addressValidation: false addressValidation: false
} }
IconButton { MoneroComponents.IconButton {
id: clipboardButton id: clipboardButton
imageSource: "../images/copyToClipboard.png" imageSource: "../images/copyToClipboard.png"
@ -104,7 +104,7 @@ ListView {
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.pixelSize: 12 font.pixelSize: 12
color: Style.greyFontColor color: MoneroComponents.Style.greyFontColor
text: label text: label
} }
@ -126,7 +126,7 @@ ListView {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: 1 width: 1
color: Style.grey color: MoneroComponents.Style.grey
z: 6 z: 6
} }
@ -135,7 +135,7 @@ ListView {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: 1 width: 1
color: Style.grey color: MoneroComponents.Style.grey
z: 6 z: 6
} }
@ -143,7 +143,7 @@ ListView {
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: Style.grey color: MoneroComponents.Style.grey
height: 1 height: 1
z: 6 z: 6
} }

6
components/TextBlock.qml
View file

@ -1,10 +1,10 @@
import QtQuick 2.0 import QtQuick 2.0
import "." 1.0 import "../components" as MoneroComponents
TextEdit { TextEdit {
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
wrapMode: Text.Wrap wrapMode: Text.Wrap
readOnly: true readOnly: true
selectByMouse: true selectByMouse: true

4
components/TickDelegate.qml
View file

@ -27,8 +27,8 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0 import QtQuick 2.0
import "." 1.0
import "../components" as MoneroComponents
Item { Item {
id: delegateItem id: delegateItem
@ -52,7 +52,7 @@ Item {
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.pixelSize: 12 * scaleRatio font.pixelSize: 12 * scaleRatio
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: { text: {
if(currentIndex === 0) return qsTr("Default") + translationManager.emptyString if(currentIndex === 0) return qsTr("Default") + translationManager.emptyString
if(currentIndex === 13) return qsTr("High") + translationManager.emptyString if(currentIndex === 13) return qsTr("High") + translationManager.emptyString