Fixes issue 2383: Prefs dialog is too tall for a 600 high display (most netbooks)

Fixes the cleint being broken

Change-Id: I7d43d97e505077556fa62648610bd464493631dc
Reviewed-on: http://gerrit.dmdirc.com/269
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -22,7 +22,8 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
@@ -117,9 +118,9 @@ public class NickColourPanel extends JPanel implements ActionListener,
         table.setFillsViewportHeight(true);
         table.setDefaultRenderer(Color.class, new ColourRenderer());
 
-        setLayout(new MigLayout("ins 0, fill, h " +
-                SwingPreferencesDialog.CLIENT_HEIGHT));
-        add(scrollPane, "grow, wrap, spanx, hmax 100%");
+        setLayout(new MigLayout("ins 0, fillx, hmax " + ((SwingController) Main.
+                getUI()).getPrefsDialog().getPanelHeight()));
+        add(scrollPane, "grow, push, wrap, spanx");
 
         final JButton addButton = new JButton("Add");
         addButton.addActionListener(this);

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -57,6 +57,7 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
@@ -531,7 +532,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new PluginPanel(me));
+                setObject(new PluginPanel(me, SwingController.this));
             }
         });
     }
@@ -544,7 +545,7 @@ public final class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new UpdateConfigPanel());
+                setObject(new UpdateConfigPanel(SwingController.this));
             }
         });
     }
@@ -643,6 +644,15 @@ public final class SwingController extends Plugin implements UIController {
                 UIManager.getFont("TextPane.font").getSize());
     }
 
+    /**
+     * Returns the preferences dialog instance creating if required.
+     *
+     * @return Swing prefs dialog
+     */
+    public SwingPreferencesDialog getPrefsDialog() {
+        return SwingPreferencesDialog.getSwingPreferencesDialog(me);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -128,9 +128,6 @@ public class TopicBar extends JComponent implements ActionListener,
         //}
         ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
                 new NewlinesDocumentFilter());
-        setAttributes();
-        ((DefaultStyledDocument) topicText.getDocument()).setCharacterAttributes(
-                0, Integer.MAX_VALUE, as, true);
 
         topicText.getActionMap().put("paste-from-clipboard",
                 new NoNewlinesPasteAction());
@@ -209,6 +206,8 @@ public class TopicBar extends JComponent implements ActionListener,
         IdentityManager.getGlobalConfig().addChangeListener(
                 controller.getDomain(), "hideEmptyTopicBar", this);
         setColours();
+        ((DefaultStyledDocument) topicText.getDocument()).setCharacterAttributes(
+                0, Integer.MAX_VALUE, as, true);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/pluginpanel/PluginPanel.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.pluginpanel;
 
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -29,7 +31,6 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DownloaderWindow;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -72,13 +73,17 @@ public final class PluginPanel extends JPanel implements
     private TextLabel blurbLabel;
     /** Parent Window. */
     private Window parentWindow;
+    /** Swing Controller. */
+    private SwingController controller;
 
     /**
      * Creates a new instance of PluginDialog.
      *
      * @param parentWindow Parent window
+     * @param controller Swing Controller
      */
-    public PluginPanel(final Window parentWindow) {
+    public PluginPanel(final Window parentWindow,
+            final SwingController controller) {
         super();
 
         this.parentWindow = parentWindow;
@@ -128,8 +133,14 @@ public final class PluginPanel extends JPanel implements
 
     /** Lays out the dialog. */
     private void layoutComponents() {
-        setLayout(new MigLayout("ins 0, fill, h " +
-                SwingPreferencesDialog.CLIENT_HEIGHT));
+        final int panelHeight;
+        if (controller == null) {
+            panelHeight = ((SwingController) Main.getUI()).getPrefsDialog().
+                    getPanelHeight();
+        } else {
+            panelHeight = controller.getPrefsDialog().getPanelHeight();
+        }
+        setLayout(new MigLayout("ins 0, fill, hmax " + panelHeight));
 
         add(blurbLabel, "wrap 10, growx, pushx");
 
@@ -204,7 +215,8 @@ public final class PluginPanel extends JPanel implements
                 toggleButton.setEnabled(true);
 
                 if (pluginInfo.getState()) {
-                    toggleButton.setEnabled(pluginInfo.getPluginInfo().isUnloadable());
+                    toggleButton.setEnabled(pluginInfo.getPluginInfo().
+                            isUnloadable());
                     toggleButton.setText("Disable");
                 } else {
                     toggleButton.setText("Enable");

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryPanel.java

@@ -33,12 +33,15 @@ import java.awt.Window;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingWorker;
+import net.miginfocom.layout.ComponentWrapper;
+import net.miginfocom.layout.LayoutCallback;
 
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
@@ -66,7 +69,7 @@ public class CategoryPanel extends JPanel {
     /** Active preferences category. */
     private PreferencesCategory category;
     /** Parent window. */
-    private Window parent;
+    private SwingPreferencesDialog parent;
     /** Title label. */
     private TitlePanel title;
     /** Tooltip display area. */
@@ -91,7 +94,7 @@ public class CategoryPanel extends JPanel {
      *
      * @param parent Parent window
      */
-    public CategoryPanel(final Window parent) {
+    public CategoryPanel(final SwingPreferencesDialog parent) {
         this(parent, null);
     }
 
@@ -101,7 +104,7 @@ public class CategoryPanel extends JPanel {
      * @param parent Parent window
      * @param category Initial category
      */
-    public CategoryPanel(final Window parent,
+    public CategoryPanel(final SwingPreferencesDialog parent,
             final PreferencesCategory category) {
         super(new MigLayout("fillx, wrap, ins 0"));
         this.parent = parent;
@@ -129,11 +132,22 @@ public class CategoryPanel extends JPanel {
                 "description, if available.");
 
         add(title, "pushx, growx, h 45!");
-        add(scrollPane, "grow, push, h 425!");
+        add(scrollPane, "grow, push");
         add(tooltip, "pushx, growx, h 65!");
 
         panels.put(null, loading);
         setCategory(category);
+        ((MigLayout) getLayout()).addLayoutCallback(new LayoutCallback() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void correctBounds(final ComponentWrapper cw) {
+                if (cw.getComponent() == scrollPane) {
+                   parent.setPanelHeight((int) (scrollPane.getViewport().
+                           getExtentSize().height * 0.95));
+                }
+            }
+        });
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -64,12 +64,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * serialized objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
-    /**
-     * The maximum height clients may use if they don't want to scroll.
-     *
-     * @since 0.6.3m1
-     */
-    public static final int CLIENT_HEIGHT = 375;
     /** Previously instantiated instance of SwingPreferencesDialog. */
     private static volatile SwingPreferencesDialog me;
     /** Preferences tab list, used to switch option types. */
@@ -84,6 +78,8 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private LoggingSwingWorker worker;
     /** Parent window. */
     private MainFrame parentWindow;
+    /** Panel size. */
+    protected int panelSize = 0;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -189,8 +185,10 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         getOkButton().addActionListener(this);
         getCancelButton().addActionListener(this);
 
-        setLayout(new MigLayout("pack"));
-        add(tabListScrollPane, "w 150!, hmax 545, growy, pushy");
+        final MigLayout layout = new MigLayout("pack, hmin min(80sp, 700), " +
+                "hmax min(700, 80sp)");
+        setLayout(layout);
+        add(tabListScrollPane, "w 150!, growy, pushy");
         add(mainPanel, "wrap, w 480!, pushy, growy, pushy");
         add(getLeftButton(), "span, split, right");
         add(getRightButton(), "right");
@@ -349,6 +347,24 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         tabList.setSelectedIndex(indexToSelect);
     }
 
+    /**
+     * Gets the maximum panel size.
+     *
+     * @return Max panel size
+     */
+    public int getPanelHeight() {
+        return panelSize;
+    }
+
+    /**
+     * Sets the panel size to the specified value.
+     *
+     * @param panelSize New panel size
+     */
+    protected void setPanelHeight(final int panelSize) {
+        this.panelSize = panelSize;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void dispose() {

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -69,11 +71,17 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     private JButton checkNow;
     /** Update channel. */
     private JComboBox updateChannel;
+    /** Swing controller. */
+    private SwingController controller;
 
     /**
      * Instantiates a new update config panel.
+     *
+     * @param controller Swing controller
      */
-    public UpdateConfigPanel() {
+    public UpdateConfigPanel(final SwingController controller) {
+        this.controller = controller;
+        
         initComponents();
         addListeners();
         layoutComponents();
@@ -139,13 +147,13 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * Lays out the components.
      */
     private void layoutComponents() {
-        setLayout(new MigLayout("fillx, ins 0, hmax " +
-                SwingPreferencesDialog.CLIENT_HEIGHT));
+        setLayout(new MigLayout("fill, ins 0, hmax " + controller.
+                getPrefsDialog().getPanelHeight()));
 
         add(new JLabel("Update checking:"), "split");
         add(enable, "growx");
         add(updateChannel, "growx, pushx, wrap");
-        add(scrollPane, "wrap");
+        add(scrollPane, "wrap, grow, push");
         add(checkNow, "right");
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -192,7 +192,6 @@ public final class WindowMenuFrameManager extends JMenu implements
             menu.remove(items.get(window));
             items.remove(window);
             if (menu.getMenuComponentCount() == 1) {
-                System.out.println(getParentMenu(parent));
                 replaceMenuWithItem(getParentMenu(parent), menus.get(parent),
                         new FrameContainerMenuItem(parent, this));
             }