eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3681 from Akarshit/gsoc-CMIcons

Browse Source 
Icons are implemented
This commit is contained in:
Ben Fry
2015-08-21 07:40:26 -04:00
parent 2d45f23fd8 83fd6932a2
commit ecb0cd647e
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/ContributionListPanel.java
+3 -3
View File
@@ -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);
app/src/processing/app/contrib/ContributionManagerDialog.java
+2 -1
View File
@@ -76,12 +76,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);
app/src/processing/app/contrib/StatusPanel.java
+3 -3
View File
@@ -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);
@@ -108,7 +108,7 @@ class StatusPanel extends JPanel {
updateLabel.setFont(Toolkit.getSansFont(14, Font.PLAIN));
updateLabel.setHorizontalAlignment(SwingConstants.CENTER);
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);
@@ -126,7 +126,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);
app/src/processing/app/contrib/UpdateContributionTab.java
+3 -3
View File
@@ -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