Changeset 5091 in josm

Timestamp:

Mar 16, 2012 6:23:04 PM (15 months ago)

Author:

akks

Message:

Warning against misaligned imagery for new users - see #7450.
Added addTopPanel function in MapFrame for other possible enhancements

Location:

trunk

Files:

• images/misc/black_x.png (added)
• src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java (added)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.gui.actionsupport.AlignImageryPanel;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -44 +45 @@
         try {
             Main.main.addLayer(ImageryLayer.create(info));
+            AlignImageryPanel.addNagPanelIfNeeded();
         } catch (IllegalArgumentException ex) {
             if (ex.getMessage() == null || ex.getMessage().isEmpty()) {

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

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.GridBagLayout;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -65 +67 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.GBC;
 
 /**
@@ -113 +116 @@
      */
     private List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
+    private final JPanel leftPanel;
     private final DialogsPanel dialogsPanel;
 
@@ -140 +144 @@
         setLayout(new BorderLayout());
 
+        
         mapView = new MapView(contentPane);
 
         new FileDrop(mapView);
-
+        
+        leftPanel = new JPanel(); 
+        leftPanel.setLayout(new GridBagLayout());
+        
+        leftPanel.add(mapView, GBC.std().fill()); 
+        
         // toolbar
         toolBarActions.setFloatable(false);
@@ -158 +168 @@
         JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
         dialogsPanel = new DialogsPanel(splitPane);
-        splitPane.setLeftComponent(mapView);
+        splitPane.setLeftComponent(leftPanel);
         splitPane.setRightComponent(dialogsPanel);
 
@@ -499 +509 @@
         Main.pref.putInteger("toggleDialogs.width", dialogsPanel.getWidth());
     }
+    
+     /*
+     * Remove panel from top of MapView by class
+     */
+     public void removeTopPanel(Class<?> type) {
+        int n = leftPanel.getComponentCount();
+        for (int i=0; i<n; i++) {
+            Component c = leftPanel.getComponent(i);
+            if (type.isInstance(c)) {
+                leftPanel.remove(i);
+                leftPanel.doLayout();
+//                repaint();
+                return;
+            }
+        }
+    }
+    
+    /*
+    * Find panel on top of MapView by class
+    */
+    public <T> T getTopPanel(Class<T> type) {
+        int n = leftPanel.getComponentCount();
+        for (int i=0; i<n; i++) {
+            Component c = leftPanel.getComponent(i);
+            if (type.isInstance(c)) {
+                return type.cast(c);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Add component @param c on top of MapView
+     */
+    public void addTopPanel(Component c) {
+        leftPanel.add(c, GBC.eol().fill(GBC.HORIZONTAL), leftPanel.getComponentCount()-1);
+        leftPanel.doLayout();
+        c.doLayout();
+    }
 
     /**