This is probably the right way to handle modal dialogs
This commit is contained in:
parent
41155406d6
commit
afcd83a434
GPG Key ID:
720A756F18DEED13
|
|
@ -2225,31 +2225,18 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
if hasattr(acct, "feedback") \
|
||||
and acct.feedback != GatewayAccount.ALL_OK:
|
||||
if acct.feedback == GatewayAccount.REGISTRATION_DENIED:
|
||||
dialog = dialogs.EmailGatewayDialog(
|
||||
self,
|
||||
_translate(
|
||||
"EmailGatewayRegistrationDialog",
|
||||
"Registration failed:"),
|
||||
_translate(
|
||||
"EmailGatewayRegistrationDialog",
|
||||
"The requested email address is not available,"
|
||||
" please try a new one."),
|
||||
config=BMConfigParser()
|
||||
)
|
||||
if dialog.exec_():
|
||||
dialog.register(acct)
|
||||
dialogs.EmailGatewayDialog(
|
||||
self, BMConfigParser(), acct).exec_()
|
||||
|
||||
def click_pushButtonAddAddressBook(self, dialog=None):
|
||||
if not dialog:
|
||||
dialog = dialogs.AddAddressDialog(self)
|
||||
if dialog.exec_():
|
||||
if not dialog.valid:
|
||||
self.updateStatusBar(_translate(
|
||||
"MainWindow",
|
||||
"The address you entered was invalid. Ignoring it."
|
||||
))
|
||||
dialog.exec_()
|
||||
try:
|
||||
address, label = dialog.data
|
||||
except AttributeError:
|
||||
return
|
||||
address = addBMIfNotPresent(str(dialog.lineEditAddress.text()))
|
||||
|
||||
# First we must check to see if the address is already in the
|
||||
# address book. The user cannot add it again or else it will
|
||||
# cause problems when updating and deleting the entry.
|
||||
|
|
@ -2261,7 +2248,7 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
" if you want."
|
||||
))
|
||||
return
|
||||
label = str(dialog.lineEditLabel.text().toUtf8())
|
||||
|
||||
self.addEntryToAddressBook(address, label)
|
||||
|
||||
def addEntryToAddressBook(self, address, label):
|
||||
|
|
@ -2289,14 +2276,12 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
|
||||
def click_pushButtonAddSubscription(self):
|
||||
dialog = dialogs.NewSubscriptionDialog(self)
|
||||
if dialog.exec_():
|
||||
if not dialog.valid:
|
||||
self.updateStatusBar(_translate(
|
||||
"MainWindow",
|
||||
"The address you entered was invalid. Ignoring it."
|
||||
))
|
||||
dialog.exec_()
|
||||
try:
|
||||
address, label = dialog.data
|
||||
except AttributeError:
|
||||
return
|
||||
address = addBMIfNotPresent(str(dialog.lineEditAddress.text()))
|
||||
|
||||
# We must check to see if the address is already in the
|
||||
# subscriptions list. The user cannot add it again or else it
|
||||
# will cause problems when updating and deleting the entry.
|
||||
|
|
@ -2308,7 +2293,7 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
" if you want."
|
||||
))
|
||||
return
|
||||
label = str(dialog.lineEditLabel.text().toUtf8())
|
||||
|
||||
self.addSubscription(address, label)
|
||||
# Now, if the user wants to display old broadcasts, let's get
|
||||
# them out of the inventory and put them
|
||||
|
|
@ -2557,10 +2542,13 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
def on_action_EmailGatewayDialog(self):
|
||||
dialog = dialogs.EmailGatewayDialog(self, config=BMConfigParser())
|
||||
# For Modal dialogs
|
||||
acct = dialog.exec_()
|
||||
dialog.exec_()
|
||||
try:
|
||||
acct = dialog.data
|
||||
except AttributeError:
|
||||
return
|
||||
|
||||
# Only settings ramain here
|
||||
if acct:
|
||||
# Only settings remain here
|
||||
acct.settings()
|
||||
for i in range(self.ui.comboBoxSendFrom.count()):
|
||||
if str(self.ui.comboBoxSendFrom.itemData(i).toPyObject()) \
|
||||
|
|
@ -2621,53 +2609,7 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
addressAtCurrentRow, self.getCurrentFolder(), None, 0)
|
||||
|
||||
def click_NewAddressDialog(self):
|
||||
dialog = dialogs.NewAddressDialog(self)
|
||||
# For Modal dialogs
|
||||
if not dialog.exec_():
|
||||
logger.debug('new address dialog box rejected')
|
||||
return
|
||||
|
||||
# dialog.buttonBox.enabled = False
|
||||
if dialog.radioButtonRandomAddress.isChecked():
|
||||
if dialog.radioButtonMostAvailable.isChecked():
|
||||
streamNumberForAddress = 1
|
||||
else:
|
||||
# User selected 'Use the same stream as an existing
|
||||
# address.'
|
||||
streamNumberForAddress = decodeAddress(
|
||||
dialog.comboBoxExisting.currentText())[2]
|
||||
queues.addressGeneratorQueue.put((
|
||||
'createRandomAddress', 4, streamNumberForAddress,
|
||||
str(dialog.newaddresslabel.text().toUtf8()), 1, "",
|
||||
dialog.checkBoxEighteenByteRipe.isChecked()
|
||||
))
|
||||
else:
|
||||
if dialog.lineEditPassphrase.text() != \
|
||||
dialog.lineEditPassphraseAgain.text():
|
||||
QtGui.QMessageBox.about(
|
||||
self, _translate("MainWindow", "Passphrase mismatch"),
|
||||
_translate(
|
||||
"MainWindow",
|
||||
"The passphrase you entered twice doesn\'t"
|
||||
" match. Try again.")
|
||||
)
|
||||
elif dialog.lineEditPassphrase.text() == "":
|
||||
QtGui.QMessageBox.about(
|
||||
self, _translate("MainWindow", "Choose a passphrase"),
|
||||
_translate(
|
||||
"MainWindow", "You really do need a passphrase.")
|
||||
)
|
||||
else:
|
||||
# this will eventually have to be replaced by logic
|
||||
# to determine the most available stream number.
|
||||
streamNumberForAddress = 1
|
||||
queues.addressGeneratorQueue.put((
|
||||
'createDeterministicAddresses', 4, streamNumberForAddress,
|
||||
"unused deterministic address",
|
||||
dialog.spinBoxNumberOfAddressesToMake.value(),
|
||||
dialog.lineEditPassphrase.text().toUtf8(),
|
||||
dialog.checkBoxEighteenByteRipe.isChecked()
|
||||
))
|
||||
dialogs.NewAddressDialog(self)
|
||||
|
||||
def network_switch(self):
|
||||
dontconnect_option = not BMConfigParser().safeGetBoolean(
|
||||
|
|
@ -3063,9 +3005,8 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
self.ui.tabWidget.setCurrentIndex(
|
||||
self.ui.tabWidget.indexOf(self.ui.send)
|
||||
)
|
||||
dialog = dialogs.AddAddressDialog(self)
|
||||
dialog.lineEditAddress.setText(addressAtCurrentInboxRow)
|
||||
self.click_pushButtonAddAddressBook(dialog)
|
||||
self.click_pushButtonAddAddressBook(
|
||||
dialogs.AddAddressDialog(self, addressAtCurrentInboxRow))
|
||||
|
||||
def on_action_InboxAddSenderToBlackList(self):
|
||||
tableWidget = self.getCurrentMessagelist()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
from PyQt4 import QtCore, QtGui
|
||||
from addresses import decodeAddress, encodeVarint
|
||||
from addresses import decodeAddress, encodeVarint, addBMIfNotPresent
|
||||
from account import (
|
||||
GatewayAccount, MailchuckAccount, AccountMixin, accountClass,
|
||||
getSortedAccounts
|
||||
|
|
@ -70,12 +70,33 @@ class AddressCheckMixin(object):
|
|||
))
|
||||
|
||||
|
||||
class AddAddressDialog(QtGui.QDialog, RetranslateMixin, AddressCheckMixin):
|
||||
class AddressDataDialog(QtGui.QDialog, AddressCheckMixin):
|
||||
def __init__(self, parent):
|
||||
super(AddressDataDialog, self).__init__(parent)
|
||||
self.parent = parent
|
||||
|
||||
def __init__(self, parent=None):
|
||||
def accept(self):
|
||||
if self.valid:
|
||||
self.data = (
|
||||
addBMIfNotPresent(str(self.lineEditAddress.text())),
|
||||
str(self.lineEditLabel.text().toUtf8())
|
||||
)
|
||||
else:
|
||||
queues.UISignalQueue.put(('updateStatusBar', _translate(
|
||||
"MainWindow",
|
||||
"The address you entered was invalid. Ignoring it."
|
||||
)))
|
||||
super(AddressDataDialog, self).accept()
|
||||
|
||||
|
||||
class AddAddressDialog(AddressDataDialog, RetranslateMixin):
|
||||
|
||||
def __init__(self, parent=None, address=None):
|
||||
super(AddAddressDialog, self).__init__(parent)
|
||||
widgets.load('addaddressdialog.ui', self)
|
||||
AddressCheckMixin.__init__(self)
|
||||
if address:
|
||||
self.lineEditAddress.setText(address)
|
||||
|
||||
|
||||
class NewAddressDialog(QtGui.QDialog, RetranslateMixin):
|
||||
|
|
@ -91,10 +112,54 @@ class NewAddressDialog(QtGui.QDialog, RetranslateMixin):
|
|||
self.comboBoxExisting.addItem(address)
|
||||
self.groupBoxDeterministic.setHidden(True)
|
||||
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
|
||||
self.show()
|
||||
|
||||
def accept(self):
|
||||
self.hide()
|
||||
# self.buttonBox.enabled = False
|
||||
if self.radioButtonRandomAddress.isChecked():
|
||||
if self.radioButtonMostAvailable.isChecked():
|
||||
streamNumberForAddress = 1
|
||||
else:
|
||||
# User selected 'Use the same stream as an existing
|
||||
# address.'
|
||||
streamNumberForAddress = decodeAddress(
|
||||
self.comboBoxExisting.currentText())[2]
|
||||
queues.addressGeneratorQueue.put((
|
||||
'createRandomAddress', 4, streamNumberForAddress,
|
||||
str(self.newaddresslabel.text().toUtf8()), 1, "",
|
||||
self.checkBoxEighteenByteRipe.isChecked()
|
||||
))
|
||||
else:
|
||||
if self.lineEditPassphrase.text() != \
|
||||
self.lineEditPassphraseAgain.text():
|
||||
QtGui.QMessageBox.about(
|
||||
self, _translate("MainWindow", "Passphrase mismatch"),
|
||||
_translate(
|
||||
"MainWindow",
|
||||
"The passphrase you entered twice doesn\'t"
|
||||
" match. Try again.")
|
||||
)
|
||||
elif self.lineEditPassphrase.text() == "":
|
||||
QtGui.QMessageBox.about(
|
||||
self, _translate("MainWindow", "Choose a passphrase"),
|
||||
_translate(
|
||||
"MainWindow", "You really do need a passphrase.")
|
||||
)
|
||||
else:
|
||||
# this will eventually have to be replaced by logic
|
||||
# to determine the most available stream number.
|
||||
streamNumberForAddress = 1
|
||||
queues.addressGeneratorQueue.put((
|
||||
'createDeterministicAddresses', 4, streamNumberForAddress,
|
||||
"unused deterministic address",
|
||||
self.spinBoxNumberOfAddressesToMake.value(),
|
||||
self.lineEditPassphrase.text().toUtf8(),
|
||||
self.checkBoxEighteenByteRipe.isChecked()
|
||||
))
|
||||
|
||||
|
||||
class NewSubscriptionDialog(
|
||||
QtGui.QDialog, RetranslateMixin, AddressCheckMixin):
|
||||
class NewSubscriptionDialog(AddressDataDialog, RetranslateMixin):
|
||||
|
||||
def __init__(self, parent=None):
|
||||
super(NewSubscriptionDialog, self).__init__(parent)
|
||||
|
|
@ -206,14 +271,20 @@ class SpecialAddressBehaviorDialog(QtGui.QDialog, RetranslateMixin):
|
|||
|
||||
|
||||
class EmailGatewayDialog(QtGui.QDialog, RetranslateMixin):
|
||||
def __init__(self, parent, title=None, label=None, config=None):
|
||||
def __init__(self, parent, config=None, account=None):
|
||||
super(EmailGatewayDialog, self).__init__(parent)
|
||||
widgets.load('emailgateway.ui', self)
|
||||
self.parent = parent
|
||||
self.config = config
|
||||
if title and label:
|
||||
self.setWindowTitle(title)
|
||||
self.label.setText(label)
|
||||
if account:
|
||||
self.acct = account
|
||||
self.setWindowTitle(_translate(
|
||||
"EmailGatewayDialog", "Registration failed:"))
|
||||
self.label.setText(_translate(
|
||||
"EmailGatewayDialog",
|
||||
"The requested email address is not available,"
|
||||
" please try a new one."
|
||||
))
|
||||
self.radioButtonRegister.hide()
|
||||
self.radioButtonStatus.hide()
|
||||
self.radioButtonSettings.hide()
|
||||
|
|
@ -239,17 +310,6 @@ class EmailGatewayDialog(QtGui.QDialog, RetranslateMixin):
|
|||
self.lineEditEmail.setFocus()
|
||||
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
|
||||
|
||||
def register(self, acct=None):
|
||||
email = str(self.lineEditEmail.text().toUtf8())
|
||||
if acct is None:
|
||||
acct = self.acct
|
||||
acct.register(email)
|
||||
self.config.set(acct.fromAddress, 'label', email)
|
||||
self.config.set(acct.fromAddress, 'gateway', 'mailchuck')
|
||||
self.config.save()
|
||||
self.parent.statusbar_message(
|
||||
"Sending email gateway registration request")
|
||||
|
||||
def accept(self):
|
||||
self.hide()
|
||||
# no chans / mailinglists
|
||||
|
|
@ -259,8 +319,17 @@ class EmailGatewayDialog(QtGui.QDialog, RetranslateMixin):
|
|||
if not isinstance(self.acct, GatewayAccount):
|
||||
return
|
||||
|
||||
if self.radioButtonRegister.isChecked():
|
||||
self.register()
|
||||
if self.radioButtonRegister.isChecked() \
|
||||
or self.radioButtonRegister.isHidden():
|
||||
email = str(self.lineEditEmail.text().toUtf8())
|
||||
self.acct.register(email)
|
||||
self.config.set(self.acct.fromAddress, 'label', email)
|
||||
self.config.set(self.acct.fromAddress, 'gateway', 'mailchuck')
|
||||
self.config.save()
|
||||
queues.UISignalQueue.put(('updateStatusBar', _translate(
|
||||
"EmailGatewayDialog",
|
||||
"Sending email gateway registration request"
|
||||
)))
|
||||
elif self.radioButtonUnregister.isChecked():
|
||||
self.acct.unregister()
|
||||
self.config.remove_option(self.acct.fromAddress, 'gateway')
|
||||
|
|
@ -276,4 +345,6 @@ class EmailGatewayDialog(QtGui.QDialog, RetranslateMixin):
|
|||
"Sending email gateway status request"
|
||||
)))
|
||||
elif self.radioButtonSettings.isChecked():
|
||||
return self.acct
|
||||
self.data = self.acct
|
||||
|
||||
super(EmailGatewayDialog, self).accept()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user