Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogButton.svg (revision 24616) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogButton.svg (revision 24616) @@ -0,0 +1,1937 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LitButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LitButton.svg (revision 24616) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LitButton.svg (revision 24616) @@ -0,0 +1,1400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarButton.svg (revision 24616) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarButton.svg (revision 24616) @@ -0,0 +1,3029 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/TopButton.svg =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/images/TopButton.svg (revision 24616) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/TopButton.svg (revision 24616) @@ -0,0 +1,4992 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java =================================================================== --- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24615) +++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24616) @@ -63,5 +63,10 @@ private JRadioButton hazButton = null; private JRadioButton specButton = null; - private JRadioButton lightButton = null; + private JRadioButton lightsButton = null; + private ButtonGroup miscButtons = null; + private JRadioButton topButton = null; + private JRadioButton fogButton = null; + private JRadioButton radarButton = null; + private JRadioButton litButton = null; private PanelChan panelChan = null; private PanelHaz panelHaz = null; @@ -121,5 +126,5 @@ oseamPanel.add(getHazButton(), null); oseamPanel.add(getSpecButton(), null); - oseamPanel.add(getLightButton(), null); + oseamPanel.add(getLightsButton(), null); oseamPanel.add(panelChan, null); oseamPanel.add(panelHaz, null); @@ -129,5 +134,5 @@ typeButtons.add(hazButton); typeButtons.add(specButton); - typeButtons.add(lightButton); + typeButtons.add(lightsButton); ActionListener alType = new ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { @@ -153,6 +158,5 @@ panelSpec.setVisible(false); } - lightButton.setEnabled(!lightButton.isSelected()); -//System.out.println("pressed: " + chanButton.isSelected() + " " + hazButton.isSelected() + " " + specButton.isSelected() + " " + lightButton.isSelected()); + lightsButton.setEnabled(!lightsButton.isSelected()); } }; @@ -160,5 +164,27 @@ hazButton.addActionListener(alType); specButton.addActionListener(alType); - lightButton.addActionListener(alType); + lightsButton.addActionListener(alType); + + oseamPanel.add(getTopButton(), null); + oseamPanel.add(getFogButton(), null); + oseamPanel.add(getRadarButton(), null); + oseamPanel.add(getLitButton(), null); + miscButtons = new ButtonGroup(); + miscButtons.add(topButton); + miscButtons.add(fogButton); + miscButtons.add(radarButton); + miscButtons.add(litButton); + ActionListener alMisc = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + topButton.setEnabled(!topButton.isSelected()); + fogButton.setEnabled(!fogButton.isSelected()); + radarButton.setEnabled(!radarButton.isSelected()); + litButton.setEnabled(!litButton.isSelected()); + } + }; + topButton.addActionListener(alMisc); + fogButton.addActionListener(alMisc); + radarButton.addActionListener(alMisc); + litButton.addActionListener(alMisc); nameLabel = new JLabel(); @@ -207,12 +233,52 @@ } - private JRadioButton getLightButton() { - if (lightButton == null) { - lightButton = new JRadioButton(new ImageIcon(getClass().getResource( + private JRadioButton getLightsButton() { + if (lightsButton == null) { + lightsButton = new JRadioButton(new ImageIcon(getClass().getResource( Messages.getString("LightsButton")))); - lightButton.setBounds(new Rectangle(0, 120, 105, 40)); - lightButton.setToolTipText(Messages.getString("LightsTip")); - } - return lightButton; + lightsButton.setBounds(new Rectangle(0, 120, 105, 40)); + lightsButton.setToolTipText(Messages.getString("LightsTip")); + } + return lightsButton; + } + + private JRadioButton getTopButton() { + if (topButton == null) { + topButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/TopButton.png"))); + topButton.setBounds(new Rectangle(0, 165, 40, 40)); + topButton.setToolTipText(tr("Topmarks")); + } + return topButton; + } + + private JRadioButton getFogButton() { + if (fogButton == null) { + fogButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/FogButton.png"))); + fogButton.setBounds(new Rectangle(0, 200, 40, 40)); + fogButton.setToolTipText(tr("Fog signals")); + } + return fogButton; + } + + private JRadioButton getRadarButton() { + if (radarButton == null) { + radarButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/RadarButton.png"))); + radarButton.setBounds(new Rectangle(0, 235, 40, 40)); + radarButton.setToolTipText(tr("Radar")); + } + return radarButton; + } + + private JRadioButton getLitButton() { + if (litButton == null) { + litButton = new JRadioButton(new ImageIcon(getClass().getResource( + "/images/LitButton.png"))); + litButton.setBounds(new Rectangle(0, 270, 40, 40)); + litButton.setToolTipText(tr("Lights")); + } + return litButton; }