diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 72a6e9b5..f3562f8e 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, sid='hot') + layout = SeedDisplayLayout(xpub, title=msg, xpub=True) 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 0bb443e4..40594d56 100644 --- a/gui/qt/seed_dialog.py +++ b/gui/qt/seed_dialog.py @@ -30,19 +30,13 @@ from electrum.i18n import _ from util import * from qrtextedit import ShowQRTextEdit, ScanQRTextEdit -def icon_filename(sid): - if sid == 'cold': - return ":icons/cold_seed.png" - elif sid == 'hot': - return ":icons/hot_seed.png" - else: - return ":icons/seed.png" - class SeedLayoutBase(object): - def _seed_layout(self, seed=None, title=None, sid=None): + + 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_filename(sid)).scaledToWidth(56)) + logo.setPixmap(QPixmap(icon).scaledToWidth(64)) logo.setMaximumWidth(60) if seed: self.seed_e = ShowQRTextEdit() @@ -70,8 +64,8 @@ class SeedLayoutBase(object): class SeedDisplayLayout(SeedLayoutBase): - def __init__(self, seed, title=None, sid=None): - self.layout_ = self._seed_layout(seed=seed, title=title, sid=sid) + def __init__(self, seed, title=None, xpub=False): + self.layout_ = self._seed_layout(seed=seed, title=title, xpub=xpub) @@ -107,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) + self.layout_ = self._seed_layout(title=title, xpub=True) self.seed_e.textChanged.connect(self.on_edit) def get_text(self): diff --git a/icons.qrc b/icons.qrc index 63ee8626..4ad4cf88 100644 --- a/icons.qrc +++ b/icons.qrc @@ -7,13 +7,11 @@ icons/clock4.png icons/clock5.png icons/confirmed.png - icons/cold_seed.png icons/copy.png icons/expired.png icons/electrum_light_icon.png icons/electrum_dark_icon.png icons/file.png - icons/hot_seed.png icons/keepkey.png icons/keepkey_unpaired.png icons/key.png @@ -39,5 +37,6 @@ icons/unlock.png icons/warning.png icons/zoom.png + icons/xpub.png diff --git a/icons/cold_seed.png b/icons/cold_seed.png deleted file mode 100644 index 0552ea56..00000000 Binary files a/icons/cold_seed.png and /dev/null differ diff --git a/icons/hot_seed.png b/icons/hot_seed.png deleted file mode 100644 index fa11e687..00000000 Binary files a/icons/hot_seed.png and /dev/null differ diff --git a/icons/xpub.png b/icons/xpub.png new file mode 100644 index 00000000..d663b78d Binary files /dev/null and b/icons/xpub.png differ