Changes in src/org/openstreetmap/josm/gui/MapFrame.java [17:30] in josm

File:

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

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

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
 import javax.swing.AbstractButton;
+import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
@@ -19 +18 @@
 import org.openstreetmap.josm.actions.mapmode.AddNodeAction;
 import org.openstreetmap.josm.actions.mapmode.AddTrackAction;
-import org.openstreetmap.josm.actions.mapmode.CombineAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -54 +52 @@
          */
         public MapStatus statusLine;
+        /**
+         * The action to open the layer list
+         */
+        private LayerList layerList;
+        /**
+         * Action to open the properties panel for the selected objects
+         */
+        private PropertiesDialog propertiesDialog;
+        /**
+         * Action to open a list of all selected objects
+         */
+        private SelectionListDialog selectionListDialog;
 
         /**
@@ -76 +86 @@
                 toolBarActions.add(new IconToggleButton(this, new AddLineSegmentAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new AddTrackAction(this)));
-                toolBarActions.add(new IconToggleButton(this, new CombineAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new DeleteAction(this)));
 
@@ -99 +108 @@
                 });
 
-                // layer list
-                toolBarActions.add(new IconToggleButton(this, new LayerList(this)));
+                JPanel toggleDialogs = new JPanel();
+                add(toggleDialogs, BorderLayout.EAST);
+
+                toggleDialogs.setLayout(new BoxLayout(toggleDialogs, BoxLayout.Y_AXIS));
+                toolBarActions.add(new IconToggleButton(this, layerList = new LayerList(this)));
+                toggleDialogs.add(layerList);
+                toolBarActions.add(new IconToggleButton(this, propertiesDialog = new PropertiesDialog(this)));
+                toggleDialogs.add(propertiesDialog);
+                toolBarActions.add(new IconToggleButton(this, selectionListDialog = new SelectionListDialog(this)));
+                toggleDialogs.add(selectionListDialog);
                 
-                // properties
-                toolBarActions.add(new IconToggleButton(this, new PropertiesDialog(this)));
-
-                // selection dialog
-                SelectionListDialog selectionList = new SelectionListDialog(this);
-                final IconToggleButton buttonSelection = new IconToggleButton(this, selectionList);
-                selectionList.addWindowListener(new WindowAdapter(){
-                        @Override
-                        public void windowClosing(WindowEvent e) {
-                                buttonSelection.setSelected(false);
-                        }
-                });
-                toolBarActions.add(buttonSelection);
 
                 // status line below the map