Hack prefs dialog into working.

For the minute this means the prefs dialog no longer
saves state, it also means there may be some layout
changes with the height loss and parenting change for
sub dialogs launched from preferences settings.

Change-Id: I9c46e6f03920866022cfe063c500f9523a11db6e
Reviewed-on: http://gerrit.dmdirc.com/3071
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -33,14 +33,12 @@ import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -54,7 +52,6 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.URLBuilder;
@@ -473,17 +470,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
                 UIManager.getFont("TextPane.font").getSize());
     }
 
-    /**
-     * Returns the preferences dialog instance creating if required.
-     *
-     * @return Swing prefs dialog
-     * @deprecated Inject the relevant dialog manager instead.
-     */
-    @Deprecated
-    public SwingPreferencesDialog getPrefsDialog() {
-        return swingManager.getPrefsDialogProvider().get();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {

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

@@ -29,11 +29,9 @@ import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialogFactory;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
-import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
@@ -76,8 +74,6 @@ public class SwingManager {
     /** Provider of first run executors. */
     private final Provider<FirstRunWizardExecutor> firstRunExecutor;
 
-    /** Provider of prefs dialogs. */
-    private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
     /** Provider of server settings dialogs. */
     private final KeyedDialogProvider<Server, ServerSettingsDialog> serverSettingsDialogProvider;
     /** Provider of channel settings dialogs. */
@@ -102,7 +98,6 @@ public class SwingManager {
      * @param ctrlTabManager The window manager that handles ctrl+tab behaviour.
      * @param dialogKeyListener The key listener that supports dialogs.
      * @param firstRunExecutor A provider of first run executors.
-     * @param prefsDialogProvider Provider of prefs dialogs.
      * @param serverSettingsDialogProvider Provider of server settings dialogs.
      * @param channelSettingsDialogProvider Provider of channel settings dialogs.
      * @param feedbackNagProvider Provider of feedback nags.
@@ -120,7 +115,6 @@ public class SwingManager {
             final CtrlTabWindowManager ctrlTabManager,
             final DialogKeyListener dialogKeyListener,
             final Provider<FirstRunWizardExecutor> firstRunExecutor,
-            final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
             final KeyedDialogProvider<Server, ServerSettingsDialog> serverSettingsDialogProvider,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> channelSettingsDialogProvider,
             final Provider<FeedbackNag> feedbackNagProvider,
@@ -132,7 +126,6 @@ public class SwingManager {
         this.statusBarManager = statusBarManager;
         this.dialogKeyListener = dialogKeyListener;
         this.firstRunExecutor = firstRunExecutor;
-        this.prefsDialogProvider = prefsDialogProvider;
         this.serverSettingsDialogProvider = serverSettingsDialogProvider;
         this.channelSettingsDialogProvider = channelSettingsDialogProvider;
         this.feedbackNagProvider = feedbackNagProvider;
@@ -178,11 +171,6 @@ public class SwingManager {
         return firstRunExecutor.get();
     }
 
-    @Deprecated
-    public DialogProvider<SwingPreferencesDialog> getPrefsDialogProvider() {
-        return prefsDialogProvider;
-    }
-
     @Deprecated
     public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider() {
         return serverSettingsDialogProvider;

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
 import java.awt.Window;
@@ -57,8 +56,6 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
     private static final long serialVersionUID = 3;
     /** List of addons. */
     protected JTable addonList;
-    /** The prefs dialog that contains this panel. */
-    private final SwingPreferencesDialog prefsDialog;
     /** Parent Window. */
     private final Window parentWindow;
     /** The factory to use to produce data loader workers. */
@@ -78,17 +75,12 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * Creates a new instance of AddonPanel
      *
      * @param parentWindow Parent window
-     * @param prefsDialog The prefs dialog that contains this panel
      * @param workerFactory The factory to use to produce data loader workers.
      */
-    public AddonPanel(
-            final Window parentWindow,
-            final SwingPreferencesDialog prefsDialog,
-            final DataLoaderWorkerFactory workerFactory) {
+    public AddonPanel(final Window parentWindow, final DataLoaderWorkerFactory workerFactory) {
         super();
 
         this.parentWindow = parentWindow;
-        this.prefsDialog = prefsDialog;
         this.workerFactory = workerFactory;
 
         initComponents();
@@ -164,7 +156,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
 
     /** Lays out the dialog. */
     private void layoutComponents() {
-        setLayout(new MigLayout("ins 0, fill, hmax " + prefsDialog.getPanelHeight()));
+        setLayout(new MigLayout("ins 0, fill, hmax 500"));
         add(blurbLabel, "wrap 5, growx, pushx");
         add(getMoreLabel, "wrap 5, right");
         add(scrollPane, "wrap 5, grow, push");

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

@@ -29,7 +29,6 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -73,7 +72,6 @@ public class PluginPanel extends AddonPanel implements ActionListener {
      *
      * @param parentWindow Parent window
      * @param pluginManager Manager to retrieve plugins from.
-     * @param prefsDialog The prefs dialog that contains this panel
      * @param workerFactory Factory to use to create data workers.
      * @param iconManager Manager to use to retrieve addon-related icons.
      * @param updateManager Manager to use to retrieve update information.
@@ -83,12 +81,11 @@ public class PluginPanel extends AddonPanel implements ActionListener {
     public PluginPanel(
             final MainFrame parentWindow,
             final PluginManager pluginManager,
-            final SwingPreferencesDialog prefsDialog,
             final DataLoaderWorkerFactory workerFactory,
             @GlobalConfig final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig) {
-        super(parentWindow, prefsDialog, workerFactory);
+        super(parentWindow, workerFactory);
         this.pluginManager = pluginManager;
         this.iconManager = iconManager;
         this.updateManager = updateManager;

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -27,7 +27,6 @@ import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.themes.Theme;
@@ -69,7 +68,6 @@ public class ThemePanel extends AddonPanel {
      *
      * @param parentWindow Parent window
      * @param themeManager Manager to retrieve themes from.
-     * @param prefsDialog The prefs dialog that contains this panel
      * @param workerFactory Factory to use to create data workers.
      * @param iconManager Manager to use to retrieve addon-related icons.
      * @param updateManager Manager to use to retrieve update information.
@@ -79,12 +77,11 @@ public class ThemePanel extends AddonPanel {
     public ThemePanel(
             final MainFrame parentWindow,
             final ThemeManager themeManager,
-            final SwingPreferencesDialog prefsDialog,
             final DataLoaderWorkerFactory workerFactory,
             @GlobalConfig final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig) {
-        super(parentWindow, prefsDialog, workerFactory);
+        super(parentWindow, workerFactory);
         this.themeManager = themeManager;
         this.iconManager = iconManager;
         this.updateManager = updateManager;

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

@@ -33,7 +33,6 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Component;
-import java.awt.Window;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,8 +44,6 @@ import javax.swing.JScrollPane;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 
-import net.miginfocom.layout.ComponentWrapper;
-import net.miginfocom.layout.LayoutCallback;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -58,8 +55,6 @@ public class CategoryPanel extends JPanel {
     private static final long serialVersionUID = -3268284364607758509L;
     /** Active preferences category. */
     private PreferencesCategory category;
-    /** Parent window. */
-    private final SwingPreferencesDialog parent;
     /** Title label. */
     private final TitlePanel title;
     /** Tooltip display area. */
@@ -89,9 +84,8 @@ public class CategoryPanel extends JPanel {
     @Inject
     public CategoryPanel(
             final PrefsComponentFactory factory,
-            @GlobalConfig final IconManager iconManager,
-            final SwingPreferencesDialog parent) {
-        this(factory, parent, iconManager, null);
+            @GlobalConfig final IconManager iconManager) {
+        this(factory, iconManager, null);
     }
 
     /**
@@ -103,11 +97,9 @@ public class CategoryPanel extends JPanel {
      * @param category Initial category
      */
     public CategoryPanel(final PrefsComponentFactory factory,
-            final SwingPreferencesDialog parent,
             final IconManager iconManager,
             final PreferencesCategory category) {
         super(new MigLayout("fillx, wrap, ins 0"));
-        this.parent = parent;
         this.factory = factory;
 
         panels = Collections.synchronizedMap(
@@ -138,27 +130,6 @@ public class CategoryPanel extends JPanel {
 
         panels.put(null, loading);
         setCategory(category);
-        ((MigLayout) getLayout()).addLayoutCallback(new LayoutCallback() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void correctBounds(final ComponentWrapper cw) {
-                if (cw.getComponent() == scrollPane) {
-                    final int newSize = Math.max(parent.getPanelHeight(),
-                            scrollPane.getViewport().getExtentSize().height);
-                    parent.setPanelHeight((int) (newSize * 0.95));
-                }
-            }
-        });
-    }
-
-    /**
-     * Returns this categrory panel's parent window.
-     *
-     * @return Parent window
-     */
-    protected Window getParentWindow() {
-        return parent;
     }
 
     /**

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

@@ -26,9 +26,6 @@ import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
-import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
-import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -197,34 +194,23 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
         final TextLabel label = new TextLabel(setting.getTitle() + ": ", false);
 
-
         final JComponent option = UIUtilities.invokeAndWait(
                 new Callable<JComponent>() {
 
-            /** {@inheritDoc} */
-            @Override
-            public JComponent call() {
-                JComponent option = factory.getComponent(setting);
-                option.setToolTipText(null);
-                return option;
-            }
-        });
+                    /** {@inheritDoc} */
+                    @Override
+                    public JComponent call() {
+                        JComponent option = factory.getComponent(setting);
+                        option.setToolTipText(null);
+                        return option;
+                    }
+                });
 
         categoryPanel.getToolTipPanel().registerTooltipHandler(label,
                 getTooltipText(setting, categoryPanel));
         categoryPanel.getToolTipPanel().registerTooltipHandler(option,
                 getTooltipText(setting, categoryPanel));
 
-
-        if (option instanceof DurationDisplay) {
-            ((DurationDisplay) option).setWindow(categoryPanel.getParentWindow());
-        } else if (option instanceof ColourChooser) {
-            ((ColourChooser) option).setWindow(categoryPanel.getParentWindow());
-        } else if (option instanceof OptionalColourChooser) {
-            ((OptionalColourChooser) option).setWindow(categoryPanel.
-                    getParentWindow());
-        }
-
         if (setting.getType() != PreferencesType.LABEL) {
             if (Apple.isAppleUI()) {
                 panel.add(label, "align right, wmax 40%");

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

@@ -19,10 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -34,6 +34,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -75,31 +76,31 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private final LoggingSwingWorker<PreferencesDialogModel, Void> worker;
     /** Panel size. */
     private int panelSize = 500;
-    /** Swing controller. */
-    @Deprecated
-    private final SwingController controller;
     /** The provider to use for restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
     /** The provider to use to produce a category panel. */
     private final Provider<CategoryPanel> categoryPanelProvider;
+    /** Icon manager to retrieve icons from. */
+    private final IconManager iconManager;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
      *
-     * @param controller The controller which owns this preferences window.
+     * @param mainFrame Main frame to parent dialogs on.
+     * @param iconManager Icon manager used to retrieve images
      * @param restartDialogProvider The provider to use for restart dialogs.
      * @param dialogModelProvider The provider to use to get a dialog model.
      * @param categoryPanelProvider The provider to use to produce a category panel.
      */
     @Inject
     public SwingPreferencesDialog(
-            final SwingController controller,
+            final MainFrame mainFrame, @GlobalConfig final IconManager iconManager,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
             final Provider<CategoryPanel> categoryPanelProvider) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
+        super(mainFrame, ModalityType.MODELESS);
 
-        this.controller = controller;
+        this.iconManager = iconManager;
         this.restartDialogProvider = restartDialogProvider;
         this.categoryPanelProvider = categoryPanelProvider;
 
@@ -149,8 +150,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         mainPanel.setCategory(null);
 
         final int count = countCategories(manager.getCategories());
-        tabList.setCellRenderer(new PreferencesListCellRenderer(
-                controller.getIconManager(), count));
+        tabList.setCellRenderer(new PreferencesListCellRenderer(iconManager, count));
 
         addCategories(manager.getCategories());
     }
@@ -207,7 +207,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                     addCategories(category.getSubcats());
                 }
                 tabList.addListSelectionListener(SwingPreferencesDialog.this);
-                restoreActiveCategory();
+                tabList.setSelectedIndex(0);
             }
         });
         mainPanel.setWaiting(false);
@@ -247,12 +247,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         mainPanel.setCategory(null);
 
         if (actionEvent != null && getOkButton().equals(actionEvent.getSource())) {
-            if (tabList.getSelectedIndex() > -1) {
-                final PreferencesCategory node = (PreferencesCategory) tabList.
-                        getSelectedValue();
-                controller.getGlobalIdentity().setOption("dialogstate",
-                        "preferences", node.getPath());
-            }
             saveOptions();
         }
 
@@ -323,22 +317,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         }
     }
 
-    private void restoreActiveCategory() {
-        final String oldCategoryPath = controller.getGlobalConfig().
-                getOption("dialogstate", "preferences");
-        final DefaultListModel model = (DefaultListModel) tabList.getModel();
-        int indexToSelect = 0;
-        for (int i = 0; i < model.getSize(); i++) {
-            final PreferencesCategory category =
-                    (PreferencesCategory) model.get(i);
-            if (oldCategoryPath.equals(category.getPath())) {
-                indexToSelect = i;
-                break;
-            }
-        }
-        tabList.setSelectedIndex(indexToSelect);
-    }
-
     /**
      * Gets the maximum panel size.
      *

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

@@ -74,8 +74,6 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     private JButton checkNow;
     /** Update channel. */
     private JComboBox updateChannel;
-    /** The prefs dialog that will be hosting the panel. */
-    private final SwingPreferencesDialog prefsDialog;
     /** The configuration to write settings changes to. */
     private final ConfigProvider userConfig;
     /** The configuration to read global settings from. */
@@ -88,7 +86,6 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /**
      * Instantiates a new update config panel.
      *
-     * @param prefsDialog The prefs dialog that will be hosting the panel.
      * @param userConfig The configuration to write settings changes to.
      * @param globalConfig The configuration to read global settings from.
      * @param updateManager The manager to read update information from.
@@ -96,12 +93,10 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      */
     @Inject
     public UpdateConfigPanel(
-            final SwingPreferencesDialog prefsDialog,
             @UserConfig final ConfigProvider userConfig,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CachingUpdateManager updateManager,
             final IdentityController identityController) {
-        this.prefsDialog = prefsDialog;
         this.userConfig = userConfig;
         this.globalConfig = globalConfig;
         this.updateManager = updateManager;
@@ -166,7 +161,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * Lays out the components.
      */
     private void layoutComponents() {
-        setLayout(new MigLayout("fill, ins 0, hmax " + prefsDialog.getPanelHeight()));
+        setLayout(new MigLayout("fill, ins 0, hmax 500"));
 
         add(new JLabel("Update checking:"), "split");
         add(enable, "growx");