Fixed bug in the dcop plugin (missing space)

Fixed bug in the action manager (array index)
Added menu to systray plugin
Switched to a new SVG-based icon
Abstracted quit functionality



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

src/uk/org/ownage/dmdirc/Main.java

@@ -58,4 +58,21 @@ public final class Main {
         MainFrame.getMainFrame();
     }
     
+    /**
+     * Quits the client nicely.
+     * @param reason The quit reason to send
+     */
+    public static void quit(final String reason) {
+        ServerManager.getServerManager().disconnectAll(reason);
+        Config.save();
+        System.exit(0);
+    }
+    
+    /**
+     * Quits the client nicely, with the default closing message.
+     */
+    public static void quit() {
+        quit(Config.getOption("general", "closemessage"));
+    }
+    
 }

src/uk/org/ownage/dmdirc/actions/ActionManager.java

@@ -196,14 +196,14 @@ public class ActionManager {
         Channel channel = null;
         ChannelClientInfo source = null;
         
-        if (arguments[0] instanceof Server) {
+        if (arguments.length > 0 && arguments[0] instanceof Server) {
             server = (Server) arguments[0];
         } else if (arguments[0] instanceof Channel) {
             channel = (Channel) arguments[0];
             server = channel.getServer();
         }
         
-        if (arguments[1] instanceof ChannelClientInfo) {
+        if (arguments.length > 1 && arguments[1] instanceof ChannelClientInfo) {
             source = (ChannelClientInfo) arguments[1];
         }
         
@@ -219,7 +219,7 @@ public class ActionManager {
             res = res.replaceAll("\\$source", source.getNickname());
         }
         
-        if (arguments[2] instanceof String) {
+        if (arguments.length > 2 && arguments[2] instanceof String) {
             res = res.replaceAll("\\$message", (String) arguments[2]);
         }
         

src/uk/org/ownage/dmdirc/commandparser/commands/server/Quit.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
 import uk.org.ownage.dmdirc.Config;
+import uk.org.ownage.dmdirc.Main;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.ServerManager;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
@@ -54,9 +55,7 @@ public final class Quit extends ServerCommand {
      */
     public void execute(final CommandWindow origin, final Server server,
             final String... args) {
-        ServerManager.getServerManager().disconnectAll(implodeArgs(args));
-        Config.save();
-        System.exit(0);
+        Main.quit(implodeArgs(args));
     }
     
     

src/uk/org/ownage/dmdirc/plugins/plugins/dcop/DcopCommand.java

@@ -56,7 +56,7 @@ public final class DcopCommand extends ServerCommand {
     public void execute(final CommandWindow origin, final Server server,
             final String... args) {
         try {
-            final List<String> res = DcopPlugin.getDcopResult("dcop" + implodeArgs(args));
+            final List<String> res = DcopPlugin.getDcopResult("dcop " + implodeArgs(args));
             for (String line : res) {
                 origin.addLine(line);
             }

src/uk/org/ownage/dmdirc/plugins/plugins/systray/SystrayPlugin.java

@@ -23,11 +23,19 @@
 package uk.org.ownage.dmdirc.plugins.plugins.systray;
 
 import java.awt.AWTException;
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
 import java.awt.SystemTray;
 import java.awt.TrayIcon;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.net.URL;
 
 import javax.swing.ImageIcon;
 
+import uk.org.ownage.dmdirc.Main;
 import uk.org.ownage.dmdirc.plugins.Plugin;
 import uk.org.ownage.dmdirc.ui.MainFrame;
 
@@ -36,7 +44,7 @@ import uk.org.ownage.dmdirc.ui.MainFrame;
  * notifications to be disabled.
  * @author chris
  */
-public class SystrayPlugin implements Plugin {
+public class SystrayPlugin implements Plugin, ActionListener, MouseListener {
     
     /** Is this plugin active? */
     private boolean isActive = false;
@@ -44,6 +52,22 @@ public class SystrayPlugin implements Plugin {
     /** The tray icon we're currently using. */
     private TrayIcon icon;
     
+    /** The menu to use for the tray icon. */
+    private final PopupMenu menu;
+    
+    /** Creates a new system tray plugin. */
+    public SystrayPlugin() {
+        final MenuItem show = new MenuItem("Show/hide");
+        final MenuItem quit = new MenuItem("Quit");
+        
+        menu = new PopupMenu();
+        menu.add(show);
+        menu.add(quit);
+        
+        show.addActionListener(this);
+        quit.addActionListener(this);
+    }
+    
     /**
      * Sends a notification via the system tray icon.
      * @param title The title of the notification
@@ -61,21 +85,28 @@ public class SystrayPlugin implements Plugin {
      */
     public void notify(final String title, final String message) {
         notify(title, message, TrayIcon.MessageType.NONE);
-    }    
+    }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getActionCommand().equals("Show/hide")) {
+            MainFrame.getMainFrame().setVisible(!MainFrame.getMainFrame().isVisible());
+        } else if (e.getActionCommand().equals("Quit")) {
+            Main.quit();
+        }
+    }
+    
+    /** {@inheritDoc} */
     public boolean onLoad() {
         if (SystemTray.isSupported()) {
-            final SystemTray tray = SystemTray.getSystemTray();
-            
-            final ImageIcon image = MainFrame.getMainFrame().getIcon();
-            
-            icon = new TrayIcon(image.getImage());
-            
-            icon.setImageAutoSize(false);
+            final ClassLoader cldr = this.getClass().getClassLoader();
+            final URL imageURL = cldr.getResource("uk/org/ownage/dmdirc/res/logo.png");
+            icon = new TrayIcon(new ImageIcon(imageURL).getImage(), "DMDirc", menu);
+            icon.setImageAutoSize(true);
+            icon.addMouseListener(this);
             
             try {
-                tray.add(icon);
+                SystemTray.getSystemTray().add(icon);
             } catch (AWTException ex) {
                 return false;
             }
@@ -88,50 +119,82 @@ public class SystrayPlugin implements Plugin {
         return true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public void onUnload() {
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public void onActivate() {
         isActive = true;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public boolean isActive() {
         return isActive;
     }
     
     /** {@inheritDoc}. */
     public void onDeactivate() {
+        SystemTray.getSystemTray().remove(icon);
         isActive = false;
-        final SystemTray tray = SystemTray.getSystemTray();
-        
-        tray.remove(icon);
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public boolean isConfigurable() {
         return false;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public void showConfig() {
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public int getVersion() {
         return 0;
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public String getAuthor() {
         return "Chris 'MD87' Smith - chris@dmdirc.com";
     }
     
-    /** {@inheritDoc}. */
+    /** {@inheritDoc} */
     public String getDescription() {
         return "Adds a system tray icon";
     }
     
+    /** {@inheritDoc} */
+    public void mouseClicked(final MouseEvent e) {
+        if (e.getButton() == MouseEvent.BUTTON1) {
+            if (MainFrame.getMainFrame().isVisible()) {
+                // TODO: Uncomment the code below, with an appropriate replacement
+                //       for requestFocus() that does something more than flash.
+                
+                //if (MainFrame.getMainFrame().isActive()) {
+                MainFrame.getMainFrame().setVisible(false);
+                //} else {
+                //    MainFrame.getMainFrame().requestFocus();
+                //}
+            } else {
+                MainFrame.getMainFrame().setVisible(true);
+            }
+        }
+    }
+    
+    /** {@inheritDoc} */
+    public void mousePressed(final MouseEvent e) {
+    }
+    
+    /** {@inheritDoc} */
+    public void mouseReleased(final MouseEvent e) {
+    }
+    
+    /** {@inheritDoc} */
+    public void mouseEntered(final MouseEvent e) {
+    }
+    
+    /** {@inheritDoc} */
+    public void mouseExited(final MouseEvent e) {
+    }
+    
 }

src/uk/org/ownage/dmdirc/res/logo.svg

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2233"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docname="logo.svg"
+   sodipodi:docbase="/home/chris/DMDirc/trunk/src/uk/org/ownage/dmdirc/res"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/chris/DMDirc/trunk/src/uk/org/ownage/dmdirc/res/icon.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5"
+   sodipodi:modified="TRUE">
+  <defs
+     id="defs2235" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="38.436654"
+     inkscape:cy="32.116009"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="956"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata2238">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#fff100;fill-opacity:1;stroke:#000000;stroke-width:2.88174772;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path2221"
+       sodipodi:cx="390.08929"
+       sodipodi:cy="567.54077"
+       sodipodi:rx="37.767857"
+       sodipodi:ry="38.392857"
+       d="M 427.85715 567.54077 A 37.767857 38.392857 0 1 1  352.32144,567.54077 A 37.767857 38.392857 0 1 1  427.85715 567.54077 z"
+       transform="matrix(0.6995081,0,0,0.6885814,-240.49033,-359.17061)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;stroke:#000000;stroke-width:0.46683663;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path2223"
+       sodipodi:cx="357.76785"
+       sodipodi:cy="535.39789"
+       sodipodi:rx="2.5892856"
+       sodipodi:ry="2.6785715"
+       d="M 360.35714 535.39789 A 2.5892856 2.6785715 0 1 1  355.17857,535.39789 A 2.5892856 2.6785715 0 1 1  360.35714 535.39789 z"
+       transform="matrix(1.209758,0,0,1.1890018,-408.04011,-611.18464)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.7099998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 23.368104,48.697059 L 47.455791,37.270576"
+       id="path2229" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;stroke:#000000;stroke-width:0.46683663;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path3216"
+       sodipodi:cx="357.76785"
+       sodipodi:cy="535.39789"
+       sodipodi:rx="2.5892856"
+       sodipodi:ry="2.6785715"
+       d="M 360.35714 535.39789 A 2.5892856 2.6785715 0 1 1  355.17857,535.39789 A 2.5892856 2.6785715 0 1 1  360.35714 535.39789 z"
+       transform="matrix(1.209758,0,0,1.1890018,-393.06865,-611.1982)" />
+  </g>
+</svg>

src/uk/org/ownage/dmdirc/ui/MainFrame.java

@@ -543,8 +543,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         } else if (e.getActionCommand().equals("Profile")) {
             new ProfileEditorDialog();
         } else if (e.getActionCommand().equals("Exit")) {
-            Config.save();
-            System.exit(1);
+            Main.quit();
         }
     }