Merge lp:~jassmith/do/DockyRightClickCleanup into lp:do

[Jason Smith]

[Alex Launi (alexlauni)]

Looks good to me.

review: Approve

=== modified file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp'
--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-02-12 15:42:08 +0000
+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-03-01 07:35:08 +0000
@@ -89,6 +89,8 @@
     <File name="src/Docky.Core/Docky.Core.Default/DockletService.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/Docky.Interface.Menus/ToggleDockletMenuButtonArgs.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/Docky.Interface.Painters/AbstractIntegratedPainter.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
--- Do.Interface.Linux.Docky/Makefile.am	2009-02-13 00:19:29 +0000
+++ Do.Interface.Linux.Docky/Makefile.am	2009-03-01 07:35:08 +0000
@@ -35,6 +35,7 @@
 	src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs \
 	src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs \
 	src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs \
+	src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs \
 	src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs \
 	src/Docky.Interface/Docky.Interface.Menus/DockItemMenu.cs \
 	src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs \
@@ -43,6 +44,7 @@
 	src/Docky.Interface/Docky.Interface.Menus/SimpleMenuButtonArgs.cs \
 	src/Docky.Interface/Docky.Interface.Menus/SeparatorMenuButtonArgs.cs \
 	src/Docky.Interface/Docky.Interface.Menus/ToggleDockletMenuButtonArgs.cs \
+	src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs \
 	src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs \
 	src/Docky.Interface/DockState.cs \
 	src/Docky.Interface/DockWindow.cs \

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-02-27 09:02:10 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-01 07:52:25 +0000
@@ -252,6 +252,7 @@
 		{
 			DockServices.ItemsService.DockItemsChanged += OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate += HandleItemNeedsUpdate;
+			DockPreferences.IconSizeChanged += HandleIconSizeChanged; 
 
 			PopupMenu.Hidden += OnDockItemMenuHidden;
 			PopupMenu.Shown += OnDockItemMenuShown;
@@ -271,6 +272,7 @@
 		{
 			DockServices.ItemsService.DockItemsChanged -= OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate -= HandleItemNeedsUpdate;
+			DockPreferences.IconSizeChanged -= HandleIconSizeChanged; 
 
 			PopupMenu.Hidden -= OnDockItemMenuHidden;
 			PopupMenu.Shown -= OnDockItemMenuShown;
@@ -318,6 +320,11 @@
 				return false;
 			});
 		}
+		
+		void HandleIconSizeChanged()
+		{
+			AnimatedDraw ();
+		}
 
 		void HandlePaintNeeded (object sender, PaintNeededArgs args)
 		{

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-02-27 08:46:31 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-03-01 04:24:20 +0000
@@ -147,7 +147,7 @@
 				double offset = 0;
 				// we never hide in these conditions
 				if (!DockPreferences.AutoHide || drag_resizing || PainterOpacity == 1) {
-					if ((DateTime.UtcNow - FirstRenderTime) > SummonTime)
+					if ((RenderTime - FirstRenderTime) > SummonTime)
 						return 0;
 					offset = 1 - Math.Min (1, (DateTime.UtcNow - FirstRenderTime).TotalMilliseconds / SummonTime.TotalMilliseconds);
 					return (int) (offset * PositionProvider.DockHeight * 1.5);

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-02-27 06:40:03 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-03-01 04:24:20 +0000
@@ -299,7 +299,7 @@
 			return Applications.Any (app => (other as ApplicationDockItem).Applications.Contains (app));
 		}
 		
-		public IEnumerable<AbstractMenuButtonArgs> GetMenuItems ()
+		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
 			foreach (Wnck.Window window in VisibleWindows)
 				yield return new WindowMenuButtonArgs (window, window.Name, WindowIcon);

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs	2009-02-17 21:13:43 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs	2009-03-01 07:47:37 +0000
@@ -93,7 +93,7 @@
 		
 		public event EventHandler RemoveClicked;
 		
-		public IEnumerable<AbstractMenuButtonArgs> GetMenuItems ()
+		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide, 
 			                                       Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon);
@@ -108,6 +108,9 @@
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled, 
 			                                       Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon);
 			
+			if (DockPreferences.ZoomEnabled)
+				yield return new WidgetMenuArgs (BuildScaleWidget ());
+			
 			if (Gdk.Screen.Default.NMonitors > 1)
 				yield return new SimpleMenuButtonArgs (() => DockPreferences.Monitor++,
 				                                       Catalog.GetString ("Switch Monitors"), "display");
@@ -124,8 +127,32 @@
 				yield return new RunnableMenuButtonArgs (item);
 			}
 		}
+
+		void HandleValueChanged(object sender, EventArgs e)
+		{
+			if (!(sender is HScale)) return;
+			
+			HScale scale = sender as HScale;
+			DockPreferences.ZoomPercent = scale.Value;
+		}
 		
 		#endregion 
 		
+		Gtk.HScale BuildScaleWidget ()
+		{
+			Gtk.HScale hscale = new Gtk.HScale (1.1, 4, .1);
+			hscale.Value = DockPreferences.ZoomPercent;
+			hscale.Name = "Zoom";
+			hscale.CanFocus = false;
+			hscale.FormatValue +=HandleFormatValue; 
+			hscale.ModifyFg (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
+			hscale.ValueChanged +=HandleValueChanged; 
+			return hscale;
+		}
+
+		void HandleFormatValue(object o, FormatValueArgs args)
+		{
+			args.RetVal = string.Format ("{0}%", args.Value * 100);
+		}
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-02-27 06:40:03 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-03-01 04:24:20 +0000
@@ -277,7 +277,7 @@
 		
 		#region IRightClickable implementation 
 		
-		public IEnumerable<AbstractMenuButtonArgs> GetMenuItems ()
+		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
 			bool hasApps = HasVisibleApps;
 			

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs	2009-02-27 09:54:58 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs	2009-03-01 04:24:20 +0000
@@ -143,7 +143,7 @@
 		
 		public event EventHandler RemoveClicked;
 		
-		public IEnumerable<Menus.AbstractMenuButtonArgs> GetMenuItems ()
+		public IEnumerable<Menus.AbstractMenuArgs> GetMenuItems ()
 		{
 			yield return new Docky.Interface.Menus.SimpleMenuButtonArgs (() => Services.Environment.OpenUrl ("trash://"),
 			                                                             Catalog.GetString ("Open Trash"), TrashFullIcon);

=== added file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs	2009-03-01 08:00:40 +0000
@@ -0,0 +1,51 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Gtk;
+
+namespace Docky.Interface.Menus
+{
+	
+	
+	public abstract class AbstractMenuArgs : IDisposable
+	{
+		public event EventHandler Activated;
+		
+		public abstract Gtk.Widget Widget { get; }
+		
+		public AbstractMenuArgs()
+		{
+			
+		}
+		
+		protected void OnActivated ()
+		{
+			if (Activated != null)
+				Activated (this, EventArgs.Empty);
+		}
+	
+		#region IDisposable implementation
+		public virtual void Dispose ()
+		{
+		}
+		#endregion
+}
+}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs	2009-02-11 08:14:54 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs	2009-03-01 07:35:08 +0000
@@ -17,46 +17,86 @@
 //
 
 using System;
+
+using Gtk;
 using Mono.Unix;
 
+using Do.Interface;
+using Do.Interface.CairoUtils;
+using Do.Platform;
+
 namespace Docky.Interface.Menus
 {
-	public abstract class AbstractMenuButtonArgs
+	public abstract class AbstractMenuButtonArgs : AbstractMenuArgs
 	{
-		const int MaxDescriptionCharacters = 50;
+		Gtk.Widget widget;
 		
-		public EventHandler Handler {
+		public override Gtk.Widget Widget { 
 			get {
-				return (sender, e) => Action ();
+				if (widget == null)
+					widget = BuildWidget ();
+				return widget;
 			}
 		}
 		
-		public string Description {
-			get; protected set;
-		}
-		
-		public string Icon {
-			get; protected set;
-		}
-		
-		public bool Sensitive {
-			get; protected set; 
-		}
+		protected virtual string Description { get; set; }
+		
+		protected virtual string Icon { get; set; }
 		
 		public AbstractMenuButtonArgs ()
 		{
-			Description = "";
-			Icon = "";
-			Sensitive = true;
+			
 		}
 		
-		public AbstractMenuButtonArgs (string description, string icon, bool sensitive)
+		public AbstractMenuButtonArgs (string description, string icon)
 		{
 			Description = GLib.Markup.EscapeText (Catalog.GetString (description));
 			Icon = icon;
-			Sensitive = sensitive;
+		}
+		
+		Gtk.Button BuildWidget ()
+		{
+			HBox hbox = new HBox ();
+			Label label = new Label ();
+			label.Markup = "<span color=\"#ffffff\"><b>" + Description + "</b></span>";
+			label.ModifyFg (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
+			label.ModifyText (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
+			label.Xalign = 0f;
+			label.Ellipsize = Pango.EllipsizeMode.End;
+			label.Ypad = 0;
+			
+			Gtk.Image image;
+			using (Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, 16)) {
+				image = new Gtk.Image (pbuf);
+			}
+				
+			hbox.PackStart (image, false, false, 0);
+			hbox.PackStart (label, true, true, 2);
+			
+			Gtk.Button button = new Gtk.Button (hbox);
+			
+			button.Relief = ReliefStyle.None;
+			button.CanFocus = false;
+			button.BorderWidth = 0;
+			
+			button.ModifyBg (StateType.Prelight, new Gdk.Color ((byte) (byte.MaxValue * 0.25), 
+			                                                    (byte) (byte.MaxValue * 0.25), 
+			                                                    (byte) (byte.MaxValue * 0.25)));
+			
+			button.Clicked += (sender, e) => Action ();
+			button.Clicked += (sender, e) => base.OnActivated ();
+			button.ShowAll ();
+			
+			return button;
 		}
 		
 		public abstract void Action ();
+		
+		public override void Dispose ()
+		{
+			Widget.Destroy ();
+			base.Dispose ();
+		}
+
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockItemMenu.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockItemMenu.cs	2009-02-14 20:53:01 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockItemMenu.cs	2009-03-01 07:35:08 +0000
@@ -36,79 +36,20 @@
 	
 	public class DockItemMenu : DockPopupMenu
 	{
-		class CustomSeparator : HSeparator
-		{
-			public CustomSeparator () : base ()
-			{
-				HeightRequest = 3;
-			}
-			
-			protected override bool OnExposeEvent (Gdk.EventExpose evnt)
-			{
-				using (Context cr = CairoHelper.Create (GdkWindow)) {
-					cr.Rectangle (evnt.Area.X, evnt.Area.Y + 1, evnt.Area.Width, 1);
-					cr.Color = new Cairo.Color (.8, .8, .8, .7);
-					cr.Fill ();
-					
-				}
-				return true;
-			}
-
-		}
+		IEnumerable<AbstractMenuArgs> current_args;
 		
 		public DockItemMenu() : base ()
 		{
 		}
 		
-		public override void PopUp (IEnumerable<AbstractMenuButtonArgs> args, int x, int y)
+		public override void PopUp (IEnumerable<AbstractMenuArgs> args, int x, int y)
 		{
-			foreach (Gtk.Widget child in Container.AllChildren) {
-				Container.Remove (child);
-				child.Dispose ();
-			}
+			current_args = args;
 			
-			foreach (AbstractMenuButtonArgs arg in args) {
-				if (arg is SeparatorMenuButtonArgs) {
-					Container.PackStart (new CustomSeparator ());
-					continue;
-				}
-				
-				HBox hbox = new HBox ();
-				Label label = new Label ();
-				if (arg.Sensitive)
-					label.Markup = "<span color=\"#ffffff\"><b>" + arg.Description + "</b></span>";
-				else
-					label.Markup = "<span color=\"#888888\"><b>" + arg.Description + "</b></span>";
-				label.ModifyFg (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
-				label.ModifyText (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
-				label.Xalign = 0f;
-				label.Ellipsize = Pango.EllipsizeMode.End;
-				label.Ypad = 0;
-				
-				Gtk.Image image;
-				using (Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (arg.Icon, 16)) {
-					image = new Gtk.Image (pbuf);
-				}
-					
-				hbox.PackStart (image, false, false, 0);
-				hbox.PackStart (label, true, true, 2);
-				
-				Gtk.Button button = new Button (hbox);
-				if (arg is WindowMenuButtonArgs)
-					button.TooltipText = arg.Description;
-				
-				button.Clicked += arg.Handler;
-				button.Clicked += OnButtonClicked;
-				
-				button.Relief = ReliefStyle.None;
-				button.CanFocus = false;
-				button.Sensitive = arg.Sensitive;
-				button.BorderWidth = 0;
-				
-				button.ModifyBg (StateType.Prelight, new Gdk.Color ((byte) (byte.MaxValue * 0.25), 
-				                                                    (byte) (byte.MaxValue * 0.25), 
-				                                                    (byte) (byte.MaxValue * 0.25)));
-				Container.PackStart (button, false, false, 0);
+			foreach (AbstractMenuArgs arg in args) {
+				Container.PackStart (arg.Widget, false, false, 0);
+				arg.Activated += OnButtonClicked;
+				arg.Widget.ShowAll ();
 			}
 			ShowAll ();
 			
@@ -117,12 +58,21 @@
 		
 		void OnButtonClicked (object o, EventArgs args)
 		{
-			foreach (Gtk.Widget widget in Container.AllChildren) {
-				if (!(widget is Gtk.Button))
-					continue;
-				(widget as Gtk.Button).Activated -= OnButtonClicked;
-			}
 			Hide ();
 		}
+		
+		protected override void OnHidden ()
+		{
+			foreach (Gtk.Widget widget in Container.Children)
+				Container.Remove (widget);
+			
+			foreach (AbstractMenuArgs arg in current_args) {
+				arg.Activated -= OnButtonClicked;
+				arg.Dispose ();
+			}
+			
+			base.OnHidden ();
+		}
+
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs	2009-02-23 04:38:44 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs	2009-03-01 04:24:20 +0000
@@ -100,7 +100,7 @@
 		}
 
 		
-		public virtual void PopUp (IEnumerable<AbstractMenuButtonArgs> args, int x, int y)
+		public virtual void PopUp (IEnumerable<AbstractMenuArgs> args, int x, int y)
 		{
 			vertical_offset = horizontal_offset = 0;
 			ShowAll ();

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/LaunchMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/LaunchMenuButtonArgs.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/LaunchMenuButtonArgs.cs	2009-03-01 04:24:20 +0000
@@ -30,7 +30,7 @@
 		Act action;
 		Item item;
 		
-		public LaunchMenuButtonArgs (Act action, Item item, string description, string icon) : base (description, icon, true)
+		public LaunchMenuButtonArgs (Act action, Item item, string description, string icon) : base (description, icon)
 		{
 			this.action = action;
 			this.item = item;

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/RunnableMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/RunnableMenuButtonArgs.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/RunnableMenuButtonArgs.cs	2009-03-01 04:24:20 +0000
@@ -28,7 +28,7 @@
 	{
 		IRunnableItem runnable;
 		
-		public RunnableMenuButtonArgs(IRunnableItem item) : base (item.Name, item.Icon, true)
+		public RunnableMenuButtonArgs(IRunnableItem item) : base (item.Name, item.Icon)
 		{
 			runnable = item;
 		}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SeparatorMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SeparatorMenuButtonArgs.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SeparatorMenuButtonArgs.cs	2009-03-01 07:35:08 +0000
@@ -18,17 +18,37 @@
 
 using System;
 
+using Cairo;
+using Gdk;
+using Gtk;
+
 namespace Docky.Interface.Menus
 {
-	public class SeparatorMenuButtonArgs : AbstractMenuButtonArgs
+	public class SeparatorMenuButtonArgs : WidgetMenuArgs
 	{
-		public SeparatorMenuButtonArgs () : base ("Separator", null, true)
-		{
-		}
-		
-		public override void Action ()
-		{
+		class CustomSeparator : HSeparator
+		{
+			public CustomSeparator () : base ()
+			{
+				HeightRequest = 3;
+			}
 			
-		}
+			protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+			{
+				using (Context cr = CairoHelper.Create (GdkWindow)) {
+					cr.Rectangle (evnt.Area.X, evnt.Area.Y + 1, evnt.Area.Width, 1);
+					cr.Color = new Cairo.Color (.8, .8, .8, .7);
+					cr.Fill ();
+					
+				}
+				return true;
+			}
+
+		}
+		
+		public SeparatorMenuButtonArgs () : base (new CustomSeparator ())
+		{
+		}
+		
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SimpleMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SimpleMenuButtonArgs.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SimpleMenuButtonArgs.cs	2009-03-01 04:24:20 +0000
@@ -26,7 +26,7 @@
 	{
 		Action action;
 		
-		public SimpleMenuButtonArgs (Action action, string description, string icon) : base (description, icon, true)
+		public SimpleMenuButtonArgs (Action action, string description, string icon) : base (description, icon)
 		{
 			this.action = action;
 		}

=== added file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs	2009-03-01 08:00:40 +0000
@@ -0,0 +1,51 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+using Cairo;
+using Gdk;
+using Gtk;
+
+namespace Docky.Interface.Menus
+{
+	
+	
+	public class WidgetMenuArgs : AbstractMenuArgs
+	{
+		Gtk.Widget widget;
+		
+		public override Widget Widget {
+			get {
+				return widget;
+			}
+		}
+
+		
+		public WidgetMenuArgs (Gtk.Widget widget) : base ()
+		{
+			this.widget = widget;
+		}
+		
+		public override void Dispose ()
+		{
+			widget.Destroy ();
+			base.Dispose ();
+		}
+
+	}
+}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs	2009-03-01 04:24:20 +0000
@@ -30,7 +30,7 @@
 	{
 		Window window;
 		
-		public WindowMenuButtonArgs (Window window, string description, string icon) : base (description, icon, true)
+		public WindowMenuButtonArgs (Window window, string description, string icon) : base (description, icon)
 		{
 			this.window = window;
 		}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/IRightClickable.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/IRightClickable.cs	2009-01-20 00:34:52 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/IRightClickable.cs	2009-03-01 04:24:20 +0000
@@ -31,7 +31,7 @@
 		/// <returns>
 		/// A <see cref="IEnumerable"/>
 		/// </returns>
-		IEnumerable<AbstractMenuButtonArgs> GetMenuItems ();
+		IEnumerable<AbstractMenuArgs> GetMenuItems ();
 		
 		/// <summary>
 		/// Lets the dock item provider know that the remove button was clicked

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-02-26 07:55:16 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	2009-03-01 07:35:08 +0000
@@ -48,7 +48,7 @@
 			get { return 350; }
 		}
 		
-		static int zoom_size = prefs.Get ("ZoomSize", 300);
+		static int zoom_size = prefs.Get ("ZoomSize", 330);
 		public static int ZoomSize {
 			get { return (int) (zoom_size * (IconSize / (double) DefaultIconSize)); }
 			set {