Changeset 2710 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2009-12-30T11:56:09+01:00 (14 years ago)

Author:

stoecker

Message:

close #4222 - unify design of right menus again

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -5 +5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.FlowLayout;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -29 +28 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
 import javax.swing.ListModel;
@@ -43 +41 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
@@ -98 +97 @@
 
     protected JPanel createButtonPanel() {
-        JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0));
-
-        JToolBar tb = new JToolBar(JToolBar.HORIZONTAL);
-        tb.setFloatable(false);
+        JPanel buttonPanel = getButtonPanel(5);
 
         // -- move up action
@@ -107 +103 @@
         adaptTo(moveUpAction, model);
         adaptTo(moveUpAction,selectionModel);
-        tb.add(moveUpAction);
+        buttonPanel.add(new SideButton(moveUpAction));
 
         // -- move down action
@@ -113 +109 @@
         adaptTo(moveDownAction, model);
         adaptTo(moveDownAction,selectionModel);
-        tb.add(moveDownAction);
+        buttonPanel.add(new SideButton(moveDownAction));
 
         // -- activate action
@@ -119 +115 @@
         adaptTo(activateLayerAction, selectionModel);
         MapView.addLayerChangeListener(activateLayerAction);
-        tb.add(activateLayerAction);
+        buttonPanel.add(new SideButton(activateLayerAction));
 
         // -- show hide action
         ShowHideLayerAction showHideLayerAction = new ShowHideLayerAction();
         adaptTo(showHideLayerAction, selectionModel);
-        tb.add(showHideLayerAction);
+        buttonPanel.add(new SideButton(showHideLayerAction));
 
         // -- merge layer action
@@ -130 +126 @@
         adaptTo(mergeLayerAction, model);
         adaptTo(mergeLayerAction,selectionModel);
-        tb.add(mergeLayerAction);
+        buttonPanel.add(new SideButton(mergeLayerAction));
 
 
@@ -140 +136 @@
         layerList.getActionMap().put("deleteLayer", deleteLayerAction);
         adaptTo(deleteLayerAction, selectionModel);
-        tb.add(deleteLayerAction);
-
-        buttonPanel.add(tb);
+        buttonPanel.add(new SideButton(deleteLayerAction, false));
+
         return buttonPanel;
     }