Changeset 1153 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2008-12-22T14:02:32+01:00 (16 years ago)

Author:

stoecker

Message:

properly seperate command and displays in left menu

File:

• trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -50 +50 @@
         /**
          * The toolbar with the action icons. To add new toggle dialog actions, use addToggleDialog
-         * instead of adding directly to this list.
+         * instead of adding directly to this list. To add a new mode use addMapMode.
          */
         public JToolBar toolBarActions = new JToolBar(JToolBar.VERTICAL);
+        public JToolBar toolBarToggle = new JToolBar(JToolBar.VERTICAL);
         /**
          * The status line below the map
@@ -82 +83 @@
                 // toolbar
                 toolBarActions.setFloatable(false);
-                toolBarActions.add(new IconToggleButton(new ZoomAction(this)));
-                toolBarActions.add(new IconToggleButton(new SelectAction(this)));
-                toolBarActions.add(new IconToggleButton(new DrawAction(this)));
-                toolBarActions.add(new IconToggleButton(new DeleteAction(this)));
-                toolBarActions.add(new IconToggleButton(new ExtrudeAction(this)));
-                
-                for (Component c : toolBarActions.getComponents())
-                        toolGroup.add((AbstractButton)c);
+                addMapMode(new IconToggleButton(new ZoomAction(this)));
+                addMapMode(new IconToggleButton(new SelectAction(this)));
+                addMapMode(new IconToggleButton(new DrawAction(this)));
+                addMapMode(new IconToggleButton(new DeleteAction(this)));
+                addMapMode(new IconToggleButton(new ExtrudeAction(this)));
+
                 toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);
-                
-                toolBarActions.addSeparator();
-                
+
                 add(toggleDialogs, BorderLayout.EAST);
                 toggleDialogs.setLayout(new BoxLayout(toggleDialogs, BoxLayout.Y_AXIS));
 
+                toolBarToggle.setFloatable(false);
                 addToggleDialog(new LayerListDialog(this));
                 addToggleDialog(new PropertiesDialog(this));
@@ -118 +116 @@
                         if (toolBarActions.getComponent(i) instanceof Destroyable)
                                 ((Destroyable)toolBarActions).destroy();
+                for (int i = 0; i < toolBarToggle.getComponentCount(); ++i)
+                        if (toolBarToggle.getComponent(i) instanceof Destroyable)
+                                ((Destroyable)toolBarToggle).destroy();
                 
                 // remove menu entries
@@ -148 +149 @@
                 dlg.action.button = button;
                 dlg.parent = toggleDialogs;
-                toolBarActions.add(button);
+                toolBarToggle.add(button);
                 toggleDialogs.add(dlg);
         }
 
+        public void addMapMode(IconToggleButton b) {
+                toolBarActions.add(b);
+                toolGroup.add((AbstractButton)b);
+        }
 
         /**
@@ -187 +192 @@
         public void fillPanel(Container panel) {
                 panel.add(this, BorderLayout.CENTER);
-                panel.add(toolBarActions, BorderLayout.WEST);
+                JToolBar jb = new JToolBar(JToolBar.VERTICAL);
+                jb.setFloatable(false);
+                jb.add(toolBarActions);
+                jb.addSeparator();
+                jb.add(toolBarToggle);
+                panel.add(jb, BorderLayout.WEST);
                 if (statusLine != null)
                         panel.add(statusLine, BorderLayout.SOUTH);