Author: mes
Date: 2011-12-01 16:16:11 -0800 (Thu, 01 Dec 2011)
New Revision: 27680
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/apply_layout.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/hide_selected.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/img_file_export.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/invert_selection.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import_small.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_export.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import_small.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/new_fromselected.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/open_session.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/select_firstneighbors.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_save.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-1.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-in.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-object.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-out.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_db_import.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_export.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_import.png
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/unhide_all.png
Removed:
core3/impl/trunk/core-task-impl/src/main/resources/images/about_icon.txt
core3/impl/trunk/core-task-impl/src/main/resources/images/database.png
core3/impl/trunk/core-task-impl/src/main/resources/images/open.png
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/OpenPanel.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
Log:
updated icons and icon handling for actions
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-12-01 19:46:07 UTC (rev 27679)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-12-02 00:16:11 UTC (rev 27680)
@@ -48,7 +48,10 @@
import javax.swing.event.MenuEvent;
import javax.swing.event.PopupMenuEvent;
+import java.net.URL;
+import java.net.MalformedURLException;
+
/**
* An abstract implementation of the CyAction interface. Instead of using this
* class directly you should (strongly) consider implementing a
@@ -152,19 +155,20 @@
*
* @param configProps
* A String-String Map of configuration metadata. This will
- * usually be the Map provided by the Spring service
+ * usually be the Map provided by the OSGi service
* configuration. Available configuration keys include:
* <ul>
- * <li>title</li>
- * <li>preferredMenu</li>
- * <li>iconName</li>
- * <li>tooltip</li>
- * <li>inToolBar</li>
- * <li>inMenuBar</li>
- * <li>enableFor</li>
- * <li>accelerator</li>
- * <li>menuGravity</li>
- * <li>toolBarGravity</li>
+ * <li>title - (The title of the menu.)</li>
+ * <li>preferredMenu - (The preferred menu for the
action.)</li>
+ * <li>largeIconURL - (The icon to be used for the
toolbar.)</li>
+ * <li>smallIconURL - (The icon to be used for the
menu.)</li>
+ * <li>tooltip - (The toolbar or menu tooltip.)</li>
+ * <li>inToolBar - (Whether the action should be in the
toolbar.)</li>
+ * <li>inMenuBar - (Whether the action should be in a
menu.)</li>
+ * <li>enableFor - (System state that the action should be
enabled for. See {@link MenuEnableSupport} for more detail.)</li>
+ * <li>accelerator - (Accelerator key bindings.)</li>
+ * <li>menuGravity - (Float value between 0.0 [top] and
100.0 [bottom] placing the action in the menu.)</li>
+ * <li>toolBarGravity - (Float value between 0.0 [top] and
100.0 [bottom] placing the action in the toolbar.)</li>
* </ul>
* @param applicationManager
* The application manager providing context for this action.
@@ -180,10 +184,13 @@
if (prefMenu != null)
setPreferredMenu(prefMenu);
- final String iconName = configProps.get("iconName");
+ final URL largeIconURL = getURL(
configProps.get("largeIconURL") );
+ if ( largeIconURL != null )
+ putValue(LARGE_ICON_KEY, new ImageIcon(largeIconURL));
- if (iconName != null)
- putValue(SMALL_ICON, new
ImageIcon(getClass().getResource(iconName)));
+ final URL smallIconURL = getURL(
configProps.get("smallIconURL") );
+ if ( smallIconURL != null )
+ putValue(SMALL_ICON, new ImageIcon(smallIconURL));
final String tooltip = configProps.get("tooltip");
@@ -457,4 +464,16 @@
private void enableForTable() {
enabler.enableForTable() ;
}
+
+ private URL getURL(String s) {
+ if ( s == null )
+ return null;
+ try {
+ URL u = new URL(s);
+ return u;
+ } catch (MalformedURLException e) {
+ logger.warn("Incorrectly formatted URL string: '" + s
+"'",e);
+ }
+ return null;
+ }
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-12-01 19:46:07 UTC (rev 27679)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-12-02 00:16:11 UTC (rev 27680)
@@ -243,7 +243,7 @@
loadNetworkFileTaskFactoryProps.setProperty("commandNamespace","network");
loadNetworkFileTaskFactoryProps.setProperty("command","load");
loadNetworkFileTaskFactoryProps.setProperty("menuGravity","1.0");
-
loadNetworkFileTaskFactoryProps.setProperty("iconName","/images/placehold/netfileimport.png");
+
loadNetworkFileTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/net_file_import.png").toString());
loadNetworkFileTaskFactoryProps.setProperty("inToolBar","true");
loadNetworkFileTaskFactoryProps.setProperty("tooltip","Import
Network From File");
registerService(bc,loadNetworkFileTaskFactory,TaskFactory.class,
loadNetworkFileTaskFactoryProps);
@@ -253,7 +253,7 @@
loadNetworkURLTaskFactoryProps.setProperty("accelerator","cmd
shift l");
loadNetworkURLTaskFactoryProps.setProperty("menuGravity","2.0");
loadNetworkURLTaskFactoryProps.setProperty("title","URL...");
-
loadNetworkURLTaskFactoryProps.setProperty("iconName","/images/placehold/netdbimport.png");
+
loadNetworkURLTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/net_db_import.png").toString());
loadNetworkURLTaskFactoryProps.setProperty("inToolBar","true");
loadNetworkURLTaskFactoryProps.setProperty("tooltip","Import
Network From Public Database");
registerService(bc,loadNetworkURLTaskFactory,TaskFactory.class,
loadNetworkURLTaskFactoryProps);
@@ -269,7 +269,7 @@
loadAttrsFileTaskFactoryProps.setProperty("preferredMenu","File.Import.Table");
loadAttrsFileTaskFactoryProps.setProperty("menuGravity","1.1");
loadAttrsFileTaskFactoryProps.setProperty("title","File...");
-
loadAttrsFileTaskFactoryProps.setProperty("iconName","/images/placehold/tablefileimport.png");
+
loadAttrsFileTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/table_file_import.png").toString());
loadAttrsFileTaskFactoryProps.setProperty("inToolBar","true");
loadAttrsFileTaskFactoryProps.setProperty("tooltip","Import
Table From File");
registerService(bc,loadAttrsFileTaskFactory,TaskFactory.class,
loadAttrsFileTaskFactoryProps);
@@ -278,7 +278,7 @@
loadAttrsURLTaskFactoryProps.setProperty("preferredMenu","File.Import.Table");
loadAttrsURLTaskFactoryProps.setProperty("menuGravity","1.2");
loadAttrsURLTaskFactoryProps.setProperty("title","URL...");
-
loadAttrsURLTaskFactoryProps.setProperty("iconName","/images/placehold/tabledbimport.png");
+
loadAttrsURLTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/table_db_import.png").toString());
loadAttrsURLTaskFactoryProps.setProperty("inToolBar","true");
loadAttrsURLTaskFactoryProps.setProperty("tooltip","Import
Table From Public Database");
registerService(bc,loadAttrsURLTaskFactory,TaskFactory.class,
loadAttrsURLTaskFactoryProps);
@@ -348,7 +348,7 @@
selectFirstNeighborsTaskFactoryProps.setProperty("menuGravity","6.0");
selectFirstNeighborsTaskFactoryProps.setProperty("accelerator","cmd 6");
selectFirstNeighborsTaskFactoryProps.setProperty("title","Undirected");
-
selectFirstNeighborsTaskFactoryProps.setProperty("iconName","/images/placehold/selectfirstneighb.png");
+
selectFirstNeighborsTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/select_firstneighbors.png").toString());
selectFirstNeighborsTaskFactoryProps.setProperty("inToolBar","true");
selectFirstNeighborsTaskFactoryProps.setProperty("tooltip","First Neighbors of
Selected Nodes (Undirected)");
registerService(bc,selectFirstNeighborsTaskFactory,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryProps);
@@ -357,7 +357,6 @@
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("preferredMenu","Select.Nodes.First
Neighbors of Selected Nodes");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("menuGravity","6.1");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("title","Directed:
Incoming");
-
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("iconName","/images/placehold/selectfirstneighb.png");
selectFirstNeighborsTaskFactoryInEdgeProps.setProperty("tooltip","First
Neighbors of Selected Nodes (Directed: Incoming)");
registerService(bc,selectFirstNeighborsTaskFactoryInEdge,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryInEdgeProps);
Properties selectFirstNeighborsTaskFactoryOutEdgeProps = new
Properties();
@@ -365,7 +364,6 @@
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("preferredMenu","Select.Nodes.First
Neighbors of Selected Nodes");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("menuGravity","6.2");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("title","Directed:
Outgoing");
-
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("iconName","/images/placehold/selectfirstneighb.png");
selectFirstNeighborsTaskFactoryOutEdgeProps.setProperty("tooltip","First
Neighbors of Selected Nodes (Directed: Outgoing)");
registerService(bc,selectFirstNeighborsTaskFactoryOutEdge,NetworkTaskFactory.class,
selectFirstNeighborsTaskFactoryOutEdgeProps);
@@ -408,7 +406,7 @@
invertSelectedNodesTaskFactoryProps.setProperty("menuGravity","1.0");
invertSelectedNodesTaskFactoryProps.setProperty("accelerator","cmd i");
invertSelectedNodesTaskFactoryProps.setProperty("title","Invert
node selection");
-
invertSelectedNodesTaskFactoryProps.setProperty("iconName","/images/placehold/invertnodeselect.png");
+
invertSelectedNodesTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/invert_selection.png").toString());
invertSelectedNodesTaskFactoryProps.setProperty("inToolBar","true");
invertSelectedNodesTaskFactoryProps.setProperty("tooltip","Invert Node
Selection");
registerService(bc,invertSelectedNodesTaskFactory,NetworkTaskFactory.class,
invertSelectedNodesTaskFactoryProps);
@@ -430,7 +428,7 @@
hideSelectedTaskFactoryProps.setProperty("preferredMenu","Select");
hideSelectedTaskFactoryProps.setProperty("menuGravity","3.1");
hideSelectedTaskFactoryProps.setProperty("title","Hide selected
nodes and edges");
-
hideSelectedTaskFactoryProps.setProperty("iconName","/images/placehold/hideselect.png");
+
hideSelectedTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/hide_selected.png").toString());
hideSelectedTaskFactoryProps.setProperty("inToolBar","true");
hideSelectedTaskFactoryProps.setProperty("tooltip","Hide
Selected Nodes and Edges");
registerService(bc,hideSelectedTaskFactory,NetworkViewTaskFactory.class,
hideSelectedTaskFactoryProps);
@@ -454,7 +452,7 @@
unHideAllTaskFactoryProps.setProperty("preferredMenu","Select");
unHideAllTaskFactoryProps.setProperty("menuGravity","3.0");
unHideAllTaskFactoryProps.setProperty("title","Show all nodes
and edges");
-
unHideAllTaskFactoryProps.setProperty("iconName","/images/placehold/unhideall.png");
+
unHideAllTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/unhide_all.png").toString());
unHideAllTaskFactoryProps.setProperty("inToolBar","true");
unHideAllTaskFactoryProps.setProperty("tooltip","Show All Nodes
and Edges");
registerService(bc,unHideAllTaskFactory,NetworkViewTaskFactory.class,
unHideAllTaskFactoryProps);
@@ -490,7 +488,7 @@
Properties newNetworkSelectedNodesOnlyTaskFactoryProps = new
Properties();
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("preferredMenu","File.New.Network");
-
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("iconName","/images/new-network-from-selected-nodes-32.png");
+
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/new_fromselected.png").toString());
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("accelerator","cmd n");
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("enableFor","selectedNodesOrEdges");
newNetworkSelectedNodesOnlyTaskFactoryProps.setProperty("title","From selected
nodes, all edges");
@@ -526,7 +524,7 @@
Properties zoomInTaskFactoryProps = new Properties();
zoomInTaskFactoryProps.setProperty("accelerator","cmd equals");
-
zoomInTaskFactoryProps.setProperty("iconName","/images/ximian/stock_zoom-in.png");
+
zoomInTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/stock_zoom-in.png").toString());
zoomInTaskFactoryProps.setProperty("enableFor","networkAndView");
zoomInTaskFactoryProps.setProperty("title","Zoom In");
zoomInTaskFactoryProps.setProperty("tooltip","Zoom In");
@@ -536,7 +534,7 @@
Properties zoomOutTaskFactoryProps = new Properties();
zoomOutTaskFactoryProps.setProperty("accelerator","cmd minus");
-
zoomOutTaskFactoryProps.setProperty("iconName","/images/ximian/stock_zoom-out.png");
+
zoomOutTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/stock_zoom-out.png").toString());
zoomOutTaskFactoryProps.setProperty("enableFor","networkAndView");
zoomOutTaskFactoryProps.setProperty("title","Zoom Out");
zoomOutTaskFactoryProps.setProperty("tooltip","Zoom Out");
@@ -546,7 +544,7 @@
Properties fitSelectedTaskFactoryProps = new Properties();
fitSelectedTaskFactoryProps.setProperty("accelerator","cmd
shift f");
-
fitSelectedTaskFactoryProps.setProperty("iconName","/images/ximian/stock_zoom-object.png");
+
fitSelectedTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/stock_zoom-object.png").toString());
fitSelectedTaskFactoryProps.setProperty("enableFor","networkAndView");
fitSelectedTaskFactoryProps.setProperty("title","Fit Selected");
fitSelectedTaskFactoryProps.setProperty("tooltip","Zoom
selected region");
@@ -556,7 +554,7 @@
Properties fitContentTaskFactoryProps = new Properties();
fitContentTaskFactoryProps.setProperty("accelerator","cmd f");
-
fitContentTaskFactoryProps.setProperty("iconName","/images/ximian/stock_zoom-1.png");
+
fitContentTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/stock_zoom-1.png").toString());
fitContentTaskFactoryProps.setProperty("enableFor","networkAndView");
fitContentTaskFactoryProps.setProperty("title","Fit Content");
fitContentTaskFactoryProps.setProperty("tooltip","Zoom out to
display all of current Network");
@@ -582,7 +580,7 @@
Properties exportNetworkImageTaskFactoryProps = new
Properties();
exportNetworkImageTaskFactoryProps.setProperty("preferredMenu","File.Export.Network
View");
-
exportNetworkImageTaskFactoryProps.setProperty("iconName","/images/ximian/tango-32-camera-photo.png");
+
exportNetworkImageTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/img_file_export.png").toString());
exportNetworkImageTaskFactoryProps.setProperty("enableFor","networkAndView");
exportNetworkImageTaskFactoryProps.setProperty("title","Graphics");
exportNetworkImageTaskFactoryProps.setProperty("toolBarGravity","5.0");
@@ -594,7 +592,7 @@
exportNetworkViewTaskFactoryProps.setProperty("preferredMenu","File.Export.Network
View");
exportNetworkViewTaskFactoryProps.setProperty("menuGravity","5.1");
exportNetworkViewTaskFactoryProps.setProperty("title","File");
-
exportNetworkViewTaskFactoryProps.setProperty("iconName","/images/placehold/netfileexport.png");
+
exportNetworkViewTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/net_file_export.png").toString());
exportNetworkViewTaskFactoryProps.setProperty("inToolBar","true");
exportNetworkViewTaskFactoryProps.setProperty("tooltip","Export
Network to File");
registerService(bc,exportNetworkViewTaskFactory,NetworkViewTaskFactory.class,
exportNetworkViewTaskFactoryProps);
@@ -618,7 +616,7 @@
exportCurrentTableTaskFactoryProps.setProperty("preferredMenu","File.Export.Table");
exportCurrentTableTaskFactoryProps.setProperty("menuGravity","1.2");
exportCurrentTableTaskFactoryProps.setProperty("title","File...");
-
exportCurrentTableTaskFactoryProps.setProperty("iconName","/images/placehold/tablefileexport.png");
+
exportCurrentTableTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/table_file_export.png").toString());
exportCurrentTableTaskFactoryProps.setProperty("inToolBar","true");
exportCurrentTableTaskFactoryProps.setProperty("tooltip","Export Table to
File");
registerService(bc,exportCurrentTableTaskFactory,TableTaskFactory.class,
exportCurrentTableTaskFactoryProps);
@@ -639,7 +637,7 @@
Properties openSessionTaskFactoryProps = new Properties();
openSessionTaskFactoryProps.setProperty("preferredMenu","File");
openSessionTaskFactoryProps.setProperty("accelerator","cmd o");
-
openSessionTaskFactoryProps.setProperty("iconName","/images/ximian/stock_open.png");
+
openSessionTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/open_session.png").toString());
openSessionTaskFactoryProps.setProperty("title","Open");
openSessionTaskFactoryProps.setProperty("toolBarGravity","1.0");
openSessionTaskFactoryProps.setProperty("inToolBar","true");
@@ -649,7 +647,7 @@
Properties saveSessionTaskFactoryProps = new Properties();
saveSessionTaskFactoryProps.setProperty("preferredMenu","File");
saveSessionTaskFactoryProps.setProperty("accelerator","cmd s");
-
saveSessionTaskFactoryProps.setProperty("iconName","/images/ximian/stock_save.png");
+
saveSessionTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/stock_save.png").toString());
saveSessionTaskFactoryProps.setProperty("title","Save");
saveSessionTaskFactoryProps.setProperty("toolBarGravity","1.1");
saveSessionTaskFactoryProps.setProperty("inToolBar","true");
@@ -666,7 +664,7 @@
Properties applyPreferredLayoutTaskFactoryProps = new
Properties();
applyPreferredLayoutTaskFactoryProps.setProperty("preferredMenu","Layout");
applyPreferredLayoutTaskFactoryProps.setProperty("accelerator","fn5");
-
applyPreferredLayoutTaskFactoryProps.setProperty("iconName","/images/apply-force-directed-layout-32.png");
+
applyPreferredLayoutTaskFactoryProps.setProperty("largeIconURL",getClass().getResource("/images/icons/apply_layout.png").toString());
applyPreferredLayoutTaskFactoryProps.setProperty("enableFor","networkAndView");
applyPreferredLayoutTaskFactoryProps.setProperty("title","Apply
Preferred Layout");
applyPreferredLayoutTaskFactoryProps.setProperty("toolBarGravity","9.0");
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
2011-12-01 19:46:07 UTC (rev 27679)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
2011-12-02 00:16:11 UTC (rev 27680)
@@ -28,8 +28,8 @@
public class CreateNewNetworkPanel extends JPanel {
- private static final String ICON_OPEN = "images/open.png";
- private static final String ICON_DATABASE = "images/database.png";
+ private static final String ICON_OPEN =
"images/icons/net_file_import_small.png";
+ private static final String ICON_DATABASE =
"images/icons/net_db_import_small.png";
private JLabel loadNetwork;
private JLabel fromDB;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/OpenPanel.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/OpenPanel.java
2011-12-01 19:46:07 UTC (rev 27679)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/OpenPanel.java
2011-12-02 00:16:11 UTC (rev 27680)
@@ -26,7 +26,7 @@
public class OpenPanel extends JPanel {
private static final Font FILE_NAME_FONT = new Font(Font.DIALOG,
Font.PLAIN, 12);
- private static final String ICON_LOCATION = "images/open.png";
+ private static final String ICON_LOCATION =
"images/icons/open_session.png";
private BufferedImage openIconImg;
private ImageIcon openIcon;
Deleted:
core3/impl/trunk/core-task-impl/src/main/resources/images/about_icon.txt
===================================================================
--- core3/impl/trunk/core-task-impl/src/main/resources/images/about_icon.txt
2011-12-01 19:46:07 UTC (rev 27679)
+++ core3/impl/trunk/core-task-impl/src/main/resources/images/about_icon.txt
2011-12-02 00:16:11 UTC (rev 27680)
@@ -1,5 +0,0 @@
-"database" icon is created by:
-
-Artist: Custom Icon Design (Available for custom work)
-Iconset: Pretty Office 3 Icons (60 icons)
-License: Free for non-commercial use.
\ No newline at end of file
Deleted: core3/impl/trunk/core-task-impl/src/main/resources/images/database.png
===================================================================
(Binary files differ)
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/apply_layout.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/apply_layout.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/hide_selected.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/hide_selected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/img_file_export.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/img_file_export.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/invert_selection.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/invert_selection.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import_small.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_db_import_small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_export.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_export.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import_small.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/net_file_import_small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/new_fromselected.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/new_fromselected.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/open_session.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/open_session.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/select_firstneighbors.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/select_firstneighbors.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_save.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_save.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-1.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-in.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-in.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-object.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-object.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-out.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/stock_zoom-out.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_db_import.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_db_import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_export.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_export.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_import.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/table_file_import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/unhide_all.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/core-task-impl/src/main/resources/images/icons/unhide_all.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: core3/impl/trunk/core-task-impl/src/main/resources/images/open.png
===================================================================
(Binary files differ)
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2011-12-01 19:46:07 UTC (rev 27679)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2011-12-02 00:16:11 UTC (rev 27680)
@@ -310,7 +310,7 @@
Properties helpContentsTaskFactoryProps = new Properties();
helpContentsTaskFactoryProps.setProperty("preferredMenu",
"Help");
- helpContentsTaskFactoryProps.setProperty("iconName",
"/images/ximian/stock_help.png");
+ helpContentsTaskFactoryProps.setProperty("largeIconURL",
getClass().getResource("/images/ximian/stock_help.png").toString());
helpContentsTaskFactoryProps.setProperty("title",
"Contents...");
helpContentsTaskFactoryProps.setProperty("tooltip", "Show Help
Contents...");
helpContentsTaskFactoryProps.setProperty("toolBarGravity",
"7.0f");
--
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.
