Changeset 23013 in osm for applications/editors/josm/plugins/toms

Timestamp:

2010-09-06T16:14:10+02:00 (14 years ago)

Author:

malcolmh

Message:

invisibility

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (2 diffs)
• msg/messages_de.properties (modified) (1 diff)
• msg/messages_en.properties (modified) (1 diff)
• seamarks/buoys/BuoyCard.java (modified) (1 diff)
• seamarks/buoys/BuoyIsol.java (modified) (1 diff)
• seamarks/buoys/BuoyLat.java (modified) (1 diff)
• seamarks/buoys/BuoySaw.java (modified) (1 diff)
• seamarks/buoys/BuoySpec.java (modified) (3 diffs)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -791 +791 @@
                                                 if (!(buoy instanceof BuoySpec)) {
                                                         buoy = new BuoySpec(dia, n);
+                                                        cbM01TopMark.removeAllItems();
+                                                        cbM01TopMark.addItem("");
+                                                        cbM01TopMark.addItem(Messages.getString("SmpDialogAction.210")); //$NON-NLS-1$
+                                                        cbM01TopMark.addItem(Messages.getString("SmpDialogAction.211")); //$NON-NLS-1$
                                                 }
                                                 buoy.setBuoyIndex(type);
@@ -921 +925 @@
                 if (cbM01TopMark == null) {
                         cbM01TopMark = new JComboBox();
-                        cbM01TopMark.setBounds(new Rectangle(100, 170, 70, 20));
+                        cbM01TopMark.setBounds(new Rectangle(110, 170, 80, 20));
                         cbM01TopMark.setFont(new Font("Dialog", Font.PLAIN, 12)); //$NON-NLS-1$
                         cbM01TopMark.addActionListener(new ActionListener() {

applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties

@@ -67 +67 @@
 SmpDialogAction.208=Minor Light
 SmpDialogAction.209=Light Float
+SmpDialogAction.210=Yellow X
+SmpDialogAction.211=Red X
 

applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties

@@ -72 +72 @@
 SmpDialogAction.208=Minor Light
 SmpDialogAction.209=Light Float
+SmpDialogAction.210=Yellow X
+SmpDialogAction.211=Red X

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java

@@ -197 +197 @@
 
                 dlg.cM01TopMark.setSelected(true);
+                dlg.cM01TopMark.setVisible(true);
                 dlg.cM01TopMark.setEnabled(false);
                 dlg.cM01Fired.setEnabled(true);
+                dlg.cM01Fired.setVisible(true);
 
                 String image = "/images/Cardinal";

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java

@@ -113 +113 @@
                 dlg.tfM01Name.setEnabled(true);
                 dlg.tfM01Name.setText(getName());
+                dlg.cM01TopMark.setEnabled(false);
+                dlg.cM01TopMark.setVisible(false);
                 dlg.cM01Fired.setEnabled(true);
-                dlg.cM01TopMark.setEnabled(false);
 
                 String image = "/images/Cardinal";

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java

@@ -352 +352 @@
                 dlg.tfM01Name.setEnabled(true);
                 dlg.tfM01Name.setText(getName());
+                dlg.cM01TopMark.setEnabled(true);
+                dlg.cM01TopMark.setVisible(true);
                 dlg.cM01Fired.setEnabled(true);
-                dlg.cM01TopMark.setEnabled(true);
 
                 String image = "/images/Lateral";

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java

@@ -110 +110 @@
                 dlg.tfM01Name.setEnabled(true);
                 dlg.tfM01Name.setText(getName());
+                dlg.cM01TopMark.setEnabled(true);
+                dlg.cM01TopMark.setVisible(true);
                 dlg.cM01Fired.setEnabled(true);
-                dlg.cM01TopMark.setEnabled(true);
 
                 String image = "/images/Safe_Water";

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java

@@ -23 +23 @@
                 keys = node.getKeys();
                 setNode(node);
-                
+
                 resetMask();
 
@@ -147 +147 @@
                 dlg.tfM01Name.setEnabled(true);
                 dlg.tfM01Name.setText(getName());
+                dlg.cM01TopMark.setEnabled(true);
+                dlg.cM01TopMark.setVisible(true);
+                if (hasTopMark()) {
+                        dlg.cbM01TopMark.setEnabled(true);
+                        dlg.cbM01TopMark.setVisible(true);
+                } else
+                        dlg.cbM01TopMark.setVisible(false);
 
                 String image = "/images/Special_Purpose";
@@ -182 +189 @@
 
                         if (isFired()) {
-                                dlg.lM01Icon02.setIcon(new ImageIcon(getClass().getResource("/images/Light_White_120.png")));
+                                dlg.lM01Icon02.setIcon(new ImageIcon(getClass().getResource(
+                                                "/images/Light_White_120.png")));
                                 if (getLightChar() != "") {
                                         String c;