Changeset 214 in josm for src/org/openstreetmap/josm/gui/MapFrame.java

Timestamp:

2007-04-05T17:19:54+02:00 (19 years ago)

Author:

imi

Message:

• fixed the confusing auto-zoom (moved to "View"-menu and made it one-time zoom)
• added (incomplete) after named ways (now it's the same as unnamed ways)

File:

• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 import javax.swing.AbstractButton;
@@ -17 +13 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.mapmode.AddSegmentAction;
 import org.openstreetmap.josm.actions.mapmode.AddWayAction;
@@ -81 +76 @@
                 setLayout(new BorderLayout());
 
-                final AutoScaleAction autoScaleAction = new AutoScaleAction(this);
-                add(mapView = new MapView(autoScaleAction), BorderLayout.CENTER);
+                add(mapView = new MapView(), BorderLayout.CENTER);
+
+                // show menu entry
+                Main.main.menu.viewMenu.setVisible(true);
 
                 // toolbar
@@ -98 +95 @@
                         toolGroup.add((AbstractButton)c);
                 toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);
-
-                // autoScale
+                
                 toolBarActions.addSeparator();
-                final IconToggleButton autoScaleButton = new IconToggleButton(autoScaleAction);
-                toolBarActions.add(autoScaleButton);
-                autoScaleButton.setText(null);
-                autoScaleButton.setSelected(mapView.isAutoScale());
-                autoScaleAction.putValue("active", true);
-                mapView.addPropertyChangeListener(new PropertyChangeListener(){
-                        public void propertyChange(PropertyChangeEvent evt) {
-                                if (evt.getPropertyName().equals("autoScale")) {
-                                        autoScaleAction.putValue("active", evt.getNewValue());
-                                        autoScaleButton.setSelected((Boolean)evt.getNewValue());
-                                }
-                        }
-                });
-                autoScaleButton.addActionListener(new ActionListener(){
-                        public void actionPerformed(ActionEvent e) {
-                                if (!autoScaleButton.groupbutton)
-                                        autoScaleButton.setSelected(true);
-                        }
-                });
-
+                
                 add(toggleDialogs, BorderLayout.EAST);
                 toggleDialogs.setLayout(new BoxLayout(toggleDialogs, BoxLayout.Y_AXIS));
@@ -144 +121 @@
                         if (toolBarActions.getComponent(i) instanceof Destroyable)
                                 ((Destroyable)toolBarActions).destroy();
+                
+                // remove menu entries
+                Main.main.menu.viewMenu.setVisible(false);
     }