RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improved dialog centring"

Browse Source 
This reverts commit d41dfa394b.
This commit is contained in:
ThomasV 2015-07-05 20:37:57 +02:00
parent 0368a2cd5e
commit d3104a17b7
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gui/qt/main_window.py
View File

@ -1141,12 +1141,10 @@ class ElectrumWindow(QMainWindow):
@protected @protected
def sign_tx(self, tx, callback, password, parent=None): def sign_tx(self, tx, callback, password):
'''Sign the transaction in a separate thread. When done, calls '''Sign the transaction in a separate thread. When done, calls
the callback with a success code of True or False. the callback with a success code of True or False.
''' '''
if parent == None:
parent = self
self.send_button.setDisabled(True) self.send_button.setDisabled(True)
# call hook to see if plugin needs gui interaction # call hook to see if plugin needs gui interaction
@ -1164,11 +1162,11 @@ class ElectrumWindow(QMainWindow):
callback(success[0]) callback(success[0])
# keep a reference to WaitingDialog or the gui might crash # keep a reference to WaitingDialog or the gui might crash
self.waiting_dialog = WaitingDialog(parent, 'Signing transaction...', sign_thread, on_sign_successful, on_dialog_close) self.waiting_dialog = WaitingDialog(self, 'Signing transaction...', sign_thread, on_sign_successful, on_dialog_close)
self.waiting_dialog.start() self.waiting_dialog.start()
def broadcast_transaction(self, tx, tx_desc, parent=None): def broadcast_transaction(self, tx, tx_desc):
def broadcast_thread(): def broadcast_thread():
# non-GUI thread # non-GUI thread
@ -1195,16 +1193,14 @@ class ElectrumWindow(QMainWindow):
if status: if status:
if tx_desc is not None and tx.is_complete(): if tx_desc is not None and tx.is_complete():
self.wallet.set_label(tx.hash(), tx_desc) self.wallet.set_label(tx.hash(), tx_desc)
QMessageBox.information(parent, '', _('Payment sent.') + '\n' + msg, _('OK')) QMessageBox.information(self, '', _('Payment sent.') + '\n' + msg, _('OK'))
self.update_invoices_list() self.update_invoices_list()
self.do_clear() self.do_clear()
else: else:
QMessageBox.warning(parent, _('Error'), msg, _('OK')) QMessageBox.warning(self, _('Error'), msg, _('OK'))
self.send_button.setDisabled(False) self.send_button.setDisabled(False)
if parent == None: self.waiting_dialog = WaitingDialog(self, 'Broadcasting transaction...', broadcast_thread, broadcast_done)
parent = self
self.waiting_dialog = WaitingDialog(parent, 'Broadcasting transaction...', broadcast_thread, broadcast_done)
self.waiting_dialog.start() self.waiting_dialog.start()

9
gui/qt/transaction_dialog.py
View File

@ -116,7 +116,7 @@ class TxDialog(QDialog):
self.update() self.update()
def do_broadcast(self): def do_broadcast(self):
self.parent.broadcast_transaction(self.tx, self.desc, parent=self) self.parent.broadcast_transaction(self.tx, self.desc)
self.broadcast = True self.broadcast = True
self.update() self.update()
@ -142,15 +142,10 @@ class TxDialog(QDialog):
def sign(self): def sign(self):
def sign_done(success): def sign_done(success):
self.sign_button.setDisabled(False)
self.prompt_if_unsaved = True self.prompt_if_unsaved = True
self.saved = False self.saved = False
self.update() self.update()
self.sign_button.setDisabled(True) self.parent.sign_tx(self.tx, sign_done)
cancelled, ret = self.parent.sign_tx(self.tx, sign_done, parent=self)
if cancelled:
self.sign_button.setDisabled(False)
def save(self): def save(self):
name = 'signed_%s.txn' % (self.tx.hash()[0:8]) if self.tx.is_complete() else 'unsigned.txn' name = 'signed_%s.txn' % (self.tx.hash()[0:8]) if self.tx.is_complete() else 'unsigned.txn'