share contacts and invoices objects between windows
This commit is contained in:
parent
da91a395b1
commit
897a5d34ed
|
@ -32,6 +32,8 @@ import PyQt4.QtCore as QtCore
|
||||||
from electrum.i18n import _, set_language
|
from electrum.i18n import _, set_language
|
||||||
from electrum.plugins import run_hook
|
from electrum.plugins import run_hook
|
||||||
from electrum import SimpleConfig, Wallet, WalletStorage
|
from electrum import SimpleConfig, Wallet, WalletStorage
|
||||||
|
from electrum.paymentrequest import InvoiceStore
|
||||||
|
from electrum.contacts import Contacts
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import icons_rc
|
import icons_rc
|
||||||
|
@ -68,7 +70,9 @@ class ElectrumGui:
|
||||||
self.app = QApplication(sys.argv)
|
self.app = QApplication(sys.argv)
|
||||||
self.app.installEventFilter(self.efilter)
|
self.app.installEventFilter(self.efilter)
|
||||||
self.timer = Timer()
|
self.timer = Timer()
|
||||||
|
# shared objects
|
||||||
|
self.invoices = InvoiceStore(self.config)
|
||||||
|
self.contacts = Contacts(self.config)
|
||||||
# init tray
|
# init tray
|
||||||
self.dark_icon = self.config.get("dark_icon", False)
|
self.dark_icon = self.config.get("dark_icon", False)
|
||||||
self.tray = QSystemTrayIcon(self.tray_icon(), None)
|
self.tray = QSystemTrayIcon(self.tray_icon(), None)
|
||||||
|
|
|
@ -44,7 +44,6 @@ from electrum import util, bitcoin, commands, Wallet
|
||||||
from electrum import SimpleConfig, Wallet, WalletStorage
|
from electrum import SimpleConfig, Wallet, WalletStorage
|
||||||
from electrum import Imported_Wallet
|
from electrum import Imported_Wallet
|
||||||
from electrum import paymentrequest
|
from electrum import paymentrequest
|
||||||
from electrum.contacts import Contacts
|
|
||||||
|
|
||||||
from amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, BTCkBEdit
|
from amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, BTCkBEdit
|
||||||
from network_dialog import NetworkDialog
|
from network_dialog import NetworkDialog
|
||||||
|
@ -82,7 +81,7 @@ class StatusBarButton(QPushButton):
|
||||||
|
|
||||||
|
|
||||||
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
|
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
|
||||||
from electrum.paymentrequest import PaymentRequest, InvoiceStore, get_payment_request
|
from electrum.paymentrequest import PaymentRequest, get_payment_request
|
||||||
|
|
||||||
pr_icons = {
|
pr_icons = {
|
||||||
PR_UNPAID:":icons/unpaid.png",
|
PR_UNPAID:":icons/unpaid.png",
|
||||||
|
@ -114,14 +113,12 @@ class ElectrumWindow(QMainWindow):
|
||||||
self.config = config
|
self.config = config
|
||||||
self.network = network
|
self.network = network
|
||||||
self.wallet = None
|
self.wallet = None
|
||||||
|
|
||||||
self.gui_object = gui_object
|
self.gui_object = gui_object
|
||||||
|
self.invoices = gui_object.invoices
|
||||||
|
self.contacts = gui_object.contacts
|
||||||
self.tray = gui_object.tray
|
self.tray = gui_object.tray
|
||||||
self.app = gui_object.app
|
self.app = gui_object.app
|
||||||
|
|
||||||
self.invoices = InvoiceStore(self.config)
|
|
||||||
self.contacts = Contacts(self.config)
|
|
||||||
|
|
||||||
self.create_status_bar()
|
self.create_status_bar()
|
||||||
self.need_update = threading.Event()
|
self.need_update = threading.Event()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue