Changeset 2285 in josm for trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

Timestamp:

2009-10-13T20:34:11+02:00 (15 years ago)

Author:

Gubaer

Message:

Improved Download Location Dialog and created ​help page.
ExtendedDialog now supports context sensitive help including a help button.
ExtendedDialog now supports tooltip texts for buttons in the button row.

File:

• trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -34 +38 @@
     }
 
+    /**
+     * Restore the current history from the preferences
+     * 
+     * @param cbHistory
+     */
+    protected void restoreUploadAddressHistory(HistoryComboBox cbHistory) {
+        List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(getClass().getName() + ".uploadAddressHistory", new LinkedList<String>()));
+        // we have to reverse the history, because ComboBoxHistory will reverse it again
+        // in addElement()
+        //
+        Collections.reverse(cmtHistory);
+        cbHistory.setPossibleItems(cmtHistory);
+    }
+
+    /**
+     * Remind the current history in the preferences
+     * @param cbHistory
+     */
+    protected void remindUploadAddressHistory(HistoryComboBox cbHistory) {
+        cbHistory.addCurrentItemToHistory();
+        Main.pref.putCollection(getClass().getName() + ".uploadAddressHistory", cbHistory.getHistory());
+    }
+
     public void actionPerformed(ActionEvent e) {
 
         JCheckBox layer = new JCheckBox(tr("Separate Layer"));
+        layer.setToolTipText(tr("Select if the data should be downloaded in a new layer"));
         layer.setSelected(Main.pref.getBoolean("download.newlayer"));
         JPanel all = new JPanel(new GridBagLayout());
-        all.add(new JLabel(tr("Enter URL to download:")), GBC.eol());
-        JTextField urltext = new JTextField(40);
-        all.add(urltext, GBC.eol());
-        all.add(layer, GBC.eol());
+        GridBagConstraints gc = new GridBagConstraints();
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.weightx = 1.0;
+        gc.anchor = GridBagConstraints.FIRST_LINE_START;
+        all.add(new JLabel(tr("Enter URL to download:")), gc);
+        HistoryComboBox uploadAdresses = new HistoryComboBox();
+        uploadAdresses.setToolTipText(tr("Enter an URL from where data should be downloaded"));
+        restoreUploadAddressHistory(uploadAdresses);
+        gc.gridy = 1;
+        all.add(uploadAdresses, gc);
+        gc.gridy = 2;
+        gc.fill = GridBagConstraints.BOTH;
+        gc.weighty = 1.0;
+        all.add(layer, gc);
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
                 tr("Download Location"),
                 new String[] {tr("Download URL"), tr("Cancel")}
         );
-        dialog.setContent(all);
+        dialog.setContent(all, false /* don't embedded content in JScrollpane  */);
         dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
+        dialog.setToolTipTexts(new String[] {
+                tr("Start downloading data"),
+                tr("Close dialog and cancel downloading")
+        });
+        dialog.configureContextsensitiveHelp("Help/Action/OpenLocation", true /* show help button */);
         dialog.showDialog();
         if (dialog.getValue() != 1) return;
-        openUrl(layer.isSelected(), urltext.getText());
+        remindUploadAddressHistory(uploadAdresses);
+        openUrl(layer.isSelected(), uploadAdresses.getText());
     }
 
@@ -60 +104 @@
         new DownloadOsmTask().loadUrl(new_layer, url, null);
     }
-
 }