Changeset 17298 in josm for trunk/src

Timestamp:

2020-11-06T07:14:35+01:00 (4 years ago)

Author:

simon04

Message:

see #7548 - Re-organize the preference dialog (Look and Feel as subtab in display preferences)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (modified) (6 diffs)

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

@@ -16 +16 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JSpinner;
@@ -30 +31 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -46 +49 @@
  * Look-and-feel preferences.
  */
-public class LafPreference extends DefaultTabPreferenceSetting {
+public class LafPreference implements SubPreferenceSetting {
 
     /**
@@ -72 +75 @@
             return new LafPreference();
         }
-    }
-
-    LafPreference() {
-        super(/* ICON(preferences/) */ "display", tr("Look and Feel"), tr("Change the Look and Feel of the program"));
     }
 
@@ -218 +217 @@
         panel.add(spinZoomRatio, GBC.eol());
 
-        panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-
-        createPreferenceTabWithScrollPane(gui, panel);
+        JScrollPane scrollpane = panel.getVerticalScrollPane();
+        scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane);
     }
 
@@ -248 +247 @@
     }
 
+    @Override
+    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
+        return gui.getDisplayPreference();
+    }
+
 }