Merge pull request #2315

1e64ebe QML: warning fixes (selsta)
This commit is contained in:
luigi1111 2019-08-06 15:03:40 -05:00
commit 886be81af2
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 43 additions and 38 deletions

View file

@ -251,7 +251,7 @@ Rectangle {
onClicked: { onClicked: {
loadPage("Settings") loadPage("Settings")
} }
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignCenter
width: 135 width: 135
} }
} }

View file

@ -4,19 +4,25 @@ import QtGraphicalEffects 1.0
import "../../components" as MoneroComponents import "../../components" as MoneroComponents
RowLayout { Item {
id: root id: root
spacing: 10
property bool checked: false; property bool checked: false;
property alias text: content.text property alias text: content.text
signal changed; signal changed;
width: checkBoxLayout.width
height: 22
RowLayout {
id: checkBoxLayout
spacing: 10
Item {
height: root.height
width: root.height
Rectangle { Rectangle {
id: checkbox id: checkbox
anchors.left: parent.left anchors.fill: parent
anchors.top: parent.top
implicitHeight: 22
width: 22
radius: 5 radius: 5
Image { Image {
@ -26,27 +32,6 @@ RowLayout {
source: "qrc:///images/uncheckedIcon.png" source: "qrc:///images/uncheckedIcon.png"
} }
} }
MoneroComponents.TextPlain {
id: content
font.pixelSize: 14
font.bold: false
color: "white"
text: ""
themeTransition: false
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
root.checked = !root.checked;
changed();
}
}
DropShadow { DropShadow {
anchors.fill: source anchors.fill: source
cached: true cached: true
@ -59,3 +44,23 @@ RowLayout {
source: checkbox source: checkbox
} }
} }
MoneroComponents.TextPlain {
id: content
font.pixelSize: 14
font.bold: false
color: "white"
text: ""
themeTransition: false
}
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
root.checked = !root.checked;
changed();
}
}
}

View file

@ -376,7 +376,7 @@ bool WalletManager::localDaemonSynced() const
bool WalletManager::isDaemonLocal(const QString &daemon_address) 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 QString WalletManager::resolveOpenAlias(const QString &address) const