Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg (revision 24576) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg (revision 24577) @@ -10,10 +10,13 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="50" - height="50" + width="100" + height="40" id="svg2" version="1.1" inkscape:version="0.47 r22583" - sodipodi:docname="Chan.svg"> + sodipodi:docname="ChanButton.svg" + inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanButton.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> @@ -33,6 +36,6 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16.8" - inkscape:cx="17.483568" + inkscape:zoom="11.879394" + inkscape:cx="47.703965" inkscape:cy="24.637413" inkscape:document-units="px" @@ -62,5 +65,5 @@ - + @@ -70,5 +73,5 @@ inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1002.3622)" + transform="translate(0,-1012.3622)" style="display:inline"> + transform="translate(0,-1012.3622)"> Deutsch + x="75.037933" + y="1036.1263">Deutsch Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg (revision 24576) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg (revision 24577) @@ -10,10 +10,10 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="50" - height="50" + width="100" + height="40" id="svg2" version="1.1" inkscape:version="0.47 r22583" - sodipodi:docname="Haz.svg" + sodipodi:docname="HazButton.svg" inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png" inkscape:export-xdpi="90" @@ -37,6 +37,6 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16.8" - inkscape:cx="17.662139" + inkscape:zoom="11.879394" + inkscape:cx="51.249711" inkscape:cy="26.914183" inkscape:document-units="px" @@ -74,5 +74,5 @@ inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1002.3622)" + transform="translate(0,-1012.3622)" style="display:inline"> + transform="translate(0,-1012.3622)"> Deutsch + x="74.953758" + y="1035.9681">Deutsch Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg (revision 24576) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg (revision 24577) @@ -10,10 +10,10 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="50" - height="50" + width="100" + height="40" id="svg2" version="1.1" inkscape:version="0.47 r22583" - sodipodi:docname="Lights.svg" + sodipodi:docname="LightsButton.svg" inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/Lights.png" inkscape:export-xdpi="90" @@ -1115,5 +1115,5 @@ inkscape:pageshadow="2" inkscape:zoom="11.879394" - inkscape:cx="14.574065" + inkscape:cx="58.263162" inkscape:cy="14.533528" inkscape:document-units="px" @@ -1151,5 +1151,5 @@ inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1002.3622)" + transform="translate(0,-1012.3622)" style="display:inline"> + transform="translate(0,-1012.3622)"> Deutsch + x="74.948616" + y="1036.1016">Deutsch Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg (revision 24576) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg (revision 24577) @@ -10,10 +10,10 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="50" - height="50" + width="100" + height="40" id="svg2" version="1.1" inkscape:version="0.47 r22583" - sodipodi:docname="Spec.svg"> + sodipodi:docname="SpecButton.svg"> @@ -33,9 +33,9 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16.8" - inkscape:cx="9.07896" + inkscape:zoom="11.879394" + inkscape:cx="52.768058" inkscape:cy="27.488438" inkscape:document-units="px" - inkscape:current-layer="g3725" + inkscape:current-layer="g3709" showgrid="true" inkscape:showpageshadow="false" @@ -70,5 +70,5 @@ inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1002.3622)" + transform="translate(0,-1012.3622)" style="display:inline"> + transform="translate(0,-1012.3622)"> Deutsch + x="75.048141" + y="1036.1364">Deutsch 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 24576) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java (revision 24577) @@ -41,8 +41,9 @@ private JPanel oseamPanel = null; - private JButton chanButton = null; - private JButton hazButton = null; - private JButton specButton = null; - private JButton lightButton = null; + private ButtonGroup typeButtons = null; + private JRadioButton chanButton = null; + private JRadioButton hazButton = null; + private JRadioButton specButton = null; + private JRadioButton lightButton = null; public OSeaMAction() { @@ -66,97 +67,66 @@ oseamPanel.setLayout(null); oseamPanel.setSize(new Dimension(400, 360)); - // System.out.println("file=" + Messages.getString("ChanButton")); oseamPanel.add(getChanButton(), null); oseamPanel.add(getHazButton(), null); oseamPanel.add(getSpecButton(), null); oseamPanel.add(getLightButton(), null); + typeButtons = new ButtonGroup(); + typeButtons.add(chanButton); + typeButtons.add(hazButton); + typeButtons.add(specButton); + typeButtons.add(lightButton); + ActionListener alType = new ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { +//System.out.println("pressed: " + chanButton.isSelected() + " " + hazButton.isSelected() + " " + specButton.isSelected() + " " + lightButton.isSelected()); + } + }; + chanButton.addActionListener(alType); + hazButton.addActionListener(alType); + specButton.addActionListener(alType); + lightButton.addActionListener(alType); } return oseamPanel; } - private JButton getChanButton() { + private JRadioButton getChanButton() { if (chanButton == null) { - chanButton = new JButton(); - chanButton.setBounds(new Rectangle(5, 5, 50, 50)); - chanButton.setText(""); - chanButton.setIcon(new ImageIcon(getClass().getResource( + chanButton = new JRadioButton(new ImageIcon(getClass().getResource( Messages.getString("ChanButton")))); + chanButton.setBounds(new Rectangle(5, 0, 105, 40)); + chanButton.setBorderPainted(true); chanButton.setToolTipText(Messages.getString("ChanTip")); - chanButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - /* - * panelLimits.setVisible(false); - * panelServices.setVisible(false); - * panelEnv.setVisible(false); - * panelRelations.setVisible(false); - * panelGeneral.setVisible(true); - */} - }); } return chanButton; } - private JButton getHazButton() { + private JRadioButton getHazButton() { if (hazButton == null) { - hazButton = new JButton(); - hazButton.setBounds(new Rectangle(60, 5, 50, 50)); - hazButton.setText(""); - hazButton.setIcon(new ImageIcon(getClass().getResource( + hazButton = new JRadioButton(new ImageIcon(getClass().getResource( Messages.getString("HazButton")))); + hazButton.setBounds(new Rectangle(5, 40, 105, 40)); + hazButton.setBorderPainted(true); hazButton.setToolTipText(Messages.getString("HazTip")); - hazButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - /* - * panelLimits.setVisible(false); - * panelServices.setVisible(false); - * panelEnv.setVisible(false); - * panelRelations.setVisible(false); - * panelGeneral.setVisible(true); - */} - }); } return hazButton; } - private JButton getSpecButton() { + private JRadioButton getSpecButton() { if (specButton == null) { - specButton = new JButton(); - specButton.setBounds(new Rectangle(115, 5, 50, 50)); - specButton.setText(""); - specButton.setIcon(new ImageIcon(getClass().getResource( + specButton = new JRadioButton(new ImageIcon(getClass().getResource( Messages.getString("SpecButton")))); + specButton.setBounds(new Rectangle(5, 80, 105, 40)); + specButton.setBorderPainted(true); specButton.setToolTipText(Messages.getString("SpecTip")); - specButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - /* - * panelLimits.setVisible(false); - * panelServices.setVisible(false); - * panelEnv.setVisible(false); - * panelRelations.setVisible(false); - * panelGeneral.setVisible(true); - */} - }); } return specButton; } - private JButton getLightButton() { + private JRadioButton getLightButton() { if (lightButton == null) { - lightButton = new JButton(); - lightButton.setBounds(new Rectangle(170, 5, 50, 50)); - lightButton.setText(""); - lightButton.setIcon(new ImageIcon(getClass().getResource( + lightButton = new JRadioButton(new ImageIcon(getClass().getResource( Messages.getString("LightsButton")))); + lightButton.setBounds(new Rectangle(5, 120, 105, 40)); + lightButton.setBorderPainted(true); lightButton.setToolTipText(Messages.getString("LightsTip")); - lightButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - /* - * panelLimits.setVisible(false); - * panelServices.setVisible(false); - * panelEnv.setVisible(false); - * panelRelations.setVisible(false); - * panelGeneral.setVisible(true); - */} - }); } return lightButton;