From 6cda0bc0069c8d1cea2270c6dbe348e03c8f88fd Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Wed, 4 Jul 2012 01:10:04 +0200 Subject: [PATCH] restore_or_create (just delegates to qt_gui - this needs cleanup & abstraction away) --- lib/gui_lite.py | 4 ++++ lib/gui_qt.py | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/gui_lite.py b/lib/gui_lite.py index bdd025ab..8c5b2bcd 100644 --- a/lib/gui_lite.py +++ b/lib/gui_lite.py @@ -71,6 +71,10 @@ class ElectrumGui: QMessageBox.No) return choice == QMessageBox.Yes + def restore_or_create(self): + qt_gui_object = gui_qt.ElectrumGui(self.wallet, self.app) + return qt_gui_object.restore_or_create() + class MiniWindow(QDialog): def __init__(self, actuator, expand_callback): diff --git a/lib/gui_qt.py b/lib/gui_qt.py index f4bda080..2891859b 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -1410,11 +1410,12 @@ class ElectrumWindow(QMainWindow): -class ElectrumGui(): +class ElectrumGui: - def __init__(self, wallet): + def __init__(self, wallet, app=None): self.wallet = wallet - self.app = QApplication(sys.argv) + if app is None: + self.app = QApplication(sys.argv) def waiting_dialog(self):