Changeset 20648 in osm

Timestamp:

2010-03-24T19:23:18+01:00 (15 years ago)

Author:

guggis

Message:

Added a second set of road signs

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• images/types/set-a (added)
• images/types/set-a/no_left_turn.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/no_left_turn.png )
• images/types/set-a/no_right_turn.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/no_right_turn.png )
• images/types/set-a/no_straight_on.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/no_straight_on.png )
• images/types/set-a/no_u_turn.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/no_u_turn.png )
• images/types/set-a/only_left_turn.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/only_left_turn.png )
• images/types/set-a/only_right_turn.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/only_right_turn.png )
• images/types/set-a/only_straight_on.png (moved) (moved from applications/editors/josm/plugins/turnrestrictions/images/types/only_straight_on.png )
• images/types/set-b (added)
• images/types/set-b/no_left_turn.png (added)
• images/types/set-b/no_right_turn.png (added)
• images/types/set-b/no_straight_on.png (added)
• images/types/set-b/no_u_turn.png (added)
• images/types/set-b/only_left_turn.png (added)
• images/types/set-b/only_right_turn.png (added)
• images/types/set-b/only_straight_on.png (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java

@@ -26 +26 @@
                 for(TurnRestrictionType type: TurnRestrictionType.values()) {
                         try {
-                                ImageIcon icon = new ImageIcon(ImageProvider.get("types", type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
+                                ImageIcon icon = new ImageIcon(ImageProvider.get("types/set-a", type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
                                 icons.put(type,icon);
                         } catch(Exception e){

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java

@@ -80 +80 @@
                 cbPsv.addItemListener(changeHandler);
                 lbl = new JLabel();
-                lbl.setText(tr("Public Service Vehicle"));
+                lbl.setText(tr("Public Service Vehicles"));
                 lbl.setToolTipText(tr("Public service vehicles like buses, tramways, etc."));
                 lbl.setIcon(ImageProvider.get("vehicle", "psv"));

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java

@@ -84 +84 @@
          */
         protected String buildImageName(String restrictionType) {
-                return "types/" + restrictionType;
+                return "types/set-a/" + restrictionType;
         }
         

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -74 +74 @@
                 pnlTurnRestrictionsInSelection.registerAsListener();
                 MapView.addEditLayerChangeListener(actNew);
+                actNew.updateEnabledState();
         }
 
@@ -318 +319 @@
         }
 
-        protected void updateEnabledState() {
+        public void updateEnabledState() {
             setEnabled(Main.main != null && Main.main.getEditLayer() != null);
         }