Merge lp:~jassmith/do/menu-theme into lp:do

[Jason Smith]

[David Siegel (djsiegel-deactivatedaccount)]

Looks good to me.

return (window.IsMinimized) ? .5 : base.IconOpacity;

You don't need to parenthesize the boolean expression.

return window.IsMinimized ? .5 : base.IconOpacity;

review: Approve

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-04 16:09:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-04 16:10:30 +0000
@@ -538,7 +538,10 @@
 						itemPosition = itemPosition.RelativeMovePoint ((int) (IconSize * itemZoom * .9 * .5), RelativeMove.Inward);
 						itemPosition = itemPosition.RelativePointToRootPoint (window);
 						
-						PopupMenu.PopUp ((CurrentDockItem as IRightClickable).GetMenuItems (), itemPosition.X, itemPosition.Y);
+						PopupMenu.PopUp (CurrentDockItem.Description, 
+						                 (CurrentDockItem as IRightClickable).GetMenuItems (), 
+						                 itemPosition.X, 
+						                 itemPosition.Y);
 						return;
 					}
 				}

=== 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-03-02 18:47:42 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-03-03 14:40:15 +0000
@@ -305,16 +305,18 @@
 		
 		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
+			yield return new SeparatorMenuButtonArgs ();
+			
 			yield return new SimpleMenuButtonArgs (() => WindowControl.MinimizeRestoreWindows (VisibleWindows), 
-			                                       MinimizeRestoreText, MinimizeIcon);
+			                                       MinimizeRestoreText, MinimizeIcon).AsDark ();
 			
 			yield return new SimpleMenuButtonArgs (() => WindowControl.CloseWindows (VisibleWindows), 
-			                                       CloseText, Gtk.Stock.Quit);
-			
-			yield return new SeparatorMenuButtonArgs ();
-			
-			foreach (Wnck.Window window in VisibleWindows)
+			                                       CloseText, Gtk.Stock.Quit).AsDark ();
+			
+			foreach (Wnck.Window window in VisibleWindows) {
+				yield return new SeparatorMenuButtonArgs ();
 				yield return new WindowMenuButtonArgs (window, window.Name, WindowIcon);
+			}
 		}
 
 		public override void Dispose ()

=== 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-03-01 07:47:37 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs	2009-03-04 05:05:46 +0000
@@ -95,35 +95,38 @@
 		
 		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
+			yield return new SeparatorMenuButtonArgs ();
+			
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide, 
-			                                       Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon);
+			                                       Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon).AsDark ();
 
 			if (!DockPreferences.AutoHide)
 				yield return new SimpleMenuButtonArgs (() => DockPreferences.AllowOverlap = !DockPreferences.AllowOverlap,
-				                                       Catalog.GetString ("Allow Window Overlap"), DockPreferences.AllowOverlap ? EnableIcon : DisableIcon);
+				                                       Catalog.GetString ("Allow Window Overlap"), DockPreferences.AllowOverlap ? EnableIcon : DisableIcon).AsDark ();
 			
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.IndicateMultipleWindows = !DockPreferences.IndicateMultipleWindows, 
-			                                       Catalog.GetString ("Advanced Indicators"), DockPreferences.IndicateMultipleWindows ? EnableIcon : DisableIcon);
+			                                       Catalog.GetString ("Advanced Indicators"), DockPreferences.IndicateMultipleWindows ? EnableIcon : DisableIcon).AsDark ();
 			
 			yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled, 
-			                                       Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon);
+			                                       Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon).AsDark ();
 			
-			if (DockPreferences.ZoomEnabled)
+			if (DockPreferences.ZoomEnabled) {
+				yield return new SeparatorMenuButtonArgs ();
 				yield return new WidgetMenuArgs (BuildScaleWidget ());
+			}
 			
 			if (Gdk.Screen.Default.NMonitors > 1)
 				yield return new SimpleMenuButtonArgs (() => DockPreferences.Monitor++,
-				                                       Catalog.GetString ("Switch Monitors"), "display");
+				                                       Catalog.GetString ("Switch Monitors"), "display").AsDark ();
 			
 			yield return new SeparatorMenuButtonArgs ();
 			
 			foreach (AbstractDockletItem dockitem in DockServices.DockletService.Docklets) {
-				yield return new ToggleDockletMenuButtonArgs (dockitem);
+				yield return new ToggleDockletMenuButtonArgs (dockitem).AsDark ();
 			}
 			
-			yield return new SeparatorMenuButtonArgs ();
-			
 			foreach (IRunnableItem item in Services.Application.MainMenuItems) {
+				yield return new SeparatorMenuButtonArgs ();
 				yield return new RunnableMenuButtonArgs (item);
 			}
 		}

=== 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-03-02 18:47:42 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-03-04 18:28:37 +0000
@@ -90,7 +90,7 @@
 				         .OrderByDescending (act => act.GetType ().Name != "WindowCloseAction")
 				         .ThenByDescending (act => act.GetType ().Name != "WindowMinimizeAction")
 				         .ThenByDescending (act => act.GetType ().Name != "WindowMaximizeAction")
-				         .ThenByDescending (act => act.Relevance))
+				         .ThenBy (act => act.Name.Length))
 					yield return act;
 			}
 		}
@@ -283,13 +283,21 @@
 		{
 			bool hasApps = HasVisibleApps;
 			
-			foreach (Act act in ActionsForItem)
-				yield return new LaunchMenuButtonArgs (act, element, act.Name, act.Icon);
-			
-			if (hasApps) {
-				yield return new SeparatorMenuButtonArgs ();
-				foreach (Wnck.Window window in VisibleWindows)
-						yield return new WindowMenuButtonArgs (window, window.Name, Icon);
+			yield return new SeparatorMenuButtonArgs ();
+			
+			if (hasApps) {
+				foreach (Act act in ActionsForItem)
+					yield return new LaunchMenuButtonArgs (act, element, act.Name, act.Icon).AsDark ();
+			} else {
+				foreach (Act act in ActionsForItem)
+					yield return new LaunchMenuButtonArgs (act, element, act.Name, act.Icon);
+			}
+			
+			if (hasApps) {
+				foreach (Wnck.Window window in VisibleWindows) {
+					yield return new SeparatorMenuButtonArgs ();
+					yield return new WindowMenuButtonArgs (window, window.Name, Icon);
+				}
 			}
 
 		}

=== 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-03-03 00:47:10 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs	2009-03-04 05:30:39 +0000
@@ -146,6 +146,8 @@
 		
 		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
+			yield return new SeparatorMenuButtonArgs ();
+			
 			yield return new SimpleMenuButtonArgs (
 					() => Services.Environment.OpenUrl ("trash://"),
 					Catalog.GetString ("Open Trash"), TrashFullIcon);

=== 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-03-01 07:35:08 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs	2009-03-04 05:17:38 +0000
@@ -18,9 +18,14 @@
 
 using System;
 
+using Cairo;
+using Gdk;
 using Gtk;
 using Mono.Unix;
 
+using Docky.Core;
+using Docky.Utilities;
+
 using Do.Interface;
 using Do.Interface.CairoUtils;
 using Do.Platform;
@@ -29,7 +34,18 @@
 {
 	public abstract class AbstractMenuButtonArgs : AbstractMenuArgs
 	{
+		const string FormatString = "{0}";
+		const int WidthBuffer = 4;
+		const int Height = 22;
+		
 		Gtk.Widget widget;
+		bool hovered;
+		
+		public bool Dark { get; set; }
+		
+		public virtual double IconOpacity {
+			get { return 1; }
+		}
 		
 		public override Gtk.Widget Widget { 
 			get {
@@ -54,44 +70,98 @@
 			Icon = icon;
 		}
 		
-		Gtk.Button BuildWidget ()
+		Widget 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 ();
+			DrawingArea button = new DrawingArea ();
+			
+			button.ExposeEvent += HandleExposeEvent;
+			button.EnterNotifyEvent += HandleEnterNotifyEvent;
+			button.LeaveNotifyEvent += HandleLeaveNotifyEvent; 
+			button.ButtonReleaseEvent += HandleButtonReleaseEvent; 
+			
+			button.AddEvents ((int) (EventMask.EnterNotifyMask | EventMask.LeaveNotifyMask | EventMask.ButtonReleaseMask));
+			button.HeightRequest = Height;
+
+			button.SetCompositeColormap ();
 			
 			return button;
 		}
 		
+		void HandleButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
+		{
+			Action ();
+			base.OnActivated ();
+		}
+
+		void HandleLeaveNotifyEvent(object o, LeaveNotifyEventArgs args)
+		{
+			(o as Widget).QueueDraw ();
+			hovered = false;
+		}
+
+		void HandleEnterNotifyEvent(object o, EnterNotifyEventArgs args)
+		{
+			(o as Widget).QueueDraw ();
+			hovered = true;
+		}
+
+		void HandleExposeEvent(object o, ExposeEventArgs args)
+		{
+			using (Context cr = CairoHelper.Create (args.Event.Window)) {
+				Gdk.Rectangle area = args.Event.Area;
+				cr.AlphaFill ();
+				LinearGradient lg = new LinearGradient (area.X, area.Y, area.X, area.Y + area.Height);
+				
+				Cairo.Color background = (Dark) ? DockPopupMenu.BackgroundColor.ShadeColor (.7) : DockPopupMenu.BackgroundColor;
+				if (hovered) {
+					Cairo.Color high = background
+						    .ConvertToGdk ()
+							.SetMinimumValue (25)
+							.ConvertToCairo (background.A);
+					
+					lg.AddColorStop (0, high);
+					lg.AddColorStop (1, background);
+				} else {
+					lg.AddColorStop (0, background);
+					lg.AddColorStop (1, background);
+				}
+				cr.Pattern = lg;
+				cr.Paint ();
+				lg.Destroy ();
+				
+				Gdk.Point textPoint;
+				int width;
+				textPoint = new Gdk.Point (area.X + WidthBuffer + 25, area.Y + area.Height / 2);
+				width = area.Width - WidthBuffer * 2 - 25;
+				
+				DockServices.DrawingService.TextPathAtPoint (cr, 
+				                                             string.Format (FormatString, Description), 
+				                                             textPoint,
+				                                             width,
+				                                             Pango.Alignment.Left);
+				cr.Color = new Cairo.Color (1, 1, 1);
+				cr.Fill ();
+				
+				Gdk.Pixbuf pbuf = GetPixbuf (Height - 8);
+				CairoHelper.SetSourcePixbuf (cr, pbuf, WidthBuffer, (Height - pbuf.Height) / 2);
+				cr.PaintWithAlpha (IconOpacity);
+				pbuf.Dispose ();
+			}
+		}
+		
+		protected virtual Gdk.Pixbuf GetPixbuf (int size)
+		{
+			return IconProvider.PixbufFromIconName (Icon, size);
+		}
+		
 		public abstract void Action ();
 		
+		public AbstractMenuButtonArgs AsDark ()
+		{
+			Dark = true;
+			return this;
+		}
+		
 		public override void Dispose ()
 		{
 			Widget.Destroy ();

=== 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-03-01 07:35:08 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockItemMenu.cs	2009-03-03 14:40:15 +0000
@@ -42,7 +42,7 @@
 		{
 		}
 		
-		public override void PopUp (IEnumerable<AbstractMenuArgs> args, int x, int y)
+		public override void PopUp (string header, IEnumerable<AbstractMenuArgs> args, int x, int y)
 		{
 			current_args = args;
 			
@@ -53,7 +53,7 @@
 			}
 			ShowAll ();
 			
-			base.PopUp (args, x, y);
+			base.PopUp (header, args, x, y);
 		}
 		
 		void OnButtonClicked (object o, EventArgs args)

=== 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-03-01 04:24:20 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/DockPopupMenu.cs	2009-03-04 18:28:37 +0000
@@ -36,10 +36,13 @@
 	
 	public class DockPopupMenu : Gtk.Window
 	{
+		public static readonly Cairo.Color BackgroundColor = new Cairo.Color (0.13, 0.13, 0.13, .95);
+		
 		const int TailHeight = 25;
 		new const int BorderWidth = 2;
-		const int Radius = 10;
-		const int Width = 230;
+		const int HeaderSize = 20;
+		const int Radius = 7;
+		const int Width = 180;
 		const double Pointiness = 1.5;
 		const double Curviness = 1;
 		const double Bluntness = 2;
@@ -47,6 +50,8 @@
 		int horizontal_offset;
 		int vertical_offset;
 		
+		string header;
+		
 		Gtk.Alignment align;
 		
 		public Gtk.VBox Container { get; private set; }
@@ -54,6 +59,15 @@
 		// we are making a new one here for speed reasons
 		public new bool Visible { get; private set; }
 		
+		int HeaderTextOffset {
+			get {
+				if (DockPreferences.Orientation == DockOrientation.Bottom)
+					return (HeaderSize + 10) / 2;
+				else
+					return (TailHeight + 3) + (HeaderSize + 10) / 2;
+			}
+		}
+		
 		public DockPopupMenu() : base (Gtk.WindowType.Popup)
 		{
 			Decorated = false;
@@ -82,26 +96,29 @@
 		protected virtual void Build ()
 		{
 			align = new Gtk.Alignment (0.5f, 0.5f, 1, 1);
-			align.LeftPadding = align.RightPadding = align.TopPadding = align.BottomPadding = 2;
+			align.LeftPadding = 4;
+			align.RightPadding = 3;
+			align.TopPadding = align.BottomPadding = 7;
+			align.TopPadding += HeaderSize;
 			
 			switch (DockPreferences.Orientation) {
 			case DockOrientation.Bottom:
-				align.BottomPadding += TailHeight;
+				align.BottomPadding += TailHeight + 3;
 				break;
 			case DockOrientation.Top:
-				align.TopPadding += TailHeight;
+				align.TopPadding += TailHeight + 3;
 				break;
 			}
 			
 			align.Add (Container);
-			Container.BorderWidth = 5;
 			Add (align);
 			align.ShowAll ();
 		}
 
 		
-		public virtual void PopUp (IEnumerable<AbstractMenuArgs> args, int x, int y)
+		public virtual void PopUp (string description, IEnumerable<AbstractMenuArgs> args, int x, int y)
 		{
+			header = description;
 			vertical_offset = horizontal_offset = 0;
 			ShowAll ();
 			Gdk.Rectangle geo = LayoutUtils.MonitorGemonetry ();
@@ -183,12 +200,23 @@
 			
 			SetBackgroundPath (cr);
 			
-			cr.Color = new Cairo.Color (0.1, 0.1, 0.1, .9);
+			cr.Color = BackgroundColor;
 			cr.FillPreserve ();
 			
-			cr.Color = new Cairo.Color (1, 1, 1, .4);
+			cr.LineWidth = 3;
+			cr.StrokePreserve ();
+			
+			cr.Color = new Cairo.Color (1, 1, 1, .25);
 			cr.LineWidth = 1;
 			cr.Stroke ();
+			
+			Core.DockServices.DrawingService.TextPathAtPoint (cr, 
+			                                                  string.Format ("<b>{0}</b>", header),
+			                                                  new Gdk.Point (8, HeaderTextOffset),
+			                                                  Width - 16,
+			                                                  Pango.Alignment.Center);
+			cr.Color = new Cairo.Color (1, 1, 1);
+			cr.Fill ();
 		}
 
 		void SetBackgroundPath (Context context)

=== 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-03-01 07:35:08 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/SeparatorMenuButtonArgs.cs	2009-03-03 14:40:15 +0000
@@ -30,16 +30,19 @@
 		{
 			public CustomSeparator () : base ()
 			{
-				HeightRequest = 3;
+				HeightRequest = 2;
 			}
 			
 			protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 			{
 				using (Context cr = CairoHelper.Create (GdkWindow)) {
+					cr.Rectangle (evnt.Area.X, evnt.Area.Y, evnt.Area.Width, 1);
+					cr.Color = new Cairo.Color (0, 0, 0, .2);
+					cr.Fill ();
+					
 					cr.Rectangle (evnt.Area.X, evnt.Area.Y + 1, evnt.Area.Width, 1);
-					cr.Color = new Cairo.Color (.8, .8, .8, .7);
+					cr.Color = new Cairo.Color (1, 1, 1, .1);
 					cr.Fill ();
-					
 				}
 				return true;
 			}

=== 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-03-01 04:24:20 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs	2009-03-04 05:05:46 +0000
@@ -18,19 +18,30 @@
 
 using System;
 
+using Gdk;
+
 using Wnck;
 
 using Docky.Utilities;
 
+using Do.Interface;
+
 namespace Docky.Interface.Menus
 {
 	
 	
 	public class WindowMenuButtonArgs : AbstractMenuButtonArgs
 	{
-		Window window;
-		
-		public WindowMenuButtonArgs (Window window, string description, string icon) : base (description, icon)
+		Wnck.Window window;
+		
+		public override double IconOpacity {
+			get {
+				return (window.IsMinimized) ? .5 : base.IconOpacity;
+			}
+		}
+
+		
+		public WindowMenuButtonArgs (Wnck.Window window, string description, string icon) : base (description, icon)
 		{
 			this.window = window;
 		}
@@ -39,6 +50,5 @@
 		{
 			window.CenterAndFocusWindow ();
 		}
-
 	}
 }