Changeset 4976 in josm for trunk/src/org

Timestamp:

2012-02-18T01:17:18+01:00 (13 years ago)

Author:

Don-vip

Message:

fix #7396 - no scroll bar in remote control and audio preferences dialogs

Location:

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

Files:

• AudioPreference.java (modified) (3 diffs)
• DefaultTabPreferenceSetting.java (modified) (2 diffs)
• RemoteControlPreference.java (modified) (2 diffs)
• ValidatorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GridBagLayout;
+
 import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.PreferencePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -54 +56 @@
 
     public void addGui(PreferenceTabbedPane gui) {
-        PreferencePanel audio = gui.createPreferenceTab(this);
+        JPanel audio = new JPanel(new GridBagLayout());
         
         // audioMenuVisible
@@ -119 +121 @@
 
         audio.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
+
+        createPreferenceTabWithScrollPane(gui, audio);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.preferences;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+import org.openstreetmap.josm.tools.GBC;
 
 public abstract class DefaultTabPreferenceSetting extends DefaultPreferenceSetting implements TabPreferenceSetting {
@@ -46 +51 @@
         return title;
     }
+    
+    protected final void createPreferenceTabWithScrollPane(PreferenceTabbedPane gui, JPanel panel) {
+        GBC a = GBC.eol().insets(-5,0,0,0);
+        a.anchor = GBC.EAST;
+        
+        JScrollPane scrollPane = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setBorder(null);
+
+        JPanel tab = gui.createPreferenceTab(this);
+        tab.add(scrollPane, GBC.eol().fill(GBC.BOTH));
+        tab.add(GBC.glue(0,10), a);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java

@@ -61 +61 @@
     public void addGui(final PreferenceTabbedPane gui) {
 
-        JPanel remote = gui.createPreferenceTab(this);
+        JPanel remote = new JPanel(new GridBagLayout());
 
         remote.add(enableRemoteControl = new JCheckBox(tr("Enable remote control"), RemoteControl.PROP_REMOTECONTROL_ENABLED.get()), GBC.eol());
@@ -123 +123 @@
         enableRemoteControl.addActionListener(remoteControlEnabled);
         remoteControlEnabled.actionPerformed(null);
+        createPreferenceTabWithScrollPane(gui, remote);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java

@@ -13 +13 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.Main;
@@ -114 +113 @@
         }
 
-        JScrollPane testPane = new JScrollPane(testPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        testPane.setBorder(null);
-
-        JPanel tab = gui.createPreferenceTab(this);
-        tab.add(testPane, GBC.eol().fill(GBC.BOTH));
-        tab.add(GBC.glue(0,10), a);
+        createPreferenceTabWithScrollPane(gui, testPanel);
     }