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

Timestamp:

2009-02-14T16:11:24+01:00 (16 years ago)

Author:

stoecker

Message:

final patch for modeless drawing by xeen. Closes #1937

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (1 diff)
• preferences/LafPreference.java (modified) (3 diffs)

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

@@ -112 +112 @@
         statusLine = new MapStatus(this);
     }
+    
+    public void selectSelectTool(boolean onlyIfModeless) {
+        if(onlyIfModeless && !Main.pref.getBoolean("modeless", false))
+            return;
+        
+        selectMapMode((MapMode)getDefaultButtonAction());
+    }
+    
+    public void selectDrawTool(boolean onlyIfModeless) {
+        if(onlyIfModeless && !Main.pref.getBoolean("modeless", false))
+            return;
+        
+        Action drawAction = ((AbstractButton)toolBarActions.getComponent(1)).getAction();
+        selectMapMode((MapMode)drawAction);
+    }
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java

@@ -33 +33 @@
     private JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
     private JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line"));
+    private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
 
     public void addGui(PreferenceDialog gui) {
@@ -82 +83 @@
         panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
 
+        modeless.setToolTipText(tr("Do not require to switch modes (potlatch style workflow)"));
+        modeless.setSelected(Main.pref.getBoolean("modeless", false));
+        panel.add(modeless, GBC.eop().insets(20, 0, 0, 0));
+
         panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
 
@@ -97 +102 @@
         Main.pref.put("osm-primitives.showid", showID.isSelected());
         Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
+        Main.pref.put("modeless", modeless.isSelected());
         return Main.pref.put("laf", ((LookAndFeelInfo)lafCombo.getSelectedItem()).getClassName());
     }