electrum

commit 15300c63611f89269cb075ec70bed2bfe0ce8012
parent f7cf90d268787570ad6aeda4312993be89ac220c
Author: ThomasV <thomasv@electrum.org>
Date:   Wed,  2 Nov 2016 07:45:16 +0100

Merge pull request #2013 from jonathancross/trusted-coin-icon-fix

Fixing TrustedCoin logo.
Diffstat:
M
icons.qrc
 | 
3
++-
A
icons/trustedcoin-status.png
 | 
0

R
icons/trustedcoin.png -> icons/trustedcoin-wizard.png
 | 
0

M
plugins/trustedcoin/qt.py
 | 
4
++--
M
plugins/trustedcoin/trustedcoin.py
 | 
4
++--

5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/icons.qrc b/icons.qrc
@@ -31,7 +31,8 @@
     <file>icons/speaker.png</file>
     <file>icons/trezor_unpaired.png</file>
     <file>icons/trezor.png</file>
-    <file>icons/trustedcoin.png</file>
+    <file>icons/trustedcoin-status.png</file>
+    <file>icons/trustedcoin-wizard.png</file>
     <file>icons/unconfirmed.png</file>
     <file>icons/unpaid.png</file>
     <file>icons/unlock.png</file>
diff --git a/icons/trustedcoin-status.png b/icons/trustedcoin-status.png
Binary files differ.
diff --git a/icons/trustedcoin.png b/icons/trustedcoin-wizard.png
Binary files differ.
diff --git a/plugins/trustedcoin/qt.py b/plugins/trustedcoin/qt.py
@@ -55,7 +55,7 @@ class Plugin(TrustedCoinPlugin):
             action = lambda: window.show_message(msg)
         else:
             action = partial(self.settings_dialog, window)
-        button = StatusBarButton(QIcon(":icons/trustedcoin.png"),
+        button = StatusBarButton(QIcon(":icons/trustedcoin-status.png"),
                                  _("TrustedCoin"), action)
         window.statusBar().addPermanentWidget(button)
         t = Thread(target=self.request_billing_info, args=(wallet,))
@@ -127,7 +127,7 @@ class Plugin(TrustedCoinPlugin):
         hbox = QHBoxLayout()
 
         logo = QLabel()
-        logo.setPixmap(QPixmap(":icons/trustedcoin.png"))
+        logo.setPixmap(QPixmap(":icons/trustedcoin-status.png"))
         msg = _('This wallet is protected by TrustedCoin\'s two-factor authentication.') + '<br/>'\
               + _("For more information, visit") + " <a href=\"https://api.trustedcoin.com/#/electrum-help\">https://api.trustedcoin.com/#/electrum-help</a>"
         label = QLabel(msg)
diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
@@ -342,7 +342,7 @@ class TrustedCoinPlugin(BasePlugin):
         window.wallet.is_billing = False
 
     def show_disclaimer(self, wizard):
-        wizard.set_icon(':icons/trustedcoin.png')
+        wizard.set_icon(':icons/trustedcoin-wizard.png')
         wizard.stack = []
         wizard.confirm_dialog(title='Disclaimer', message='\n\n'.join(DISCLAIMER), run_next = lambda x: wizard.run('choose_seed'))
 
@@ -413,7 +413,7 @@ class TrustedCoinPlugin(BasePlugin):
         wizard.passphrase_dialog(run_next=f) if is_ext else f('')
 
     def restore_choice(self, wizard, seed, passphrase):
-        wizard.set_icon(':icons/trustedcoin.png')
+        wizard.set_icon(':icons/trustedcoin-wizard.png')
         wizard.stack = []
         title = _('Restore 2FA wallet')
         msg = ' '.join([