Merge lp:~cszikszoy/do/do-fix-copy into lp:do

[Chris S.]

[Chris S. (cszikszoy)]

This branch fixes copying to the clipboard in a couple of ways:

* Remove GTK / GDK specific code from core (Do.Core.Controller.cs)
* Add CopyToClipboard as a method of Services.Environment
* Put linux specific (GTK / GDK) clipboard related code inside of Do.Platform.Linux.EnvironmentService.cs
* Adds item checking to copy action

[lp:~cszikszoy/do/do-fix-copy]

1220. By Chris S. on 2009-06-16

exception handling & logging

[Jason Smith (jassmith)]

Looks beautiful

review: Approve

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentService.cs	2009-01-21 01:40:49 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentService.cs	2009-06-16 00:30:44 +0000
@@ -26,7 +26,7 @@
 using Mono.Unix;
 
 using Do.Platform;
-
+using Do.Universe;
 
 namespace Do.Platform.Linux
 {
@@ -86,6 +86,31 @@
 				Process.Start (line);
 			}
 		}
+		
+		public void CopyToClipboard (Item item)
+		{
+			string text = "";
+			
+			if (item is ITextItem)
+				text = (item as ITextItem).Text;
+			else if (item is IFileItem)
+				text = (item as IFileItem).Path;
+			else if (item is IUriItem)
+				text = (item as IUriItem).Uri;
+			else if (item is IUrlItem)
+				text = (item as IUrlItem).Url;
+			else if (item is IContactDetailItem)
+				text = (item as IContactDetailItem).Value;
+			else if (item is ContactItem)
+				text = (item as ContactItem).Name;
+			else					
+				text = string.Format ("{0} - {1}", item.Name, item.Description);
+			
+			Gtk.Clipboard.Get (Gdk.Selection.Clipboard).Text =
+				Gtk.Clipboard.Get (Gdk.Selection.Primary).Text = text;
+			
+			Log.Debug ("Copied to clipboard, \"{0}\"", text);
+		}
 
 		#endregion
 
@@ -138,6 +163,5 @@
 			}
 			return false;
 		}
-		
 	}
 }

=== modified file 'Do.Platform.Linux/src/Do.Universe/CopyToClipboardAction.cs'
--- Do.Platform.Linux/src/Do.Universe/CopyToClipboardAction.cs	2008-12-20 00:31:54 +0000
+++ Do.Platform.Linux/src/Do.Universe/CopyToClipboardAction.cs	2009-06-16 00:30:44 +0000
@@ -23,12 +23,10 @@
 using System.Linq;
 using System.Collections.Generic;
 
-using Gtk;
-using Gdk;
-
 using Mono.Unix;
 
 using Do.Universe;
+using Do.Platform;
 
 namespace Do.Universe.Linux
 {
@@ -52,20 +50,18 @@
 			get { yield return typeof (Item); }
 		}
 		
+		public override bool SupportsItem (Item item)
+		{
+			return !(item is IApplicationItem);
+		}
+		
 		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
 		{
-			string text = "";
 			Item item = items.First ();
-
-			if (item is ITextItem)
-				text = (item as ITextItem).Text;
-			else
-				text = string.Format ("{0} - {1}", item.Name, item.Description);
 			
-			Clipboard.Get (Gdk.Selection.Clipboard).Text =
-				Clipboard.Get (Gdk.Selection.Primary).Text = text;
+			Services.Environment.CopyToClipboard (item);
 
-			return null;
+			yield break;
 		}
 	}
 }

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/EnvironmentService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/EnvironmentService.cs	2008-12-04 18:49:59 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/EnvironmentService.cs	2009-06-16 00:30:44 +0000
@@ -20,6 +20,8 @@
 using System;
 using System.Collections.Generic;
 
+using Do.Universe;
+
 namespace Do.Platform.Default
 {
 	
@@ -53,6 +55,11 @@
 		{
 			Log.Debug ("Default IEnvironmentService cannot execute \"{0}\".", line);
 		}
+		
+		public void CopyToClipboard (Item item)
+		{
+			Log.Debug ("Default IEnvironmentService cannot copy \"{0}\".", item.Name);
+		}
 
 		#endregion
 	}

=== modified file 'Do.Platform/src/Do.Platform/IEnvironmentService.cs'
--- Do.Platform/src/Do.Platform/IEnvironmentService.cs	2008-12-03 19:18:36 +0000
+++ Do.Platform/src/Do.Platform/IEnvironmentService.cs	2009-06-16 00:30:44 +0000
@@ -22,6 +22,8 @@
 using System.Linq;
 using System.Collections.Generic; 
 
+using Do.Universe;
+
 using Do.Platform.ServiceStack;
 
 namespace Do.Platform
@@ -37,6 +39,8 @@
 			
 		bool IsExecutable (string line);
 		void Execute (string line);
+		
+		void CopyToClipboard (Item item);
 	}
 
 	public static class IEnvironmentServiceExtensions

=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs	2009-05-16 06:15:14 +0000
+++ Do/src/Do.Core/Controller.cs	2009-06-16 00:31:32 +0000
@@ -477,9 +477,8 @@
 		
 		void OnCopyEvent (EventKey evnt)
 		{
-			Gtk.Clipboard clip = Gtk.Clipboard.Get (Selection.Clipboard);
-			if (SearchController.Selection != null)
-				clip.Text = SearchController.Selection.Name;
+			if (SearchController.Selection is Item)
+				Services.Environment.CopyToClipboard (SearchController.Selection as Item);
 		}
 		
 		void OnActivateKeyPressEvent (EventKey evnt)