Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java (revision 20666) @@ -11,6 +11,8 @@ import javax.swing.JScrollPane; +import org.openstreetmap.josm.data.Preferences; import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel; import org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; import org.openstreetmap.josm.tools.CheckParameterUtil; @@ -140,3 +142,13 @@ } } + + /** + * Initializes the set of icons used from the preference key + * {@see PreferenceKeys#ROAD_SIGNS}. + * + * @param prefs the JOSM preferences + */ + public void initIconSetFromPreferences(Preferences prefs){ + cbTurnRestrictions.initIconSetFromPreferences(prefs); + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBox.java (revision 20666) @@ -2,4 +2,7 @@ import javax.swing.JComboBox; + +import org.openstreetmap.josm.data.Preferences; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; /** * A combo box for selecting a turn restriction type. @@ -26,3 +29,15 @@ return (TurnRestrictionComboBoxModel)getModel(); } + + /** + * Initializes the set of icons used from the preference key + * {@see PreferenceKeys#ROAD_SIGNS}. + * + * @param prefs the JOSM preferences + */ + public void initIconSetFromPreferences(Preferences prefs){ + TurnRestrictionTypeRenderer renderer = (TurnRestrictionTypeRenderer)getRenderer(); + renderer.initIconSetFromPreferences(prefs); + repaint(); + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java (revision 20666) @@ -39,4 +39,6 @@ import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.ConflictAddCommand; +import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; +import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; import org.openstreetmap.josm.data.conflict.Conflict; import org.openstreetmap.josm.data.osm.Relation; @@ -50,4 +52,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; import org.openstreetmap.josm.plugins.turnrestrictions.qa.IssuesView; import org.openstreetmap.josm.tools.CheckParameterUtil; @@ -88,4 +91,5 @@ private TurnRestrictionEditorModel editorModel; private JTabbedPane tpEditors; + private PreferenceChangeHandler preferenceChangeHandler; /** @@ -202,5 +206,5 @@ editorModel.getIssuesModel().addObserver(new IssuesModelObserver()); - setSize(600,600); + setSize(600,600); } @@ -335,7 +339,10 @@ pnlJosmSelection.wireListeners(); editorModel.registerAsEventListener(); + Main.pref.addPreferenceChangeListener(this.preferenceChangeHandler = new PreferenceChangeHandler()); + pnlBasicEditor.initIconSetFromPreferences(Main.pref); } else if (!visible && isVisible()) { pnlJosmSelection.unwireListeners(); editorModel.unregisterAsEventListener(); + Main.pref.removePreferenceChangeListener(preferenceChangeHandler); } super.setVisible(visible); @@ -857,3 +864,19 @@ } } + + /** + * Listens the changes of the preference {@see PreferenceKeys#ROAD_SIGNS} + * and refreshes the set of road icons + * + */ + class PreferenceChangeHandler implements PreferenceChangedListener { + public void refreshIconSet() { + pnlBasicEditor.initIconSetFromPreferences(Main.pref); + } + + public void preferenceChanged(PreferenceChangeEvent evt) { + if (!evt.getKey().equals(PreferenceKeys.ROAD_SIGNS)) return; + refreshIconSet(); + } + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java (revision 20666) @@ -12,4 +12,6 @@ import javax.swing.UIManager; +import org.openstreetmap.josm.data.Preferences; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; import org.openstreetmap.josm.tools.ImageProvider; import static org.openstreetmap.josm.tools.I18n.tr; @@ -19,4 +21,5 @@ final private Map icons = new HashMap(); + private String iconSet = "set-a"; /** @@ -26,5 +29,5 @@ for(TurnRestrictionType type: TurnRestrictionType.values()) { try { - ImageIcon icon = new ImageIcon(ImageProvider.get("types/set-a", type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH)); + ImageIcon icon = new ImageIcon(ImageProvider.get("types/" + iconSet, type.getTagValue()).getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH)); icons.put(type,icon); } catch(Exception e){ @@ -50,4 +53,19 @@ } + /** + * Initializes the set of icons used from the preference key + * {@see PreferenceKeys#ROAD_SIGNS}. + * + * @param prefs the JOSM preferences + */ + public void initIconSetFromPreferences(Preferences prefs){ + iconSet = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a"); + iconSet = iconSet.trim().toLowerCase(); + if (!iconSet.equals("set-a") && !iconSet.equals("set-b")) { + iconSet = "set-a"; + } + loadImages(); + } + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/AbstractTurnRestrictionsListView.java (revision 20666) @@ -4,4 +4,6 @@ import javax.swing.JPanel; import javax.swing.event.ListSelectionListener; + +import org.openstreetmap.josm.data.Preferences; /** @@ -31,4 +33,8 @@ lstTurnRestrictions.addListSelectionListener(listener); } - + + public void initIconSetFromPreferences(Preferences prefs){ + TurnRestrictionCellRenderer renderer = (TurnRestrictionCellRenderer)lstTurnRestrictions.getCellRenderer(); + renderer.initIconSetFromPreferences(prefs); + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java (revision 20666) @@ -22,4 +22,5 @@ import javax.swing.table.TableCellRenderer; +import org.openstreetmap.josm.data.Preferences; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.Relation; @@ -28,4 +29,5 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter; import org.openstreetmap.josm.gui.JMultilineLabel; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; import org.openstreetmap.josm.tools.ImageProvider; import static org.openstreetmap.josm.tools.I18n.trc; @@ -58,4 +60,5 @@ private JLabel from; private JLabel to; + private String iconSet = "set-a"; public TurnRestrictionCellRenderer() { @@ -84,5 +87,5 @@ */ protected String buildImageName(String restrictionType) { - return "types/set-a/" + restrictionType; + return "types/" + iconSet + "/" + restrictionType; } @@ -214,4 +217,19 @@ } + /** + * Initializes the set of icons used from the preference key + * {@see PreferenceKeys#ROAD_SIGNS}. + * + * @param prefs the JOSM preferences + */ + public void initIconSetFromPreferences(Preferences prefs){ + + iconSet = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a"); + iconSet = iconSet.trim().toLowerCase(); + if (!iconSet.equals("set-a") && !iconSet.equals("set-b")) { + iconSet = "set-a"; + } + } + /* ---------------------------------------------------------------------------------- */ /* interface ListCellRenderer */ Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 20666) @@ -12,4 +12,5 @@ import java.util.HashSet; import java.util.List; +import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -23,4 +24,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.AutoScaleAction; +import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; +import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Relation; @@ -30,5 +33,4 @@ import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; -import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; @@ -36,4 +38,5 @@ import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditor; import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditorManager; +import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceKeys; import org.openstreetmap.josm.tools.ImageProvider; @@ -48,4 +51,5 @@ */ public class TurnRestrictionsListDialog extends ToggleDialog{ + private static final Logger logger = Logger.getLogger(TurnRestrictionsListDialog.class.getName()); /** checkbox for switching between the two list views */ @@ -68,4 +72,5 @@ /** the main content panel in this toggle dialog */ private JPanel pnlContent; + private PreferenceChangeHandler preferenceChangeHandler; @Override @@ -75,4 +80,6 @@ MapView.addEditLayerChangeListener(actNew); actNew.updateEnabledState(); + Main.pref.addPreferenceChangeListener(preferenceChangeHandler); + preferenceChangeHandler.refreshIconSet(); } @@ -82,4 +89,5 @@ pnlTurnRestrictionsInSelection.unregisterAsListener(); MapView.removeEditLayerChangeListener(actNew); + Main.pref.removePreferenceChangeListener(preferenceChangeHandler); } @@ -141,4 +149,7 @@ pnlTurnRestrictionsInDataSet.getList().addMouseListener(launcher); pnlTurnRestrictionsInSelection.getList().addMouseListener(launcher); + + preferenceChangeHandler = new PreferenceChangeHandler(); + } @@ -429,3 +440,21 @@ } } + + /** + * Listens the changes of the preference {@see PreferenceKeys#ROAD_SIGNS} + * and refreshes the set of road icons + * + */ + class PreferenceChangeHandler implements PreferenceChangedListener { + public void refreshIconSet() { + pnlTurnRestrictionsInDataSet.initIconSetFromPreferences(Main.pref); + pnlTurnRestrictionsInSelection.initIconSetFromPreferences(Main.pref); + repaint(); + } + + public void preferenceChanged(PreferenceChangeEvent evt) { + if (!evt.getKey().equals(PreferenceKeys.ROAD_SIGNS)) return; + refreshIconSet(); + } + } } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/IconPreferencePanel.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/IconPreferencePanel.java (revision 20666) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/IconPreferencePanel.java (revision 20666) @@ -0,0 +1,182 @@ +package org.openstreetmap.josm.plugins.turnrestrictions.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.logging.Logger; + + +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; + +import org.openstreetmap.josm.data.Preferences; +import org.openstreetmap.josm.gui.widgets.HtmlPanel; +import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel; +import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionType; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * IconPreferencePanel allows to configure a set of road sign icons to be + * used in the turnrestrictions plugin. + * + */ +public class IconPreferencePanel extends VerticallyScrollablePanel { + private static final Logger logger = Logger.getLogger(IconPreferencePanel.class.getName()); + private JRadioButton rbSetA; + private JRadioButton rbSetB; + private ButtonGroup bgIconSet; + + /** + * Builds the panel for the icon set "set-a" + * + * @return + */ + protected JPanel buildSetAPanel() { + JPanel pnl = new JPanel(new GridBagLayout());; + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + gc.gridx = 0; + gc.gridy = 0; + + pnl.add(rbSetA = new JRadioButton(tr("Road signs - Set A")),gc); + + JPanel icons = new JPanel(new FlowLayout(FlowLayout.LEFT)); + for (TurnRestrictionType type: TurnRestrictionType.values()){ + JLabel lbl = new JLabel(); + icons.add(lbl); + lbl.setIcon(ImageProvider.get("types/set-a",type.getTagValue())); + } + + gc.gridy = 1; + gc.insets = new Insets(0,20,0,0); + pnl.add(icons, gc); + return pnl; + } + + /** + * Builds the panel for the icon set "set-b" + * + * @return + */ + protected JPanel buildSetBPanel() { + JPanel pnl = new JPanel(new GridBagLayout());; + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + gc.gridx = 0; + gc.gridy = 0; + + pnl.add(rbSetB = new JRadioButton(tr("Road signs - Set B")),gc); + + JPanel icons = new JPanel(new FlowLayout(FlowLayout.LEFT)); + for (TurnRestrictionType type: TurnRestrictionType.values()){ + JLabel lbl = new JLabel(); + icons.add(lbl); + lbl.setIcon(ImageProvider.get("types/set-b",type.getTagValue())); + } + + gc.gridy = 1; + gc.insets = new Insets(0,20,0,0); + pnl.add(icons, gc); + return pnl; + } + + /** + * Builds the message panel at the top + * + * @return + */ + protected JPanel buildMessagePanel() { + HtmlPanel pnl = new HtmlPanel(); + pnl.setText( + "" + + tr("Please select the set of road sign icons to be used in the plugin.") + + "" + ); + return pnl; + } + + /** + * Builds the UI + * + * @return + */ + protected void build() { + setLayout(new GridBagLayout()); + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + gc.gridx = 0; + gc.gridy = 0; + + add(buildMessagePanel(), gc); + gc.gridy++; + add(buildSetAPanel(), gc); + gc.gridy++; + add(buildSetBPanel(), gc); + + // filler - just grab remaining space + gc.gridy++; + gc.fill = GridBagConstraints.BOTH; + gc.weighty = 1.0; + add(new JPanel(), gc); + + bgIconSet = new ButtonGroup(); + bgIconSet.add(rbSetA); + bgIconSet.add(rbSetB); + + setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + } + + /** + * Initializes the UI from the current settings in the JOSM preferences + * {@code prefs} + * + * @param prefs the preferences + */ + public void initFromPreferences(Preferences prefs){ + String set = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a"); + set = set.trim().toLowerCase(); + if (! set.equals("set-a") && ! set.equals("set-b")) { + System.out.println(tr("Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. Assuming the default value ''set-a''.", PreferenceKeys.ROAD_SIGNS, set)); + set = "set-a"; + } + if (set.equals("set-a")){ + rbSetA.setSelected(true); + } else { + rbSetB.setSelected(true); + } + } + + /** + * Saves the current settings to the JOSM preferences {@code prefs}. + * + * @param prefs the preferences + */ + public void saveToPreferences(Preferences prefs){ + String set = null; + if (rbSetA.isSelected()){ + set = "set-a"; + } else { + set = "set-b"; + } + String oldSet = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a"); + if (!set.equals(oldSet)){ + prefs.put(PreferenceKeys.ROAD_SIGNS, set); + } + } + + public IconPreferencePanel() { + build(); + } +} Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java (revision 20665) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java (revision 20666) @@ -13,8 +13,10 @@ import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.preferences.PreferenceSetting; import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; @@ -29,4 +31,6 @@ */ public class PreferenceEditor extends JPanel implements PreferenceSetting{ + + private IconPreferencePanel pnlIconPreferences; /** @@ -70,10 +74,26 @@ } + protected JPanel buildIconPreferencePanel() { + JPanel pnl = new JPanel(new BorderLayout()); + + pnlIconPreferences = new IconPreferencePanel(); + pnlIconPreferences.initFromPreferences(Main.pref); + + JScrollPane sp = new JScrollPane(pnlIconPreferences); + sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + + pnl.add(sp, BorderLayout.CENTER); + return pnl; + } protected void build() { setLayout(new BorderLayout()); JTabbedPane tp = new JTabbedPane(); - tp.add(buildCreditPanel()); - tp.setTitleAt(0, tr("Sponsor")); + tp.add(buildIconPreferencePanel()); + tp.add(buildCreditPanel()); + tp.setTitleAt(0, tr("Road Signs")); + tp.setToolTipTextAt(0,tr("Configure the set of road sign icons to be used in the turnrestrictions plugin")); + tp.setTitleAt(1, tr("Sponsor")); add(tp, BorderLayout.CENTER); } @@ -90,4 +110,5 @@ public boolean ok() { + pnlIconPreferences.saveToPreferences(Main.pref); return false; } Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceKeys.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceKeys.java (revision 20666) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceKeys.java (revision 20666) @@ -0,0 +1,19 @@ +package org.openstreetmap.josm.plugins.turnrestrictions.preferences; + +/** + * Defines the preference keys used for preferences of the turnrestrictions + * plugin + * + */ +public interface PreferenceKeys { + /** + * Indicates which of two sets of road sign icons to use. Supported + * values are: + * + * + */ + String ROAD_SIGNS = "turnrestrictions.road-signs"; +}