commit 2c71b9da0c3698332aa0758fe1d0e49c3ebebf9e parent 9beabc03112a420ec0b1a069dd77ab291ab094f3 Author: SomberNight <somber.night@protonmail.com> Date: Thu, 7 Feb 2019 18:57:25 +0100 icons: instead of symlinks, just mv "icons" dir symlinks are really inconvenient on Windows (when running from cloned source) follow-up #5055 Diffstat:
89 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in @@ -7,7 +7,6 @@ include contrib/requirements/requirements.txt include contrib/requirements/requirements-hw.txt recursive-include packages *.py recursive-include packages cacert.pem -graft icons graft electrum prune electrum/tests diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh @@ -122,7 +122,7 @@ cp "/usr/lib/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0" info "desktop integration." cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop" -cp "$PROJECT_ROOT/icons/electrum.png" "$APPDIR/electrum.png" +cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png" # add launcher diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec @@ -42,8 +42,7 @@ datas = [ (home+'electrum/locale', 'electrum/locale'), (home+'electrum/plugins', 'electrum/plugins'), ('C:\\Program Files (x86)\\ZBar\\bin\\', '.'), - (home+'icons/*.png', 'electrum/gui/icons'), - (home+'icons/*.svg', 'electrum/gui/icons'), + (home+'electrum/gui/icons', 'electrum/gui/icons'), ] datas += collect_data_files('trezorlib') datas += collect_data_files('safetlib') @@ -120,7 +119,7 @@ exe_standalone = EXE( debug=False, strip=None, upx=False, - icon=home+'icons/electrum.ico', + icon=home+'electrum/gui/icons/electrum.ico', console=False) # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used @@ -133,7 +132,7 @@ exe_portable = EXE( debug=False, strip=None, upx=False, - icon=home+'icons/electrum.ico', + icon=home+'electrum/gui/icons/electrum.ico', console=False) ##### @@ -147,7 +146,7 @@ exe_dependent = EXE( debug=False, strip=None, upx=False, - icon=home+'icons/electrum.ico', + icon=home+'electrum/gui/icons/electrum.ico', console=False) coll = COLLECT( @@ -158,6 +157,6 @@ coll = COLLECT( strip=None, upx=True, debug=False, - icon=home+'icons/electrum.ico', + icon=home+'electrum/gui/icons/electrum.ico', console=False, name=os.path.join('dist', 'electrum')) diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi @@ -72,7 +72,7 @@ !define MUI_ABORTWARNING !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?" - !define MUI_ICON "c:\electrum\icons\electrum.ico" + !define MUI_ICON "c:\electrum\electrum\gui\icons\electrum.ico" ;-------------------------------- ;Pages @@ -111,7 +111,7 @@ Section ;Files to pack into the installer File /r "dist\electrum\*.*" - File "c:\electrum\icons\electrum.ico" + File "c:\electrum\electrum\gui\icons\electrum.ico" ;Store installation folder WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR diff --git a/contrib/osx/osx.spec b/contrib/osx/osx.spec @@ -7,7 +7,7 @@ import sys, os PACKAGE='Electrum' PYPKG='electrum' MAIN_SCRIPT='run_electrum' -ICONS_FILE='electrum.icns' +ICONS_FILE=PYPKG + '/gui/icons/electrum.icns' APP_SIGN = os.environ.get('APP_SIGN', '') def fail(*msg): @@ -76,8 +76,7 @@ datas = [ (electrum + PYPKG + '/wordlist/english.txt', PYPKG + '/wordlist'), (electrum + PYPKG + '/locale', PYPKG + '/locale'), (electrum + PYPKG + '/plugins', PYPKG + '/plugins'), - (electrum + 'icons/*.png', 'electrum/gui/icons'), - (electrum + 'icons/*.svg', 'electrum/gui/icons'), + (electrum + PYPKG + '/gui/icons', PYPKG + '/gui/icons'), ] datas += collect_data_files('trezorlib') datas += collect_data_files('safetlib') diff --git a/electrum/gui/icons b/electrum/gui/icons @@ -1 +0,0 @@ -../../icons/- \ No newline at end of file diff --git a/icons/camera_dark.png b/electrum/gui/icons/camera_dark.png Binary files differ. diff --git a/icons/camera_white.png b/electrum/gui/icons/camera_white.png Binary files differ. diff --git a/icons/clock1.png b/electrum/gui/icons/clock1.png Binary files differ. diff --git a/icons/clock2.png b/electrum/gui/icons/clock2.png Binary files differ. diff --git a/icons/clock3.png b/electrum/gui/icons/clock3.png Binary files differ. diff --git a/icons/clock4.png b/electrum/gui/icons/clock4.png Binary files differ. diff --git a/icons/clock5.pdn b/electrum/gui/icons/clock5.pdn Binary files differ. diff --git a/icons/clock5.png b/electrum/gui/icons/clock5.png Binary files differ. diff --git a/icons/coldcard.png b/electrum/gui/icons/coldcard.png Binary files differ. diff --git a/icons/coldcard_unpaired.png b/electrum/gui/icons/coldcard_unpaired.png Binary files differ. diff --git a/icons/confirmed.png b/electrum/gui/icons/confirmed.png Binary files differ. diff --git a/icons/confirmed.svg b/electrum/gui/icons/confirmed.svg diff --git a/icons/copy.png b/electrum/gui/icons/copy.png Binary files differ. diff --git a/icons/digitalbitbox.png b/electrum/gui/icons/digitalbitbox.png Binary files differ. diff --git a/icons/digitalbitbox_unpaired.png b/electrum/gui/icons/digitalbitbox_unpaired.png Binary files differ. diff --git a/electrum.icns b/electrum/gui/icons/electrum.icns Binary files differ. diff --git a/icons/electrum.ico b/electrum/gui/icons/electrum.ico Binary files differ. diff --git a/icons/electrum.png b/electrum/gui/icons/electrum.png Binary files differ. diff --git a/icons/electrum_dark_icon.png b/electrum/gui/icons/electrum_dark_icon.png Binary files differ. diff --git a/icons/electrum_launcher.png b/electrum/gui/icons/electrum_launcher.png Binary files differ. diff --git a/icons/electrum_light_icon.png b/electrum/gui/icons/electrum_light_icon.png Binary files differ. diff --git a/icons/electrum_presplash.png b/electrum/gui/icons/electrum_presplash.png Binary files differ. diff --git a/icons/electrumb.png b/electrum/gui/icons/electrumb.png Binary files differ. diff --git a/icons/expired.png b/electrum/gui/icons/expired.png Binary files differ. diff --git a/icons/eye1.png b/electrum/gui/icons/eye1.png Binary files differ. diff --git a/icons/file.png b/electrum/gui/icons/file.png Binary files differ. diff --git a/icons/info.png b/electrum/gui/icons/info.png Binary files differ. diff --git a/icons/keepkey.png b/electrum/gui/icons/keepkey.png Binary files differ. diff --git a/icons/keepkey_unpaired.png b/electrum/gui/icons/keepkey_unpaired.png Binary files differ. diff --git a/icons/key.png b/electrum/gui/icons/key.png Binary files differ. diff --git a/icons/ledger.png b/electrum/gui/icons/ledger.png Binary files differ. diff --git a/icons/ledger_unpaired.png b/electrum/gui/icons/ledger_unpaired.png Binary files differ. diff --git a/icons/lock.png b/electrum/gui/icons/lock.png Binary files differ. diff --git a/icons/lock.svg b/electrum/gui/icons/lock.svg diff --git a/icons/microphone.png b/electrum/gui/icons/microphone.png Binary files differ. diff --git a/icons/network.png b/electrum/gui/icons/network.png Binary files differ. diff --git a/icons/offline_tx.png b/electrum/gui/icons/offline_tx.png Binary files differ. diff --git a/icons/preferences.png b/electrum/gui/icons/preferences.png Binary files differ. diff --git a/icons/preferences.svg b/electrum/gui/icons/preferences.svg diff --git a/icons/qrcode.png b/electrum/gui/icons/qrcode.png Binary files differ. diff --git a/icons/qrcode_white.png b/electrum/gui/icons/qrcode_white.png Binary files differ. diff --git a/icons/revealer.png b/electrum/gui/icons/revealer.png Binary files differ. diff --git a/icons/revealer_c.png b/electrum/gui/icons/revealer_c.png Binary files differ. diff --git a/icons/safe-t.png b/electrum/gui/icons/safe-t.png Binary files differ. diff --git a/icons/safe-t_unpaired.png b/electrum/gui/icons/safe-t_unpaired.png Binary files differ. diff --git a/icons/seal.png b/electrum/gui/icons/seal.png Binary files differ. diff --git a/icons/seed.png b/electrum/gui/icons/seed.png Binary files differ. diff --git a/icons/speaker.png b/electrum/gui/icons/speaker.png Binary files differ. diff --git a/icons/status_connected.png b/electrum/gui/icons/status_connected.png Binary files differ. diff --git a/icons/status_connected.svg b/electrum/gui/icons/status_connected.svg diff --git a/icons/status_connected_fork.png b/electrum/gui/icons/status_connected_fork.png Binary files differ. diff --git a/icons/status_connected_proxy.png b/electrum/gui/icons/status_connected_proxy.png Binary files differ. diff --git a/icons/status_connected_proxy.svg b/electrum/gui/icons/status_connected_proxy.svg diff --git a/icons/status_connected_proxy_fork.png b/electrum/gui/icons/status_connected_proxy_fork.png Binary files differ. diff --git a/icons/status_disconnected.png b/electrum/gui/icons/status_disconnected.png Binary files differ. diff --git a/icons/status_disconnected.svg b/electrum/gui/icons/status_disconnected.svg diff --git a/icons/status_lagging.png b/electrum/gui/icons/status_lagging.png Binary files differ. diff --git a/icons/status_lagging.svg b/electrum/gui/icons/status_lagging.svg diff --git a/icons/status_lagging_fork.png b/electrum/gui/icons/status_lagging_fork.png Binary files differ. diff --git a/icons/status_waiting.png b/electrum/gui/icons/status_waiting.png Binary files differ. diff --git a/icons/status_waiting.svg b/electrum/gui/icons/status_waiting.svg diff --git a/icons/tab_addresses.png b/electrum/gui/icons/tab_addresses.png Binary files differ. diff --git a/icons/tab_coins.png b/electrum/gui/icons/tab_coins.png Binary files differ. diff --git a/icons/tab_console.png b/electrum/gui/icons/tab_console.png Binary files differ. diff --git a/icons/tab_contacts.png b/electrum/gui/icons/tab_contacts.png Binary files differ. diff --git a/icons/tab_history.png b/electrum/gui/icons/tab_history.png Binary files differ. diff --git a/icons/tab_receive.png b/electrum/gui/icons/tab_receive.png Binary files differ. diff --git a/icons/tab_send.png b/electrum/gui/icons/tab_send.png Binary files differ. diff --git a/icons/tor_logo.png b/electrum/gui/icons/tor_logo.png Binary files differ. diff --git a/icons/trezor.png b/electrum/gui/icons/trezor.png Binary files differ. diff --git a/icons/trezor_unpaired.png b/electrum/gui/icons/trezor_unpaired.png Binary files differ. diff --git a/icons/trustedcoin-status.png b/electrum/gui/icons/trustedcoin-status.png Binary files differ. diff --git a/icons/trustedcoin-wizard.png b/electrum/gui/icons/trustedcoin-wizard.png Binary files differ. diff --git a/icons/unconfirmed.png b/electrum/gui/icons/unconfirmed.png Binary files differ. diff --git a/icons/unlock.png b/electrum/gui/icons/unlock.png Binary files differ. diff --git a/icons/unlock.svg b/electrum/gui/icons/unlock.svg diff --git a/icons/unpaid.png b/electrum/gui/icons/unpaid.png Binary files differ. diff --git a/icons/update.png b/electrum/gui/icons/update.png Binary files differ. diff --git a/icons/warning.png b/electrum/gui/icons/warning.png Binary files differ. diff --git a/icons/zoom.png b/electrum/gui/icons/zoom.png Binary files differ. diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py @@ -671,7 +671,7 @@ class ElectrumWindow(App): self.receive_screen = None self.requests_screen = None self.address_screen = None - self.icon = "icons/electrum.png" + self.icon = "electrum/gui/icons/electrum.png" self.tabs = self.root.ids['tabs'] def update_interfaces(self, dt): diff --git a/electrum/gui/kivy/tools/buildozer.spec b/electrum/gui/kivy/tools/buildozer.spec @@ -35,10 +35,10 @@ requirements = python3, android, openssl, plyer, kivy==b47f669f44dbda4f463bcb7d2 # (str) Presplash of the application #presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png -presplash.filename = %(source.dir)s/icons/electrum_presplash.png +presplash.filename = %(source.dir)s/electrum/gui/icons/electrum_presplash.png # (str) Icon of the application -icon.filename = %(source.dir)s/icons/electrum_launcher.png +icon.filename = %(source.dir)s/electrum/gui/icons/electrum_launcher.png # (str) Supported orientation (one of landscape, portrait or all) orientation = portrait diff --git a/setup.py b/setup.py @@ -47,7 +47,7 @@ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']: usr_share = os.path.expanduser('~/.local/share') data_files += [ (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), - (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']), + (os.path.join(usr_share, icons_dirname), ['electrum/gui/icons/electrum.png']), ] extras_require = {
