Author: mes
Date: 2012-06-18 11:50:48 -0700 (Mon, 18 Jun 2012)
New Revision: 29600
Added:
core3/impl/trunk/swing-application-impl/src/main/resources/images/blank_icon_16.png
core3/impl/trunk/swing-application-impl/src/main/resources/images/network_16.png
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
Log:
refs #1127 Here is one attempt to do what this decision asks. We apparently
need a blank icon for the leaf nodes because otherwise a default icon will be
used. I also shrank the height of the rows rom 32 pixels to 16 to match the
icon sizes. This can easily be changed back.
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-06-18 18:42:07 UTC (rev 29599)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-06-18 18:50:48 UTC (rev 29600)
@@ -109,7 +109,7 @@
private static final Logger logger =
LoggerFactory.getLogger(NetworkPanel.class);
static final Color FONT_COLOR = new Color(20, 20, 20);
- private static final int TABLE_ROW_HEIGHT = 32;
+ private static final int TABLE_ROW_HEIGHT = 16;
private static final Dimension PANEL_SIZE = new Dimension(400, 700);
private final JTreeTable treeTable;
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
2012-06-18 18:42:07 UTC (rev 29599)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
2012-06-18 18:50:48 UTC (rev 29600)
@@ -18,8 +18,8 @@
private final static long serialVersionUID = 1213748836751014L;
- private static final String NETWORK_ICON = "/images/network_32.png";
- private static final String NETWORK_LEAF_ICON =
"/images/network_l_32.png";
+ private static final String NETWORK_ICON = "/images/network_16.png";
+ private static final String NETWORK_LEAF_ICON =
"/images/blank_icon_16.png";
private static final Font TABLE_FONT = new Font("SansSerif",
Font.PLAIN, 12);
private static final Font TABLE_FONT_SELECTED = new Font("SansSerif",
Font.BOLD, 12);
@@ -33,6 +33,8 @@
final Image iconImage =
Toolkit.getDefaultToolkit().getImage(getClass().getResource(NETWORK_ICON));
final ImageIcon icon = new ImageIcon(iconImage);
+
+ // If we don't provide a leaf Icon, a default one will be used.
final Image iconImageLeaf =
Toolkit.getDefaultToolkit().getImage(getClass().getResource(NETWORK_LEAF_ICON));
final ImageIcon iconLeaf = new ImageIcon(iconImageLeaf);
Added:
core3/impl/trunk/swing-application-impl/src/main/resources/images/blank_icon_16.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/swing-application-impl/src/main/resources/images/blank_icon_16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/swing-application-impl/src/main/resources/images/network_16.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/swing-application-impl/src/main/resources/images/network_16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
