Skip to content

GUI: Migrate to PySide6 (Enables ARM/Apple Silicon support) #824

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
therohityadav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GUI: Migrate to PySide6 (Enables ARM/Apple Silicon support) #824

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
2 changes: 1 addition & 1 deletion contrib/generate-ui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pushd hwilib/ui
for file in *.ui
do
gen_file=ui_`echo $file| cut -d. -f1`.py
pyside2-uic $file -o $gen_file
pyside6-uic $file -o $gen_file
sed -i'' -e 's/raise()/raise_()/g' $gen_file
done
popd
34 changes: 17 additions & 17 deletions hwilib/_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
print('Could not import UI files, did you run contrib/generate-ui.sh')
exit(-1)

from PySide2.QtGui import QRegExpValidator
from PySide2.QtWidgets import QApplication, QDialog, QDialogButtonBox, QFileDialog, QLineEdit, QMessageBox, QMainWindow, QMenu
from PySide2.QtCore import QCoreApplication, QRegExp, Signal, Slot
from PySide6.QtGui import QRegularExpressionValidator
from PySide6.QtWidgets import QApplication, QDialog, QDialogButtonBox, QFileDialog, QLineEdit, QMessageBox, QMainWindow, QMenu
from PySide6.QtCore import QCoreApplication, QRegularExpression, Signal, Slot

def do_command(f, *args, **kwargs):
result = {}
Expand Down Expand Up @@ -59,7 +59,7 @@ def __init__(self, client, prompt_pin=True):
self.setWindowTitle('Send Pin')
self.client = client
self.ui.pin_lineedit.setFocus()
self.ui.pin_lineedit.setValidator(QRegExpValidator(QRegExp("[1-9]+"), None))
self.ui.pin_lineedit.setValidator(QRegularExpressionValidator(QRegularExpression("[1-9]+"), None))
self.ui.pin_lineedit.setEchoMode(QLineEdit.Password)

self.ui.p1_button.clicked.connect(self.button_clicked(1))
Expand Down Expand Up @@ -100,7 +100,7 @@ def __init__(self, client):
self.setWindowTitle('Get xpub')
self.client = client

self.ui.path_lineedit.setValidator(QRegExpValidator(QRegExp("m(/[0-9]+['Hh]?)+"), None))
self.ui.path_lineedit.setValidator(QRegularExpressionValidator(QRegularExpression("m(/[0-9]+['Hh]?)+"), None))
self.ui.path_lineedit.setFocus()
self.ui.buttonBox.button(QDialogButtonBox.Close).setAutoDefault(False)

Expand Down Expand Up @@ -186,7 +186,7 @@ def __init__(self, client):
self.setWindowTitle('Sign Message')
self.client = client

self.ui.path_lineedit.setValidator(QRegExpValidator(QRegExp("m(/[0-9]+['Hh]?)+"), None))
self.ui.path_lineedit.setValidator(QRegularExpressionValidator(QRegularExpression("m(/[0-9]+['Hh]?)+"), None))
self.ui.msg_textedit.setFocus()

self.ui.signmsg_button.clicked.connect(self.signmsg_button_clicked)
Expand All @@ -207,7 +207,7 @@ def __init__(self, client):
self.setWindowTitle('Display Address')
self.client = client

self.ui.path_lineedit.setValidator(QRegExpValidator(QRegExp("m(/[0-9]+['Hh]?)+"), None))
self.ui.path_lineedit.setValidator(QRegularExpressionValidator(QRegularExpression("m(/[0-9]+['Hh]?)+"), None))
self.ui.path_lineedit.setFocus()

self.ui.go_button.clicked.connect(self.go_button_clicked)
Expand Down Expand Up @@ -239,7 +239,7 @@ def __init__(self, opts):
self.ui.internal_checkbox.setChecked(opts['internal'])
self.ui.keypool_checkbox.setChecked(opts['keypool'])
self.ui.account_spinbox.setValue(opts['account'])
self.ui.path_lineedit.setValidator(QRegExpValidator(QRegExp(r"m(/[0-9]+['Hh]?)+/\*"), None))
self.ui.path_lineedit.setValidator(QRegularExpressionValidator(QRegularExpression(r"m(/[0-9]+['Hh]?)+/\*"), None))
if opts['account_used']:
self.ui.account_radio.setChecked(True)
self.ui.path_radio.setChecked(False)
Expand Down Expand Up @@ -307,7 +307,7 @@ def show_pairing(self, code: str, device_response: Callable[[], bool]) -> bool:
if not device_response():
return False
dialog.enable_buttons()
dialog.exec_()
dialog.exec()
return dialog.result() == QDialog.Accepted

def attestation_check(self, result: bool) -> None:
Expand Down Expand Up @@ -390,7 +390,7 @@ def refresh_clicked(self):
def show_setpassphrasedialog(self):
self.current_dialog = SetPassphraseDialog()
self.current_dialog.accepted.connect(self.setpassphrasedialog_accepted)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def setpassphrasedialog_accepted(self):
Expand Down Expand Up @@ -455,7 +455,7 @@ def get_device_info(self):
def show_sendpindialog(self, prompt_pin=True):
self.current_dialog = SendPinDialog(self.client, prompt_pin)
self.current_dialog.pin_sent_success.connect(self.sendpindialog_accepted)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def sendpindialog_accepted(self):
Expand All @@ -468,28 +468,28 @@ def sendpindialog_accepted(self):
@Slot()
def show_getxpubdialog(self):
self.current_dialog = GetXpubDialog(self.client)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def show_signpsbtdialog(self):
self.current_dialog = SignPSBTDialog(self.client)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def show_signmessagedialog(self):
self.current_dialog = SignMessageDialog(self.client)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def show_displayaddressdialog(self):
self.current_dialog = DisplayAddressDialog(self.client)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def show_getkeypooloptionsdialog(self):
self.current_dialog = GetKeypoolOptionsDialog(self.getkeypool_opts)
self.current_dialog.accepted.connect(self.getkeypooloptionsdialog_accepted)
self.current_dialog.exec_()
self.current_dialog.exec()

@Slot()
def getkeypooloptionsdialog_accepted(self):
Expand Down Expand Up @@ -543,7 +543,7 @@ def process_gui_commands(cli_args):
window.refresh_clicked()

window.show()
ret = app.exec_()
ret = app.exec()
result = {'success': ret == 0}

return result
Expand Down
Loading