Changeset 4840 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

Timestamp:

2012-01-21T23:04:50+01:00 (12 years ago)

Author:

bastiK

Message:

expert mode rework:

• toggling of expert mode does not require restart
• checkbox at a more prominent places (MainMenu > View and in the preference dialog at the bottom)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (4 diffs)

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

@@ -9 +9 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -18 +20 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -24 +27 @@
 import javax.swing.KeyStroke;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -37 +42 @@
 
     protected JPanel buildActionPanel() {
-        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
-        pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        pnl.add(new SideButton(new OKAction()));
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Action/Preferences"))));
+        JPanel pnl = new JPanel(new GridBagLayout());
+
+        JCheckBox expert = new JCheckBox(tr("Expert mode"));
+        expert.setSelected(Main.main.menu.expert.isSelected());
+        expert.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                Main.main.menu.expert.actionPerformed(null);
+            }
+        });
+
+        JPanel btns = new JPanel(new FlowLayout(FlowLayout.CENTER));
+        btns.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        btns.add(new SideButton(new OKAction()));
+        btns.add(new SideButton(new CancelAction()));
+        btns.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Action/Preferences"))));
+        pnl.add(expert, GBC.std().insets(5,0,0,0));
+        pnl.add(btns, GBC.std().fill(GBC.HORIZONTAL));
         return pnl;
     }