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

Timestamp:

2007-10-13T00:12:31+02:00 (19 years ago)

Author:

framm

Message:

• introduced various modifier keys to existing modes (for add node mode, shift to disable auto-connect and ctrl to disable auto-insert/reuse; for delete mode, shift to delete way segment and alt to delete way+nodes)
• added small help bar at bottom of screen to display available modifiers

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (1 diff)
• MapStatus.java (modified) (9 diffs)

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

@@ -54 +54 @@
          * The status line below the map
          */
-        private MapStatus statusLine;
+        public MapStatus statusLine;
 
         public ConflictDialog conflictDialog;

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

@@ -6 +6 @@
 import java.awt.AWTEvent;
 import java.awt.Cursor;
+import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -17 +18 @@
 import java.awt.event.MouseMotionListener;
 import java.lang.reflect.InvocationTargetException;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -58 +61 @@
          * The position of the mouse cursor.
          */
-        JTextField positionText = new JTextField("-000.00000000000000 -000.00000000000000".length());
+        DecimalFormat latlon = new DecimalFormat("###0.0000000");
+        JTextField positionText = new JTextField(25);
+        
         /**
          * The field holding the name of the object under the mouse.
@@ -64 +69 @@
         JTextField nameText = new JTextField(30);
 
+        /**
+         * The field holding information about what the user can do.
+         */
+        JTextField helpText = new JTextField();
+        
         /**
          * The collector class that waits for notification and then update
@@ -114 +124 @@
                                 // the data.
                                 try {
-                                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
-
-                                        if (osms == null && osmStatus == null && ms.modifiers == oldModifiers)
-                                                continue;
-                                        if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
-                                                continue;
-
+                                        // Popup Information
+                                        if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 ) {
+                                                Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
+
+                                                if (osms == null)
+                                                        continue;
+                                                if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
+                                                        continue;
+                                        /*
                                         osmStatus = osms;
                                         oldModifiers = ms.modifiers;
@@ -133 +145 @@
                                         } else
                                                 nameText.setText("");
-
-                                        // Popup Information
-                                        if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) {
+                                        */
+                                        
+
                                                 if (popup != null) {
                                                         try {
@@ -235 +247 @@
                                 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
                                         LatLon p = mv.getLatLon(e.getX(),e.getY());
-                                        positionText.setText(p.lat()+" "+p.lon());
+                                        positionText.setText(latlon.format(p.lat())+" "+latlon.format(p.lon()));
                                 }
                         }
@@ -242 +254 @@
                 positionText.setEditable(false);
                 nameText.setEditable(false);
-                setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+                helpText.setEditable(false);
+                setLayout(new GridBagLayout());
                 setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-                add(new JLabel(tr("Lat/Lon")+" "));
-                add(positionText);
-                add(new JLabel(" "+tr("Object")+" "));
-                add(nameText);
-
+                add(new JLabel(tr("Lat/Lon")+" "), GBC.std());
+                add(positionText, GBC.std());
+                //add(new JLabel(" "+tr("Object")+" "));
+                //add(nameText);
+                add(helpText, GBC.eol().fill(GBC.HORIZONTAL));
+                positionText.setMinimumSize(new Dimension(positionText.getMinimumSize().height, 200));
+                
                 // The background thread
                 final Collector collector = new Collector(mapFrame);
@@ -270 +285 @@
             return "Statusline";
     }
+        
+        public void setHelpText(String t) {
+                helpText.setText(t);
+        }
 }