From 1e64ebe17a9b704e2b59496cde4ddd59d9305c3d Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Tue, 23 Jul 2019 21:24:41 +0200
Subject: [PATCH] QML: warning fixes
---
pages/Keys.qml | 2 +-
pages/merchant/MerchantCheckbox.qml | 77 +++++++++++++++--------------
src/libwalletqt/WalletManager.cpp | 2 +-
3 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/pages/Keys.qml b/pages/Keys.qml
index a8f62a19..3f6dcffd 100644
--- a/pages/Keys.qml
+++ b/pages/Keys.qml
@@ -251,7 +251,7 @@ Rectangle {
onClicked: {
loadPage("Settings")
}
- anchors.horizontalCenter: parent.horizontalCenter
+ Layout.alignment: Qt.AlignCenter
width: 135
}
}
diff --git a/pages/merchant/MerchantCheckbox.qml b/pages/merchant/MerchantCheckbox.qml
index 81eb924d..5483439e 100644
--- a/pages/merchant/MerchantCheckbox.qml
+++ b/pages/merchant/MerchantCheckbox.qml
@@ -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
+
+ 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
}
}
-
- 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
- }
}
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index d4ec5d41..eab5aad2 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -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