Skip to content
Permalink
Browse files

Merge pull request #2315

1e64ebe QML: warning fixes (selsta)
  • Loading branch information...
luigi1111 committed Aug 6, 2019
2 parents 671ddf5 + 1e64ebe commit 886be81af28c9f1dd8d131a8e2e42b5adbb393c7
Showing with 43 additions and 38 deletions.
  1. +1 −1 pages/Keys.qml
  2. +41 −36 pages/merchant/MerchantCheckbox.qml
  3. +1 −1 src/libwalletqt/WalletManager.cpp
@@ -251,7 +251,7 @@ Rectangle {
onClicked: {
loadPage("Settings")
}
anchors.horizontalCenter: parent.horizontalCenter
Layout.alignment: Qt.AlignCenter
width: 135
}
}
@@ -4,38 +4,55 @@ import QtGraphicalEffects 1.0

import "../../components" as MoneroComponents

RowLayout {
Item {
id: root
spacing: 10
property bool checked: false;
property alias text: content.text
signal changed;

Rectangle {
id: checkbox
anchors.left: parent.left
anchors.top: parent.top
implicitHeight: 22
width: 22
radius: 5
width: checkBoxLayout.width
height: 22

Image {
id: imageChecked
visible: root.checked
anchors.centerIn: parent
source: "qrc:///images/uncheckedIcon.png"
}
}
RowLayout {
id: checkBoxLayout
spacing: 10

MoneroComponents.TextPlain {
id: content
font.pixelSize: 14
font.bold: false
color: "white"
text: ""
themeTransition: false
}
Item {
height: root.height
width: root.height
Rectangle {
id: checkbox
anchors.fill: parent
radius: 5

Image {
id: imageChecked
visible: root.checked
anchors.centerIn: parent
source: "qrc:///images/uncheckedIcon.png"
}
}
DropShadow {
anchors.fill: source
cached: true
horizontalOffset: 3
verticalOffset: 3
radius: 8.0
samples: 16
color: "#20000000"
smooth: true
source: checkbox
}
}
MoneroComponents.TextPlain {
id: content
font.pixelSize: 14
font.bold: false
color: "white"
text: ""
themeTransition: false
}
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
@@ -46,16 +63,4 @@ RowLayout {
changed();
}
}

DropShadow {
anchors.fill: source
cached: true
horizontalOffset: 3
verticalOffset: 3
radius: 8.0
samples: 16
color: "#20000000"
smooth: true
source: checkbox
}
}
@@ -376,7 +376,7 @@ bool WalletManager::localDaemonSynced() const

bool WalletManager::isDaemonLocal(const QString &daemon_address) const
{
return Monero::Utils::isAddressLocal(daemon_address.toStdString());
return daemon_address.isEmpty() ? false : Monero::Utils::isAddressLocal(daemon_address.toStdString());
}

QString WalletManager::resolveOpenAlias(const QString &address) const

0 comments on commit 886be81

Please sign in to comment.
You can’t perform that action at this time.