From 2e0d55e25e5dbea31c77c6e912dfb359f54b3b66 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 28 Sep 2016 21:31:47 +0200 Subject: [PATCH] remove xpub icon --- gui/qt/installwizard.py | 2 +- gui/qt/seed_dialog.py | 18 +++++++++--------- icons.qrc | 1 - icons/xpub.png | Bin 3471 -> 0 bytes lib/base_wizard.py | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 icons/xpub.png diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index f3562f8e7..822299eeb 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -412,7 +412,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): _("Please share it with your cosigners.") ]) vbox = QVBoxLayout() - layout = SeedDisplayLayout(xpub, title=msg, xpub=True) + layout = SeedDisplayLayout(xpub, title=msg, icon=False) vbox.addLayout(layout.layout()) self.set_main_layout(vbox, _('Master Public Key')) return None diff --git a/gui/qt/seed_dialog.py b/gui/qt/seed_dialog.py index 40594d56f..e750ed9dc 100644 --- a/gui/qt/seed_dialog.py +++ b/gui/qt/seed_dialog.py @@ -33,11 +33,7 @@ from qrtextedit import ShowQRTextEdit, ScanQRTextEdit class SeedLayoutBase(object): - def _seed_layout(self, seed=None, title=None, xpub=False): - icon = ":icons/xpub.png" if xpub else ":icons/seed.png" - logo = QLabel() - logo.setPixmap(QPixmap(icon).scaledToWidth(64)) - logo.setMaximumWidth(60) + def _seed_layout(self, seed=None, title=None, icon=True): if seed: self.seed_e = ShowQRTextEdit() self.seed_e.setText(seed) @@ -46,7 +42,11 @@ class SeedLayoutBase(object): self.seed_e.setTabChangesFocus(True) self.seed_e.setMaximumHeight(75) 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) if not title: return hbox @@ -64,8 +64,8 @@ class SeedLayoutBase(object): class SeedDisplayLayout(SeedLayoutBase): - def __init__(self, seed, title=None, xpub=False): - self.layout_ = self._seed_layout(seed=seed, title=title, xpub=xpub) + def __init__(self, seed, title=None, icon=True): + 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): self.is_valid = is_valid 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) def get_text(self): diff --git a/icons.qrc b/icons.qrc index 4ad4cf887..a7e00ce61 100644 --- a/icons.qrc +++ b/icons.qrc @@ -37,6 +37,5 @@ icons/unlock.png icons/warning.png icons/zoom.png - icons/xpub.png diff --git a/icons/xpub.png b/icons/xpub.png deleted file mode 100644 index d663b78d2ba04e994245f01a073f50c6d7a8e87f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3471 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 i@xlM