diff options
| author | Keksoj <herrbosquet@gmail.com> | 2017-09-15 23:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 23:01:11 +0200 |
| commit | c712444e174e57aa083973ac91f458ce499787cf (patch) | |
| tree | 70df5c9c70773f7f9721c2270bf34e83c04a5e1c /components | |
| parent | 3e90c3d8251a418387307f24fa039c739124ff05 (diff) | |
| parent | 4066cb22ea9e17c831f0f751911814d6fabefcdb (diff) | |
| download | monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.gz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.xz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.zip | |
Merge pull request #1 from erciccione/fix
Fix conflicts and rebase.
Diffstat (limited to 'components')
| -rw-r--r-- | components/HistoryTable.qml | 6 | ||||
| -rw-r--r-- | components/IconButton.qml | 30 | ||||
| -rw-r--r-- | components/TextBlock.qml | 7 |
3 files changed, 25 insertions, 18 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 933c606c..082822d3 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -259,11 +259,11 @@ ListView { //elide: Text.ElideRight font.family: "Arial" font.pixelSize: 13 - color: (confirmations < 10)? "#FF6C3C" : "#545454" + color: (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454" text: { if (!isPending) - if(confirmations < 10) - return blockHeight + " " + qsTr("(%1/10 confirmations)").arg(confirmations) + if(confirmations < confirmationsRequired) + return blockHeight + " " + qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired) else return blockHeight if (!isOut) diff --git a/components/IconButton.qml b/components/IconButton.qml index eeb80267..042439f1 100644 --- a/components/IconButton.qml +++ b/components/IconButton.qml @@ -50,23 +50,23 @@ Item { z: 100 } -// MouseArea { -// id: buttonArea -// anchors.fill: parent + MouseArea { + id: buttonArea + anchors.fill: parent -// onPressed: { -// buttonImage.x = buttonImage.x + 2 -// buttonImage.y = buttonImage.y + 2 -// } -// onReleased: { -// buttonImage.x = buttonImage.x - 2 -// buttonImage.y = buttonImage.y - 2 -// } + onPressed: { + buttonImage.x = buttonImage.x + 2 + buttonImage.y = buttonImage.y + 2 + } + onReleased: { + buttonImage.x = buttonImage.x - 2 + buttonImage.y = buttonImage.y - 2 + } -// onClicked: { -// parent.clicked(mouse) -// } -// } + onClicked: { + parent.clicked(mouse) + } + } } diff --git a/components/TextBlock.qml b/components/TextBlock.qml new file mode 100644 index 00000000..7c36088a --- /dev/null +++ b/components/TextBlock.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 + +TextEdit { + wrapMode: Text.Wrap + readOnly: true + selectByMouse: true +} |