separate directories for GUIs
This commit is contained in:
parent
e40776bcee
commit
004aa4b640
|
@ -1,2 +1,3 @@
|
|||
# do not remove this file
|
||||
from plugins import BasePlugin
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,8 @@ import datetime
|
|||
|
||||
from electrum.version import ELECTRUM_VERSION as electrum_version
|
||||
from electrum.util import format_satoshis, age
|
||||
import gui_classic
|
||||
|
||||
from main_window import ElectrumWindow
|
||||
import shutil
|
||||
|
||||
from qt_util import *
|
||||
|
@ -186,7 +187,7 @@ class ElectrumGui(QObject):
|
|||
self.set_url(url)
|
||||
|
||||
if self.expert is None:
|
||||
self.expert = gui_classic.ElectrumWindow(self.config)
|
||||
self.expert = ElectrumWindow(self.config)
|
||||
self.expert.load_wallet(self.wallet)
|
||||
self.expert.app = self.app
|
||||
timer = Timer()
|
||||
|
@ -218,7 +219,7 @@ class ElectrumGui(QObject):
|
|||
return choice == QMessageBox.Yes
|
||||
|
||||
def restore_or_create(self):
|
||||
qt_gui_object = gui_classic.ElectrumGui(self.wallet, self.app)
|
||||
qt_gui_object = ElectrumGui(self.wallet, self.app)
|
||||
return qt_gui_object.restore_or_create()
|
||||
|
||||
class TransactionWindow(QDialog):
|
||||
|
@ -934,7 +935,7 @@ class MiniActuator:
|
|||
webbrowser.open(url)
|
||||
|
||||
def show_seed_dialog(self):
|
||||
gui_classic.ElectrumWindow.show_seed_dialog(self.wallet)
|
||||
ElectrumWindow.show_seed_dialog(self.wallet)
|
||||
|
||||
class MiniDriver(QObject):
|
||||
|
||||
|
@ -949,9 +950,9 @@ class MiniDriver(QObject):
|
|||
self.wallet = wallet
|
||||
self.window = window
|
||||
|
||||
self.wallet.interface.register_callback('updated',self.update_callback)
|
||||
self.wallet.interface.register_callback('connected', self.update_callback)
|
||||
self.wallet.interface.register_callback('disconnected', self.update_callback)
|
||||
self.wallet.network.register_callback('updated',self.update_callback)
|
||||
self.wallet.network.register_callback('connected', self.update_callback)
|
||||
self.wallet.network.register_callback('disconnected', self.update_callback)
|
||||
|
||||
self.state = None
|
||||
|
|
@ -1375,13 +1375,13 @@ class ElectrumWindow(QMainWindow):
|
|||
|
||||
|
||||
def go_lite(self):
|
||||
import gui_lite
|
||||
import lite_window
|
||||
self.config.set_key('gui', 'lite', True)
|
||||
self.hide()
|
||||
if self.lite:
|
||||
self.lite.mini.show()
|
||||
else:
|
||||
self.lite = gui_lite.ElectrumGui(self.config, None, None, self)
|
||||
self.lite = lite_window.ElectrumGui(self.config, None, None, self)
|
||||
self.lite.main(None)
|
||||
|
||||
|
||||
|
@ -1894,7 +1894,7 @@ class ElectrumWindow(QMainWindow):
|
|||
|
||||
|
||||
def do_export_history(self):
|
||||
from gui_lite import csv_transaction
|
||||
from lite_window import csv_transaction
|
||||
csv_transaction(self.wallet)
|
||||
|
||||
|
||||
|
@ -2165,63 +2165,3 @@ class ElectrumWindow(QMainWindow):
|
|||
self.config.set_key("console-history", self.console.history[-50:], True)
|
||||
event.accept()
|
||||
|
||||
class OpenFileEventFilter(QObject):
|
||||
def __init__(self, windows):
|
||||
self.windows = windows
|
||||
super(OpenFileEventFilter, self).__init__()
|
||||
|
||||
def eventFilter(self, obj, event):
|
||||
if event.type() == QtCore.QEvent.FileOpen:
|
||||
if len(self.windows) >= 1:
|
||||
self.windows[0].set_url(event.url().toString())
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
|
||||
|
||||
class ElectrumGui:
|
||||
|
||||
def __init__(self, config, network, app=None):
|
||||
self.network = network
|
||||
#self.interface = interface
|
||||
self.config = config
|
||||
#self.blockchain = network.blockchain
|
||||
self.windows = []
|
||||
self.efilter = OpenFileEventFilter(self.windows)
|
||||
if app is None:
|
||||
self.app = QApplication(sys.argv)
|
||||
self.app.installEventFilter(self.efilter)
|
||||
|
||||
|
||||
def main(self, url):
|
||||
|
||||
storage = WalletStorage(self.config)
|
||||
if not storage.file_exists:
|
||||
import installwizard
|
||||
wizard = installwizard.InstallWizard(self.config, self.network, storage)
|
||||
wallet = wizard.run()
|
||||
if not wallet:
|
||||
exit()
|
||||
else:
|
||||
wallet = Wallet(storage)
|
||||
|
||||
wallet.start_threads(self.network)
|
||||
|
||||
s = Timer()
|
||||
s.start()
|
||||
w = ElectrumWindow(self.config, self.network)
|
||||
w.load_wallet(wallet)
|
||||
|
||||
self.windows.append(w)
|
||||
if url: w.set_url(url)
|
||||
w.app = self.app
|
||||
w.connect_slots(s)
|
||||
w.update_wallet()
|
||||
w.show()
|
||||
|
||||
self.app.exec_()
|
||||
|
||||
wallet.stop_threads()
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ from simple_config import SimpleConfig
|
|||
import bitcoin
|
||||
import account
|
||||
from transaction import Transaction
|
||||
|
||||
from plugins import BasePlugin
|
||||
from mnemonic import mn_encode as mnemonic_encode
|
||||
from mnemonic import mn_decode as mnemonic_decode
|
||||
from commands import protected_commands, known_commands, offline_commands, Commands
|
||||
|
|
|
@ -7,9 +7,8 @@ from PyQt4.QtCore import *
|
|||
import PyQt4.QtCore as QtCore
|
||||
import PyQt4.QtGui as QtGui
|
||||
|
||||
from electrum_gui.qrcodewidget import QRCodeWidget
|
||||
from electrum_gui import bmp, pyqrnative
|
||||
from electrum_gui.i18n import _
|
||||
from electrum import bmp, pyqrnative
|
||||
from electrum.i18n import _
|
||||
|
||||
from electrum import util
|
||||
|
||||
|
@ -17,7 +16,8 @@ ALIAS_REGEXP = '^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$'
|
|||
|
||||
|
||||
|
||||
from electrum_gui import BasePlugin
|
||||
from electrum.plugins import BasePlugin
|
||||
|
||||
class Plugin(BasePlugin):
|
||||
|
||||
def fullname(self): return 'Aliases'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from electrum.util import print_error
|
||||
from electrum_gui.i18n import _
|
||||
|
||||
import httplib, urllib
|
||||
import socket
|
||||
import hashlib
|
||||
|
@ -16,8 +16,10 @@ import PyQt4.QtCore as QtCore
|
|||
import PyQt4.QtGui as QtGui
|
||||
import aes
|
||||
import base64
|
||||
from electrum_gui import bmp, pyqrnative, BasePlugin
|
||||
from electrum_gui.i18n import _
|
||||
from electrum import bmp, pyqrnative
|
||||
from electrum.plugins import BasePlugin
|
||||
from electrum.i18n import _
|
||||
|
||||
from electrum_gui.gui_classic import HelpButton
|
||||
|
||||
class Plugin(BasePlugin):
|
||||
|
|
|
@ -7,9 +7,10 @@ from PyQt4.QtCore import *
|
|||
import PyQt4.QtCore as QtCore
|
||||
import PyQt4.QtGui as QtGui
|
||||
|
||||
from electrum_gui.qrcodewidget import QRCodeWidget
|
||||
from electrum_gui import bmp, pyqrnative, BasePlugin
|
||||
from electrum_gui.i18n import _
|
||||
from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
|
||||
|
||||
from electrum import bmp, pyqrnative, BasePlugin
|
||||
from electrum.i18n import _
|
||||
|
||||
|
||||
if platform.system() == 'Windows':
|
||||
|
@ -105,8 +106,8 @@ class Plugin(BasePlugin):
|
|||
|
||||
self.gui.expert_mode = True
|
||||
self.gui.receive_list.setHeaderLabels([ _('Address'), _('Label'), _('Balance'), _('Request')])
|
||||
self.toggle_QR_window(True)
|
||||
self.requested_amounts = {}
|
||||
self.toggle_QR_window(True)
|
||||
|
||||
def load_wallet(self):
|
||||
self.requested_amounts = self.gui.wallet.storage.get('requested_amounts',{})
|
||||
|
|
|
@ -2,13 +2,13 @@ from electrum.util import print_error
|
|||
from urlparse import urlparse, parse_qs
|
||||
from PyQt4.QtGui import QPushButton, QMessageBox, QDialog, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel
|
||||
from PyQt4.QtCore import Qt
|
||||
from electrum_gui.i18n import _
|
||||
|
||||
from electrum.i18n import _
|
||||
import re
|
||||
from electrum import Transaction
|
||||
from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid
|
||||
from electrum_gui.qrcodewidget import QRCodeWidget
|
||||
import electrum_gui.bmp
|
||||
from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
|
||||
from electrum import bmp
|
||||
import json
|
||||
|
||||
try:
|
||||
|
@ -16,7 +16,7 @@ try:
|
|||
except ImportError:
|
||||
zbar = None
|
||||
|
||||
from electrum_gui import BasePlugin
|
||||
from electrum import BasePlugin
|
||||
class Plugin(BasePlugin):
|
||||
|
||||
def fullname(self): return 'QR scans'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from PyQt4.QtGui import *
|
||||
from electrum_gui import BasePlugin
|
||||
from electrum_gui.i18n import _
|
||||
from electrum import BasePlugin
|
||||
from electrum.i18n import _
|
||||
|
||||
class Plugin(BasePlugin):
|
||||
|
||||
|
|
Loading…
Reference in New Issue