diff --git a/src/main/java/org/qortal/gui/SplashFrame.java b/src/main/java/org/qortal/gui/SplashFrame.java index 407fc0ee..37d20ec5 100644 --- a/src/main/java/org/qortal/gui/SplashFrame.java +++ b/src/main/java/org/qortal/gui/SplashFrame.java @@ -47,12 +47,12 @@ public class SplashFrame { List icons = new ArrayList<>(); icons.add(Gui.loadImage("icons/icon16.png")); - icons.add(Gui.loadImage("icons/icon32.png")); - icons.add(Gui.loadImage("icons/icon32c.png")); - icons.add(Gui.loadImage("icons/icon32m.png")); - icons.add(Gui.loadImage("icons/icon32n.png")); + icons.add(Gui.loadImage("icons/qortal_ui_tray_synced.png")); + icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png")); + icons.add(Gui.loadImage("icons/qortal_ui_tray_minting.png")); + icons.add(Gui.loadImage("icons/qortal_ui_tray_syncing.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.getContentPane().add(new SplashPanel()); diff --git a/src/main/java/org/qortal/gui/SysTray.java b/src/main/java/org/qortal/gui/SysTray.java index 3ff1306d..6fc994bf 100644 --- a/src/main/java/org/qortal/gui/SysTray.java +++ b/src/main/java/org/qortal/gui/SysTray.java @@ -61,7 +61,7 @@ public class SysTray { this.popupMenu = createJPopupMenu(); // 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) this.trayIcon.addMouseListener(new MouseAdapter() { @Override @@ -293,16 +293,16 @@ public class SysTray { if (trayIcon != null) { switch (iconid) { case 1: - this.trayIcon.setImage(Gui.loadImage("icons/icon32c.png")); + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing_time-alt.png")); break; case 2: - this.trayIcon.setImage(Gui.loadImage("icons/icon32m.png")); + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_minting.png")); break; case 3: - this.trayIcon.setImage(Gui.loadImage("icons/icon32n.png")); + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_syncing.png")); break; case 4: - this.trayIcon.setImage(Gui.loadImage("icons/icon32.png")); + this.trayIcon.setImage(Gui.loadImage("icons/qortal_ui_tray_synced.png")); break; } } diff --git a/src/main/resources/images/icons/Qlogo_128.png b/src/main/resources/images/icons/Qlogo_128.png new file mode 100644 index 00000000..463bb527 Binary files /dev/null and b/src/main/resources/images/icons/Qlogo_128.png differ diff --git a/src/main/resources/images/icons/icon128.png b/src/main/resources/images/icons/icon128.png deleted file mode 100644 index ddb869bd..00000000 Binary files a/src/main/resources/images/icons/icon128.png and /dev/null differ diff --git a/src/main/resources/images/icons/icon32.png b/src/main/resources/images/icons/icon32.png deleted file mode 100644 index e6503e50..00000000 Binary files a/src/main/resources/images/icons/icon32.png and /dev/null differ diff --git a/src/main/resources/images/icons/icon32c.png b/src/main/resources/images/icons/icon32c.png deleted file mode 100644 index 0d5782ef..00000000 Binary files a/src/main/resources/images/icons/icon32c.png and /dev/null differ diff --git a/src/main/resources/images/icons/icon32m.png b/src/main/resources/images/icons/icon32m.png deleted file mode 100644 index dab63a62..00000000 Binary files a/src/main/resources/images/icons/icon32m.png and /dev/null differ diff --git a/src/main/resources/images/icons/icon32n.png b/src/main/resources/images/icons/icon32n.png deleted file mode 100644 index c160a221..00000000 Binary files a/src/main/resources/images/icons/icon32n.png and /dev/null differ diff --git a/src/main/resources/images/icons/qortal_ui_tray_minting.png b/src/main/resources/images/icons/qortal_ui_tray_minting.png new file mode 100644 index 00000000..567e784b Binary files /dev/null and b/src/main/resources/images/icons/qortal_ui_tray_minting.png differ diff --git a/src/main/resources/images/icons/qortal_ui_tray_synced.png b/src/main/resources/images/icons/qortal_ui_tray_synced.png new file mode 100644 index 00000000..f944bad9 Binary files /dev/null and b/src/main/resources/images/icons/qortal_ui_tray_synced.png differ diff --git a/src/main/resources/images/icons/qortal_ui_tray_syncing.png b/src/main/resources/images/icons/qortal_ui_tray_syncing.png new file mode 100644 index 00000000..82d39bbb Binary files /dev/null and b/src/main/resources/images/icons/qortal_ui_tray_syncing.png differ diff --git a/src/main/resources/images/icons/qortal_ui_tray_syncing_time-alt.png b/src/main/resources/images/icons/qortal_ui_tray_syncing_time-alt.png new file mode 100644 index 00000000..608be51e Binary files /dev/null and b/src/main/resources/images/icons/qortal_ui_tray_syncing_time-alt.png differ