Changeset 295 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2007-07-24T11:23:01+02:00 (18 years ago)

Author:

imi

Message:

• added "download to new layer" option
• added missing color preferences when opening preferences dialog

Location:

src/org/openstreetmap/josm/gui

Files:

• download/DownloadDialog.java (modified) (3 diffs)
• layer/RawGpsLayer.java (modified) (1 diff)
• preferences/ColorPreference.java (modified) (5 diffs)

src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -57 +57 @@
 
         public final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
+        public final JTabbedPane tabpane = new JTabbedPane();
+        public final JCheckBox newLayer;
         
         public double minlon;
@@ -63 +65 @@
         public double maxlat;
         
-        public JTabbedPane tabpane = new JTabbedPane();
         
-        public DownloadDialog(int tabindex) {
+        public DownloadDialog() {
                 setLayout(new GridBagLayout());
                 
@@ -103 +104 @@
                         boundingBoxChanged(null);
                 }
-                
+
+                newLayer = new JCheckBox(tr("Download as new layer"), Main.pref.getBoolean("download.newlayer", true));
+                add(newLayer, GBC.eol().insets(0,5,0,0));
+
                 add(new JLabel(tr("Download Area")), GBC.eol().insets(0,5,0,0));
                 add(tabpane, GBC.eol().fill());
                 
                 try {
-                        tabpane.setSelectedIndex(tabindex);
+                        tabpane.setSelectedIndex(Integer.parseInt(Main.pref.get("download.tab", "0")));
                 } catch (Exception ex) {
-                        // ignore
+                        Main.pref.put("download.tab", "0");
                 }
-                //Dimension d = getPreferredSize();
-                //setPreferredSize(new Dimension((int)(d.width*1.5), d.height));
-                //wc.addInputFields(latlon, osmUrl, osmUrlRefresher);
         }
         

src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -103 +103 @@
          */
         public final Collection<Collection<GpsPoint>> data;
-
-        public RawGpsLayer(Collection<Collection<GpsPoint>> data, String name, File associatedFile) {
+        public final boolean fromServer;
+
+        public RawGpsLayer(boolean fromServer, Collection<Collection<GpsPoint>> data, String name, File associatedFile) {
                 super(name);
+                this.fromServer = fromServer;
                 this.associatedFile = associatedFile;
                 this.data = data;

src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.xnap.commons.i18n.I18n.marktr;
 
 import java.awt.Color;
@@ -27 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -34 +36 @@
         private DefaultTableModel tableModel;
         private JTable colors;
-        public static final String PREF_COLOR_PREFIX = "color.";
-        
+
         /**
          * Set the colors to be shown in the preference table. This method creates a table model if
@@ -89 +90 @@
         public void addGui(final PreferenceDialog gui) {
                 // initial fill with colors from preferences:
-                Map<String,String> prefColorMap = new TreeMap<String, String>(Main.pref.getAllPrefix(PREF_COLOR_PREFIX));
+                Map<String,String> prefColorMap = new TreeMap<String, String>(Main.pref.getAllPrefix("color."));
+                fixColorPrefixes(prefColorMap);
                 Map<String,String> colorMap = new TreeMap<String, String>();
                 for(String key : prefColorMap.keySet()) {
-                        colorMap.put(key.substring(PREF_COLOR_PREFIX.length()), prefColorMap.get(key));
+                        colorMap.put(key.substring("color.".length()), prefColorMap.get(key));
                 }
                 setColorModel(colorMap);
@@ -137 +139 @@
     }
 
+        /**
+         * Add all missing color entries.
+         */
+        private void fixColorPrefixes(Map<String, String> prefColorMap) {
+                String[] cp = {
+                        marktr("background"), ColorHelper.color2html(Color.black),
+                        marktr("node"), ColorHelper.color2html(Color.red),
+                        marktr("segment"), ColorHelper.color2html(SimplePaintVisitor.darkgreen),
+                        marktr("way"), ColorHelper.color2html(SimplePaintVisitor.darkblue),
+                        marktr("incomplete way"), ColorHelper.color2html(SimplePaintVisitor.darkerblue),
+                        marktr("selected"), ColorHelper.color2html(Color.white),
+                        marktr("gps point"), ColorHelper.color2html(Color.gray),
+                        marktr("conflict"), ColorHelper.color2html(Color.gray),
+                        marktr("scale"), ColorHelper.color2html(Color.white),
+                        marktr("inactive"), ColorHelper.color2html(Color.darkGray),
+                };
+                for (int i = 0; i < cp.length/2; ++i)
+                        if (!Main.pref.hasKey("color."+cp[i*2]))
+                                Main.pref.put("color."+cp[i*2], cp[i*2+1]);
+    }
+
         public void ok() {
                 for (int i = 0; i < colors.getRowCount(); ++i) {
                         String name = (String)colors.getValueAt(i, 0);
                         Color col = (Color)colors.getValueAt(i, 1);
-                        Main.pref.put(PREF_COLOR_PREFIX + name, ColorHelper.color2html(col));
+                        Main.pref.put("color." + name, ColorHelper.color2html(col));
                 }
     }