Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 1375) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 1376) @@ -6,4 +6,5 @@ import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -247,4 +248,6 @@ }); + /* I don't like this text any more. Let's just get on with doing the specialist + * editors instead of talking about it. JLabel help = new JLabel(""+ tr("This is the basic relation editor which allows you to change the relation's tags " + @@ -252,4 +255,5 @@ "detects the type of relationship and limits your choices in a sensible way.")+""); getContentPane().add(help, BorderLayout.NORTH); + */ try { setAlwaysOnTop(true); } catch (SecurityException sx) {} @@ -346,5 +350,7 @@ } - JPanel buttonPanel = new JPanel(new GridLayout(1,3)); + // this is not exactly pretty but the four buttons simply don't fit in one line. + // we should have smaller buttons for situations like this. + JPanel buttonPanel = new JPanel(new GridLayout(2,2)); buttonPanel.add(createButton(marktr("Add Selected"),"addselected", @@ -355,6 +361,6 @@ })); - buttonPanel.add(createButton(marktr("Delete Selected"),"deleteselected", - tr("Delete all currently selected objects from relation"), KeyEvent.VK_R, new ActionListener() { + buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected", + tr("Remove all currently selected objects from relation"), KeyEvent.VK_R, new ActionListener() { public void actionPerformed(ActionEvent e) { deleteSelected(); @@ -362,5 +368,5 @@ })); - buttonPanel.add(createButton(marktr("Delete"),"delete", + buttonPanel.add(createButton(marktr("Remove"),"remove", tr("Remove the member in the current table row from this relation"), KeyEvent.VK_D, new ActionListener() { public void actionPerformed(ActionEvent e) {