diff --git a/design/navIcons.psd b/design/navIcons.psd deleted file mode 100644 index f656b9e888..0000000000 Binary files a/design/navIcons.psd and /dev/null differ diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java index ffa1cc824a..335d2bc2df 100644 --- a/src/main/java/io/bitsquare/gui/MainController.java +++ b/src/main/java/io/bitsquare/gui/MainController.java @@ -513,12 +513,8 @@ class ViewBuilder { splashVBox.setSpacing(10); ImageView logo = ImageUtil.getIconImageView(ImageUtil.SPLASH_LOGO); - logo.setFitWidth(270); - logo.setFitHeight(200); - - ImageView titleLabel = ImageUtil.getIconImageView(ImageUtil.SPLASH_LABEL); - titleLabel.setFitWidth(300); - titleLabel.setFitHeight(79); + logo.setFitWidth(300); + logo.setFitHeight(300); Label subTitle = new Label("The P2P Fiat-Bitcoin Exchange"); subTitle.setAlignment(Pos.CENTER); @@ -528,7 +524,7 @@ class ViewBuilder { loadingLabel.setAlignment(Pos.CENTER); loadingLabel.setPadding(new Insets(80, 0, 0, 0)); - splashVBox.getChildren().addAll(logo, titleLabel, subTitle, loadingLabel); + splashVBox.getChildren().addAll(logo, subTitle, loadingLabel); return splashVBox; } diff --git a/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/src/main/java/io/bitsquare/gui/util/ImageUtil.java index 05de271774..3d7a87e8fa 100644 --- a/src/main/java/io/bitsquare/gui/util/ImageUtil.java +++ b/src/main/java/io/bitsquare/gui/util/ImageUtil.java @@ -20,11 +20,10 @@ package io.bitsquare.gui.util; import javafx.scene.image.*; public class ImageUtil { - public static final String SPLASH_LOGO = "/images/logo_200_270.png"; - public static final String SPLASH_LABEL = "/images/bitsquare_logo_label_300_69.png"; + public static final String SPLASH_LOGO = "/images/logo_600_600.png"; - public static final String SYS_TRAY = "/images/systemTrayIcon.png"; - public static final String SYS_TRAY_ALERT = "/images/systemTrayAlertIcon.png"; + public static final String SYS_TRAY = "/images/system_tray_icon_44_32.png"; + public static final String SYS_TRAY_ALERT = "/images/system_tray_notify_icon_44_32.png"; public static final String HOME = "/images/nav/home.png"; public static final String HOME_ACTIVE = "/images/nav/home_active.png"; diff --git a/src/main/resources/images/bitsquare_logo_label_300_69.png b/src/main/resources/images/bitsquare_logo_label_300_69.png deleted file mode 100644 index c2b83609f1..0000000000 Binary files a/src/main/resources/images/bitsquare_logo_label_300_69.png and /dev/null differ diff --git a/src/main/resources/images/logo_200_270.png b/src/main/resources/images/logo_200_270.png deleted file mode 100644 index ecb3d190dd..0000000000 Binary files a/src/main/resources/images/logo_200_270.png and /dev/null differ diff --git a/src/main/resources/images/logo_600_600.png b/src/main/resources/images/logo_600_600.png new file mode 100644 index 0000000000..5572fe6fa8 Binary files /dev/null and b/src/main/resources/images/logo_600_600.png differ diff --git a/src/main/resources/images/systemTrayAlertIcon.png b/src/main/resources/images/systemTrayAlertIcon.png deleted file mode 100644 index a3bc0584ea..0000000000 Binary files a/src/main/resources/images/systemTrayAlertIcon.png and /dev/null differ diff --git a/src/main/resources/images/systemTrayIcon.png b/src/main/resources/images/systemTrayIcon.png deleted file mode 100644 index f5f770a699..0000000000 Binary files a/src/main/resources/images/systemTrayIcon.png and /dev/null differ diff --git a/src/main/resources/images/system_tray_icon_44_32.png b/src/main/resources/images/system_tray_icon_44_32.png new file mode 100644 index 0000000000..f9133252aa Binary files /dev/null and b/src/main/resources/images/system_tray_icon_44_32.png differ diff --git a/src/main/resources/images/system_tray_notify_icon_44_32.png b/src/main/resources/images/system_tray_notify_icon_44_32.png new file mode 100644 index 0000000000..289121fdc3 Binary files /dev/null and b/src/main/resources/images/system_tray_notify_icon_44_32.png differ