Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
Radiant icons
Browse files Browse the repository at this point in the history
  • Loading branch information
bkn7 committed Aug 2, 2022
1 parent 53982ef commit e788e1c
Show file tree
Hide file tree
Showing 17 changed files with 25,666 additions and 28,696 deletions.
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ CFLAGS="-g0" "$python" -m pip install --no-deps --no-warn-script-location --cach

info "Copying desktop integration"
cp -fp "$PROJECT_ROOT/electron-radiant.desktop" "$APPDIR/electron-radiant.desktop"
cp -fp "$PROJECT_ROOT/icons/electron-cash.png" "$APPDIR/electron-cash.png"
cp -fp "$PROJECT_ROOT/icons/electron-radiant.png" "$APPDIR/electron-radiant.png"


# add launcher
Expand Down
4 changes: 2 additions & 2 deletions electron-radiant.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
Comment=Lightweight Radiant Client
Exec=electron-radiant %u
GenericName=Radiant Wallet
Icon=electron-cash
Icon=electron-radiant
Name=Electron Radiant
Categories=Finance;Network;
StartupNotify=true
StartupWMClass=Electron Radiant
Terminal=false
Type=Application
MimeType=x-scheme-handler/bitcoincash;x-scheme-handler/cashacct;
#MimeType=x-scheme-handler/bitcoincash;x-scheme-handler/cashacct;
Actions=Testnet;

[Desktop Action Testnet]
Expand Down
6 changes: 3 additions & 3 deletions electroncash_gui/qt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ def _set_icon(self):
# electron.icns). However, in .app mode, Qt will not know about
# this icon and won't be able to use it for e.g. the About dialog.
# In the latter case the branch below will tell Qt to use
# electron-cash.svg as the "window icon".
# electron-radiant.svg as the "window icon".
icon = QIcon("electron.icns") if os.path.exists("electron.icns") else None
if not icon:
# Set this on all other platforms (and macOS built .app) as it can
# only help and never harm, and is always available.
icon = QIcon(":icons/electron-cash.svg")
icon = QIcon(":icons/electron-radiant.svg")
if icon:
self.app.setWindowIcon(icon)

Expand Down Expand Up @@ -905,7 +905,7 @@ def notify(self, message):
if self.tray:
try:
# this requires Qt 5.9
self.tray.showMessage("Electron Radiant", message, QIcon(":icons/electron-cash.svg"), 20000)
self.tray.showMessage("Electron Radiant", message, QIcon(":icons/electron-radiant.svg"), 20000)
except TypeError:
self.tray.showMessage("Electron Radiant", message, QSystemTrayIcon.Information, 20000)

Expand Down
54,048 changes: 25,645 additions & 28,403 deletions electroncash_gui/qt/icons.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion electroncash_gui/qt/installwizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def __init__(self, config, app, plugins, storage):
hbox.setStretchFactor(scroll, 1)
outer_vbox.addLayout(hbox)
outer_vbox.addLayout(Buttons(self.back_button, self.next_button))
self.set_icon(':icons/electron-cash.svg')
self.set_icon(':icons/electron-radiant.svg')
self.show()
self.raise_()

Expand Down
2 changes: 1 addition & 1 deletion electroncash_gui/qt/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -2968,7 +2968,7 @@ def create_status_bar(self):
self.search_box.hide()
sb.addPermanentWidget(self.search_box, 1)

self.update_available_button = StatusBarButton(QIcon(":icons/electron-cash-update.svg"), _("Update available, click for details"), lambda: self.gui_object.show_update_checker(self, skip_check=True))
self.update_available_button = StatusBarButton(QIcon(":icons/electron-radiant-update.svg"), _("Update available, click for details"), lambda: self.gui_object.show_update_checker(self, skip_check=True))
self.update_available_button.setStatusTip(_("An Electron Radiant update is available"))
sb.addPermanentWidget(self.update_available_button)
self.update_available_button.setVisible(bool(self.gui_object.new_version_available)) # if hidden now gets unhidden by on_update_available when a new version comes in
Expand Down
4 changes: 2 additions & 2 deletions icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<qresource prefix="/" >
<file>icons/cashacct-logo.png</file>
<file>icons/cashacct-button-darkmode.png</file>
<file>icons/electron-cash.svg</file>
<file>icons/electron-cash-update.svg</file>
<file>icons/electron-radiant.svg</file>
<file>icons/electron-radiant-update.svg</file>
<file>icons/clock1.svg</file>
<file>icons/clock2.svg</file>
<file>icons/clock3.svg</file>
Expand Down
112 changes: 0 additions & 112 deletions icons/electron-cash-update.svg

This file was deleted.

Binary file removed icons/electron-cash.png
Binary file not shown.
Loading

0 comments on commit e788e1c

Please sign in to comment.