Changeset 768 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-08-11T20:59:42+02:00 (16 years ago)

Author:

framm

Message:

• mappaint modifications by Joerg Henne <j.henne@…>; now supports new config options mappaint.node.selected-size and .unselected-size, .fill-selected and .fill-unselected, mappaint.segment.default-width; change in unselect_all (supports escape), new keyboard shortcuts for zoom in/out (keys + and -)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (6 diffs)
• NavigatableComponent.java (modified) (1 diff)
• layer/GpxLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AlignInRectangleAction;
-import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.AlignInLineAction;
+import org.openstreetmap.josm.actions.AlignInRectangleAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.DuplicateAction;
@@ -29 +29 @@
 import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.JoinNodeWayAction;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.actions.NewAction;
@@ -44 +45 @@
 import org.openstreetmap.josm.actions.UnselectAllAction;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.actions.ZoomInAction;
+import org.openstreetmap.josm.actions.ZoomOutAction;
 import org.openstreetmap.josm.actions.audio.AudioBackAction;
+import org.openstreetmap.josm.actions.audio.AudioFasterAction;
 import org.openstreetmap.josm.actions.audio.AudioFwdAction;
 import org.openstreetmap.josm.actions.audio.AudioNextAction;
 import org.openstreetmap.josm.actions.audio.AudioPlayPauseAction;
 import org.openstreetmap.josm.actions.audio.AudioPrevAction;
-import org.openstreetmap.josm.actions.audio.AudioFasterAction;
 import org.openstreetmap.josm.actions.audio.AudioSlowerAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
@@ -79 +82 @@
         public final JosmAction copy = new CopyAction();
         public final JosmAction paste = new PasteAction();
+        public final JosmAction delete = new DeleteAction();
         public final JosmAction pasteTags = new PasteTagsAction(copy); 
         public final JosmAction duplicate = new DuplicateAction(); 
@@ -154 +158 @@
                 current = editMenu.add(copy);
                 current.setAccelerator(copy.shortCut);
+                current = editMenu.add(delete);
+                current.setAccelerator(delete.shortCut);
                 current = editMenu.add(paste);
                 current.setAccelerator(paste.shortCut);
@@ -180 +186 @@
         }
         viewMenu.addSeparator();
-
-        // TODO move code to an "action" like the others?
+        JosmAction a = new ZoomOutAction();
+                viewMenu.add(a).setAccelerator(a.shortCut);
+                a = new ZoomInAction();
+                viewMenu.add(a).setAccelerator(a.shortCut);
+
+                viewMenu.addSeparator();
+
+                // TODO move code to an "action" like the others?
         final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(tr("Wireframe view"));
         wireframe.setSelected(Main.pref.getBoolean("draw.wireframe", true));     

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -110 +110 @@
          */
         public Point getPoint(EastNorth p) {
+                if(null == p)
+                        return new Point();
                 double x = (p.east()-center.east())/scale + getWidth()/2;
                 double y = (center.north()-p.north())/scale + getHeight()/2;

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -187 +187 @@
                                         }
                                 });
-                                fc.showOpenDialog(Main.parent);
-                                File sel = fc.getSelectedFile();
-                                if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir))
-                                        Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
-                                if (sel == null)
-                                        return;
-                                importAudio(sel);
-                                Main.map.repaint();
+                                fc.setMultiSelectionEnabled(true);
+                                if(fc.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) {
+                                        if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir))
+                                                Main.pref.put("markers.lastaudiodirectory", fc
+                                                                .getCurrentDirectory().getAbsolutePath());
+                                        
+                                        // FIXME: properly support multi-selection here. 
+                                        // Calling importAudio several times just creates N maker layers, which
+                                        // is sub-optimal.
+                                        File sel[] = fc.getSelectedFiles();
+                                        if(sel != null)
+                                                for (int i = 0; i < sel.length; i++) 
+                                                        importAudio(sel[i]);
+                                        
+                                        Main.map.repaint();
+                                }
                         }
                 });