Merge lp:~psybers/do/escape-painters into lp:do

[Robert Dyer]

[Robert Dyer (psybers)]

Let's painters close by pressing the Escape key (or whatever key 'Clear' is bound to by the user).

Moved the KeyEventToString method into the key services, as it was needed in Docky and seems logical.

[lp:~psybers/do/escape-painters]

1295. By Robert Dyer <rdyer@yamuna> on 2009-08-19

cleaning the code for cszikszoy

[Robert Dyer (psybers)]

review: Approve

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-06-17 04:41:30 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-08-19 07:27:08 +0000
@@ -276,6 +276,8 @@
 			DnDTracker.DragEnded += HandleDragEnded;
 			DnDTracker.DrawRequired += HandleDrawRequired; 
 			
+			window.KeyPressEvent += HandleKeyPressEvent;
+			
 			StyleSet += (o, a) => { 
 				if (IsRealized)
 					GdkWindow.SetBackPixmap (null, false);
@@ -308,6 +310,8 @@
 			
 			DnDTracker.DragEnded -= HandleDragEnded;
 			DnDTracker.DrawRequired -= HandleDrawRequired; 
+			
+			window.KeyPressEvent -= HandleKeyPressEvent;
 		}
 		
 		void BuildAnimationStateEngine ()
@@ -333,6 +337,16 @@
 			                             DateTime.UtcNow - showhide_time < SummonTime);
 		}
 		
+		void HandleKeyPressEvent (Gdk.EventKey key)
+		{
+			KeyBinding clearKeyBinding = null;
+			if (Services.Keybinder.Bindings.Where(p => p.Description == Mono.Unix.Catalog.GetString ("Clear")).Any())
+				clearKeyBinding = Services.Keybinder.Bindings.Where(p => p.Description == Mono.Unix.Catalog.GetString ("Clear")).First();
+			if (PainterOverlayVisible &&
+				clearKeyBinding != null && Services.Keybinder.KeyEventToString (key) == clearKeyBinding.KeyString)
+				InterruptPainter ();
+		}
+		
 		void HandleCursorUpdated (object sender, CursorUpdatedArgs args)
 		{
 			if (PopupMenu.Visible)

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-06-21 02:20:30 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-08-19 07:27:08 +0000
@@ -194,7 +194,7 @@
 		
 		protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
 		{
-			if (Visible)
+			if (Visible || dock_area.PainterOverlayVisible)
 				KeyPressEvent (evnt);
 			return base.OnKeyPressEvent (evnt);
 		}

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs	2009-08-08 05:48:10 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs	2009-08-19 07:27:08 +0000
@@ -96,6 +96,37 @@
 
 			return true;
 		}
+		
+		/// <summary>
+		/// Converts a keypress into a human readable string for comparing
+		/// against values in GConf.
+		/// </summary>
+		/// <param name="evnt">
+		/// A <see cref="EventKey"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.String"/> in the form "<Modifier>key"
+		/// </returns>
+		public string KeyEventToString (Gdk.EventKey evnt) {
+			string modifier = "";
+			if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
+				modifier += "<Control>";
+			}
+			if ((evnt.State & Gdk.ModifierType.SuperMask) != 0) {
+				modifier += "<Super>";
+			}
+			if ((evnt.State & Gdk.ModifierType.Mod1Mask) != 0) {
+				modifier += "<Alt>";
+			}
+			if ((evnt.State & Gdk.ModifierType.ShiftMask) != 0) {
+				modifier += "<Shift>";
+				//if we're pressing shift, and the key is ISO_Left_Tab,
+				//just make it Tab
+				if (evnt.Key == Gdk.Key.ISO_Left_Tab)
+					return string.Format ("{0}{1}", modifier, Gdk.Key.Tab);
+			}
+			return string.Format ("{0}{1}", modifier, Gtk.Accelerator.Name (evnt.KeyValue, Gdk.ModifierType.None));
+		}
 #endregion
 	}
-}
\ No newline at end of file
+}

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs	2009-07-27 01:25:19 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs	2009-08-19 07:27:08 +0000
@@ -16,6 +16,9 @@
 		public bool SetKeyString (KeyBinding binding, string keyString) {
 			return false;
 		}
+		public string KeyEventToString (Gdk.EventKey evnt) {
+			return "";
+		}
 		public List<KeyBinding> Bindings { get { return new List<KeyBinding> (); } }
 		public void Initialize () {
 		}

=== modified file 'Do.Platform/src/Do.Platform/IKeyBindingService.cs'
--- Do.Platform/src/Do.Platform/IKeyBindingService.cs	2009-07-27 01:25:19 +0000
+++ Do.Platform/src/Do.Platform/IKeyBindingService.cs	2009-08-19 07:27:08 +0000
@@ -15,5 +15,6 @@
 		bool RegisterKeyBinding (KeyBinding evnt);
 		bool SetKeyString (KeyBinding binding, string keyString);
 		List<KeyBinding> Bindings { get; }
+		string KeyEventToString (EventKey evnt);
 	}
 }

=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs	2009-08-09 00:54:16 +0000
+++ Do/src/Do.Core/Controller.cs	2009-08-19 07:27:08 +0000
@@ -465,9 +465,9 @@
 			} else if (key == Key.Delete ||
 				   key == Key.BackSpace) {
 				OnDeleteKeyPressEvent (evnt);
-			} else if (Services.Keybinder.Bindings.Any (k => k.KeyString == KeyEventToString (evnt))) {
+			} else if (Services.Keybinder.Bindings.Any (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt))) {
 				// User set keybindings
-				Services.Keybinder.Bindings.First (k => k.KeyString == KeyEventToString (evnt)).Callback (evnt);
+				Services.Keybinder.Bindings.First (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt)).Callback (evnt);
 			} else {
 				OnInputKeyPressEvent (evnt);
 			}
@@ -704,37 +704,6 @@
 			im_context.Reset ();
 			SearchController.Cursor += 5;
 		}
-				
-		/// <summary>
-		/// Converts a keypress into a human readable string for comparing
-		/// against values in GConf.
-		/// </summary>
-		/// <param name="evnt">
-		/// A <see cref="EventKey"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.String"/> in the form "<Modifier>key"
-		/// </returns>
-		string KeyEventToString (EventKey evnt) {
-			string modifier = "";
-			if ((evnt.State & ModifierType.ControlMask) != 0) {
-				modifier += "<Control>";
-			}
-			if ((evnt.State & ModifierType.SuperMask) != 0) {
-				modifier += "<Super>";
-			}
-			if ((evnt.State & ModifierType.Mod1Mask) != 0) {
-				modifier += "<Alt>";
-			}
-			if ((evnt.State & ModifierType.ShiftMask) != 0) {
-				modifier += "<Shift>";
-				//if we're pressing shift, and the key is ISO_Left_Tab,
-				//just make it Tab
-				if (evnt.Key == Key.ISO_Left_Tab)
-					return string.Format ("{0}{1}", modifier, Key.Tab);
-			}
-			return string.Format ("{0}{1}", modifier, Gtk.Accelerator.Name (evnt.KeyValue, Gdk.ModifierType.None));
-		}
 #endregion
 		
 		/// <summary>