From c7e055bdb963524d181346c707b627a17c912421 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 19 Dec 2023 12:19:38 +0100 Subject: [PATCH 1/2] qml: remove unused components --- .../gui/qml/components/ChannelBackups.qml | 108 --------------- electrum/gui/qml/components/Channels.qml | 16 --- .../LightningPaymentProgressDialog.qml | 125 ------------------ .../gui/qml/components/WalletMainView.qml | 7 - 4 files changed, 256 deletions(-) delete mode 100644 electrum/gui/qml/components/ChannelBackups.qml delete mode 100644 electrum/gui/qml/components/LightningPaymentProgressDialog.qml diff --git a/electrum/gui/qml/components/ChannelBackups.qml b/electrum/gui/qml/components/ChannelBackups.qml deleted file mode 100644 index 1291b6939..000000000 --- a/electrum/gui/qml/components/ChannelBackups.qml +++ /dev/null @@ -1,108 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import QtQuick.Controls.Material - -import org.electrum 1.0 - -import "controls" - -Pane { - id: root - padding: 0 - - ColumnLayout { - id: layout - width: parent.width - height: parent.height - spacing: 0 - - GridLayout { - id: summaryLayout - Layout.preferredWidth: parent.width - Layout.topMargin: constants.paddingLarge - Layout.leftMargin: constants.paddingLarge - Layout.rightMargin: constants.paddingLarge - - columns: 2 - - Heading { - Layout.columnSpan: 2 - text: qsTr('Lightning Channel Backups') - } - } - - Frame { - id: channelsFrame - Layout.fillWidth: true - Layout.fillHeight: true - Layout.topMargin: constants.paddingLarge - Layout.bottomMargin: constants.paddingLarge - Layout.leftMargin: constants.paddingMedium - Layout.rightMargin: constants.paddingMedium - - verticalPadding: 0 - horizontalPadding: 0 - background: PaneInsetBackground {} - - ColumnLayout { - spacing: 0 - anchors.fill: parent - - ListView { - id: listview - Layout.preferredWidth: parent.width - Layout.fillHeight: true - clip: true - model: Daemon.currentWallet.channelModel.filterModelBackups() - - delegate: ChannelDelegate { - onClicked: { - app.stack.push(Qt.resolvedUrl('ChannelDetails.qml'), { channelid: model.cid }) - } - } - - ScrollIndicator.vertical: ScrollIndicator { } - - Label { - visible: listview.model.count == 0 - anchors.centerIn: parent - width: listview.width * 4/5 - font.pixelSize: constants.fontSizeXXLarge - color: constants.mutedForeground - text: qsTr('No Lightning channel backups present') - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignHCenter - } - } - } - } - - FlatButton { - Layout.fillWidth: true - text: qsTr('Import channel backup') - onClicked: { - var dialog = importChannelBackupDialog.createObject(root) - dialog.open() - } - icon.source: '../../icons/file.png' - } - - } - - Connections { - target: Daemon.currentWallet - function onImportChannelBackupFailed(message) { - var dialog = app.messageDialog.createObject(root, { title: qstr('Error'), text: message }) - dialog.open() - } - } - - Component { - id: importChannelBackupDialog - ImportChannelBackupDialog { - onClosed: destroy() - } - } - -} diff --git a/electrum/gui/qml/components/Channels.qml b/electrum/gui/qml/components/Channels.qml index 1faed65c5..794fd7c2f 100644 --- a/electrum/gui/qml/components/Channels.qml +++ b/electrum/gui/qml/components/Channels.qml @@ -155,7 +155,6 @@ Pane { } icon.source: '../../icons/lightning.png' } - } } @@ -167,19 +166,4 @@ Pane { } } - Component { - id: importChannelBackupDialog - ImportChannelBackupDialog { - onClosed: destroy() - } - } - - Connections { - target: Daemon.currentWallet - function onImportChannelBackupFailed(message) { - var dialog = app.messageDialog.createObject(root, { title: qsTr('Error'), text: message }) - dialog.open() - } - } - } diff --git a/electrum/gui/qml/components/LightningPaymentProgressDialog.qml b/electrum/gui/qml/components/LightningPaymentProgressDialog.qml deleted file mode 100644 index 1f82380a0..000000000 --- a/electrum/gui/qml/components/LightningPaymentProgressDialog.qml +++ /dev/null @@ -1,125 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import QtQuick.Controls.Material - -import org.electrum 1.0 - -import "controls" - -ElDialog { - id: dialog - - required property string invoice_key - - width: parent.width - height: parent.height - - title: qsTr('Paying Lightning Invoice...') - - Item { - id: s - state: '' - states: [ - State { - name: '' - }, - State { - name: 'success' - PropertyChanges { target: spinner; running: false } - PropertyChanges { target: helpText; text: qsTr('Paid!') } - PropertyChanges { target: icon; source: '../../icons/confirmed.png' } - }, - State { - name: 'failed' - PropertyChanges { target: spinner; running: false } - PropertyChanges { target: helpText; text: qsTr('Payment failed') } - PropertyChanges { target: errorText; visible: true } - PropertyChanges { target: icon; source: '../../icons/warning.png' } - } - ] - transitions: [ - Transition { - from: '' - to: 'success' - PropertyAnimation { target: helpText; properties: 'text'; duration: 0} - NumberAnimation { target: icon; properties: 'opacity'; from: 0; to: 1; duration: 200 } - NumberAnimation { target: icon; properties: 'scale'; from: 0; to: 1; duration: 500 - easing.type: Easing.OutBack - easing.overshoot: 10 - } - }, - Transition { - from: '' - to: 'failed' - PropertyAnimation { target: helpText; properties: 'text'; duration: 0} - NumberAnimation { target: icon; properties: 'opacity'; from: 0; to: 1; duration: 500 } - } - ] - } - - ColumnLayout { - id: content - anchors.centerIn: parent - width: parent.width - - Item { - Layout.alignment: Qt.AlignHCenter - Layout.preferredWidth: constants.iconSizeXXLarge - Layout.preferredHeight: constants.iconSizeXXLarge - - BusyIndicator { - id: spinner - visible: s.state == '' - width: constants.iconSizeXXLarge - height: constants.iconSizeXXLarge - } - - Image { - id: icon - width: constants.iconSizeXXLarge - height: constants.iconSizeXXLarge - } - } - - Label { - id: helpText - Layout.alignment: Qt.AlignHCenter - text: qsTr('Paying...') - font.pixelSize: constants.fontSizeXXLarge - } - - Label { - id: errorText - Layout.preferredWidth: parent.width - Layout.alignment: Qt.AlignHCenter - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - font.pixelSize: constants.fontSizeLarge - } - } - - Connections { - target: Daemon.currentWallet - function onPaymentSucceeded(key) { - if (key != invoice_key) { - console.log('wrong invoice ' + key + ' != ' + invoice_key) - return - } - console.log('payment succeeded!') - s.state = 'success' - } - function onPaymentFailed(key, reason) { - if (key != invoice_key) { - console.log('wrong invoice ' + key + ' != ' + invoice_key) - return - } - console.log('payment failed: ' + reason) - s.state = 'failed' - errorText.text = reason - } - function onPaymentAuthRejected() { - dialog.close() - } - } -} diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml index 8dfd9c1de..6b2e1452b 100644 --- a/electrum/gui/qml/components/WalletMainView.qml +++ b/electrum/gui/qml/components/WalletMainView.qml @@ -584,13 +584,6 @@ Item { } } - Component { - id: lightningPaymentProgressDialog - LightningPaymentProgressDialog { - onClosed: destroy() - } - } - Component { id: lnurlPayDialog LnurlPayRequestDialog { From adcc9eb2d151bb222f2c7b1e7220586bae7c1f95 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 19 Dec 2023 12:26:00 +0100 Subject: [PATCH 2/2] qml: qewallet code style --- electrum/gui/qml/qewallet.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/electrum/gui/qml/qewallet.py b/electrum/gui/qml/qewallet.py index 16236256b..6febc387b 100644 --- a/electrum/gui/qml/qewallet.py +++ b/electrum/gui/qml/qewallet.py @@ -55,27 +55,27 @@ class QEWallet(AuthMixin, QObject, QtEventListener): dataChanged = pyqtSignal() balanceChanged = pyqtSignal() - requestStatusChanged = pyqtSignal([str,int], arguments=['key','status']) + requestStatusChanged = pyqtSignal([str, int], arguments=['key', 'status']) requestCreateSuccess = pyqtSignal([str], arguments=['key']) requestCreateError = pyqtSignal([str], arguments=['error']) - invoiceStatusChanged = pyqtSignal([str,int], arguments=['key','status']) + invoiceStatusChanged = pyqtSignal([str, int], arguments=['key', 'status']) invoiceCreateSuccess = pyqtSignal() - invoiceCreateError = pyqtSignal([str,str], arguments=['code','error']) + invoiceCreateError = pyqtSignal([str, str], arguments=['code', 'error']) paymentAuthRejected = pyqtSignal() paymentSucceeded = pyqtSignal([str], arguments=['key']) - paymentFailed = pyqtSignal([str,str], arguments=['key','reason']) + paymentFailed = pyqtSignal([str, str], arguments=['key', 'reason']) requestNewPassword = pyqtSignal() signSucceeded = pyqtSignal([str], arguments=['txid']) signFailed = pyqtSignal([str], arguments=['message']) broadcastSucceeded = pyqtSignal([str], arguments=['txid']) - broadcastFailed = pyqtSignal([str,str,str], arguments=['txid','code','reason']) + broadcastFailed = pyqtSignal([str, str, str], arguments=['txid', 'code', 'reason']) saveTxSuccess = pyqtSignal([str], arguments=['txid']) - saveTxError = pyqtSignal([str,str,str], arguments=['txid', 'code', 'message']) + saveTxError = pyqtSignal([str, str, str], arguments=['txid', 'code', 'message']) importChannelBackupFailed = pyqtSignal([str], arguments=['message']) labelsUpdated = pyqtSignal() otpRequested = pyqtSignal() otpSuccess = pyqtSignal() - otpFailed = pyqtSignal([str,str], arguments=['code','message']) + otpFailed = pyqtSignal([str, str], arguments=['code', 'message']) peersUpdated = pyqtSignal() seedRetrieved = pyqtSignal()