fixes(?) issue 1324: Tabbed DIalogs have odd colour

git-svn-id: http://svn.dmdirc.com/trunk@4181 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/MainFrame.java

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.ui.swing;
 
 import com.dmdirc.FrameContainer;
@@ -119,7 +120,7 @@ public final class MainFrame extends JFrame implements WindowListener,
      */
     protected MainFrame(final SwingStatusBar statusBar) {
         super();
-        
+
         this.statusBar = statusBar;
 
         initComponents();
@@ -154,6 +155,8 @@ public final class MainFrame extends JFrame implements WindowListener,
         showVersion =
                 IdentityManager.getGlobalConfig().
                 getOptionBool("ui", "showversion", false);
+        IdentityManager.getGlobalConfig().
+                addChangeListener("ui", "lookandfeel", this);
         IdentityManager.getGlobalConfig().
                 addChangeListener("ui", "showversion", this);
         IdentityManager.getGlobalConfig().
@@ -165,7 +168,7 @@ public final class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void windowGainedFocus(WindowEvent e) {
-                //Ignore
+            //Ignore
             }
 
             /** {@inheritDoc} */
@@ -174,7 +177,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 MenuSelectionManager.defaultManager().clearSelectedPath();
             }
         });
-        
+
         setTitle(getTitlePrefix());
     }
 
@@ -297,46 +300,74 @@ public final class MainFrame extends JFrame implements WindowListener,
         return statusBar;
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowOpened(final WindowEvent windowEvent) {
-        //ignore
+    //ignore
     }
 
-    /** {@inheritDoc} */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowClosing(final WindowEvent windowEvent) {
         quit();
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowClosed(final WindowEvent windowEvent) {
-        //ignore
+    //ignore
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowIconified(final WindowEvent windowEvent) {
         ActionManager.processEvent(CoreActionType.CLIENT_MINIMISED, null);
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowDeiconified(final WindowEvent windowEvent) {
         ActionManager.processEvent(CoreActionType.CLIENT_UNMINIMISED, null);
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowActivated(final WindowEvent windowEvent) {
-        //ignore
+    //ignore
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param windowEvent Window event
+     */
     @Override
     public void windowDeactivated(final WindowEvent windowEvent) {
-        //ignore
+    //ignore
     }
 
     /** Initialiases the frame managers. */
@@ -382,7 +413,8 @@ public final class MainFrame extends JFrame implements WindowListener,
 
         getContentPane().setLayout(new MigLayout("fill, ins rel, wrap 1, hidemode 2"));
         getContentPane().add(mainSplitPane, "grow, push");
-        getContentPane().add(statusBar, "hmax 20, wmax 100%-2*rel, wmin 100%-2*rel");
+        getContentPane().add(statusBar,
+                "hmax 20, wmax 100%-2*rel, wmin 100%-2*rel");
 
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 
@@ -400,7 +432,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private void initSplitPane(final JSplitPane mainSplitPane) {
         mainSplitPane.setBorder(null);
 
-        mainSplitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).getValue());
+        mainSplitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).
+                getValue());
         mainSplitPane.setOneTouchExpandable(false);
 
         position =
@@ -572,7 +605,11 @@ public final class MainFrame extends JFrame implements WindowListener,
         return super.isVisible();
     }
 
-    /** {@inheritDoc}. */
+    /** 
+     * {@inheritDoc}.
+     * 
+     * @param newTitle New Title
+     */
     @Override
     public void setTitle(final String newTitle) {
         //NOPMD
@@ -583,9 +620,14 @@ public final class MainFrame extends JFrame implements WindowListener,
     @Override
     public void configChanged(final String domain, final String key) {
         if ("ui".equals(domain)) {
-            showVersion =
-                    IdentityManager.getGlobalConfig().
-                    getOptionBool("ui", "showversion", false);
+            if ("lookandfeel".equals(key))  {
+                //Almost there
+                //SwingController.updateLookAndFeel();
+            } else {
+                showVersion =
+                        IdentityManager.getGlobalConfig().
+                        getOptionBool("ui", "showversion", false);
+            }
         } else {
             imageIcon =
                     new ImageIcon(IconManager.getIconManager().getImage("icon"));
@@ -596,7 +638,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** {@inheritDoc}. */
     @Override
     public void setParent(final JComponent parent) {
-        //Ignore
+    //Ignore
     }
 
     /** {@inheritDoc}. */
@@ -658,13 +700,15 @@ public final class MainFrame extends JFrame implements WindowListener,
 
     /** {@inheritDoc}. */
     @Override
-    public void addWindow(final FrameContainer parent, final FrameContainer window) {
+    public void addWindow(final FrameContainer parent,
+            final FrameContainer window) {
         addWindow(window);
     }
 
     /** {@inheritDoc}. */
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+    public void delWindow(final FrameContainer parent,
+            final FrameContainer window) {
         delWindow(window);
     }
 }

src/com/dmdirc/ui/swing/SwingController.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
@@ -56,8 +57,8 @@ import java.awt.Toolkit;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.List;
-
 import java.util.concurrent.Semaphore;
+
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -313,6 +314,29 @@ public final class SwingController implements UIController {
         });
     }
 
+    /**
+     * Updates the look and feel to the current config setting.
+     */
+    static void updateLookAndFeel() {
+        try {
+            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.getGlobalConfig().
+                    getOption("ui", "lookandfeel", "")));
+            SwingUtilities.updateComponentTreeUI((MainFrame) Main.getUI().getMainWindow());
+        } catch (ClassNotFoundException ex) {
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to change Look and Feel: " + ex.getMessage());
+        } catch (InstantiationException ex) {
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to change Look and Feel: " + ex.getMessage());
+        } catch (IllegalAccessException ex) {
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to change Look and Feel: " + ex.getMessage());
+        } catch (UnsupportedLookAndFeelException ex) {
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to change Look and Feel: " + ex.getMessage());
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public void initUISettings() {

src/com/dmdirc/ui/swing/UIUtilities.java

@@ -113,6 +113,7 @@ public final class UIUtilities {
         
         UIManager.put("swing.useSystemFontSettings", true);
         
+        UIManager.put("TabbedPane.contentOpaque", false);
         UIManager.put("swing.boldMetal", false);
         UIManager.put("InternalFrame.useTaskBar", false);
         UIManager.put("SplitPaneDivider.border", BorderFactory.createEmptyBorder());