Author: scooter
Date: 2011-08-03 15:56:53 -0700 (Wed, 03 Aug 2011)
New Revision: 26371

Modified:
   
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/NamedSelection.java
   
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/ui/GroupPanel.java
Log:
Updates to make panel look more like other CytoPanel west panels.


Modified: 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/NamedSelection.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/NamedSelection.java
  2011-08-03 21:55:07 UTC (rev 26370)
+++ 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/NamedSelection.java
  2011-08-03 22:56:53 UTC (rev 26371)
@@ -117,6 +117,11 @@
                groupPanel = new GroupPanel();
                
Cytoscape.getDesktop().getCytoPanel(SwingConstants.WEST).add("Groups", 
groupPanel);
 
+               // Register with CyGroup
+               groupViewer = new NamedSelectionGroupViewer(groupPanel, 
myLogger);
+               CyGroupManager.registerGroupViewer(groupViewer);
+               groupPanel.addViewer(groupViewer);
+
                // Create our main plugin menu
                JMenu menu = new JMenu("Named Selection Tool");
                menu.addMenuListener(new NamedSelectionMenuListener(null, 
groupPanel));
@@ -127,11 +132,6 @@
                // We want to listen for graph perspective changes (primarily 
SELECT/UNSELECT)
                
Cytoscape.getCurrentNetworkView().addGraphViewChangeListener(groupPanel.getTree());
 
-               // Register with CyGroup
-               groupViewer = new NamedSelectionGroupViewer(groupPanel, 
myLogger);
-               CyGroupManager.registerGroupViewer(groupViewer);
-               groupPanel.addViewer(groupViewer);
-
                // Finally, register our commands (which are pretty sparse...)
                new NamedSelectionCommandHandler("namedselection", myLogger, 
groupPanel);
 

Modified: 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/ui/GroupPanel.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/ui/GroupPanel.java
   2011-08-03 21:55:07 UTC (rev 26370)
+++ 
csplugins/trunk/ucsf/scooter/namedSelection/src/namedSelection/ui/GroupPanel.java
   2011-08-03 22:56:53 UTC (rev 26371)
@@ -103,7 +103,7 @@
                super();
                viewerList = new ArrayList();
 
-               setPreferredSize(new Dimension(200,-1));
+               setPreferredSize(new Dimension(350,-1));
                setLayout(new BorderLayout());
 
                // Create a separate JPanel for our various controls
@@ -114,6 +114,8 @@
 
                // Create a button box at the top 
                JPanel buttonBox = new JPanel();
+               buttonBox.setLayout(new BoxLayout(buttonBox, BoxLayout.X_AXIS));
+
                // Create clear selection button
                buttonBox.add(createButton("Clear Selection", CLEAR, true));
 
@@ -125,19 +127,20 @@
                buttonBox.add(deleteButton);
 
                // Border it
-               buttonBox.setBorder(BorderFactory.createEtchedBorder());
+               buttonBox.setBorder(BorderFactory.createTitledBorder(""));
                controlPanel.add(buttonBox);
 
                depthBox = new JPanel();
+               depthBox.setLayout(new BoxLayout(depthBox, BoxLayout.X_AXIS));
                depthGroup = new ButtonGroup();
                addDepthButtons(1);
 
+               controlPanel.add(new javax.swing.JLabel("<html><b>Expansion 
Depth</b></html>"));
                // Border it
-               Border depthBorder = BorderFactory.createEtchedBorder();
-               TitledBorder dTitleBorder = 
BorderFactory.createTitledBorder(depthBorder, "Expansion Depth");
-               dTitleBorder.setTitlePosition(TitledBorder.LEFT);
-               dTitleBorder.setTitlePosition(TitledBorder.TOP);
-               depthBox.setBorder(dTitleBorder);
+               TitledBorder depthBorder = BorderFactory.createTitledBorder("");
+               depthBorder.setTitlePosition(TitledBorder.LEFT);
+               depthBorder.setTitlePosition(TitledBorder.TOP);
+               depthBox.setBorder(depthBorder);
                controlPanel.add(depthBox);
 
                add(controlPanel, BorderLayout.NORTH);
@@ -148,7 +151,7 @@
                reload();
 
                JScrollPane treeView = new JScrollPane(navTree);
-               treeView.setBorder(BorderFactory.createEtchedBorder());
+               treeView.setBorder(BorderFactory.createTitledBorder(""));
                treeView.setBackground(Cytoscape.getDesktop().getBackground());
 
                add(treeView, BorderLayout.CENTER);

-- 
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.

Reply via email to