Changeset 2632 in josm for trunk

Timestamp:

2009-12-14T12:57:16+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed: Action New Relation initially disabled
update: now uses a JToolBar for action panel

File:

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

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

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
-import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -23 +22 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JList;
-import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -49 +48 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -101 +99 @@
         // create the panel with buttons
         //
-        JPanel buttonPanel = new JPanel(new GridLayout(1,3));
-
+        JToolBar tp = new JToolBar(JToolBar.HORIZONTAL);
+        tp.setFloatable(false);
         // the new action
         //
         newAction = new NewAction();
-        buttonPanel.add(new SideButton(newAction), GBC.std());
+        tp.add(newAction);
 
         // the edit action
@@ -112 +110 @@
         editAction = new EditAction();
         displaylist.addListSelectionListener(editAction);
-        buttonPanel.add(new SideButton(editAction), GBC.std());
+        tp.add(editAction);
 
         // the duplicate action
@@ -118 +116 @@
         DuplicateAction duplicateAction = new DuplicateAction();
         displaylist.addListSelectionListener(duplicateAction);
-        buttonPanel.add(new SideButton(duplicateAction), GBC.std());
+        tp.add(duplicateAction);
 
         // the delete action
@@ -124 +122 @@
         deleteAction = new DeleteAction();
         displaylist.addListSelectionListener(deleteAction);
-        buttonPanel.add(new SideButton(deleteAction), GBC.eol());
+        tp.add(deleteAction);
 
         // the select action
@@ -130 +128 @@
         SelectAction selectAction = new SelectAction();
         displaylist.addListSelectionListener(selectAction);
-        buttonPanel.add(new SideButton(selectAction), GBC.eol());
-
-        add(buttonPanel, BorderLayout.SOUTH);
+        tp.add(selectAction);
+
+        add(tp, BorderLayout.SOUTH);
 
         // activate DEL in the list of relations
@@ -339 +337 @@
      *
      */
-    static class NewAction extends AbstractAction implements MapView.LayerChangeListener{
+    static class NewAction extends AbstractAction implements LayerChangeListener{
         public NewAction() {
             putValue(SHORT_DESCRIPTION,tr("Create a new relation"));
             //putValue(NAME, tr("New"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "addrelation"));
-            setEnabled(false);
+            updateEnabledState();
         }