From 1ca97369aa00a50960f23185aae17fb1eacf04ef Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 16 Sep 2014 03:53:43 +0200 Subject: [PATCH] Add retina version for all img --- .../java/io/bitsquare/gui/AWTSystemTray.java | 20 +++++++--- src/main/java/io/bitsquare/gui/images.css | 32 ++++++++++++++++ .../io/bitsquare/gui/main/MainViewCB.java | 7 ++-- .../restrictions/RestrictionsViewCB.java | 6 +-- .../main/orders/offer/OfferController.java | 2 +- .../pending/PendingTradeController.java | 20 ++-------- .../trade/createoffer/CreateOfferView.fxml | 4 +- .../trade/createoffer/CreateOfferViewCB.java | 12 +++++- .../gui/main/trade/orderbook/OrderBookPM.java | 5 ++- .../main/trade/orderbook/OrderBookViewCB.java | 16 ++++---- .../java/io/bitsquare/gui/util/ImageUtil.java | 35 +++++++++++------- src/main/resources/images/alert_round.png | Bin 0 -> 360 bytes src/main/resources/images/alert_round@2x.png | Bin 0 -> 557 bytes src/main/resources/images/buy@2x.png | Bin 0 -> 850 bytes src/main/resources/images/buy_large.png | Bin 1058 -> 1081 bytes src/main/resources/images/buy_large@2x.png | Bin 0 -> 3243 bytes src/main/resources/images/collapse.png | Bin 194 -> 213 bytes src/main/resources/images/collapse@2x.png | Bin 0 -> 273 bytes src/main/resources/images/expand.png | Bin 195 -> 211 bytes src/main/resources/images/expand@2x.png | Bin 0 -> 274 bytes src/main/resources/images/nav/alertRound.png | Bin 3025 -> 0 bytes src/main/resources/images/remove.png | Bin 0 -> 327 bytes src/main/resources/images/remove@2x.png | Bin 0 -> 544 bytes src/main/resources/images/removeOffer.png | Bin 901 -> 0 bytes src/main/resources/images/sell@2x.png | Bin 0 -> 790 bytes src/main/resources/images/sell_large.png | Bin 0 -> 1070 bytes src/main/resources/images/sell_large@2x.png | Bin 0 -> 2809 bytes .../resources/images/system_tray_icon.png | Bin 0 -> 1623 bytes .../resources/images/system_tray_icon@2x.png | Bin 0 -> 3177 bytes .../images/system_tray_icon_44_32.png | Bin 5223 -> 0 bytes .../images/system_tray_icon_alert.png | Bin 0 -> 1838 bytes .../images/system_tray_icon_alert@2x.png | Bin 0 -> 3901 bytes .../images/system_tray_notify_icon_44_32.png | Bin 2126 -> 0 bytes src/main/resources/images/unused/add.png | Bin 598 -> 0 bytes src/main/resources/images/unused/add_10.png | Bin 486 -> 0 bytes src/main/resources/images/unused/add_12.png | Bin 598 -> 0 bytes src/main/resources/images/unused/add_14.png | Bin 708 -> 0 bytes src/main/resources/images/unused/add_16.png | Bin 837 -> 0 bytes src/main/resources/images/unused/add_8.png | Bin 369 -> 0 bytes src/main/resources/images/unused/alert.png | Bin 272 -> 0 bytes .../resources/images/unused/alertFlag1.png | Bin 259 -> 0 bytes .../resources/images/unused/alertFlag2.png | Bin 262 -> 0 bytes src/main/resources/images/unused/arrowIn.png | Bin 233 -> 0 bytes .../resources/images/unused/buy_white.png | Bin 287 -> 0 bytes .../images/unused/circleProgress0.png | Bin 609 -> 0 bytes src/main/resources/images/unused/edit.png | Bin 425 -> 0 bytes .../resources/images/unused/edit_16_15.png | Bin 2950 -> 0 bytes src/main/resources/images/unused/edit_pen.png | Bin 415 -> 0 bytes src/main/resources/images/unused/history.png | Bin 430 -> 0 bytes .../images/unused/history_active.png | Bin 436 -> 0 bytes src/main/resources/images/unused/info.png | Bin 491 -> 0 bytes src/main/resources/images/unused/list.png | Bin 157 -> 0 bytes src/main/resources/images/unused/mail.png | Bin 408 -> 0 bytes src/main/resources/images/unused/offline.png | Bin 1094 -> 0 bytes src/main/resources/images/unused/online.png | Bin 1087 -> 0 bytes src/main/resources/images/unused/peers.png | Bin 1945 -> 0 bytes src/main/resources/images/unused/refresh.png | Bin 573 -> 0 bytes .../resources/images/unused/remove_10.png | Bin 454 -> 0 bytes .../resources/images/unused/remove_12.png | Bin 597 -> 0 bytes src/main/resources/images/unused/remove_6.png | Bin 254 -> 0 bytes src/main/resources/images/unused/remove_8.png | Bin 369 -> 0 bytes src/main/resources/images/unused/remove_9.png | Bin 427 -> 0 bytes .../images/unused/remove_minus_8.png | Bin 212 -> 0 bytes .../images/unused/remove_minus_9.png | Bin 205 -> 0 bytes .../images/unused/systemTrayAlertIcon.png | Bin 355 -> 0 bytes .../images/unused/systemTrayIcon.png | Bin 367 -> 0 bytes src/main/resources/images/unused/trade.png | Bin 371 -> 0 bytes src/main/resources/images/unused/trash.png | Bin 286 -> 0 bytes 68 files changed, 103 insertions(+), 56 deletions(-) create mode 100644 src/main/resources/images/alert_round.png create mode 100644 src/main/resources/images/alert_round@2x.png create mode 100644 src/main/resources/images/buy@2x.png create mode 100644 src/main/resources/images/buy_large@2x.png create mode 100644 src/main/resources/images/collapse@2x.png create mode 100644 src/main/resources/images/expand@2x.png delete mode 100644 src/main/resources/images/nav/alertRound.png create mode 100644 src/main/resources/images/remove.png create mode 100644 src/main/resources/images/remove@2x.png delete mode 100644 src/main/resources/images/removeOffer.png create mode 100644 src/main/resources/images/sell@2x.png create mode 100644 src/main/resources/images/sell_large.png create mode 100644 src/main/resources/images/sell_large@2x.png create mode 100644 src/main/resources/images/system_tray_icon.png create mode 100644 src/main/resources/images/system_tray_icon@2x.png delete mode 100644 src/main/resources/images/system_tray_icon_44_32.png create mode 100644 src/main/resources/images/system_tray_icon_alert.png create mode 100644 src/main/resources/images/system_tray_icon_alert@2x.png delete mode 100644 src/main/resources/images/system_tray_notify_icon_44_32.png delete mode 100644 src/main/resources/images/unused/add.png delete mode 100644 src/main/resources/images/unused/add_10.png delete mode 100644 src/main/resources/images/unused/add_12.png delete mode 100644 src/main/resources/images/unused/add_14.png delete mode 100644 src/main/resources/images/unused/add_16.png delete mode 100644 src/main/resources/images/unused/add_8.png delete mode 100644 src/main/resources/images/unused/alert.png delete mode 100644 src/main/resources/images/unused/alertFlag1.png delete mode 100644 src/main/resources/images/unused/alertFlag2.png delete mode 100644 src/main/resources/images/unused/arrowIn.png delete mode 100644 src/main/resources/images/unused/buy_white.png delete mode 100644 src/main/resources/images/unused/circleProgress0.png delete mode 100644 src/main/resources/images/unused/edit.png delete mode 100644 src/main/resources/images/unused/edit_16_15.png delete mode 100644 src/main/resources/images/unused/edit_pen.png delete mode 100644 src/main/resources/images/unused/history.png delete mode 100644 src/main/resources/images/unused/history_active.png delete mode 100644 src/main/resources/images/unused/info.png delete mode 100644 src/main/resources/images/unused/list.png delete mode 100644 src/main/resources/images/unused/mail.png delete mode 100644 src/main/resources/images/unused/offline.png delete mode 100644 src/main/resources/images/unused/online.png delete mode 100644 src/main/resources/images/unused/peers.png delete mode 100644 src/main/resources/images/unused/refresh.png delete mode 100644 src/main/resources/images/unused/remove_10.png delete mode 100644 src/main/resources/images/unused/remove_12.png delete mode 100644 src/main/resources/images/unused/remove_6.png delete mode 100644 src/main/resources/images/unused/remove_8.png delete mode 100644 src/main/resources/images/unused/remove_9.png delete mode 100644 src/main/resources/images/unused/remove_minus_8.png delete mode 100644 src/main/resources/images/unused/remove_minus_9.png delete mode 100644 src/main/resources/images/unused/systemTrayAlertIcon.png delete mode 100644 src/main/resources/images/unused/systemTrayIcon.png delete mode 100644 src/main/resources/images/unused/trade.png delete mode 100644 src/main/resources/images/unused/trash.png diff --git a/src/main/java/io/bitsquare/gui/AWTSystemTray.java b/src/main/java/io/bitsquare/gui/AWTSystemTray.java index 80a49e6ac9..a18fdf88b7 100644 --- a/src/main/java/io/bitsquare/gui/AWTSystemTray.java +++ b/src/main/java/io/bitsquare/gui/AWTSystemTray.java @@ -49,7 +49,11 @@ public class AWTSystemTray { Platform.setImplicitExit(false); SystemTray systemTray = SystemTray.getSystemTray(); - trayIcon = new TrayIcon(getImage(ImageUtil.SYS_TRAY)); + if (ImageUtil.isRetina()) + trayIcon = new TrayIcon(getImage(ImageUtil.SYS_TRAY_HI_RES)); + else + trayIcon = new TrayIcon(getImage(ImageUtil.SYS_TRAY)); + trayIcon.setToolTip("BitSquare P2P Fiat-Bitcoin exchange"); PopupMenu popupMenu = new PopupMenu(); @@ -93,12 +97,18 @@ public class AWTSystemTray { } } - public static void setAlert() { - trayIcon.setImage(getImage(ImageUtil.SYS_TRAY_ALERT)); + public static void setAlertIcon() { + if (ImageUtil.isRetina()) + trayIcon.setImage(getImage(ImageUtil.SYS_TRAY_ALERT_HI_RES)); + else + trayIcon.setImage(getImage(ImageUtil.SYS_TRAY_ALERT)); } - public static void unSetAlert() { - trayIcon.setImage(getImage(ImageUtil.SYS_TRAY)); + public static void setIcon() { + if (ImageUtil.isRetina()) + trayIcon.setImage(getImage(ImageUtil.SYS_TRAY_HI_RES)); + else + trayIcon.setImage(getImage(ImageUtil.SYS_TRAY)); } public static void setStageHidden() { diff --git a/src/main/java/io/bitsquare/gui/images.css b/src/main/java/io/bitsquare/gui/images.css index b7403d8eac..276d283897 100644 --- a/src/main/java/io/bitsquare/gui/images.css +++ b/src/main/java/io/bitsquare/gui/images.css @@ -9,6 +9,38 @@ -fx-image: url("../../../images/info.png"); } +#image-alert-round { + -fx-image: url("../../../images/alert_round.png"); +} +#image-remove { + -fx-image: url("../../../images/remove.png"); +} + +#image-buy { + -fx-image: url("../../../images/buy.png"); +} + +#image-sell { + -fx-image: url("../../../images/sell.png"); +} + +#image-expand { + -fx-image: url("../../../images/expand.png"); +} + +#image-collapse { + -fx-image: url("../../../images/collapse.png"); +} + +#image-buy-large { + -fx-image: url("../../../images/buy_large.png"); +} + +#image-sell-large { + -fx-image: url("../../../images/sell_large.png"); +} + + /* naviagtion buttons */ #image-nav-home { diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index de4deb4e4a..4b049646d0 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -24,7 +24,6 @@ import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.ViewCB; import io.bitsquare.gui.components.NetworkSyncPane; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Transitions; import io.bitsquare.util.ViewLoader; @@ -184,7 +183,9 @@ public class MainViewCB extends ViewCB { Profiler.printMsgWithTime("MainController.ondMainNavigationAdded"); presentationModel.takeOfferRequested.addListener((ov, olaValue, newValue) -> { - final Button alertButton = new Button("", ImageUtil.getImageView(ImageUtil.MSG_ALERT)); + ImageView icon = new ImageView(); + icon.setId("image-alert-round"); + final Button alertButton = new Button("", icon); alertButton.setId("nav-alert-button"); alertButton.relocate(36, 19); alertButton.setOnAction((e) -> @@ -194,7 +195,7 @@ public class MainViewCB extends ViewCB { Tooltip.install(alertButton, new Tooltip("Your offer has been accepted")); ordersButtonButtonPane.getChildren().add(alertButton); - AWTSystemTray.setAlert(); + AWTSystemTray.setAlertIcon(); }); navigation.navigateToLastStoredItem(); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index b3817c5d21..aac0dfba21 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -236,7 +236,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { final Label label = new Label(); - final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON); + final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON); final Button removeButton = new Button("", icon); final AnchorPane pane = new AnchorPane(label, removeButton); @@ -294,7 +294,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { final Label label = new Label(); - final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON); + final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON); final Button removeButton = new Button("", icon); final AnchorPane pane = new AnchorPane(label, removeButton); @@ -338,7 +338,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { final Label label = new Label(); - final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON); + final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON); final Button removeButton = new Button("", icon); final AnchorPane pane = new AnchorPane(label, removeButton); diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java index 3ca3154dc5..090a133098 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java @@ -155,7 +155,7 @@ public class OfferController extends CachedViewController { @Override public TableCell call(TableColumn directionColumn) { return new TableCell() { - final ImageView iconView = ImageUtil.getImageView(ImageUtil.REMOVE_ICON); + final ImageView iconView = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON); final Button button = new Button(); { diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java index 1ca30526f8..320522f6af 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java @@ -78,8 +78,6 @@ public class PendingTradeController extends CachedViewController { private Trade currentTrade; - private final Image buyIcon = ImageUtil.getImage(ImageUtil.BUY_ICON); - private final Image sellIcon = ImageUtil.getImage(ImageUtil.SELL_ICON); private ConfidenceDisplay confidenceDisplay; @FXML private TableView openTradesTable; @@ -290,7 +288,7 @@ public class PendingTradeController extends CachedViewController { bankTransferInitedButton.setVisible(false); - AWTSystemTray.unSetAlert(); + AWTSystemTray.setIcon(); } } @@ -364,15 +362,7 @@ public class PendingTradeController extends CachedViewController { hBox.getChildren().clear(); if (tradesTableItem != null) { Country country = tradesTableItem.getTrade().getOffer().getBankAccountCountry(); - try { - hBox.getChildren().add(ImageUtil.getImageView( - "/images/countries/" + country.getCode().toLowerCase() + ".png")); - - } catch (Exception e) { - log.warn("Country icon not found: /images/countries/" + - country.getCode().toLowerCase() + ".png country name: " + - country.getName()); - } + hBox.getChildren().add(ImageUtil.getCountryIconImageView(country)); Tooltip.install(this, new Tooltip(country.getName())); } } @@ -429,19 +419,17 @@ public class PendingTradeController extends CachedViewController { if (tradesTableItem != null) { String title; - Image icon; Offer offer = tradesTableItem.getTrade().getOffer(); if (offer.getDirection() == Direction.SELL) { - icon = buyIcon; + iconView.setId("image-buy"); title = BSFormatter.formatDirection(Direction.BUY, true); } else { - icon = sellIcon; + iconView.setId("image-sell"); title = BSFormatter.formatDirection(Direction.SELL, true); } button.setDisable(true); - iconView.setImage(icon); button.setText(title); setGraphic(button); } diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml index 1a3ccad53f..0986138f7a 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml @@ -51,9 +51,7 @@ - - - +