Index: plications/editors/josm/plugins/smed/plugs/oseam/src/images/NoTopButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoTopButton.svg (revision 26572) +++ (revision ) @@ -1,5576 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoneButton.svg =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoneButton.svg (revision 26573) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoneButton.svg (revision 26573) @@ -0,0 +1,5576 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties (revision 26573) @@ -88,16 +88,18 @@ Range=Range Category=Category +SSCategory=Signal Station +UKCategory=Unknown Category NoneSpecified=None specified Vert2=Vertically disposed x2 Visibility=Visibility -Intensified=intensified -Unintensified=unintensified +Intensified=Intensified +Unintensified=Unintensified PartiallyObscured=Partially obscured Orientation=Orientation Exhibition=Exhibition 24h=24h -Day=day -Night=night -Fog=fog +Day=Day +Night=Night +Fog=Fog NoColour=No colour @@ -111,2 +113,10 @@ Violet=Violet Black=Black +Grey=Grey +Brown=Brown +Magenta=Magenta +Pink=Pink + +Lock=Lock +Storm=Storm + Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java (revision 26573) @@ -111,6 +111,8 @@ button.setBorderPainted(false); } - if (dlg.mark != null) + if (dlg.mark != null) { + dlg.panelMain.moreButton.setVisible(true); dlg.mark.paintSign(); + } } }; Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (revision 26573) @@ -62,6 +62,8 @@ warningCatBox.setVisible(false); } - if (dlg.mark != null) + if (dlg.mark != null) { + dlg.panelMain.moreButton.setVisible(true); dlg.mark.paintSign(); + } } }; @@ -87,5 +89,5 @@ this.add(trafficCatBox, null); trafficCatBox.addActionListener(alTrafficCatBox); - trafficCatBox.addItem(Messages.getString("NoneSpecified")); + trafficCatBox.addItem(Messages.getString("UKCategory")); trafficCatBox.addItem(Messages.getString("Lock")); trafficCatBox.setVisible(false); @@ -95,5 +97,5 @@ this.add(warningCatBox, null); warningCatBox.addActionListener(alWarningCatBox); - warningCatBox.addItem(Messages.getString("NoneSpecified")); + warningCatBox.addItem(Messages.getString("UKCategory")); warningCatBox.addItem(Messages.getString("Storm")); warningCatBox.setVisible(false); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java (revision 26573) @@ -23,5 +23,5 @@ private JButton saveButton = null; private ActionListener alSave = null; - private JButton moreButton = null; + public JButton moreButton = null; private ActionListener alMore = null; public ButtonGroup typeButtons = null; @@ -103,4 +103,5 @@ this.add(panelSpec, null); this.add(panelLights, null); + this.add(panelMore, null); this.add(panelTop, null); this.add(panelFog, null); @@ -304,4 +305,5 @@ public void clearSelections() { typeButtons.clearSelection(); + moreButton.setVisible(false); alType.actionPerformed(null); nameBox.setText(""); Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java (revision 26573) @@ -89,6 +89,8 @@ button.setBorderPainted(false); } - if (dlg.mark != null) + if (dlg.mark != null) { + dlg.panelMain.moreButton.setVisible(true); dlg.mark.paintSign(); + } } }; Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java (revision 26573) @@ -51,6 +51,8 @@ button.setBorderPainted(false); } - if (dlg.mark != null) + if (dlg.mark != null) { + dlg.panelMain.moreButton.setVisible(true); dlg.mark.paintSign(); + } } }; Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java (revision 26573) @@ -89,6 +89,8 @@ button.setBorderPainted(false); } - if (dlg.mark != null) + if (dlg.mark != null) { + dlg.panelMain.moreButton.setVisible(true); dlg.mark.paintSign(); + } } }; Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java =================================================================== --- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 26572) +++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java (revision 26573) @@ -15,5 +15,5 @@ public PanelCol panelCol = null; private ButtonGroup topButtons = new ButtonGroup(); - public JRadioButton noTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NoTopButton.png"))); + public JRadioButton noTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/NoneButton.png"))); public JRadioButton canTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CanTopButton.png"))); public JRadioButton coneTopButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/ConeTopButton.png")));