Changeset 3250

Timestamp:

07/27/10 14:40:55 (6 weeks ago)

Author:

martijn

Message:

1. change the title of the side-bar tab from "Items" to "Objects"
2. update the related variable names
3. new icon for new line drop-down

Location:

trunk

Files:

• resources/newinteractionmenu.gif (added)
• src/gui/org/pathvisio/gui/swing/MainPanel.java (modified) (7 diffs)
• src/gui/org/pathvisio/gui/swing/ObjectsPane.java (moved) (moved from trunk/src/swing/org/pathvisio/gui/swing/ItemsPane.java) (2 diffs)
• src/swing/org/pathvisio/gui/swing/MainPanelStandalone.java (modified) (1 diff)

trunk/src/gui/org/pathvisio/gui/swing/MainPanel.java

@@ -16 +16 @@
 //
 package org.pathvisio.gui.swing;
+
+import com.mammothsoftware.frwk.ddb.DropDownButton;
 
 import java.awt.BorderLayout;
@@ -66 +68 @@
 import org.pathvisio.gui.swing.dnd.PathwayImportHandler;
 import org.pathvisio.gui.swing.propertypanel.PathwayTableModel;
-import org.pathvisio.gui.swing.ImageButton;
 import org.pathvisio.model.PathwayElement;
 import org.pathvisio.util.Resources;
@@ -77 +78 @@
 import org.pathvisio.view.VPathwayListener;
 
-import com.mammothsoftware.frwk.ddb.DropDownButton;
+
+
+
 
 /**
@@ -101 +104 @@
         protected DropDownButton itemsDropDown;
         
-        private ItemsPane itemsPane;
+        private ObjectsPane objectsPane;
 
         private JTable propertyTable;
@@ -199 +202 @@
                 pathwayScrollPane.getViewport().setBackground(Color.LIGHT_GRAY);
                 
-                itemsPane = new ItemsPane(swingEngine);
+                objectsPane = new ObjectsPane(swingEngine);
                 int numItemsPerRow = 10;
-                itemsPane.addButtons(actions.newShapeActions, "Basic Shapes", numItemsPerRow);
-                itemsPane.addButtons(actions.newCellularComponentActions, "Cellular components", numItemsPerRow);
-                itemsPane.addButtons(actions.newMIMShapeActions, "Molecular interaction map", numItemsPerRow);
-                itemsPane.addButtons(actions.newInteractionActions, "Basic interactions", numItemsPerRow);
-                itemsPane.addButtons(actions.newRLInteractionActions, "Receptor/ligand", numItemsPerRow);
-                itemsPane.addButtons(actions.newMIMInteractionActions, "Molecular interaction map", numItemsPerRow);
+                objectsPane.addButtons(actions.newShapeActions, "Basic Shapes", numItemsPerRow);
+                objectsPane.addButtons(actions.newCellularComponentActions, "Cellular components", numItemsPerRow);
+                objectsPane.addButtons(actions.newMIMShapeActions, "Molecular interaction map", numItemsPerRow);
+                objectsPane.addButtons(actions.newInteractionActions, "Basic interactions", numItemsPerRow);
+                objectsPane.addButtons(actions.newRLInteractionActions, "Receptor/ligand", numItemsPerRow);
+                objectsPane.addButtons(actions.newMIMInteractionActions, "Molecular interaction map", numItemsPerRow);
                 
                 propertyTable = new JTable(model) {
@@ -251 +254 @@
 
                 sidebarTabbedPane = new JTabbedPane();
-                sidebarTabbedPane.addTab("Items", itemsPane);
+                sidebarTabbedPane.addTab("Objects", objectsPane);
                 sidebarTabbedPane.addTab( "Properties", propertiesScrollPane );
                 sidebarTabbedPane.addTab( "Backpage", new JScrollPane(backpagePane) );
@@ -515 +518 @@
                 backpagePane.dispose();
         }
+
+        /**
+         * hook of the objects tab
+         */
+        public ObjectsPane getObjectsPane()
+        {
+                return objectsPane;
+        }
         
         /**

trunk/src/gui/org/pathvisio/gui/swing/ObjectsPane.java

@@ -34 +34 @@
 
 /**
- * A side panel which displays all items.
+ * A side panel which displays all objects.
  */
-public class ItemsPane extends JPanel
+public class ObjectsPane extends JPanel
 {
         private Engine engine;
@@ -42 +42 @@
         private JPanel currentPane;
 
-        public ItemsPane(SwingEngine swingEngine)
+        public ObjectsPane(SwingEngine swingEngine)
         {
                 this.engine = swingEngine.getEngine();

trunk/src/swing/org/pathvisio/gui/swing/MainPanelStandalone.java

@@ -263 +263 @@
                 
                 // define the drop-down menu for interactions
-                icon = "newlinemenu.gif";
+                icon = "newinteractionmenu.gif";
                 tooltip = "Select a interaction to draw";
                 DropDownButton lineButton = new DropDownButton(
                                 new ImageIcon(Resources.getResourceURL(icon)));
                 lineButton.setToolTipText(tooltip);             
-                itemsDropDown = lineButton;
+                //itemsDropDown = lineButton;
                 
                 numItemsPerRow = 6;