Changeset 172 in josm for src/org/openstreetmap/josm/actions

Timestamp:

2006-11-30T00:00:37+01:00 (18 years ago)

Author:

imi

Message:

• added support for Applet mode again (the basics)
• added customizable toolbar
• fixed shortcut for "New Empty Layer"

Location:

src/org/openstreetmap/josm/actions

Files:

• DownloadAction.java (modified) (5 diffs)
• JosmAction.java (modified) (2 diffs)
• NewAction.java (modified) (2 diffs)
• RenameLayerAction.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -35 +35 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.BookmarkList;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.WorldChooser;
-import org.openstreetmap.josm.gui.BookmarkList.Bookmark;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -184 +184 @@
                 bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener(){
                         public void valueChanged(ListSelectionEvent e) {
-                                Bookmark b = (Bookmark)bookmarks.getSelectedValue();
+                                Preferences.Bookmark b = (Preferences.Bookmark)bookmarks.getSelectedValue();
                                 for (int i = 0; i < 4; ++i) {
                                         latlon[i].setText(b == null ? "" : ""+b.latlon[i]);
@@ -199 +199 @@
                 add.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                Bookmark b = readBookmark();
+                                Preferences.Bookmark b = readBookmark();
                                 if (b == null) {
                                         JOptionPane.showMessageDialog(Main.parent, tr("Please enter the desired coordinates first."));
@@ -232 +232 @@
 
                 // Finally: the dialog
-                Bookmark b;
+                Preferences.Bookmark b;
                 boolean anySelected = false;
                 do {
@@ -278 +278 @@
          *              checkbox.
          */
-        Bookmark readBookmark() {
+        Preferences.Bookmark readBookmark() {
                 try {
-                        Bookmark b = new Bookmark();
+                        Preferences.Bookmark b = new Preferences.Bookmark();
                         for (int i = 0; i < 4; ++i) {
                                 if (latlon[i].getText().equals(""))

src/org/openstreetmap/josm/actions/JosmAction.java

@@ -28 +28 @@
                 putValue(SHORT_DESCRIPTION, tooltip);
                 putValue(MNEMONIC_KEY, mnemonic);
+                putValue("toolbar", iconName);
+                Main.toolbar.register(this);
         }
 
@@ -37 +39 @@
         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, modifier), name);
         Main.contentPane.getActionMap().put(name, this);
+        putValue("toolbar", iconName);
+        Main.toolbar.register(this);
         }
 

src/org/openstreetmap/josm/actions/NewAction.java

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
@@ -10 +11 @@
 public class NewAction extends JosmAction {
 
-
         public NewAction() {
-                super(tr("New"), "new", tr("Create a new map."), KeyEvent.VK_N);
+                super(tr("New"), "new", tr("Create a new map."), KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK);
         }
 

src/org/openstreetmap/josm/actions/RenameLayerAction.java

@@ -43 +43 @@
                 panel.add(name);
                 JCheckBox filerename = new JCheckBox(tr("Also rename the file"));
-                panel.add(filerename);
-                filerename.setEnabled(file != null);
+                if (Main.applet) {
+                        filerename.setEnabled(false);
+                        filerename.setSelected(false);
+                } else {
+                        panel.add(filerename);
+                        filerename.setEnabled(file != null);
+                }
                 if (filerename.isEnabled())
                         filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true));