Added custom window icon

Added custom window container
Server notification targets now support window:foo syntax

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

src/com/dmdirc/CustomWindow.java

@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
+
+/**
+ *
+ * @author chris
+ */
+public class CustomWindow extends FrameContainer {
+    
+    /** This custom window's name. */
+    private final String name;
+    
+    /** This custom window's title. */
+    private final String title;
+    
+    private final Window window;
+    
+    private Window parent = null;
+    
+    public CustomWindow(final String name, final String title, final Window parent) {
+        super();
+        
+        this.name = name;
+        this.title = title;
+        this.parent = parent;
+        
+        icon = IconManager.getIconManager().getIcon("custom");
+        
+        window = Main.getUI().getWindow(this);
+        window.setTitle(title);
+        window.setFrameIcon(icon);
+        
+        WindowManager.addWindow(parent, window);
+        
+        window.setVisible(true);
+    }
+    
+    public CustomWindow(final String name, final String title) {
+        super();
+        
+        this.name = name;
+        this.title = title;
+        
+        icon = IconManager.getIconManager().getIcon("custom");
+        
+        window = Main.getUI().getWindow(this);
+        window.setTitle(title);
+        window.setFrameIcon(icon);
+        
+        WindowManager.addWindow(window);
+        
+        window.setVisible(true);
+    }    
+
+    /** {@inheritDoc} */
+    @Override    
+    public Window getFrame() {
+        return window;
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public String toString() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override    
+    public void close() {
+        window.setVisible(false);
+        
+        WindowManager.removeWindow(window);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server getServer() {
+        return parent == null ? null : parent.getContainer().getServer();
+    }
+
+    /**
+     * Retrieves this custom window's name.
+     *
+     * @return This custom window's name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Retrieves this custom window's title.
+     *
+     * @return This custom window's title
+     */    
+    public String getTitle() {
+        return title;
+    }
+
+}

src/com/dmdirc/Server.java

@@ -840,6 +840,16 @@ public final class Server extends WritableFrameContainer implements Serializable
             addLineToAll(messageType, args);
         } else if ("active".equals(target)) {
             addLineToActive(messageType, args);
+        } else if (target.startsWith("window:")) {
+            final String windowName = target.substring(7);
+            
+            Window targetWindow = WindowManager.findCustomWindow(getFrame(), windowName);
+            
+            if (targetWindow == null) {
+                targetWindow = new CustomWindow(windowName, windowName, getFrame()).getFrame();
+            }
+            
+            targetWindow.addLine(messageType, args);
         } else if (target.startsWith("lastcommand:")) {
             final Object[] escapedargs = new Object[args.length];
             

src/com/dmdirc/config/defaults/defaults

@@ -2,33 +2,33 @@ identity.name = DMDirc default settings
 identity.globaldefault = true
 
 general.submitErrors=true
-        
+
 general.commandchar=/
 general.silencechar=.
-        
+
 general.reconnectmessage=Reconnecting
 general.closemessage=DMDirc exiting
 general.quitmessage=Using DMDirc
 general.partmessage=Using DMDirc
 general.cyclemessage=Cycling
 general.kickmessage=Bye!
-        
+
 general.hidequeries=false
-        
+
 general.closechannelsonquit=false
 general.closequeriesonquit=false
-        
+
 general.closechannelsondisconnect=false
 general.closequeriesondisconnect=false
-        
+
 general.reconnectonconnectfailure=true
 general.reconnectondisconnect=true
 general.reconnectdelay=5
-        
+
 general.server=blueyonder.uk.quakenet.org
 general.port=7000
 general.password=
-        
+
 notifications.authNotice=server
 notifications.unknownNotice=server
 notifications.connectError=server
@@ -42,7 +42,7 @@ notifications.privateCTCPreply=lastcommand:ctcp %1$s %4$S
 notifications.wallusers=server
 notifications.wallops=server
 notifications.walldesync=server
-        
+
 notifications.numeric_301=group:whois
 notifications.numeric_307=group:whois
 notifications.numeric_311=group:whois
@@ -73,7 +73,7 @@ notifications.numeric_671=group:whois
 notifications.numeric_705=server
 
 notifications.whois=lastcommand:whois %4$s( %4$s)?
-        
+
 ui.backgroundcolour=0
 ui.foregroundcolour=1
 ui.framemanagerPosition=left
@@ -85,29 +85,29 @@ ui.showversion=true
 ui.quickCopy=false
 ui.pasteProtectionLimit=1
 ui.stylelinks=true
-        
+
 ui.treeviewActiveBold=true
 treeview.sortwindows=true
 treeview.sortservers=true
-        
+
 channel.splitusermodes=false
 channel.sendwho=false
 channel.showmodeprefix=true
 general.whotime=60000
-        
+
 tabcompletion.casesensitive=false
-        
+
 logging.dateFormat=EEE, d MMM yyyy HH:mm:ss Z
 logging.programLogging=true
 logging.debugLogging=true
 logging.debugLoggingSysOut=true
-        
+
 server.friendlymodes=true
 server.pingtimeout=60000
-        
+
 updater.frequency=86400
 updater.lastcheck=0
-        
+
 actions.textcolour=12
 actions.eventcolour=3
 actions.highlightcolour=4

src/com/dmdirc/ui/WindowManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui;
 
-import com.dmdirc.Main;
+import com.dmdirc.CustomWindow;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.Window;
@@ -35,11 +35,14 @@ import java.util.Map.Entry;
 
 public class WindowManager {
     
-    private final static List<Window> rootWindows = new ArrayList<Window>();
+    private final static List<Window> rootWindows
+            = new ArrayList<Window>();
     
-    private final static Map<Window, List<Window>> childWindows = new HashMap<Window, List<Window>>();
+    private final static Map<Window, List<Window>> childWindows
+            = new HashMap<Window, List<Window>>();
     
-    private final static List<FrameManager> frameManagers = new ArrayList<FrameManager>();
+    private final static List<FrameManager> frameManagers
+            = new ArrayList<FrameManager>();
     
     private WindowManager() {
         // Shouldn't be instansiated
@@ -104,6 +107,30 @@ public class WindowManager {
         }
     }
     
+    public static Window findCustomWindow(final String name) {
+        Logger.doAssertion(name != null);
+        
+        return findCustomWindow(rootWindows, name);
+    }
+    
+    public static Window findCustomWindow(final Window parent, final String name) {
+        Logger.doAssertion(parent != null, name != null);
+        Logger.doAssertion(childWindows.containsKey(parent));
+        
+        return findCustomWindow(childWindows.get(parent), name);
+    }
+    
+    private static Window findCustomWindow(final List<Window> windows, final String name) {
+        for (Window window : windows) {
+            if (window.getContainer() instanceof CustomWindow
+                    && ((CustomWindow) window.getContainer()).getName().equals(name)) {
+                return window;
+            }
+        }
+        
+        return null;
+    }
+    
     private static Window getParent(final Window window) {
         for (Entry<Window, List<Window>> entry : childWindows.entrySet()) {
             if (entry.getValue().contains(window)) {