AaronFiore/electrum
1
0
Fork 0
Code Activity

rm qt icons file

Browse Source 
so we don't need pyrcc5, which is not deterministic,
and so we don't need the submodule for the icons

based on electrumsv/electrumsv@bf8802c2ea
This commit is contained in:
SomberNight
2019-02-01 19:01:21 +01:00
parent 3ad6f738bd
commit 16bac5fd73
38 changed files with 109 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/plugins/audio_modem/qt.py
View File

@@ -6,7 +6,7 @@ import sys
import platform
from electrum.plugin import BasePlugin, hook
from electrum.gui.qt.util import WaitingDialog, EnterButton, WindowModalDialog
from electrum.gui.qt.util import WaitingDialog, EnterButton, WindowModalDialog, read_QIcon
from electrum.util import print_msg, print_error
from electrum.i18n import _
@@ -71,7 +71,7 @@ class Plugin(BasePlugin):
@hook
def transaction_dialog(self, dialog):
b = QPushButton()
b.setIcon(QIcon(":icons/speaker.png"))
b.setIcon(read_QIcon("speaker.png"))
def handler():
blob = json.dumps(dialog.tx.as_dict())
@@ -81,7 +81,7 @@ class Plugin(BasePlugin):
@hook
def scan_text_edit(self, parent):
parent.addButton(':icons/microphone.png', partial(self._recv, parent),
parent.addButton('microphone.png', partial(self._recv, parent),
_("Read from microphone"))
@hook
@@ -89,7 +89,7 @@ class Plugin(BasePlugin):
def handler():
blob = str(parent.toPlainText())
self._send(parent=parent, blob=blob)
parent.addButton(':icons/speaker.png', handler, _("Send to speaker"))
parent.addButton('speaker.png', handler, _("Send to speaker"))
def _audio_interface(self):
interface = amodem.audio.Interface(config=self.modem_config)

4
electrum/plugins/coldcard/qt.py
View File

@@ -11,8 +11,8 @@ from ..hw_wallet.plugin import only_hook_if_libraries_available
class Plugin(ColdcardPlugin, QtPluginBase):
icon_unpaired = ":icons/coldcard_unpaired.png"
icon_paired = ":icons/coldcard.png"
icon_unpaired = "coldcard_unpaired.png"
icon_paired = "coldcard.png"
def create_handler(self, window):
return Coldcard_Handler(window)

4
electrum/plugins/digitalbitbox/qt.py
View File

@@ -10,8 +10,8 @@ from .digitalbitbox import DigitalBitboxPlugin
class Plugin(DigitalBitboxPlugin, QtPluginBase):
icon_unpaired = ":icons/digitalbitbox_unpaired.png"
icon_paired = ":icons/digitalbitbox.png"
icon_unpaired = "digitalbitbox_unpaired.png"
icon_paired = "digitalbitbox.png"
def create_handler(self, window):
return DigitalBitbox_Handler(window)

6
electrum/plugins/hw_wallet/qt.py
View File

@@ -73,8 +73,8 @@ class QtHandlerBase(QObject, PrintError):
def _update_status(self, paired):
if hasattr(self, 'button'):
button = self.button
icon = button.icon_paired if paired else button.icon_unpaired
button.setIcon(QIcon(icon))
icon_name = button.icon_paired if paired else button.icon_unpaired
button.setIcon(read_QIcon(icon_name))
def query_choice(self, msg, labels):
self.done.clear()
@@ -234,4 +234,4 @@ class QtPluginBase(object):
def show_address():
addr = receive_address_e.text()
keystore.thread.add(partial(plugin.show_address, wallet, addr, keystore))
receive_address_e.addButton(":icons/eye1.png", show_address, _("Show on {}").format(plugin.device))
receive_address_e.addButton("eye1.png", show_address, _("Show on {}").format(plugin.device))

4
electrum/plugins/keepkey/qt.py
View File

@@ -295,8 +295,8 @@ class QtPlugin(QtPluginBase):
class Plugin(KeepKeyPlugin, QtPlugin):
icon_paired = ":icons/keepkey.png"
icon_unpaired = ":icons/keepkey_unpaired.png"
icon_paired = "keepkey.png"
icon_unpaired = "keepkey_unpaired.png"
@classmethod
def pin_matrix_widget_class(self):

4
electrum/plugins/ledger/qt.py
View File

@@ -11,8 +11,8 @@ from ..hw_wallet.plugin import only_hook_if_libraries_available
class Plugin(LedgerPlugin, QtPluginBase):
icon_unpaired = ":icons/ledger_unpaired.png"
icon_paired = ":icons/ledger.png"
icon_unpaired = "ledger_unpaired.png"
icon_paired = "ledger.png"
def create_handler(self, window):
return Ledger_Handler(window)

10
electrum/plugins/revealer/qt.py
View File

@@ -54,7 +54,7 @@ class Plugin(RevealerPlugin):
@hook
def create_status_bar(self, parent):
b = StatusBarButton(QIcon(':icons/revealer.png'), "Revealer "+_("secret backup utility"),
b = StatusBarButton(read_QIcon('revealer.png'), "Revealer "+_("secret backup utility"),
partial(self.setup_dialog, parent))
parent.addPermanentWidget(b)
@@ -98,7 +98,7 @@ class Plugin(RevealerPlugin):
vbox = QVBoxLayout()
logo = QLabel()
self.hbox.addWidget(logo)
logo.setPixmap(QPixmap(':icons/revealer.png'))
logo.setPixmap(QPixmap(icon_path('revealer.png')))
logo.setAlignment(Qt.AlignLeft)
self.hbox.addSpacing(16)
vbox.addWidget(WWLabel("<b>"+_("Revealer Secret Backup Plugin")+"</b><br>"
@@ -228,7 +228,7 @@ class Plugin(RevealerPlugin):
self.vbox = QVBoxLayout()
logo = QLabel()
hbox.addWidget(logo)
logo.setPixmap(QPixmap(':icons/revealer.png'))
logo.setPixmap(QPixmap(icon_path('revealer.png')))
logo.setAlignment(Qt.AlignLeft)
hbox.addSpacing(16)
self.vbox.addWidget(WWLabel("<b>" + _("Revealer Secret Backup Plugin") + "</b><br>"
@@ -549,7 +549,7 @@ class Plugin(RevealerPlugin):
painter.drawLine(base_img.width()-(dist_h), 0, base_img.width()-(dist_h), base_img.height())
painter.drawImage(((total_distance_h))+11, ((total_distance_h))+11,
QImage(':icons/electrumb.png').scaledToWidth(2.1*(total_distance_h), Qt.SmoothTransformation))
QImage(icon_path('electrumb.png')).scaledToWidth(2.1*(total_distance_h), Qt.SmoothTransformation))
painter.setPen(QPen(Qt.white, border_thick*8))
painter.drawLine(base_img.width()-((total_distance_h))-(border_thick*8)/2-(border_thick/2)-2,
@@ -575,7 +575,7 @@ class Plugin(RevealerPlugin):
painter.drawLine(dist_h, 0, dist_h, base_img.height())
painter.drawLine(0, base_img.height()-dist_v, base_img.width(), base_img.height()-(dist_v))
painter.drawLine(base_img.width()-(dist_h), 0, base_img.width()-(dist_h), base_img.height())
logo = QImage(':icons/revealer_c.png').scaledToWidth(1.3*(total_distance_h))
logo = QImage(icon_path('revealer_c.png')).scaledToWidth(1.3*(total_distance_h))
painter.drawImage((total_distance_h)+ (border_thick), ((total_distance_h))+ (border_thick), logo, Qt.SmoothTransformation)
#frame around logo

4
electrum/plugins/safe_t/qt.py
View File

@@ -169,8 +169,8 @@ class QtPlugin(QtPluginBase):
class Plugin(SafeTPlugin, QtPlugin):
icon_unpaired = ":icons/safe-t_unpaired.png"
icon_paired = ":icons/safe-t.png"
icon_unpaired = "safe-t_unpaired.png"
icon_paired = "safe-t.png"
@classmethod
def pin_matrix_widget_class(self):

4
electrum/plugins/trezor/qt.py
View File

@@ -259,8 +259,8 @@ class QtPlugin(QtPluginBase):
class Plugin(TrezorPlugin, QtPlugin):
icon_unpaired = ":icons/trezor_unpaired.png"
icon_paired = ":icons/trezor.png"
icon_unpaired = "trezor_unpaired.png"
icon_paired = "trezor.png"
@classmethod
def pin_matrix_widget_class(self):

4
electrum/plugins/trustedcoin/qt.py
View File

@@ -90,7 +90,7 @@ class Plugin(TrustedCoinPlugin):
action = lambda: window.show_message(msg)
else:
action = partial(self.settings_dialog, window)
button = StatusBarButton(QIcon(":icons/trustedcoin-status.png"),
button = StatusBarButton(read_QIcon("trustedcoin-status.png"),
_("TrustedCoin"), action)
window.statusBar().addPermanentWidget(button)
self.start_request_thread(window.wallet)
@@ -152,7 +152,7 @@ class Plugin(TrustedCoinPlugin):
hbox = QHBoxLayout()
logo = QLabel()
logo.setPixmap(QPixmap(":icons/trustedcoin-status.png"))
logo.setPixmap(QPixmap(icon_path("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)

4
electrum/plugins/trustedcoin/trustedcoin.py
View File

@@ -492,7 +492,7 @@ class TrustedCoinPlugin(BasePlugin):
window.wallet.is_billing = False
def show_disclaimer(self, wizard):
wizard.set_icon(':icons/trustedcoin-wizard.png')
wizard.set_icon('trustedcoin-wizard.png')
wizard.stack = []
wizard.confirm_dialog(title='Disclaimer', message='\n\n'.join(self.disclaimer_msg), run_next = lambda x: wizard.run('choose_seed'))
@@ -581,7 +581,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-wizard.png')
wizard.set_icon('trustedcoin-wizard.png')
wizard.stack = []
title = _('Restore 2FA wallet')
msg = ' '.join([