Changeset 586 in josm for trunk

Timestamp:

2008-03-20T23:56:02+01:00 (16 years ago)

Author:

framm

Message:

• add a "select" button at the bottom of the relation list to transfer a relation into JOSM's selection, from where it can then be added to a relation in the relation editor. Fixes #510. Note that JOSM still has difficulties when uploading newly-created nested relations; it may do so in the wrong order and be rejected by the API which refuses to create a reference to a not-yet-uploaded relation. Workaround is: create your simple relations, upload them, and then create your combined relations.

File:

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

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

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -28 +30 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -67 +70 @@
                 add(new JScrollPane(displaylist), BorderLayout.CENTER);
 
-                JPanel buttonPanel = new JPanel(new GridLayout(1,3));
-
-                buttonPanel.add(createButton(marktr("Add Relation"), "addrelation", tr("Create a new relation"), -1, new ActionListener() {
+                JPanel buttonPanel = new JPanel(new GridBagLayout());
+                
+                buttonPanel.add(createButton(marktr("New"), "addrelation", tr("Create a new relation"), -1, new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
                                 // call relation editor with null argument to create new relation
                                 new RelationEditor(null).setVisible(true);
                         }
-                }));
+                }), GBC.std());
+                
+                buttonPanel.add(createButton(marktr("Select"), "select", tr("Select this relation"), -1, new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                                // replace selection with the relation from the list
+                                Main.ds.setSelected((Relation)displaylist.getSelectedValue());
+                        }
+                }), GBC.std());
                 
                 buttonPanel.add(createButton(marktr("Edit"), "edit", tr( "Open an editor for the selected relation"), -1, new ActionListener() {
@@ -82 +92 @@
                                         new RelationEditor(toEdit).setVisible(true);                            
                         }
-                }));
+                }), GBC.std());
                 
-                buttonPanel.add(createButton(marktr("Delete"), "delete", tr("Delete the selected relation"), -1, new ActionListener() {
+                buttonPanel.add(createButton("", "delete", tr("Delete the selected relation"), -1, new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
                                 Relation toDelete = (Relation) displaylist.getSelectedValue();
@@ -92 +102 @@
                                 }
                         }
-                }));
+                }), GBC.eol());
                 Layer.listeners.add(this);
                 add(buttonPanel, BorderLayout.SOUTH);