Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display

Timestamp:

2012-08-11T23:03:55+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7917 - Control the number of items displayed at once in all comboboxes (20 by default, configurable with gui.combobox.maximum-row-count)

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/display

Files:

• GPXSettingsPanel.java (modified) (6 diffs)
• LafPreference.java (modified) (4 diffs)
• LanguagePreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -13 +13 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -27 +26 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker.TemplateEntryProperty;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
@@ -58 +58 @@
     private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
     private JRadioButton colorTypeGlobal  = new JRadioButton(tr("Use global settings"));
-    private JComboBox colorTypeVelocityTune = new JComboBox(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
+    private JosmComboBox colorTypeVelocityTune = new JosmComboBox(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
     private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX"));
     private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
@@ -64 +64 @@
     private JTextField drawGpsArrowsMinDist = new JTextField(8);
     private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
-    private JComboBox waypointLabel = new JComboBox(LABEL_PATTERN_DESC);
+    private JosmComboBox waypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
     private JTextField waypointLabelPattern = new JTextField();
-    private JComboBox audioWaypointLabel = new JComboBox(LABEL_PATTERN_DESC);
+    private JosmComboBox audioWaypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
     private JTextField audioWaypointLabelPattern = new JTextField();
 
@@ -414 +414 @@
     }
 
-    private void updateWaypointLabelCombobox(JComboBox cb, JTextField tf, TemplateEntryProperty property) {
+    private void updateWaypointLabelCombobox(JosmComboBox cb, JTextField tf, TemplateEntryProperty property) {
         String labelPattern = property.getAsString();
         boolean found = false;
@@ -431 +431 @@
     }
 
-    private void updateWaypointPattern(JComboBox cb, JTextField tf) {
+    private void updateWaypointPattern(JosmComboBox cb, JTextField tf) {
         if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
             tf.setEnabled(true);

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -11 +11 @@
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -27 +26 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -40 +40 @@
      * ComboBox with all look and feels.
      */
-    private JComboBox lafCombo;
+    private JosmComboBox lafCombo;
     public JPanel panel;
     private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
@@ -49 +49 @@
 
     public void addGui(PreferenceTabbedPane gui) {
-        lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
+        lafCombo = new JosmComboBox(UIManager.getInstalledLookAndFeels());
 
         // let's try to load additional LookAndFeels and put them into the list

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -13 +13 @@
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -25 +24 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -36 +36 @@
 
     /** the combo box with the available locales */
-    private JComboBox langCombo;
+    private JosmComboBox langCombo;
     /** the model for the combo box */
     private LanguageComboBoxModel model;
@@ -45 +45 @@
         // See http://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui 
         model.selectLanguage(Main.pref.get("language"));
-        langCombo = new JComboBox(model);
+        langCombo = new JosmComboBox(model);
         langCombo.setRenderer(new LanguageCellRenderer(langCombo.getRenderer()));