Changeset 24641 in osm for applications/editors/josm/plugins/smed

Timestamp:

2010-12-07T15:25:55+01:00 (14 years ago)

Author:

malcolmh

Message:

lights panel

Location:

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

Files:

• images/AmberButton.png (added)
• images/AmberButton.svg (added)
• images/BlackButton.png (added)
• images/BlackButton.svg (added)
• images/BlueButton.png (added)
• images/BlueButton.svg (added)
• images/FloatButton.png (modified) ( previous)
• images/FloatButton.svg (modified) (6 diffs)
• images/FloatButton_de.png (modified) ( previous)
• images/GreenButton.png (added)
• images/GreenButton.svg (added)
• images/LightFloatButton.png (added)
• images/LightFloatButton.svg (added)
• images/LightFloatButton_de.png (added)
• images/LightMajorButton.png (added)
• images/LightMajorButton.svg (added)
• images/LightMajorButton_de.png (added)
• images/LightMinorButton.png (added)
• images/LightMinorButton.svg (added)
• images/LightMinorButton_de.png (added)
• images/LightVesselButton.png (added)
• images/LightVesselButton.svg (added)
• images/LightVesselButton_de.png (added)
• images/LighthouseButton.png (added)
• images/LighthouseButton.svg (added)
• images/LighthouseButton_de.png (added)
• images/OrangeButton.png (added)
• images/OrangeButton.svg (added)
• images/RedButton.png (added)
• images/RedButton.svg (added)
• images/VioletButton.png (added)
• images/VioletButton.svg (added)
• images/WhiteButton.png (added)
• images/WhiteButton.svg (added)
• images/YellowButton.png (added)
• images/YellowButton.svg (added)
• oseam/dialogs/OSeaMAction.java (modified) (4 diffs)
• oseam/msg/messages.properties (modified) (1 diff)
• oseam/msg/messages_de.properties (modified) (1 diff)
• oseam/msg/messages_en.properties (modified) (1 diff)
• oseam/panels/PanelLights.java (copied) (copied from applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java ) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/images/FloatButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="BarrelButton.svg"
+   sodipodi:docname="FloatButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BarrelButton_de.png"
    inkscape:export-xdpi="90"
@@ -2977 +2977 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g2912"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -3005 +3005 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -3049 +3049 @@
      inkscape:groupmode="layer"
      inkscape:label="Text EN"
-     style="display:inline">
+     style="display:none">
     <text
        inkscape:export-ydpi="90"
@@ -3063 +3063 @@
          x="52.833485"
          id="tspan2910"
-         sodipodi:role="line">Light Float</tspan></text>
+         sodipodi:role="line">Float</tspan></text>
   </g>
   <g
-     style="display:none"
+     style="display:inline"
      inkscape:label="Text DE"
      inkscape:groupmode="layer"
@@ -3084 +3084 @@
          id="tspan4557"
          x="52.94833"
-         y="1039.3102">Leuchtfloß</tspan></text>
+         y="1039.3102">Floß</tspan></text>
   </g>
 </svg>

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

@@ -72 +72 @@
         private PanelHaz panelHaz = null;
         private PanelSpec panelSpec = null;
+        private PanelLights panelLights = null;
 
         public OSeaMAction() {
@@ -95 +96 @@
                 panelSpec.setBounds(new Rectangle(105, 0, 295, 160));
                 panelSpec.setVisible(false);
+                panelLights= new PanelLights();
+                panelLights.setBounds(new Rectangle(105, 0, 295, 160));
+                panelLights.setVisible(false);
         }
 
@@ -129 +133 @@
                         oseamPanel.add(panelHaz, null);
                         oseamPanel.add(panelSpec, null);
+                        oseamPanel.add(panelLights, null);
                         typeButtons = new ButtonGroup();
                         typeButtons.add(chanButton);
@@ -157 +162 @@
                                                 panelSpec.setVisible(false);
                                         }
-                                        lightsButton.setEnabled(!lightsButton.isSelected());
+                                        if (lightsButton.isSelected()) {
+                                                lightsButton.setEnabled(false);
+                                                panelLights.setVisible(true);
+                                        } else { 
+                                                lightsButton.setEnabled(true);
+                                                panelLights.setVisible(false);
+                                        }
                                 }
                         };

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -29 +29 @@
 IsolButton=/images/IsolButton.png
 IsolTip=Isolated danger marks
+LighthouseButton=/images/LighthouseButton.png
+LightMajorButton=/images/LightMajorButton.png
+LightMinorButton=/images/LightMinorButton.png
+LightVesselButton=/images/LightVesselButton.png
+LightFloatButton=/images/LightFloatButton.png
 PillarButton=/images/PillarButton.png
 SparButton=/images/SparButton.png

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

@@ -29 +29 @@
 IsolButton=/images/IsolButton_de.png
 IsolTip=Isolated danger marks
+LighthouseButton=/images/LighthouseButton_de.png
+LightMajorButton=/images/LightMajorButton_de.png
+LightMinorButton=/images/LightMinorButton_de.png
+LightVesselButton=/images/LightVesselButton_de.png
+LightFloatButton=/images/LightFloatButton_de.png
 PillarButton=/images/PillarButton_de.png
 SparButton=/images/SparButton_de.png

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

@@ -29 +29 @@
 IsolButton=/images/IsolButton.png
 IsolTip=Isolated danger marks
+LighthouseButton=/images/LighthouseButton.png
+LightMajorButton=/images/LightMajorButton.png
+LightMinorButton=/images/LightMinorButton.png
+LightVesselButton=/images/LightVesselButton.png
+LightFloatButton=/images/LightFloatButton.png
 PillarButton=/images/PillarButton.png
 SparButton=/images/SparButton.png

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

@@ -22 +22 @@
 import java.awt.event.ActionListener;
 
-public class PanelChan extends JPanel {
+public class PanelLights extends JPanel {
 
         private ButtonGroup catButtons = null;
-        private JRadioButton portButton = null;
-        private JRadioButton stbdButton = null;
-        private JRadioButton prefPortButton = null;
-        private JRadioButton prefStbdButton = null;
-        private JRadioButton safeWaterButton = null;
-        private PanelPort panelPort = null;
-        private PanelStbd panelStbd = null;
-        private PanelPrefPort panelPrefPort = null;
-        private PanelPrefStbd panelPrefStbd = null;
-        private PanelSafeWater panelSafeWater = null;
+        private JRadioButton houseButton = null;
+        private JRadioButton majorButton = null;
+        private JRadioButton minorButton = null;
+        private JRadioButton vesselButton = null;
+        private JRadioButton floatButton = null;
         
-        public PanelChan() {
+        public PanelLights() {
                 super();
-                panelPort = new PanelPort();
-                panelPort.setBounds(new Rectangle(105, 0, 185, 160));
-                panelPort.setVisible(false);
-                panelStbd = new PanelStbd();
-                panelStbd.setBounds(new Rectangle(105, 0, 185, 160));
-                panelStbd.setVisible(false);
-                panelPrefPort = new PanelPrefPort();
-                panelPrefPort.setBounds(new Rectangle(105, 0, 185, 160));
-                panelPrefPort.setVisible(false);
-                panelPrefStbd = new PanelPrefStbd();
-                panelPrefStbd.setBounds(new Rectangle(105, 0, 185, 160));
-                panelPrefStbd.setVisible(false);
-                panelSafeWater = new PanelSafeWater();
-                panelSafeWater.setBounds(new Rectangle(105, 0, 185, 160));
-                panelSafeWater.setVisible(false);
                 initialize();
         }
@@ -58 +38 @@
         private void initialize() {
          this.setLayout(null);
-         this.add(panelPort, null);
-         this.add(panelStbd, null);
-         this.add(panelPrefPort, null);
-         this.add(panelPrefStbd, null);
-         this.add(panelSafeWater, null);
-         this.add(getPortButton(), null);
-         this.add(getStbdButton(), null);
-         this.add(getPrefPortButton(), null);
-         this.add(getPrefStbdButton(), null);
-         this.add(getSafeWaterButton(), null);
+         this.add(getHouseButton(), null);
+         this.add(getMajorButton(), null);
+         this.add(getMinorButton(), null);
+         this.add(getVesselButton(), null);
+         this.add(getFloatButton(), null);
          catButtons = new ButtonGroup();
-         catButtons.add(portButton);
-         catButtons.add(stbdButton);
-         catButtons.add(prefPortButton);
-         catButtons.add(prefStbdButton);
-         catButtons.add(safeWaterButton);
+         catButtons.add(houseButton);
+         catButtons.add(majorButton);
+         catButtons.add(minorButton);
+         catButtons.add(vesselButton);
+         catButtons.add(floatButton);
                         ActionListener alCat = new ActionListener() {
                                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                                        if (portButton.isSelected()) {
-                                                portButton.setEnabled(false);
-                                                panelPort.setVisible(true);
-                                        } else { 
-                                                portButton.setEnabled(true);
-                                                panelPort.setVisible(false);
-                                        }
-                                        if (stbdButton.isSelected()) {
-                                                stbdButton.setEnabled(false);
-                                                panelStbd.setVisible(true);
-                                        } else { 
-                                                stbdButton.setEnabled(true);
-                                                panelStbd.setVisible(false);
-                                        }
-                                        if (prefPortButton.isSelected()) {
-                                                prefPortButton.setEnabled(false);
-                                                panelPrefPort.setVisible(true);
-                                        } else { 
-                                                prefPortButton.setEnabled(true);
-                                                panelPrefPort.setVisible(false);
-                                        }
-                                        if (prefStbdButton.isSelected()) {
-                                                prefStbdButton.setEnabled(false);
-                                                panelPrefStbd.setVisible(true);
-                                        } else { 
-                                                prefStbdButton.setEnabled(true);
-                                                panelPrefStbd.setVisible(false);
-                                        }
-                                        if (safeWaterButton.isSelected()) {
-                                                safeWaterButton.setEnabled(false);
-                                                panelSafeWater.setVisible(true);
-                                        } else { 
-                                                safeWaterButton.setEnabled(true);
-                                                panelSafeWater.setVisible(false);
-                                        }
+                                        houseButton.setEnabled(!houseButton.isSelected());
+                                        majorButton.setEnabled(!majorButton.isSelected());
+                                        minorButton.setEnabled(!minorButton.isSelected());
+                                        vesselButton.setEnabled(!vesselButton.isSelected());
+                                        floatButton.setEnabled(!floatButton.isSelected());
                                 }
                         };
-                        portButton.addActionListener(alCat);
-                        stbdButton.addActionListener(alCat);
-                        prefPortButton.addActionListener(alCat);
-                        prefStbdButton.addActionListener(alCat);
-                        safeWaterButton.addActionListener(alCat);
+                        houseButton.addActionListener(alCat);
+                        majorButton.addActionListener(alCat);
+                        minorButton.addActionListener(alCat);
+                        vesselButton.addActionListener(alCat);
+                        floatButton.addActionListener(alCat);
         }
 
-        private JRadioButton getPortButton() {
-                if (portButton == null) {
-                        portButton = new JRadioButton(new ImageIcon(getClass().getResource(
-                                        Messages.getString("PortButton"))));
-                        portButton.setBounds(new Rectangle(0, 0, 105, 32));
-                        portButton.setToolTipText(Messages.getString("PortTip"));
+        private JRadioButton getHouseButton() {
+                if (houseButton == null) {
+                        houseButton = new JRadioButton(new ImageIcon(getClass().getResource(
+                                        Messages.getString("LighthouseButton"))));
+                        houseButton.setBounds(new Rectangle(0, 0, 105, 32));
                 }
-                return portButton;
+                return houseButton;
         }
 
-        private JRadioButton getStbdButton() {
-                if (stbdButton == null) {
-                        stbdButton = new JRadioButton(new ImageIcon(getClass().getResource(
-                                        Messages.getString("StbdButton"))));
-                        stbdButton.setBounds(new Rectangle(0, 32, 105, 32));
-                        stbdButton.setToolTipText(Messages.getString("StbdTip"));
+        private JRadioButton getMajorButton() {
+                if (majorButton == null) {
+                        majorButton = new JRadioButton(new ImageIcon(getClass().getResource(
+                                        Messages.getString("LightMajorButton"))));
+                        majorButton.setBounds(new Rectangle(0, 32, 105, 32));
                 }
-                return stbdButton;
+                return majorButton;
         }
 
-        private JRadioButton getPrefPortButton() {
-                if (prefPortButton == null) {
-                        prefPortButton = new JRadioButton(new ImageIcon(getClass().getResource(
-                                        Messages.getString("PrefPortButton"))));
-                        prefPortButton.setBounds(new Rectangle(0, 64, 105, 32));
-                        prefPortButton.setToolTipText(Messages.getString("PrefPortTip"));
+        private JRadioButton getMinorButton() {
+                if (minorButton == null) {
+                        minorButton = new JRadioButton(new ImageIcon(getClass().getResource(
+                                        Messages.getString("LightMinorButton"))));
+                        minorButton.setBounds(new Rectangle(0, 64, 105, 32));
                 }
-                return prefPortButton;
+                return minorButton;
         }
 
-        private JRadioButton getPrefStbdButton() {
-                if (prefStbdButton == null) {
-                        prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource(
-                                        Messages.getString("PrefStbdButton"))));
-                        prefStbdButton.setBounds(new Rectangle(0, 96, 105, 32));
-                        prefStbdButton.setToolTipText(Messages.getString("PrefStbdTip"));
+        private JRadioButton getVesselButton() {
+                if (vesselButton == null) {
+                        vesselButton = new JRadioButton(new ImageIcon(getClass().getResource(
+                                        Messages.getString("LightVesselButton"))));
+                        vesselButton.setBounds(new Rectangle(0, 96, 105, 32));
                 }
-                return prefStbdButton;
+                return vesselButton;
         }
 
-        private JRadioButton getSafeWaterButton() {
-                if (safeWaterButton == null) {
-                        safeWaterButton = new JRadioButton(new ImageIcon(getClass().getResource(
-                                        Messages.getString("SafeWaterButton"))));
-                        safeWaterButton.setBounds(new Rectangle(0, 128, 105, 32));
-                        safeWaterButton.setToolTipText(Messages.getString("SafeWaterTip"));
+        private JRadioButton getFloatButton() {
+                if (floatButton == null) {
+                        floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
+                                        Messages.getString("LightFloatButton"))));
+                        floatButton.setBounds(new Rectangle(0, 128, 105, 32));
                 }
-                return safeWaterButton;
+                return floatButton;
         }