Browse Source

Merge pull request #56 from DrewMPeacock/update-splash

Update task tray icon files. Now with transparency™
AT-sleep-until-message
CalDescent 3 years ago committed by GitHub
parent
commit
64d39765ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/main/java/org/qortal/gui/SplashFrame.java
  2. 10
      src/main/java/org/qortal/gui/SysTray.java
  3. BIN
      src/main/resources/images/icons/Qlogo_128.png
  4. BIN
      src/main/resources/images/icons/icon128.png
  5. BIN
      src/main/resources/images/icons/icon32.png
  6. BIN
      src/main/resources/images/icons/icon32c.png
  7. BIN
      src/main/resources/images/icons/icon32m.png
  8. BIN
      src/main/resources/images/icons/icon32n.png
  9. BIN
      src/main/resources/images/icons/qortal_ui_tray_minting.png
  10. BIN
      src/main/resources/images/icons/qortal_ui_tray_synced.png
  11. BIN
      src/main/resources/images/icons/qortal_ui_tray_syncing.png
  12. BIN
      src/main/resources/images/icons/qortal_ui_tray_syncing_time-alt.png

10
src/main/java/org/qortal/gui/SplashFrame.java

@ -47,12 +47,12 @@ public class SplashFrame {
List<Image> icons = new ArrayList<>(); List<Image> icons = new ArrayList<>();
icons.add(Gui.loadImage("icons/icon16.png")); icons.add(Gui.loadImage("icons/icon16.png"));
icons.add(Gui.loadImage("icons/icon32.png")); icons.add(Gui.loadImage("icons/qortal_ui_tray_synced.png"));
icons.add(Gui.loadImage("icons/icon32c.png")); icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png"));
icons.add(Gui.loadImage("icons/icon32m.png")); icons.add(Gui.loadImage("icons/qortal_ui_tray_minting.png"));
icons.add(Gui.loadImage("icons/icon32n.png")); icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing.png"));
icons.add(Gui.loadImage("icons/icon64.png")); icons.add(Gui.loadImage("icons/icon64.png"));
icons.add(Gui.loadImage("icons/icon128.png")); icons.add(Gui.loadImage("icons/Qlogo_128.png"));
this.splashDialog.setIconImages(icons); this.splashDialog.setIconImages(icons);
this.splashDialog.getContentPane().add(new SplashPanel()); this.splashDialog.getContentPane().add(new SplashPanel());

10
src/main/java/org/qortal/gui/SysTray.java

@ -61,7 +61,7 @@ public class SysTray {
this.popupMenu = createJPopupMenu(); this.popupMenu = createJPopupMenu();
// Build TrayIcon without AWT PopupMenu (which doesn't support Unicode)... // Build TrayIcon without AWT PopupMenu (which doesn't support Unicode)...
this.trayIcon = new TrayIcon(Gui.loadImage("icons/icon32.png"), "qortal", null); this.trayIcon = new TrayIcon(Gui.loadImage("icons/qortal_ui_tray_synced.png"), "qortal", null);
// ...and attach mouse listener instead so we can use JPopupMenu (which does support Unicode) // ...and attach mouse listener instead so we can use JPopupMenu (which does support Unicode)
this.trayIcon.addMouseListener(new MouseAdapter() { this.trayIcon.addMouseListener(new MouseAdapter() {
@Override @Override
@ -293,16 +293,16 @@ public class SysTray {
if (trayIcon != null) { if (trayIcon != null) {
switch (iconid) { switch (iconid) {
case 1: case 1:
this.trayIcon.setImage(Gui.loadImage("icons/icon32c.png")); this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png"));
break; break;
case 2: case 2:
this.trayIcon.setImage(Gui.loadImage("icons/icon32m.png")); this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_minting.png"));
break; break;
case 3: case 3:
this.trayIcon.setImage(Gui.loadImage("icons/icon32n.png")); this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing.png"));
break; break;
case 4: case 4:
this.trayIcon.setImage(Gui.loadImage("icons/icon32.png")); this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_synced.png"));
break; break;
} }
} }

BIN
src/main/resources/images/icons/Qlogo_128.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
src/main/resources/images/icons/icon128.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
src/main/resources/images/icons/icon32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 B

BIN
src/main/resources/images/icons/icon32c.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 B

BIN
src/main/resources/images/icons/icon32m.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

BIN
src/main/resources/images/icons/icon32n.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 B

BIN
src/main/resources/images/icons/qortal_ui_tray_minting.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/images/icons/qortal_ui_tray_synced.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/images/icons/qortal_ui_tray_syncing.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/images/icons/qortal_ui_tray_syncing_time-alt.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Loading…
Cancel
Save