access to global configuration using set_config and get_config
This commit is contained in:
parent
2b2a8d17df
commit
c07c1c58ed
|
@ -6,6 +6,7 @@ import PyQt4.QtGui as QtGui
|
||||||
import os
|
import os
|
||||||
import qrcode
|
import qrcode
|
||||||
|
|
||||||
|
import electrum
|
||||||
from electrum import bmp
|
from electrum import bmp
|
||||||
from electrum.i18n import _
|
from electrum.i18n import _
|
||||||
|
|
||||||
|
@ -99,9 +100,9 @@ class QRDialog(QDialog):
|
||||||
hbox = QHBoxLayout()
|
hbox = QHBoxLayout()
|
||||||
hbox.addStretch(1)
|
hbox.addStretch(1)
|
||||||
|
|
||||||
if parent:
|
config = electrum.get_config()
|
||||||
self.config = parent.config
|
if config:
|
||||||
filename = os.path.join(self.config.path, "qrcode.bmp")
|
filename = os.path.join(config.path, "qrcode.bmp")
|
||||||
|
|
||||||
def print_qr():
|
def print_qr():
|
||||||
bmp.save_qrcode(qrw.qr, filename)
|
bmp.save_qrcode(qrw.qr, filename)
|
||||||
|
@ -112,13 +113,13 @@ class QRDialog(QDialog):
|
||||||
self.parent().app.clipboard().setImage(QImage(filename))
|
self.parent().app.clipboard().setImage(QImage(filename))
|
||||||
QMessageBox.information(None, _('Message'), _("QR code saved to clipboard"), _('OK'))
|
QMessageBox.information(None, _('Message'), _("QR code saved to clipboard"), _('OK'))
|
||||||
|
|
||||||
b = QPushButton(_("Copy"))
|
b = QPushButton(_("Copy"))
|
||||||
hbox.addWidget(b)
|
hbox.addWidget(b)
|
||||||
b.clicked.connect(copy_to_clipboard)
|
b.clicked.connect(copy_to_clipboard)
|
||||||
|
|
||||||
b = QPushButton(_("Save"))
|
b = QPushButton(_("Save"))
|
||||||
hbox.addWidget(b)
|
hbox.addWidget(b)
|
||||||
b.clicked.connect(print_qr)
|
b.clicked.connect(print_qr)
|
||||||
|
|
||||||
b = QPushButton(_("Close"))
|
b = QPushButton(_("Close"))
|
||||||
hbox.addWidget(b)
|
hbox.addWidget(b)
|
||||||
|
|
|
@ -5,7 +5,7 @@ from wallet import Wallet, Wallet_2of2, Wallet_2of3, Imported_Wallet
|
||||||
from verifier import TxVerifier
|
from verifier import TxVerifier
|
||||||
from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server
|
from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server
|
||||||
from interface import Interface
|
from interface import Interface
|
||||||
from simple_config import SimpleConfig
|
from simple_config import SimpleConfig, get_config, set_config
|
||||||
import bitcoin
|
import bitcoin
|
||||||
import account
|
import account
|
||||||
import transaction
|
import transaction
|
||||||
|
|
|
@ -6,6 +6,15 @@ import os
|
||||||
from util import user_dir, print_error, print_msg
|
from util import user_dir, print_error, print_msg
|
||||||
|
|
||||||
|
|
||||||
|
config = None
|
||||||
|
def get_config():
|
||||||
|
global config
|
||||||
|
return config
|
||||||
|
|
||||||
|
def set_config(c):
|
||||||
|
global config
|
||||||
|
config = c
|
||||||
|
|
||||||
|
|
||||||
class SimpleConfig:
|
class SimpleConfig:
|
||||||
"""
|
"""
|
||||||
|
@ -32,7 +41,7 @@ a SimpleConfig instance then reads the wallet file.
|
||||||
self.user_config = {}
|
self.user_config = {}
|
||||||
self.read_user_config()
|
self.read_user_config()
|
||||||
|
|
||||||
|
set_config(self)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue