Changeset 397 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

Timestamp:

16.10.2007 23:18:46 (5 years ago)

Author:

framm

Message:

• added a built-in set of tagging presets. this can be disabled from preferences panel, or replaced with an own control file.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -10 +11 @@
 import java.util.StringTokenizer;
 
+import javax.swing.Action;
+import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.border.BevelBorder;
 
 import org.openstreetmap.josm.Main;
@@ -27 +34 @@
         public static Collection<TaggingPreset> taggingPresets;
         private JList taggingPresetSources;
+        private JCheckBox enableDefault;
+        
+        public void addGui(final PreferenceDialog gui) {
+                
+                taggingPresetSources = new JList(new DefaultListModel());
+                enableDefault = new JCheckBox(tr("Enable built-in defaults"), 
+                                Main.pref.getBoolean("taggingpreset.enable-defaults"));
 
-        public void addGui(final PreferenceDialog gui) {
-                taggingPresetSources = new JList(new DefaultListModel());
                 String annos = Main.pref.get("taggingpreset.sources");
                 StringTokenizer st = new StringTokenizer(annos, ";");
@@ -78 +90 @@
                 deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
 
-                gui.map.add(new JLabel(tr("Tagging preset sources")), GBC.eol().insets(0,5,0,0));
-                gui.map.add(new JScrollPane(taggingPresetSources), GBC.eol().fill(GBC.BOTH));
+                JPanel tpPanel = new JPanel();
+                tpPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.gray), tr("Tagging Presets")));
+                tpPanel.setLayout(new GridBagLayout());
+                tpPanel.add(enableDefault, GBC.eol().insets(5,5,5,0));
+                tpPanel.add(new JLabel(tr("Tagging preset sources")), GBC.eol().insets(5,5,5,0));
+                tpPanel.add(new JScrollPane(taggingPresetSources), GBC.eol().insets(5,0,5,0).fill(GBC.BOTH));
                 JPanel buttonPanel = new JPanel(new GridBagLayout());
-                gui.map.add(buttonPanel, GBC.eol().fill(GBC.HORIZONTAL));
+                tpPanel.add(buttonPanel, GBC.eol().insets(5,0,5,5).fill(GBC.HORIZONTAL));
                 buttonPanel.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
                 buttonPanel.add(addAnno, GBC.std().insets(0,5,0,0));
                 buttonPanel.add(editAnno, GBC.std().insets(5,5,5,0));
                 buttonPanel.add(deleteAnno, GBC.std().insets(0,5,0,0));
+                gui.map.add(tpPanel, GBC.eol().fill(GBC.BOTH));
         }
 
         public void ok() {
+                Main.pref.put("taggingpreset.enable-defaults", enableDefault.getSelectedObjects() != null);
                 if (taggingPresetSources.getModel().getSize() > 0) {
                         StringBuilder sb = new StringBuilder();
@@ -103 +121 @@
         public static void initialize() {
                 taggingPresets = TaggingPreset.readFromPreferences();
+                for (final TaggingPreset p : taggingPresets) {
+                        if (p.getValue(Action.NAME).equals(" ")) {
+                                Main.main.menu.presetsMenu.add(new JSeparator());
+                        } else {
+                                Main.main.menu.presetsMenu.add(new JMenuItem(p));
+                        }
+                }               
         }
 }