Skip to content

qml: allow renaming wallets #10573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
f321x wants to merge 1 commit into
base: master
Choose a base branch
from
+106 −0
Open

qml: allow renaming wallets #10573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions electrum/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,17 @@ def delete_wallet(self, path: str) -> bool:
return True
return False

def rename_wallet_file(self, old_path: str, new_path: str):
old_path = standardize_path(old_path)
new_path = standardize_path(new_path)
if os.path.exists(new_path):
raise ValueError("Wallet file already exists")
os.rename(old_path, new_path)
self.logger.debug(f'renamed wallet: {old_path} -> {new_path}')
self.update_recently_opened_wallets(old_path, remove=True)
if self.config.CURRENT_WALLET == old_path:
self.config.CURRENT_WALLET = new_path

def stop_wallet(self, path: str) -> bool:
"""Returns True iff a wallet was found."""
assert util.get_running_loop() != util.get_asyncio_loop(), 'must not be called from asyncio thread'
Expand Down
66 changes: 66 additions & 0 deletions electrum/gui/qml/components/WalletDetails.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,64 @@ Pane {
visible: Daemon.currentWallet
columns: 2

Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
text: qsTr('Name')
color: Material.accentColor
}

TextHighlightPane {
id: walletNameContent
property bool editmode: false
Layout.columnSpan: 2
Layout.fillWidth: true

RowLayout {
width: parent.width
Label {
visible: !walletNameContent.editmode
text: Daemon.currentWallet.name
wrapMode: Text.Wrap
Layout.fillWidth: true
font.pixelSize: constants.fontSizeLarge
}
ToolButton {
visible: !walletNameContent.editmode
icon.source: '../../icons/pen.png'
icon.color: 'transparent'
onClicked: {
walletNameEdit.text = Daemon.currentWallet.name
walletNameContent.editmode = true
walletNameEdit.focus = true
}
}
TextField {
id: walletNameEdit
visible: walletNameContent.editmode
Layout.fillWidth: true
font.pixelSize: constants.fontSizeLarge
}
ToolButton {
visible: walletNameContent.editmode
icon.source: '../../icons/confirmed.png'
icon.color: enabled ? 'transparent' : constants.mutedForeground
enabled: walletNameEdit.text !== Daemon.currentWallet.name
&& Daemon.isValidWalletName(walletNameEdit.text)
onClicked: {
walletNameContent.editmode = false
Daemon.renameWallet(walletNameEdit.text)
}
}
ToolButton {
visible: walletNameContent.editmode
icon.source: '../../icons/closebutton.png'
icon.color: 'transparent'
onClicked: walletNameContent.editmode = false
}
}
}

Label {
Layout.columnSpan: 2
Layout.topMargin: constants.paddingSmall
Expand Down Expand Up @@ -526,6 +584,14 @@ Pane {
dialog.open()
}
}
function onWalletRenameError(message) {
var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message
})
dialog.open()
}
}

Connections {
Expand Down
29 changes: 29 additions & 0 deletions electrum/gui/qml/qedaemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class QEDaemon(AuthMixin, QObject):
walletRequiresPassword = pyqtSignal([str, str], arguments=['name', 'path'])
walletOpenError = pyqtSignal([str], arguments=["error"])
walletDeleteError = pyqtSignal([str, str], arguments=['code', 'message'])
walletRenameError = pyqtSignal([str], arguments=['message'])

def __init__(self, daemon: 'Daemon', plugins: 'Plugins', parent=None):
super().__init__(parent)
Expand Down Expand Up @@ -310,6 +311,34 @@ def delete_wallet(self, wallet):

self.availableWallets.remove_wallet(path)

@pyqtSlot(str, result=bool)
def isValidWalletName(self, wallet_name: str) -> bool:
if not wallet_name:
return False
if self.availableWallets.wallet_name_exists(wallet_name):
return False
# ensure wallet_name is not interpreted as path
if os.path.basename(wallet_name) != wallet_name: # '/foo/bar/' returns 'bar'
return False
return True

@pyqtSlot(str)
def renameWallet(self, new_name: str):
wallet = self._current_wallet
assert wallet, "name change without wallet?"
old_path = standardize_path(wallet.wallet.storage.path)
wallet_dir = os.path.dirname(old_path)
new_path = standardize_path(os.path.join(wallet_dir, new_name))
if old_path == new_path:
return
self._current_wallet = None
self.daemon.stop_wallet(old_path)
try:
self.daemon.rename_wallet_file(old_path, new_path)
except Exception as e:
self.walletRenameError.emit(_('Error renaming wallet:\n') + str(e))
self.walletLoaded.emit(None, None)

@pyqtProperty(bool, notify=loadingChanged)
def loading(self):
return self._loading
Expand Down