diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2017-12-07 16:35:42 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:01 +0100 |
| commit | af9e4e86f0bb4f63fbf516fd5b984a58668495a8 (patch) | |
| tree | 3c2abf5fab58ba06522bc5090e6ab854432e90d7 /pages | |
| parent | 5028491ab3791673fbb21abdeec978da83f222ee (diff) | |
| download | monzero-gui-af9e4e86f0bb4f63fbf516fd5b984a58668495a8.tar.gz monzero-gui-af9e4e86f0bb4f63fbf516fd5b984a58668495a8.tar.xz monzero-gui-af9e4e86f0bb4f63fbf516fd5b984a58668495a8.zip | |
Replacing checkbox, using default values from component
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/History.qml | 2 | ||||
| -rw-r--r-- | pages/Mining.qml | 4 | ||||
| -rw-r--r-- | pages/Transfer.qml | 9 |
3 files changed, 0 insertions, 15 deletions
diff --git a/pages/History.qml b/pages/History.qml index 5ea27ca7..1642f3bc 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -291,8 +291,6 @@ Rectangle { anchors.left: filterButton.right anchors.bottom: filterButton.bottom anchors.leftMargin: 17 - checkedIcon: "../images/checkedVioletIcon.png" - uncheckedIcon: "../images/uncheckedIcon.png" onClicked: { if(checked) tableRect.height = Qt.binding(function(){ return tableRect.collapsedHeight }) else tableRect.height = Qt.binding(function(){ return tableRect.middleHeight }) diff --git a/pages/Mining.qml b/pages/Mining.qml index 0f0b370b..be2b1805 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -102,8 +102,6 @@ Rectangle { checked: persistentSettings.allow_background_mining onClicked: {persistentSettings.allow_background_mining = checked} text: qsTr("Background mining (experimental)") + translationManager.emptyString - checkedIcon: "../images/checkedVioletIcon.png" - uncheckedIcon: "../images/uncheckedIcon.png" } } @@ -118,8 +116,6 @@ Rectangle { checked: !persistentSettings.miningIgnoreBattery onClicked: {persistentSettings.miningIgnoreBattery = !checked} text: qsTr("Enable mining when running on battery") + translationManager.emptyString - checkedIcon: "../images/checkedVioletIcon.png" - uncheckedIcon: "../images/uncheckedIcon.png" } } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 83e6d0a2..7296d190 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -331,15 +331,7 @@ Rectangle { Layout.bottomMargin: 17 * scaleRatio Layout.topMargin: 17 * scaleRatio text: qsTr("Send") + translationManager.emptyString -<<<<<<< HEAD - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#FF6C3C" - pressedColor: "#FF4304" - enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype) -======= enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) ->>>>>>> Transfer page QML development onClicked: { console.log("Transfer: paymentClicked") var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority @@ -399,7 +391,6 @@ Rectangle { persistentSettings.transferShowAdvanced = !persistentSettings.transferShowAdvanced } text: qsTr("Show advanced options") + translationManager.emptyString - checkedIcon: "../images/checkedIcon-black.png" } } |