AaronFiore/electrum
1
0
Fork 0
Code Activity

More modality fixes and cleanups

Browse Source
This commit is contained in:
Neil Booth
2015-12-23 18:31:36 +09:00
parent 37b474716b
commit 9484b6371f
6 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/qt/qrtextedit.py
View File

@@ -3,7 +3,7 @@ from electrum.plugins import run_hook
from PyQt4.QtGui import *
from PyQt4.QtCore import *
from util import ButtonsTextEdit
from util import ButtonsTextEdit, MessageBoxMixin
class ShowQRTextEdit(ButtonsTextEdit):
@@ -29,7 +29,7 @@ class ShowQRTextEdit(ButtonsTextEdit):
m.exec_(e.globalPos())
class ScanQRTextEdit(ButtonsTextEdit):
class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
def __init__(self, text=""):
ButtonsTextEdit.__init__(self, text)
@@ -50,8 +50,8 @@ class ScanQRTextEdit(ButtonsTextEdit):
from electrum import qrscanner, get_config
try:
data = qrscanner.scan_qr(get_config())
except BaseException, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
except BaseException as e:
self.show_error(str(e))
return ""
if type(data) != str:
return