AaronFiore/electrum
1
0
Fork 0
Code Activity

remove xpub icon

Browse Source
This commit is contained in:
ThomasV
2016-09-28 21:31:47 +02:00
parent 68ed60ca87
commit 2e0d55e25e
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/installwizard.py
View File

@@ -412,7 +412,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
_("Please share it with your cosigners.") _("Please share it with your cosigners.")
]) ])
vbox = QVBoxLayout() vbox = QVBoxLayout()
layout = SeedDisplayLayout(xpub, title=msg, xpub=True) layout = SeedDisplayLayout(xpub, title=msg, icon=False)
vbox.addLayout(layout.layout()) vbox.addLayout(layout.layout())
self.set_main_layout(vbox, _('Master Public Key')) self.set_main_layout(vbox, _('Master Public Key'))
return None return None

18
gui/qt/seed_dialog.py
View File

@@ -33,11 +33,7 @@ from qrtextedit import ShowQRTextEdit, ScanQRTextEdit
class SeedLayoutBase(object): class SeedLayoutBase(object):
def _seed_layout(self, seed=None, title=None, xpub=False): def _seed_layout(self, seed=None, title=None, icon=True):
icon = ":icons/xpub.png" if xpub else ":icons/seed.png"
logo = QLabel()
logo.setPixmap(QPixmap(icon).scaledToWidth(64))
logo.setMaximumWidth(60)
if seed: if seed:
self.seed_e = ShowQRTextEdit() self.seed_e = ShowQRTextEdit()
self.seed_e.setText(seed) self.seed_e.setText(seed)
@@ -46,7 +42,11 @@ class SeedLayoutBase(object):
self.seed_e.setTabChangesFocus(True) self.seed_e.setTabChangesFocus(True)
self.seed_e.setMaximumHeight(75) self.seed_e.setMaximumHeight(75)
hbox = QHBoxLayout() hbox = QHBoxLayout()
hbox.addWidget(logo) if icon:
logo = QLabel()
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(64))
logo.setMaximumWidth(60)
hbox.addWidget(logo)
hbox.addWidget(self.seed_e) hbox.addWidget(self.seed_e)
if not title: if not title:
return hbox return hbox
@@ -64,8 +64,8 @@ class SeedLayoutBase(object):
class SeedDisplayLayout(SeedLayoutBase): class SeedDisplayLayout(SeedLayoutBase):
def __init__(self, seed, title=None, xpub=False): def __init__(self, seed, title=None, icon=True):
self.layout_ = self._seed_layout(seed=seed, title=title, xpub=xpub) self.layout_ = self._seed_layout(seed=seed, title=title, icon=icon)
@@ -101,7 +101,7 @@ class TextInputLayout(SeedLayoutBase):
def __init__(self, parent, title, is_valid): def __init__(self, parent, title, is_valid):
self.is_valid = is_valid self.is_valid = is_valid
self.parent = parent self.parent = parent
self.layout_ = self._seed_layout(title=title, xpub=True) self.layout_ = self._seed_layout(title=title, icon=False)
self.seed_e.textChanged.connect(self.on_edit) self.seed_e.textChanged.connect(self.on_edit)
def get_text(self): def get_text(self):

1
icons.qrc
View File

@@ -37,6 +37,5 @@
<file>icons/unlock.png</file> <file>icons/unlock.png</file>
<file>icons/warning.png</file> <file>icons/warning.png</file>
<file>icons/zoom.png</file> <file>icons/zoom.png</file>
<file>icons/xpub.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
icons/xpub.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

2
lib/base_wizard.py
View File

@@ -140,7 +140,7 @@ class BaseWizard(object):
v = keystore.is_address_list v = keystore.is_address_list
title = _("Import Bitcoin Addresses") title = _("Import Bitcoin Addresses")
message = _("Enter a list of Bitcoin addresses. This will create a watching-only wallet.") message = _("Enter a list of Bitcoin addresses. This will create a watching-only wallet.")
self.restore_keys_dialog(title=title, message=message, run_next=self.on_import_addresses, is_valid=v) self.add_xpub_dialog(title=title, message=message, run_next=self.on_import_addresses, is_valid=v)
def on_import_addresses(self, text): def on_import_addresses(self, text):
assert keystore.is_address_list(text) assert keystore.is_address_list(text)