From 83fd6932a2e346ae3ff42c148dc9c5cacbb18ee0 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Thu, 20 Aug 2015 12:22:16 +0530 Subject: [PATCH] Icons are implemented --- app/src/processing/app/contrib/ContributionListPanel.java | 6 +++--- .../processing/app/contrib/ContributionManagerDialog.java | 3 ++- app/src/processing/app/contrib/StatusPanel.java | 6 +++--- app/src/processing/app/contrib/UpdateContributionTab.java | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionListPanel.java b/app/src/processing/app/contrib/ContributionListPanel.java index af02f4886..095372783 100644 --- a/app/src/processing/app/contrib/ContributionListPanel.java +++ b/app/src/processing/app/contrib/ContributionListPanel.java @@ -298,12 +298,12 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib label.setBorder(BorderFactory.createEmptyBorder(2, 17, 0, 0)); label.setFont(Toolkit.getSansFont(14, Font.PLAIN)); if (contribution.isInstalled()) { - icon = Toolkit.getLibIcon("manager/up-to-date.png"); + icon = Toolkit.getLibIcon("manager/up-to-date-" + ContributionManagerDialog.iconVer + "x.png"); if (contribListing.hasUpdates(contribution)) { - icon = Toolkit.getLibIcon("manager/update-available.png"); + icon = Toolkit.getLibIcon("manager/update-available-" + ContributionManagerDialog.iconVer + "x.png"); } if (!contribution.isCompatible(Base.getRevision())) { - icon = Toolkit.getLibIcon("manager/incompatible.png"); + icon = Toolkit.getLibIcon("manager/incompatible-" + ContributionManagerDialog.iconVer + "x.png"); } } label.setIcon(icon); diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java index 2bb5c91b4..91a2f8e49 100644 --- a/app/src/processing/app/contrib/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -75,12 +75,13 @@ public class ContributionManagerDialog { private JLabel updateTabLabel; static Font myFont; + static int iconVer = Toolkit.highResDisplay() ? 2 : 1; public ContributionManagerDialog() { myFont = Toolkit.getSansFont(14, Font.PLAIN); // GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(myFont); - numberLabel = new JLabel(Toolkit.getLibIcon("manager/notification.png"), SwingConstants.CENTER); + numberLabel = new JLabel(Toolkit.getLibIcon("manager/notification-" + iconVer + "x.png"), SwingConstants.CENTER); toolsContributionTab = new ContributionTab(ContributionType.TOOL, this); librariesContributionTab = new ContributionTab(ContributionType.LIBRARY, this); modesContributionTab = new ContributionTab(ContributionType.MODE, this); diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 895d24138..2dcf9bc30 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -86,7 +86,7 @@ class StatusPanel extends JPanel { } }); installButton = new JButton("Install", - Toolkit.getLibIcon("manager/install.png")); + Toolkit.getLibIcon("manager/install-" + ContributionManagerDialog.iconVer + "x.png")); installButton.setFont(Toolkit.getSansFont(14, Font.PLAIN)); installButton.setHorizontalAlignment(SwingConstants.LEFT); // installButton.setContentAreaFilled(false); @@ -107,7 +107,7 @@ class StatusPanel extends JPanel { updateLabel = new JLabel(" "); updateLabel.setFont(Toolkit.getSansFont(14, Font.PLAIN)); updateButton = new JButton("Update", - Toolkit.getLibIcon("manager/update.png")); + Toolkit.getLibIcon("manager/update-" + ContributionManagerDialog.iconVer + "x.png")); updateButton.setFont(Toolkit.getSansFont(14, Font.PLAIN)); updateButton.setHorizontalAlignment(SwingConstants.LEFT); // updateButton.setAlignmentX(SwingConstants.LEFT); @@ -125,7 +125,7 @@ class StatusPanel extends JPanel { }); removeButton = new JButton("Remove", - Toolkit.getLibIcon("manager/remove.png")); + Toolkit.getLibIcon("manager/remove-" + ContributionManagerDialog.iconVer + "x.png")); removeButton.setFont(Toolkit.getSansFont(14, Font.BOLD)); removeButton.setHorizontalAlignment(SwingConstants.LEFT); // removeButton.setContentAreaFilled(false); diff --git a/app/src/processing/app/contrib/UpdateContributionTab.java b/app/src/processing/app/contrib/UpdateContributionTab.java index b0a7eda51..bf58a35c6 100644 --- a/app/src/processing/app/contrib/UpdateContributionTab.java +++ b/app/src/processing/app/contrib/UpdateContributionTab.java @@ -281,12 +281,12 @@ public class UpdateContributionTab extends ContributionTab { } Icon icon = null; if (entry.isInstalled()) { - icon = Toolkit.getLibIcon("manager/up-to-date.png"); + icon = Toolkit.getLibIcon("manager/up-to-date-" + ContributionManagerDialog.iconVer + "x.png"); if (contribListing.hasUpdates(entry)) { - icon = Toolkit.getLibIcon("manager/update-available.png"); + icon = Toolkit.getLibIcon("manager/update-available-" + ContributionManagerDialog.iconVer + "x.png"); } if (!entry.isCompatible(Base.getRevision())) { - icon = Toolkit.getLibIcon("manager/incompatible.png"); + icon = Toolkit.getLibIcon("manager/incompatible-" + ContributionManagerDialog.iconVer + "x.png"); } } dtm