AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: consistency camelcase qewallet

Browse Source
This commit is contained in:
Sander van Grieken
2023-04-25 13:33:15 +02:00
parent f0bbbe9955
commit 61179ede8c
6 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/Invoices.qml
View File

@@ -94,7 +94,7 @@ Pane {
icon.source: '../../icons/delete.png'
visible: listview.currentIndex >= 0
onClicked: {
Daemon.currentWallet.delete_invoice(listview.currentItem.getKey())
Daemon.currentWallet.deleteInvoice(listview.currentItem.getKey())
}
}
FlatButton {

2
electrum/gui/qml/components/ReceiveRequests.qml
View File

@@ -93,7 +93,7 @@ Pane {
icon.source: '../../icons/delete.png'
visible: listview.currentIndex >= 0
onClicked: {
Daemon.currentWallet.delete_request(listview.currentItem.getKey())
Daemon.currentWallet.deleteRequest(listview.currentItem.getKey())
}
}
FlatButton {

2
electrum/gui/qml/components/WalletDetails.qml
View File

@@ -493,7 +493,7 @@ Pane {
infotext: qsTr('If you forget your password, you\'ll need to restore from seed. Please make sure you have your seed stored safely')
})
dialog.accepted.connect(function() {
Daemon.currentWallet.set_password(dialog.password)
Daemon.currentWallet.setPassword(dialog.password)
})
dialog.open()
}

2
electrum/gui/qml/components/WalletMainView.qml
View File

@@ -193,7 +193,7 @@ Item {
}
onPressAndHold: {
Config.userKnowsPressAndHold = true
Daemon.currentWallet.delete_expired_requests()
Daemon.currentWallet.deleteExpiredRequests()
app.stack.push(Qt.resolvedUrl('ReceiveRequests.qml'))
AppController.haptic()
}

4
electrum/gui/qml/components/main.qml
View File

@@ -541,13 +541,13 @@ ApplicationWindow
function handleAuthRequired(qtobject, method, authMessage) {
console.log('auth using method ' + method)
if (method == 'wallet') {
if (Daemon.currentWallet.verify_password('')) {
if (Daemon.currentWallet.verifyPassword('')) {
// wallet has no password
qtobject.authProceed()
} else {
var dialog = app.passwordDialog.createObject(app, {'title': qsTr('Enter current password')})
dialog.accepted.connect(function() {
if (Daemon.currentWallet.verify_password(dialog.password)) {
if (Daemon.currentWallet.verifyPassword(dialog.password)) {
qtobject.authProceed()
} else {
qtobject.authCancel()

18
electrum/gui/qml/qewallet.py
View File

@@ -614,7 +614,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
threading.Thread(target=pay_thread, daemon=True).start()
@pyqtSlot()
def delete_expired_requests(self):
def deleteExpiredRequests(self):
keys = self.wallet.delete_expired_requests()
for key in keys:
self.requestModel.delete_invoice(key)
@@ -654,27 +654,19 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
self.requestCreateSuccess.emit(key)
@pyqtSlot(str)
def delete_request(self, key: str):
def deleteRequest(self, key: str):
self._logger.debug('delete req %s' % key)
self.wallet.delete_request(key)
self.requestModel.delete_invoice(key)
@pyqtSlot(str, result='QVariant')
def get_request(self, key: str):
return self.requestModel.get_model_invoice(key)
@pyqtSlot(str)
def delete_invoice(self, key: str):
def deleteInvoice(self, key: str):
self._logger.debug('delete inv %s' % key)
self.wallet.delete_invoice(key)
self.invoiceModel.delete_invoice(key)
@pyqtSlot(str, result='QVariant')
def get_invoice(self, key: str):
return self.invoiceModel.get_model_invoice(key)
@pyqtSlot(str, result=bool)
def verify_password(self, password):
def verifyPassword(self, password):
try:
self.wallet.storage.check_password(password)
return True
@@ -682,7 +674,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
return False
@pyqtSlot(str)
def set_password(self, password):
def setPassword(self, password):
if password == '':
password = None