Skip to content

Commit 9efe93f

Browse files
chrtannuschrtannus
committed
Changes app logo. Removes unused icons.
1 parent 5710bdb commit 9efe93f

26 files changed

+30
-30
lines changed

‎EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/AboutDialog.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,32 @@ public AboutDialog(CySwingApplication application, OpenBrowser browser) {
7171
this.browser = browser;
7272
setResizable(false);
7373

74-
//main panel for dialog box
7574
JEditorPane editorPane = new JEditorPane();
7675
editorPane.setMargin(new Insets(10, 10, 10, 10));
7776
editorPane.setEditable(false);
7877
editorPane.setEditorKit(new HTMLEditorKit());
7978
editorPane.addHyperlinkListener(new HyperlinkAction(editorPane));
8079

81-
URL logoURL = this.getClass().getResource("enrichmentmap_logo.png");
80+
URL logoURL = getClass().getClassLoader().getResource("images/enrichmentmap_logo.png");
8281

8382
editorPane.setText("<html><body style='font-family:Arial,Helvetica,sans-serif;'>" +
84-
"<table border='0'><tr>" + "<td width='125'></td>" + "<td width='200'>"
85-
+ "<p align=center><b>EnrichmentMap v" + APP_VERSION + "</b><BR>" + "A Cytoscape App<BR>" + "<BR></p>"
86-
+ "</td>" + "<td width='125'><div align='right'><img height='77' width='125' src=\""
87-
+ logoURL.toString() + "\" ></div></td>" + "</tr>"
88-
+ "</table>"
83+
"<table border='0'><tr>"
84+
+ "<td width='92' valign='top'><img height='46' width='92' src='" + logoURL.toString() + "'></td>"
85+
+ "<td width='209'>"
86+
+ "<p align=center>"
87+
+ "<b style='font-size:1.5em;'><span style='color:#1f78b4;'>Enrichment</span><span style='color:#33a02c;'>Map</span></b>"
88+
+ "<BR><span style='font-size:small;'><b>version " + APP_VERSION + "</b>"
89+
+ "<BR><BR>A Cytoscape App</span>"
90+
+ "</p>"
91+
+ "</td>"
92+
+ "<td width='92'> </td>"
93+
+ "</tr></table>"
8994
+ "<hr size='4' noshade>"
9095
+ "<p align=center>EnrichmentMap is a network-based method to visualize<BR>"
91-
+ "and interpret gene-set enrichment results.<BR>" + "<BR>"
96+
+ "and interpret gene-set enrichment results.<BR><BR>"
9297
+ "by Gary Bader, Daniele Merico, Ruth Isserlin and Oliver Stueker<BR>"
93-
+ "(<a href='http://www.baderlab.org/'>Bader Lab</a>, University of Toronto)<BR>" + "<BR>"
94-
+ "App Homepage:<BR>" + "<a href='" + APP_URL + "'>" + APP_URL + "</a></p><BR>"
98+
+ "(<a href='http://www.baderlab.org/'>Bader Lab</a>, University of Toronto)<BR><BR>"
99+
+ "App Homepage:<BR><a href='" + APP_URL + "'>" + APP_URL + "</a></p><BR>"
95100
+ "<hr size='4' noshade>"
96101
+ "<p style='font-size:small'>If you use this app in your research, please cite:</p>"
97102
+ "<p style='font-family:Courier,monospace;font-size:small'>"
@@ -105,17 +110,18 @@ public AboutDialog(CySwingApplication application, OpenBrowser browser) {
105110
}
106111

107112
private class HyperlinkAction implements HyperlinkListener {
113+
108114
@SuppressWarnings("unused")
109115
JEditorPane pane;
110116

111117
public HyperlinkAction(JEditorPane pane) {
112118
this.pane = pane;
113119
}
114120

121+
@Override
115122
public void hyperlinkUpdate(HyperlinkEvent event) {
116-
if(event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
123+
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
117124
browser.openURL(event.getURL().toString());
118-
}
119125
}
120126
}
121127
}

‎EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanel.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ public String getTitle() {
115115

116116
@Override
117117
public Icon getIcon() {
118-
String path = "org/baderlab/csplugins/enrichmentmap/view/enrichmentmap_logo_notext_small.png";
119-
URL url = getClass().getClassLoader().getResource(path);
118+
URL url = getClass().getClassLoader().getResource("images/enrichmentmap_logo_16.png");
120119
return url == null ? null : new ImageIcon(url);
121120
}
122121

‎EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanelMediator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ private void addNetworkView(CyNetworkView netView) {
390390
invokeOnEDT(() -> {
391391
EnrichmentMap map = emManager.getEnrichmentMap(netView.getModel().getSUID());
392392

393-
// Is the new view an Enrichment Map one?
393+
// Is the new view an EnrichmentMap one?
394394
if (map != null) {
395395
EMViewControlPanel viewPanel = getControlPanel().addEnrichmentMapView(netView);
396396

‎EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/HeatMapParentPanel.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ public String getTitle() {
113113

114114
@Override
115115
public Icon getIcon() {
116-
String path = "org/baderlab/csplugins/enrichmentmap/view/enrichmentmap_logo_notext_small.png";
117-
URL url = getClass().getClassLoader().getResource(path);
116+
URL url = getClass().getClassLoader().getResource("images/enrichmentmap_logo_16.png");
118117
return url == null ? null : new ImageIcon(url);
119118
}
120119

‎EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/mastermap/MasterMapDialogParameters.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package org.baderlab.csplugins.enrichmentmap.view.mastermap;
22

33
import java.awt.Dimension;
4-
import java.awt.Image;
5-
import java.net.URL;
64
import java.util.Arrays;
75
import java.util.List;
86

97
import javax.swing.AbstractButton;
10-
import javax.swing.Icon;
11-
import javax.swing.ImageIcon;
128
import javax.swing.JButton;
139

14-
import org.baderlab.csplugins.enrichmentmap.view.AboutDialog;
1510
import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
1611
import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
1712

@@ -52,14 +47,6 @@ public Dimension getPreferredSize() {
5247
return new Dimension(750, 700);
5348
}
5449

55-
@Override
56-
public Icon getIcon() {
57-
URL iconURL = AboutDialog.class.getResource("enrichmentmap_logo.png");
58-
ImageIcon original = new ImageIcon(iconURL);
59-
Image scaled = original.getImage().getScaledInstance(80, 49, Image.SCALE_SMOOTH);
60-
return new ImageIcon(scaled);
61-
}
62-
6350
@Override
6451
public AbstractButton[] getAdditionalButtons() {
6552
JButton resetButton = new JButton("Reset");

‎EnrichmentMapPlugin/src/main/resources/images/enrichmentmap_logo.png‎

524 Bytes
Loading

‎EnrichmentMapPlugin/src/main/resources/images/enrichmentmap_logo.svg‎

Lines changed: 9 additions & 0 deletions
Loading

‎EnrichmentMapPlugin/src/main/resources/images/enrichmentmap_logo_16.png‎

15.4 KB
Loading

‎EnrichmentMapPlugin/src/main/resources/org/baderlab/csplugins/enrichmentmap/autoannotate/view/enrichmentmap_logo_notext_small.png‎

-626 Bytes
Binary file not shown.

‎EnrichmentMapPlugin/src/main/resources/org/baderlab/csplugins/enrichmentmap/heatmap/arrow_down.gif‎

-60 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)