From 2c71b9da0c3698332aa0758fe1d0e49c3ebebf9e Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 7 Feb 2019 18:57:25 +0100 Subject: [PATCH] icons: instead of symlinks, just mv "icons" dir symlinks are really inconvenient on Windows (when running from cloned source) follow-up #5055 --- MANIFEST.in | 1 - contrib/build-linux/appimage/build.sh | 2 +- contrib/build-wine/deterministic.spec | 11 +++++------ contrib/build-wine/electrum.nsi | 4 ++-- contrib/osx/osx.spec | 5 ++--- electrum/gui/icons | 1 - {icons => electrum/gui/icons}/camera_dark.png | Bin {icons => electrum/gui/icons}/camera_white.png | Bin {icons => electrum/gui/icons}/clock1.png | Bin {icons => electrum/gui/icons}/clock2.png | Bin {icons => electrum/gui/icons}/clock3.png | Bin {icons => electrum/gui/icons}/clock4.png | Bin {icons => electrum/gui/icons}/clock5.pdn | Bin {icons => electrum/gui/icons}/clock5.png | Bin {icons => electrum/gui/icons}/coldcard.png | Bin {icons => electrum/gui/icons}/coldcard_unpaired.png | Bin {icons => electrum/gui/icons}/confirmed.png | Bin {icons => electrum/gui/icons}/confirmed.svg | 0 {icons => electrum/gui/icons}/copy.png | Bin {icons => electrum/gui/icons}/digitalbitbox.png | Bin .../gui/icons}/digitalbitbox_unpaired.png | Bin electrum.icns => electrum/gui/icons/electrum.icns | Bin {icons => electrum/gui/icons}/electrum.ico | Bin {icons => electrum/gui/icons}/electrum.png | Bin .../gui/icons}/electrum_dark_icon.png | Bin {icons => electrum/gui/icons}/electrum_launcher.png | Bin .../gui/icons}/electrum_light_icon.png | Bin .../gui/icons}/electrum_presplash.png | Bin {icons => electrum/gui/icons}/electrumb.png | Bin {icons => electrum/gui/icons}/expired.png | Bin {icons => electrum/gui/icons}/eye1.png | Bin {icons => electrum/gui/icons}/file.png | Bin {icons => electrum/gui/icons}/info.png | Bin {icons => electrum/gui/icons}/keepkey.png | Bin {icons => electrum/gui/icons}/keepkey_unpaired.png | Bin {icons => electrum/gui/icons}/key.png | Bin {icons => electrum/gui/icons}/ledger.png | Bin {icons => electrum/gui/icons}/ledger_unpaired.png | Bin {icons => electrum/gui/icons}/lock.png | Bin {icons => electrum/gui/icons}/lock.svg | 0 {icons => electrum/gui/icons}/microphone.png | Bin {icons => electrum/gui/icons}/network.png | Bin {icons => electrum/gui/icons}/offline_tx.png | Bin {icons => electrum/gui/icons}/preferences.png | Bin {icons => electrum/gui/icons}/preferences.svg | 0 {icons => electrum/gui/icons}/qrcode.png | Bin {icons => electrum/gui/icons}/qrcode_white.png | Bin {icons => electrum/gui/icons}/revealer.png | Bin {icons => electrum/gui/icons}/revealer_c.png | Bin {icons => electrum/gui/icons}/safe-t.png | Bin {icons => electrum/gui/icons}/safe-t_unpaired.png | Bin {icons => electrum/gui/icons}/seal.png | Bin {icons => electrum/gui/icons}/seed.png | Bin {icons => electrum/gui/icons}/speaker.png | Bin {icons => electrum/gui/icons}/status_connected.png | Bin {icons => electrum/gui/icons}/status_connected.svg | 0 .../gui/icons}/status_connected_fork.png | Bin .../gui/icons}/status_connected_proxy.png | Bin .../gui/icons}/status_connected_proxy.svg | 0 .../gui/icons}/status_connected_proxy_fork.png | Bin .../gui/icons}/status_disconnected.png | Bin .../gui/icons}/status_disconnected.svg | 0 {icons => electrum/gui/icons}/status_lagging.png | Bin {icons => electrum/gui/icons}/status_lagging.svg | 0 .../gui/icons}/status_lagging_fork.png | Bin {icons => electrum/gui/icons}/status_waiting.png | Bin {icons => electrum/gui/icons}/status_waiting.svg | 0 {icons => electrum/gui/icons}/tab_addresses.png | Bin {icons => electrum/gui/icons}/tab_coins.png | Bin {icons => electrum/gui/icons}/tab_console.png | Bin {icons => electrum/gui/icons}/tab_contacts.png | Bin {icons => electrum/gui/icons}/tab_history.png | Bin {icons => electrum/gui/icons}/tab_receive.png | Bin {icons => electrum/gui/icons}/tab_send.png | Bin {icons => electrum/gui/icons}/tor_logo.png | Bin {icons => electrum/gui/icons}/trezor.png | Bin {icons => electrum/gui/icons}/trezor_unpaired.png | Bin .../gui/icons}/trustedcoin-status.png | Bin .../gui/icons}/trustedcoin-wizard.png | Bin {icons => electrum/gui/icons}/unconfirmed.png | Bin {icons => electrum/gui/icons}/unlock.png | Bin {icons => electrum/gui/icons}/unlock.svg | 0 {icons => electrum/gui/icons}/unpaid.png | Bin {icons => electrum/gui/icons}/update.png | Bin {icons => electrum/gui/icons}/warning.png | Bin {icons => electrum/gui/icons}/zoom.png | Bin electrum/gui/kivy/main_window.py | 2 +- electrum/gui/kivy/tools/buildozer.spec | 4 ++-- setup.py | 2 +- 89 files changed, 14 insertions(+), 18 deletions(-) delete mode 120000 electrum/gui/icons rename {icons => electrum/gui/icons}/camera_dark.png (100%) rename {icons => electrum/gui/icons}/camera_white.png (100%) rename {icons => electrum/gui/icons}/clock1.png (100%) rename {icons => electrum/gui/icons}/clock2.png (100%) rename {icons => electrum/gui/icons}/clock3.png (100%) rename {icons => electrum/gui/icons}/clock4.png (100%) rename {icons => electrum/gui/icons}/clock5.pdn (100%) rename {icons => electrum/gui/icons}/clock5.png (100%) rename {icons => electrum/gui/icons}/coldcard.png (100%) rename {icons => electrum/gui/icons}/coldcard_unpaired.png (100%) rename {icons => electrum/gui/icons}/confirmed.png (100%) rename {icons => electrum/gui/icons}/confirmed.svg (100%) rename {icons => electrum/gui/icons}/copy.png (100%) rename {icons => electrum/gui/icons}/digitalbitbox.png (100%) rename {icons => electrum/gui/icons}/digitalbitbox_unpaired.png (100%) rename electrum.icns => electrum/gui/icons/electrum.icns (100%) rename {icons => electrum/gui/icons}/electrum.ico (100%) rename {icons => electrum/gui/icons}/electrum.png (100%) rename {icons => electrum/gui/icons}/electrum_dark_icon.png (100%) rename {icons => electrum/gui/icons}/electrum_launcher.png (100%) rename {icons => electrum/gui/icons}/electrum_light_icon.png (100%) rename {icons => electrum/gui/icons}/electrum_presplash.png (100%) rename {icons => electrum/gui/icons}/electrumb.png (100%) rename {icons => electrum/gui/icons}/expired.png (100%) rename {icons => electrum/gui/icons}/eye1.png (100%) rename {icons => electrum/gui/icons}/file.png (100%) rename {icons => electrum/gui/icons}/info.png (100%) rename {icons => electrum/gui/icons}/keepkey.png (100%) rename {icons => electrum/gui/icons}/keepkey_unpaired.png (100%) rename {icons => electrum/gui/icons}/key.png (100%) rename {icons => electrum/gui/icons}/ledger.png (100%) rename {icons => electrum/gui/icons}/ledger_unpaired.png (100%) rename {icons => electrum/gui/icons}/lock.png (100%) rename {icons => electrum/gui/icons}/lock.svg (100%) rename {icons => electrum/gui/icons}/microphone.png (100%) rename {icons => electrum/gui/icons}/network.png (100%) rename {icons => electrum/gui/icons}/offline_tx.png (100%) rename {icons => electrum/gui/icons}/preferences.png (100%) rename {icons => electrum/gui/icons}/preferences.svg (100%) rename {icons => electrum/gui/icons}/qrcode.png (100%) rename {icons => electrum/gui/icons}/qrcode_white.png (100%) rename {icons => electrum/gui/icons}/revealer.png (100%) rename {icons => electrum/gui/icons}/revealer_c.png (100%) rename {icons => electrum/gui/icons}/safe-t.png (100%) rename {icons => electrum/gui/icons}/safe-t_unpaired.png (100%) rename {icons => electrum/gui/icons}/seal.png (100%) rename {icons => electrum/gui/icons}/seed.png (100%) rename {icons => electrum/gui/icons}/speaker.png (100%) rename {icons => electrum/gui/icons}/status_connected.png (100%) rename {icons => electrum/gui/icons}/status_connected.svg (100%) rename {icons => electrum/gui/icons}/status_connected_fork.png (100%) rename {icons => electrum/gui/icons}/status_connected_proxy.png (100%) rename {icons => electrum/gui/icons}/status_connected_proxy.svg (100%) rename {icons => electrum/gui/icons}/status_connected_proxy_fork.png (100%) rename {icons => electrum/gui/icons}/status_disconnected.png (100%) rename {icons => electrum/gui/icons}/status_disconnected.svg (100%) rename {icons => electrum/gui/icons}/status_lagging.png (100%) rename {icons => electrum/gui/icons}/status_lagging.svg (100%) rename {icons => electrum/gui/icons}/status_lagging_fork.png (100%) rename {icons => electrum/gui/icons}/status_waiting.png (100%) rename {icons => electrum/gui/icons}/status_waiting.svg (100%) rename {icons => electrum/gui/icons}/tab_addresses.png (100%) rename {icons => electrum/gui/icons}/tab_coins.png (100%) rename {icons => electrum/gui/icons}/tab_console.png (100%) rename {icons => electrum/gui/icons}/tab_contacts.png (100%) rename {icons => electrum/gui/icons}/tab_history.png (100%) rename {icons => electrum/gui/icons}/tab_receive.png (100%) rename {icons => electrum/gui/icons}/tab_send.png (100%) rename {icons => electrum/gui/icons}/tor_logo.png (100%) rename {icons => electrum/gui/icons}/trezor.png (100%) rename {icons => electrum/gui/icons}/trezor_unpaired.png (100%) rename {icons => electrum/gui/icons}/trustedcoin-status.png (100%) rename {icons => electrum/gui/icons}/trustedcoin-wizard.png (100%) rename {icons => electrum/gui/icons}/unconfirmed.png (100%) rename {icons => electrum/gui/icons}/unlock.png (100%) rename {icons => electrum/gui/icons}/unlock.svg (100%) rename {icons => electrum/gui/icons}/unpaid.png (100%) rename {icons => electrum/gui/icons}/update.png (100%) rename {icons => electrum/gui/icons}/warning.png (100%) rename {icons => electrum/gui/icons}/zoom.png (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 34323d299..5c7667c6d 100644 --- 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 index 35480a6cd..3e28f6d7c 100755 --- 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 index b65654b2f..53aafd85a 100644 --- 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 index ed7adcc3e..1946c7749 100644 --- 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 index b08facb2c..2bf74f2f6 100644 --- 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 deleted file mode 120000 index 9a5906b77..000000000 --- a/electrum/gui/icons +++ /dev/null @@ -1 +0,0 @@ -../../icons/ \ No newline at end of file diff --git a/icons/camera_dark.png b/electrum/gui/icons/camera_dark.png similarity index 100% rename from icons/camera_dark.png rename to electrum/gui/icons/camera_dark.png diff --git a/icons/camera_white.png b/electrum/gui/icons/camera_white.png similarity index 100% rename from icons/camera_white.png rename to electrum/gui/icons/camera_white.png diff --git a/icons/clock1.png b/electrum/gui/icons/clock1.png similarity index 100% rename from icons/clock1.png rename to electrum/gui/icons/clock1.png diff --git a/icons/clock2.png b/electrum/gui/icons/clock2.png similarity index 100% rename from icons/clock2.png rename to electrum/gui/icons/clock2.png diff --git a/icons/clock3.png b/electrum/gui/icons/clock3.png similarity index 100% rename from icons/clock3.png rename to electrum/gui/icons/clock3.png diff --git a/icons/clock4.png b/electrum/gui/icons/clock4.png similarity index 100% rename from icons/clock4.png rename to electrum/gui/icons/clock4.png diff --git a/icons/clock5.pdn b/electrum/gui/icons/clock5.pdn similarity index 100% rename from icons/clock5.pdn rename to electrum/gui/icons/clock5.pdn diff --git a/icons/clock5.png b/electrum/gui/icons/clock5.png similarity index 100% rename from icons/clock5.png rename to electrum/gui/icons/clock5.png diff --git a/icons/coldcard.png b/electrum/gui/icons/coldcard.png similarity index 100% rename from icons/coldcard.png rename to electrum/gui/icons/coldcard.png diff --git a/icons/coldcard_unpaired.png b/electrum/gui/icons/coldcard_unpaired.png similarity index 100% rename from icons/coldcard_unpaired.png rename to electrum/gui/icons/coldcard_unpaired.png diff --git a/icons/confirmed.png b/electrum/gui/icons/confirmed.png similarity index 100% rename from icons/confirmed.png rename to electrum/gui/icons/confirmed.png diff --git a/icons/confirmed.svg b/electrum/gui/icons/confirmed.svg similarity index 100% rename from icons/confirmed.svg rename to electrum/gui/icons/confirmed.svg diff --git a/icons/copy.png b/electrum/gui/icons/copy.png similarity index 100% rename from icons/copy.png rename to electrum/gui/icons/copy.png diff --git a/icons/digitalbitbox.png b/electrum/gui/icons/digitalbitbox.png similarity index 100% rename from icons/digitalbitbox.png rename to electrum/gui/icons/digitalbitbox.png diff --git a/icons/digitalbitbox_unpaired.png b/electrum/gui/icons/digitalbitbox_unpaired.png similarity index 100% rename from icons/digitalbitbox_unpaired.png rename to electrum/gui/icons/digitalbitbox_unpaired.png diff --git a/electrum.icns b/electrum/gui/icons/electrum.icns similarity index 100% rename from electrum.icns rename to electrum/gui/icons/electrum.icns diff --git a/icons/electrum.ico b/electrum/gui/icons/electrum.ico similarity index 100% rename from icons/electrum.ico rename to electrum/gui/icons/electrum.ico diff --git a/icons/electrum.png b/electrum/gui/icons/electrum.png similarity index 100% rename from icons/electrum.png rename to electrum/gui/icons/electrum.png diff --git a/icons/electrum_dark_icon.png b/electrum/gui/icons/electrum_dark_icon.png similarity index 100% rename from icons/electrum_dark_icon.png rename to electrum/gui/icons/electrum_dark_icon.png diff --git a/icons/electrum_launcher.png b/electrum/gui/icons/electrum_launcher.png similarity index 100% rename from icons/electrum_launcher.png rename to electrum/gui/icons/electrum_launcher.png diff --git a/icons/electrum_light_icon.png b/electrum/gui/icons/electrum_light_icon.png similarity index 100% rename from icons/electrum_light_icon.png rename to electrum/gui/icons/electrum_light_icon.png diff --git a/icons/electrum_presplash.png b/electrum/gui/icons/electrum_presplash.png similarity index 100% rename from icons/electrum_presplash.png rename to electrum/gui/icons/electrum_presplash.png diff --git a/icons/electrumb.png b/electrum/gui/icons/electrumb.png similarity index 100% rename from icons/electrumb.png rename to electrum/gui/icons/electrumb.png diff --git a/icons/expired.png b/electrum/gui/icons/expired.png similarity index 100% rename from icons/expired.png rename to electrum/gui/icons/expired.png diff --git a/icons/eye1.png b/electrum/gui/icons/eye1.png similarity index 100% rename from icons/eye1.png rename to electrum/gui/icons/eye1.png diff --git a/icons/file.png b/electrum/gui/icons/file.png similarity index 100% rename from icons/file.png rename to electrum/gui/icons/file.png diff --git a/icons/info.png b/electrum/gui/icons/info.png similarity index 100% rename from icons/info.png rename to electrum/gui/icons/info.png diff --git a/icons/keepkey.png b/electrum/gui/icons/keepkey.png similarity index 100% rename from icons/keepkey.png rename to electrum/gui/icons/keepkey.png diff --git a/icons/keepkey_unpaired.png b/electrum/gui/icons/keepkey_unpaired.png similarity index 100% rename from icons/keepkey_unpaired.png rename to electrum/gui/icons/keepkey_unpaired.png diff --git a/icons/key.png b/electrum/gui/icons/key.png similarity index 100% rename from icons/key.png rename to electrum/gui/icons/key.png diff --git a/icons/ledger.png b/electrum/gui/icons/ledger.png similarity index 100% rename from icons/ledger.png rename to electrum/gui/icons/ledger.png diff --git a/icons/ledger_unpaired.png b/electrum/gui/icons/ledger_unpaired.png similarity index 100% rename from icons/ledger_unpaired.png rename to electrum/gui/icons/ledger_unpaired.png diff --git a/icons/lock.png b/electrum/gui/icons/lock.png similarity index 100% rename from icons/lock.png rename to electrum/gui/icons/lock.png diff --git a/icons/lock.svg b/electrum/gui/icons/lock.svg similarity index 100% rename from icons/lock.svg rename to electrum/gui/icons/lock.svg diff --git a/icons/microphone.png b/electrum/gui/icons/microphone.png similarity index 100% rename from icons/microphone.png rename to electrum/gui/icons/microphone.png diff --git a/icons/network.png b/electrum/gui/icons/network.png similarity index 100% rename from icons/network.png rename to electrum/gui/icons/network.png diff --git a/icons/offline_tx.png b/electrum/gui/icons/offline_tx.png similarity index 100% rename from icons/offline_tx.png rename to electrum/gui/icons/offline_tx.png diff --git a/icons/preferences.png b/electrum/gui/icons/preferences.png similarity index 100% rename from icons/preferences.png rename to electrum/gui/icons/preferences.png diff --git a/icons/preferences.svg b/electrum/gui/icons/preferences.svg similarity index 100% rename from icons/preferences.svg rename to electrum/gui/icons/preferences.svg diff --git a/icons/qrcode.png b/electrum/gui/icons/qrcode.png similarity index 100% rename from icons/qrcode.png rename to electrum/gui/icons/qrcode.png diff --git a/icons/qrcode_white.png b/electrum/gui/icons/qrcode_white.png similarity index 100% rename from icons/qrcode_white.png rename to electrum/gui/icons/qrcode_white.png diff --git a/icons/revealer.png b/electrum/gui/icons/revealer.png similarity index 100% rename from icons/revealer.png rename to electrum/gui/icons/revealer.png diff --git a/icons/revealer_c.png b/electrum/gui/icons/revealer_c.png similarity index 100% rename from icons/revealer_c.png rename to electrum/gui/icons/revealer_c.png diff --git a/icons/safe-t.png b/electrum/gui/icons/safe-t.png similarity index 100% rename from icons/safe-t.png rename to electrum/gui/icons/safe-t.png diff --git a/icons/safe-t_unpaired.png b/electrum/gui/icons/safe-t_unpaired.png similarity index 100% rename from icons/safe-t_unpaired.png rename to electrum/gui/icons/safe-t_unpaired.png diff --git a/icons/seal.png b/electrum/gui/icons/seal.png similarity index 100% rename from icons/seal.png rename to electrum/gui/icons/seal.png diff --git a/icons/seed.png b/electrum/gui/icons/seed.png similarity index 100% rename from icons/seed.png rename to electrum/gui/icons/seed.png diff --git a/icons/speaker.png b/electrum/gui/icons/speaker.png similarity index 100% rename from icons/speaker.png rename to electrum/gui/icons/speaker.png diff --git a/icons/status_connected.png b/electrum/gui/icons/status_connected.png similarity index 100% rename from icons/status_connected.png rename to electrum/gui/icons/status_connected.png diff --git a/icons/status_connected.svg b/electrum/gui/icons/status_connected.svg similarity index 100% rename from icons/status_connected.svg rename to electrum/gui/icons/status_connected.svg diff --git a/icons/status_connected_fork.png b/electrum/gui/icons/status_connected_fork.png similarity index 100% rename from icons/status_connected_fork.png rename to electrum/gui/icons/status_connected_fork.png diff --git a/icons/status_connected_proxy.png b/electrum/gui/icons/status_connected_proxy.png similarity index 100% rename from icons/status_connected_proxy.png rename to electrum/gui/icons/status_connected_proxy.png diff --git a/icons/status_connected_proxy.svg b/electrum/gui/icons/status_connected_proxy.svg similarity index 100% rename from icons/status_connected_proxy.svg rename to 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 similarity index 100% rename from icons/status_connected_proxy_fork.png rename to electrum/gui/icons/status_connected_proxy_fork.png diff --git a/icons/status_disconnected.png b/electrum/gui/icons/status_disconnected.png similarity index 100% rename from icons/status_disconnected.png rename to electrum/gui/icons/status_disconnected.png diff --git a/icons/status_disconnected.svg b/electrum/gui/icons/status_disconnected.svg similarity index 100% rename from icons/status_disconnected.svg rename to electrum/gui/icons/status_disconnected.svg diff --git a/icons/status_lagging.png b/electrum/gui/icons/status_lagging.png similarity index 100% rename from icons/status_lagging.png rename to electrum/gui/icons/status_lagging.png diff --git a/icons/status_lagging.svg b/electrum/gui/icons/status_lagging.svg similarity index 100% rename from icons/status_lagging.svg rename to electrum/gui/icons/status_lagging.svg diff --git a/icons/status_lagging_fork.png b/electrum/gui/icons/status_lagging_fork.png similarity index 100% rename from icons/status_lagging_fork.png rename to electrum/gui/icons/status_lagging_fork.png diff --git a/icons/status_waiting.png b/electrum/gui/icons/status_waiting.png similarity index 100% rename from icons/status_waiting.png rename to electrum/gui/icons/status_waiting.png diff --git a/icons/status_waiting.svg b/electrum/gui/icons/status_waiting.svg similarity index 100% rename from icons/status_waiting.svg rename to electrum/gui/icons/status_waiting.svg diff --git a/icons/tab_addresses.png b/electrum/gui/icons/tab_addresses.png similarity index 100% rename from icons/tab_addresses.png rename to electrum/gui/icons/tab_addresses.png diff --git a/icons/tab_coins.png b/electrum/gui/icons/tab_coins.png similarity index 100% rename from icons/tab_coins.png rename to electrum/gui/icons/tab_coins.png diff --git a/icons/tab_console.png b/electrum/gui/icons/tab_console.png similarity index 100% rename from icons/tab_console.png rename to electrum/gui/icons/tab_console.png diff --git a/icons/tab_contacts.png b/electrum/gui/icons/tab_contacts.png similarity index 100% rename from icons/tab_contacts.png rename to electrum/gui/icons/tab_contacts.png diff --git a/icons/tab_history.png b/electrum/gui/icons/tab_history.png similarity index 100% rename from icons/tab_history.png rename to electrum/gui/icons/tab_history.png diff --git a/icons/tab_receive.png b/electrum/gui/icons/tab_receive.png similarity index 100% rename from icons/tab_receive.png rename to electrum/gui/icons/tab_receive.png diff --git a/icons/tab_send.png b/electrum/gui/icons/tab_send.png similarity index 100% rename from icons/tab_send.png rename to electrum/gui/icons/tab_send.png diff --git a/icons/tor_logo.png b/electrum/gui/icons/tor_logo.png similarity index 100% rename from icons/tor_logo.png rename to electrum/gui/icons/tor_logo.png diff --git a/icons/trezor.png b/electrum/gui/icons/trezor.png similarity index 100% rename from icons/trezor.png rename to electrum/gui/icons/trezor.png diff --git a/icons/trezor_unpaired.png b/electrum/gui/icons/trezor_unpaired.png similarity index 100% rename from icons/trezor_unpaired.png rename to electrum/gui/icons/trezor_unpaired.png diff --git a/icons/trustedcoin-status.png b/electrum/gui/icons/trustedcoin-status.png similarity index 100% rename from icons/trustedcoin-status.png rename to electrum/gui/icons/trustedcoin-status.png diff --git a/icons/trustedcoin-wizard.png b/electrum/gui/icons/trustedcoin-wizard.png similarity index 100% rename from icons/trustedcoin-wizard.png rename to electrum/gui/icons/trustedcoin-wizard.png diff --git a/icons/unconfirmed.png b/electrum/gui/icons/unconfirmed.png similarity index 100% rename from icons/unconfirmed.png rename to electrum/gui/icons/unconfirmed.png diff --git a/icons/unlock.png b/electrum/gui/icons/unlock.png similarity index 100% rename from icons/unlock.png rename to electrum/gui/icons/unlock.png diff --git a/icons/unlock.svg b/electrum/gui/icons/unlock.svg similarity index 100% rename from icons/unlock.svg rename to electrum/gui/icons/unlock.svg diff --git a/icons/unpaid.png b/electrum/gui/icons/unpaid.png similarity index 100% rename from icons/unpaid.png rename to electrum/gui/icons/unpaid.png diff --git a/icons/update.png b/electrum/gui/icons/update.png similarity index 100% rename from icons/update.png rename to electrum/gui/icons/update.png diff --git a/icons/warning.png b/electrum/gui/icons/warning.png similarity index 100% rename from icons/warning.png rename to electrum/gui/icons/warning.png diff --git a/icons/zoom.png b/electrum/gui/icons/zoom.png similarity index 100% rename from icons/zoom.png rename to electrum/gui/icons/zoom.png diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py index 33e2a3926..09b1dbbfb 100644 --- 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 index 30b2ff863..29f7d9327 100644 --- 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 index f39a04717..947e01cee 100755 --- 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 = {