Changeset 26565 in osm for applications/editors/josm

Timestamp:

2011-08-24T17:25:20+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src

Files:

• images/StationButton.png (deleted)
• images/StationButton.svg (deleted)
• images/TrafficButton.png (added)
• images/TrafficButton.svg (added)
• images/WarningButton.png (added)
• images/WarningButton.svg (added)
• oseam/dialogs/OSeaMAction.java (modified) (3 diffs)
• oseam/panels/PanelLights.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java

@@ -39 +39 @@
                                                         mark.parseMark(node);
                                                 }
-                                        } else
+                                        } else {
                                                 manager.showVisualMessage(Messages.getString("OneNode"));
+                                                panelMain.clearSelections();
+                                        }
                                 }
                         }
@@ -47 +49 @@
                                 mark = null;
                                 manager.showVisualMessage(Messages.getString("SelectNode"));
+                                panelMain.clearSelections();
                         }
                 }
@@ -63 +66 @@
                         Main.pref.put("mappaint.style.sources", str + "http://dev.openseamap.org/josm/seamark_styles.xml");
                 }
-                str = Main.pref.get("color.background");
-                if (str.equals("#000000") || str.isEmpty())
-                        Main.pref.put("color.background", "#606060");
         }
 

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java

@@ -18 +18 @@
         public JRadioButton minorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMinorButton.png")));
         public JRadioButton vesselButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightVesselButton.png")));
-        public JRadioButton stationButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StationButton.png")));
+        public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightFloatButton.png")));
+        public JRadioButton trafficButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TrafficButton.png")));
+        public JRadioButton warningButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WarningButton.png")));
         private EnumMap<Cat, JRadioButton> categories = new EnumMap<Cat, JRadioButton>(Cat.class);
         private EnumMap<Cat, Obj> objects = new EnumMap<Cat, Obj>(Cat.class);
@@ -39 +41 @@
                 this.setLayout(null);
                 this.add(getCatButton(houseButton, 0, 0, 34, 32, "Lighthouse", Cat.LIGHT_HOUSE, Obj.LNDMRK), null);
-                this.add(getCatButton(majorButton, 0, 32, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, Obj.LITMAJ), null);
-                this.add(getCatButton(minorButton, 0, 64, 34, 32, "MinorLight", Cat.LIGHT_MINOR, Obj.LITMIN), null);
-                this.add(getCatButton(vesselButton, 0, 96, 34, 32, "LightVessel", Cat.LIGHT_VESSEL, Obj.LITVES), null);
-                this.add(getCatButton(stationButton, 0, 128, 34, 32, "SignalStation", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
+                this.add(getCatButton(majorButton, 35, 0, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, Obj.LITMAJ), null);
+                this.add(getCatButton(minorButton, 70, 0, 34, 32, "MinorLight", Cat.LIGHT_MINOR, Obj.LITMIN), null);
+                this.add(getCatButton(vesselButton, 105, 0, 34, 32, "LightVessel", Cat.LIGHT_VESSEL, Obj.LITVES), null);
+                this.add(getCatButton(floatButton, 140, 0, 34, 32, "LightFloat", Cat.LIGHT_FLOAT, Obj.LITFLT), null);
+                this.add(getCatButton(trafficButton, 35, 32, 34, 32, "SSTraffic", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
+                this.add(getCatButton(warningButton, 105, 32, 34, 32, "SSWarning", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
         }