diff --git a/electrum/gui/qml/components/About.qml b/electrum/gui/qml/components/About.qml index b66453432..18d5e0c9d 100644 --- a/electrum/gui/qml/components/About.qml +++ b/electrum/gui/qml/components/About.qml @@ -4,6 +4,8 @@ import QtQuick.Controls 2.0 import QtQuick.Controls.Material 2.0 Pane { + objectName: 'About' + property string title: qsTr("About Electrum") Flickable { diff --git a/electrum/gui/qml/components/Addresses.qml b/electrum/gui/qml/components/Addresses.qml index 280239334..3008c9612 100644 --- a/electrum/gui/qml/components/Addresses.qml +++ b/electrum/gui/qml/components/Addresses.qml @@ -9,6 +9,8 @@ import "controls" Pane { id: rootItem + objectName: 'Addresses' + padding: 0 ColumnLayout { diff --git a/electrum/gui/qml/components/Channels.qml b/electrum/gui/qml/components/Channels.qml index 19a9ed915..7a67256be 100644 --- a/electrum/gui/qml/components/Channels.qml +++ b/electrum/gui/qml/components/Channels.qml @@ -9,6 +9,8 @@ import "controls" Pane { id: root + objectName: 'Channels' + padding: 0 ColumnLayout { diff --git a/electrum/gui/qml/components/Preferences.qml b/electrum/gui/qml/components/Preferences.qml index a2cbababc..c7ffe8cf3 100644 --- a/electrum/gui/qml/components/Preferences.qml +++ b/electrum/gui/qml/components/Preferences.qml @@ -9,6 +9,7 @@ import "controls" Pane { id: preferences + objectName: 'Properties' property string title: qsTr("Preferences") diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml index 3e0501977..8769c35e3 100644 --- a/electrum/gui/qml/components/WalletMainView.qml +++ b/electrum/gui/qml/components/WalletMainView.qml @@ -78,41 +78,42 @@ Item { id: menu MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/wallet.png' action: Action { text: qsTr('Wallet details') - enabled: Daemon.currentWallet + enabled: Daemon.currentWallet && app.stack.currentItem.objectName != 'WalletDetails' onTriggered: menu.openPage(Qt.resolvedUrl('WalletDetails.qml')) - icon.source: '../../icons/wallet.png' } } MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/tab_addresses.png' action: Action { text: qsTr('Addresses'); onTriggered: menu.openPage(Qt.resolvedUrl('Addresses.qml')); - enabled: Daemon.currentWallet - icon.source: '../../icons/tab_addresses.png' + enabled: Daemon.currentWallet && app.stack.currentItem.objectName != 'Addresses' } } MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/lightning.png' action: Action { text: qsTr('Channels'); - enabled: Daemon.currentWallet && Daemon.currentWallet.isLightning + enabled: Daemon.currentWallet && Daemon.currentWallet.isLightning && app.stack.currentItem.objectName != 'Channels' onTriggered: menu.openPage(Qt.resolvedUrl('Channels.qml')) - icon.source: '../../icons/lightning.png' } } MenuSeparator { } MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/file.png' action: Action { - text: qsTr('Other wallets'); + text: qsTr('Other wallets') + enabled: app.stack.currentItem.objectName != 'Wallets' onTriggered: menu.openPage(Qt.resolvedUrl('Wallets.qml')) - icon.source: '../../icons/file.png' } } diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml index 3a86199fb..de4f656dd 100644 --- a/electrum/gui/qml/components/main.qml +++ b/electrum/gui/qml/components/main.qml @@ -49,29 +49,32 @@ ApplicationWindow id: menu MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/network.png' action: Action { text: qsTr('Network') onTriggered: menu.openPage(Qt.resolvedUrl('NetworkOverview.qml')) - icon.source: '../../icons/network.png' + enabled: stack.currentItem.objectName != 'NetworkOverview' } } MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/preferences.png' action: Action { - text: qsTr('Preferences'); + text: qsTr('Preferences') onTriggered: menu.openPage(Qt.resolvedUrl('Preferences.qml')) - icon.source: '../../icons/preferences.png' + enabled: stack.currentItem.objectName != 'Properties' } } MenuItem { - icon.color: 'transparent' + icon.color: action.enabled ? 'transparent' : Material.iconDisabledColor + icon.source: '../../icons/electrum.png' action: Action { text: qsTr('About'); onTriggered: menu.openPage(Qt.resolvedUrl('About.qml')) - icon.source: '../../icons/electrum.png' + enabled: stack.currentItem.objectName != 'About' } }