fix GUIs to work with PyQt6

Unresolved problems:
* File->Quit menu does not work.
* Validator in add chan dialog does not work.

src/bitmessageqt/account.py

@@ -150,10 +150,7 @@ def parseMessage(self, toAddress, fromAddress, subject, message):
 
         self.toAddress = toAddress
         self.fromAddress = fromAddress
-        if isinstance(subject, unicode):
-            self.subject = str(subject)
-        else:
-            self.subject = subject
+        self.subject = subject
         self.message = message
         self.fromLabel = self.getLabel(fromAddress)
         self.toLabel = self.getLabel(toAddress)

src/bitmessageqt/address_dialogs.py

@@ -8,7 +8,7 @@
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 import queues
-import bitmessageqt.widgets
+import bitmessageqt.widgets as widgets
 import state
 from .account import AccountMixin, GatewayAccount, MailchuckAccount, accountClass
 from addresses import addBMIfNotPresent, decodeAddress, encodeVarint
@@ -21,10 +21,6 @@ class AddressCheckMixin(object):
 
     def __init__(self):
         self.valid = False
-        QtCore.QObject.connect(  # pylint: disable=no-member
-            self.lineEditAddress,
-            QtCore.SIGNAL("textChanged(QString)"),
-            self.addressChanged)
 
     def _onSuccess(self, addressVersion, streamNumber, ripe):
         pass
@@ -90,8 +86,8 @@ def accept(self):
         """Callback for QDIalog accepting value"""
         if self.valid:
             self.data = (
-                addBMIfNotPresent(str(self.lineEditAddress.text())),
-                str(self.lineEditLabel.text().toUtf8())
+                addBMIfNotPresent(self.lineEditAddress.text()),
+                self.lineEditLabel.text()
             )
         else:
             queues.UISignalQueue.put(('updateStatusBar', _translate(
@@ -110,6 +106,7 @@ def __init__(self, parent=None, address=None):
         AddressCheckMixin.__init__(self)
         if address:
             self.lineEditAddress.setText(address)
+        self.lineEditAddress.textChanged.connect(self.addressChanged)
 
 
 class NewAddressDialog(QtWidgets.QDialog):
@@ -125,7 +122,7 @@ def __init__(self, parent=None):
             self.radioButtonExisting.click()
             self.comboBoxExisting.addItem(address)
         self.groupBoxDeterministic.setHidden(True)
-        QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
+        QtWidgets.QWidget.resize(self, QtWidgets.QWidget.sizeHint(self))
         self.show()
 
     def accept(self):
@@ -142,7 +139,7 @@ def accept(self):
                     self.comboBoxExisting.currentText())[2]
             queues.addressGeneratorQueue.put((
                 'createRandomAddress', 4, streamNumberForAddress,
-                str(self.newaddresslabel.text().toUtf8()), 1, "",
+                self.newaddresslabel.text(), 1, "",
                 self.checkBoxEighteenByteRipe.isChecked()
             ))
         else:
@@ -169,7 +166,7 @@ def accept(self):
                     'createDeterministicAddresses', 4, streamNumberForAddress,
                     "unused deterministic address",
                     self.spinBoxNumberOfAddressesToMake.value(),
-                    self.lineEditPassphrase.text().toUtf8(),
+                    self.lineEditPassphrase.text(),
                     self.checkBoxEighteenByteRipe.isChecked()
                 ))
 
@@ -181,6 +178,7 @@ def __init__(self, parent=None):
         super(NewSubscriptionDialog, self).__init__(parent)
         widgets.load('newsubscriptiondialog.ui', self)
         AddressCheckMixin.__init__(self)
+        self.lineEditAddress.textChanged.connect(self.addressChanged)
 
     def _onSuccess(self, addressVersion, streamNumber, ripe):
         if addressVersion <= 3:
@@ -222,7 +220,7 @@ def __init__(self, parent=None):
         super(RegenerateAddressesDialog, self).__init__(parent)
         widgets.load('regenerateaddresses.ui', self)
         self.groupBox.setTitle('')
-        QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
+        QtWidgets.QWidget.resize(self, QtWidgets.QWidget.sizeHint(self))
 
 
 class SpecialAddressBehaviorDialog(QtWidgets.QDialog):
@@ -257,11 +255,9 @@ def __init__(self, parent=None, config=global_config):
                 else:
                     self.radioButtonBehaveNormalAddress.click()
                 mailingListName = config.safeGet(self.address, 'mailinglistname', '')
-                self.lineEditMailingListName.setText(
-                    unicode(mailingListName, 'utf-8')
-                )
+                self.lineEditMailingListName.setText(mailingListName)
 
-        QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
+        QtWidgets.QWidget.resize(self, QtWidgets.QWidget.sizeHint(self))
         self.show()
 
     def accept(self):
@@ -281,7 +277,7 @@ def accept(self):
         else:
             self.config.set(str(self.address), 'mailinglist', 'true')
             self.config.set(str(self.address), 'mailinglistname', str(
-                self.lineEditMailingListName.text().toUtf8()))
+                self.lineEditMailingListName.text()))
             self.parent.setCurrentItemColor(
                 QtGui.QColor(137, 4, 177))  # magenta
         self.parent.rerenderComboBoxSendFrom()
@@ -329,7 +325,7 @@ def __init__(self, parent, config=global_config, account=None):
             else:
                 self.acct = MailchuckAccount(address)
         self.lineEditEmail.setFocus()
-        QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
+        QtWidgets.QWidget.resize(self, QtWidgets.QWidget.sizeHint(self))
 
     def accept(self):
         """Accept callback"""
@@ -343,7 +339,7 @@ def accept(self):
 
         if self.radioButtonRegister.isChecked() \
                 or self.radioButtonRegister.isHidden():
-            email = str(self.lineEditEmail.text().toUtf8())
+            email = self.lineEditEmail.text()
             self.acct.register(email)
             self.config.set(self.acct.fromAddress, 'label', email)
             self.config.set(self.acct.fromAddress, 'gateway', 'mailchuck')

src/bitmessageqt/addressvalidator.py

@@ -5,7 +5,7 @@
 
 from queue import Empty
 
-from PyQt6 import QtGui
+from PyQt6 import QtGui, QtWidgets
 
 from addresses import decodeAddress, addBMIfNotPresent
 from bmconfigparser import config
@@ -32,7 +32,7 @@ def setParams(
         self.addressMandatory = addressMandatory
         self.isValid = False
         # save default text
-        self.okButtonLabel = self.buttonBox.button(QtGui.QDialogButtonBox.Ok).text()
+        self.okButtonLabel = self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).text()
 
     def setError(self, string):
         """Indicate that the validation is pending or failed"""
@@ -44,12 +44,12 @@ def setError(self, string):
             self.feedBackObject.setText(string)
         self.isValid = False
         if self.buttonBox:
-            self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(False)
+            self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setEnabled(False)
             if string is not None and self.feedBackObject is not None:
-                self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText(
+                self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText(
                     _translate("AddressValidator", "Invalid"))
             else:
-                self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText(
+                self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText(
                     _translate("AddressValidator", "Validating..."))
 
     def setOK(self, string):
@@ -62,8 +62,8 @@ def setOK(self, string):
             self.feedBackObject.setText(string)
         self.isValid = True
         if self.buttonBox:
-            self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True)
-            self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText(self.okButtonLabel)
+            self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setEnabled(True)
+            self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText(self.okButtonLabel)
 
     def checkQueue(self):
         """Validator queue loop"""
@@ -87,47 +87,47 @@ def checkQueue(self):
 
         if not addressGeneratorReturnValue:
             self.setError(_translate("AddressValidator", "Address already present as one of your identities."))
-            return (QtGui.QValidator.Intermediate, 0)
+            return (QtGui.QValidator.State.Intermediate, 0)
         if addressGeneratorReturnValue[0] == 'chan name does not match address':
             self.setError(
                 _translate(
                     "AddressValidator",
                     "Although the Bitmessage address you "
                     "entered was valid, it doesn't match the chan name."))
-            return (QtGui.QValidator.Intermediate, 0)
+            return (QtGui.QValidator.State.Intermediate, 0)
         self.setOK(_translate("MainWindow", "Passphrase and address appear to be valid."))
 
     def returnValid(self):
         """Return the value of whether the validation was successful"""
         if self.isValid:
-            return QtGui.QValidator.Acceptable
-        return QtGui.QValidator.Intermediate
+            return QtGui.QValidator.State.Acceptable
+        return QtGui.QValidator.State.Intermediate
 
     def validate(self, s, pos):
         """Top level validator method"""
         if self.addressObject is None:
             address = None
         else:
-            address = str(self.addressObject.text().toUtf8())
+            address = self.addressObject.text()
             if address == "":
                 address = None
         if self.passPhraseObject is None:
             passPhrase = ""
         else:
-            passPhrase = str(self.passPhraseObject.text().toUtf8())
+            passPhrase = self.passPhraseObject.text()
             if passPhrase == "":
                 passPhrase = None
 
         # no chan name
         if passPhrase is None:
             self.setError(_translate("AddressValidator", "Chan name/passphrase needed. You didn't enter a chan name."))
-            return (QtGui.QValidator.Intermediate, pos)
+            return (QtGui.QValidator.State.Intermediate, pos)
 
         if self.addressMandatory or address is not None:
             # check if address already exists:
             if address in config.addresses():
                 self.setError(_translate("AddressValidator", "Address already present as one of your identities."))
-                return (QtGui.QValidator.Intermediate, pos)
+                return (QtGui.QValidator.State.Intermediate, pos)
 
             # version too high
             if decodeAddress(address)[0] == 'versiontoohigh':
@@ -138,29 +138,29 @@ def validate(self, s, pos):
                         " address might be valid, its version number"
                         " is too new for us to handle. Perhaps you need"
                         " to upgrade Bitmessage."))
-                return (QtGui.QValidator.Intermediate, pos)
+                return (QtGui.QValidator.State.Intermediate, pos)
 
             # invalid
             if decodeAddress(address)[0] != 'success':
                 self.setError(_translate("AddressValidator", "The Bitmessage address is not valid."))
-                return (QtGui.QValidator.Intermediate, pos)
+                return (QtGui.QValidator.State.Intermediate, pos)
 
         # this just disables the OK button without changing the feedback text
         # but only if triggered by textEdited, not by clicking the Ok button
-        if not self.buttonBox.button(QtGui.QDialogButtonBox.Ok).hasFocus():
+        if not self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).hasFocus():
             self.setError(None)
 
         # check through generator
         if address is None:
-            addressGeneratorQueue.put(('createChan', 4, 1, str_chan + ' ' + str(passPhrase), passPhrase, False))
+            addressGeneratorQueue.put(('createChan', 4, 1, str_chan + ' ' + passPhrase, passPhrase, False))
         else:
             addressGeneratorQueue.put(
                 ('joinChan', addBMIfNotPresent(address),
                  "{} {}".format(str_chan, passPhrase), passPhrase, False))
 
-        if self.buttonBox.button(QtGui.QDialogButtonBox.Ok).hasFocus():
+        if self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).hasFocus():
             return (self.returnValid(), pos)
-        return (QtGui.QValidator.Intermediate, pos)
+        return (QtGui.QValidator.State.Intermediate, pos)
 
     def checkData(self):
         """Validator Qt signal interface"""