Merge lp:~cszikszoy/do/kb-service into lp:do

[Chris S.]

[Chris S. (cszikszoy)]

This adds a Keybinding service to Do.Platform.

This service is what all other assemblies will interact with to register keys (both internal and with the host OS) to perform specific actions. Keys can now be bound from any other assmebly that references Do.Platform. Also, multiple key combinations can now be registered with the host OS. For example, I've added a new global hotkey, "<Super>period", this will summon do directly in text mode. Using the keybinding service, this can all be done in one line.

The keybinding service consists of an interface in Do.Platform, IKeyBindingService. Next, in Do.Platform.Common an AbstractKeyBindingService is defined. This class implements all of the platform independant code relating to mapping and keeping track of hotkeys. For example, all internal events (anything other than the summon key, basically) get handled by this class. This class defines two abstract methods, RegisterOSKey, and UnRegisterOSKey. These methods should be defined in the platform specific implementation of the Keybinding service which gets placed in Do.Platform.*

Along with creating the keybinging service, I've also edited libdo to return gbooleans when it tries to register or unregister keys. This feedback helpful in determining if we were successful in attempting to register a particular keystring with the host OS. Should the binding of a keystring, the KeybindingService will attempt to use the DefaultKeystring, instead of what's in the preferences.

Finally, I've removed unnecessary files (XKeyBinder.cs & CoreKeyBindings.cs, both in Do) and fixed the KeyBindingTreeview in the preferences widget. Thanks to a tip I saw on a bug report, setting the CellRendererAccelMode to "Other" allows many more keys to be grabbed.

I originally wrote this service as a part of the Windows port, and I've already written the windows specific implementation of KeyBindingService there.

[Chris S. (cszikszoy)]

Also, please ignore the Console.WriteLine () on line 1038 of the diff. I removed that in rev 1285, but LP currently doesn't update the merge diff when I add revisions after I proposed the merge.

(Here's to hoping they fix that! https://bugs.launchpad.net/launchpad-code/+bug/392343)

[David Siegel (djsiegel-deactivatedaccount)]

Awesome.

[Alex Launi (alexlauni)]

Please remove the <Super>period global keybinding, and then we'll be merge
ready!

--
--Alex Launi

[Chris S. (cszikszoy)]

I can do that, but I thought it was pretty neat and useful for plugins that primarily use text mode, like Microblogging or Translate. It was also something that I put in there to highlight the capabilities of the new keybinding service, but if you think it should go, I can take it out.

[Alex Launi (alexlauni)]

On Sat, Jul 25, 2009 at 12:28 AM, Chris S. <email address hidden> wrote:

> I can do that, but I thought it was pretty neat and useful for plugins that
> primarily use text mode, like Microblogging or Translate. It was also
> something that I put in there to highlight the capabilities of the new
> keybinding service, but if you think it should go, I can take it out.
> --
> https://code.edge.launchpad.net/~cszikszoy/do/kb-service/+merge/9183<https://code.edge.launchpad.net/%7Ecszikszoy/do/kb-service/+merge/9183>
> Your team GNOME Do Core Team is subscribed to branch lp:do.
>

I can see why it'd be neat but I don't think it's useful enough to warrant a
second keybinding to summon Do, and has the potential to be more confusing
than useful. I wouldn't be opposed to leaving it in the keybindings UI but
unbound by default, so that power users can bind it if they want. How do you
feel about that?

--
--Alex Launi

[Robert Dyer (psybers)]

Notes: I can only review the diff on the merge proposal as I have no way at the moment to check out the code. Thus, if the diff is outdated so is this review. I don't know if the code compiles. I have not *tested* the code. :-)

All line numbers refer to the diff.

1) On line 1045, you do a hack to stop from binding to 'only' the super key. The hack checks for Gdk.Key.Super_L, should it also check for Super_R (for keyboards w/ 2 windows keys I'm guessing... I have no way to test this myself).

2) In RegisterOSKey, add a check to see if the binding is emptyornull, if so return false
This way, you don't have to check it every time you call it (make the method enforce its pre-condition). Thus you can remove those checks on lines 253, 256, 286, 289. Might make sense to also check if the callback is null.

3) Clean this code:
253 + if (!string.IsNullOrEmpty (binding.KeyString))
254 + success = RegisterOSKey (binding.KeyString, binding.Callback);
255 + //if we fail to register the summon key, try again with the default binding
256 + if (!success && !string.IsNullOrEmpty (binding.DefaultKeyString)) {
257 + success = RegisterOSKey (binding.DefaultKeyString, binding.Callback);
258 + //if we succeeded now, change the event's keystring
259 + if (success)
260 + binding.KeyString = binding.DefaultKeyString;
261 + }
262 + }
263 +
264 + if (success) {
265 + //add the event to the list of bindings
266 + Bindings.Add (binding);
267 + //set the bound keystring in the prefs
268 + prefs.Set (binding.Description.Replace (' ', '_'), binding.KeyString);
269 + }

Can turn this into:

<<<
254 + success = RegisterOSKey (binding.KeyString, binding.Callback);
255 + //if we fail to register the summon key, try again with the default binding
>>> + if (!success) {
257 + success = RegisterOSKey (binding.DefaultKeyString, binding.Callback);
258 + //if we succeeded now, change the event's keystring
>>> + if (success)
>>> + binding.KeyString = binding.DefaultKeyString;
>>> + }
>>> + if (!success)
>>> return false;
262 + }
263 +
<<<
265 + //add the event to the list of bindings
266 + Bindings.Add (binding);
267 + //set the bound keystring in the prefs
268 + prefs.Set (binding.Description.Replace (' ', '_'), binding.KeyString);

See the change? You don't need to put that last block in a test for success. Basically when the OS binding fails, you don't want to do anything else (hence, just return false). If it passes, you want to do everything else. This is slightly clearer, as if it is not an OS binding, you skip the block that potentially sets success = false. So reasoning for that case is much clearer and reasoning in the other case is the same.

4) Similar thing for SetKeyString on line 274.

5) What is the commented block on lines 294-301? If it isn't needed remove it.

That is all I see. Nice work. :-)

review: Needs Fixing

[lp:~cszikszoy/do/kb-service]

1287. By Chris S. on 2009-08-01

merge trunk

1288. By Chris S. on 2009-08-01

fixes as per Roberts review

1289. By Chris S. on 2009-08-01

it helps when I save the file _before_ pushing...

=== added file 'Do.Platform.Linux/Do.Platform.Linux.dll.config.in'
--- Do.Platform.Linux/Do.Platform.Linux.dll.config.in	1970-01-01 00:00:00 +0000
+++ Do.Platform.Linux/Do.Platform.Linux.dll.config.in	2009-07-23 07:17:00 +0000
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
+</configuration>

=== modified file 'Do.Platform.Linux/Do.Platform.Linux.mdp'
--- Do.Platform.Linux/Do.Platform.Linux.mdp	2009-06-26 11:01:40 +0000
+++ Do.Platform.Linux/Do.Platform.Linux.mdp	2009-07-22 01:12:59 +0000
@@ -52,6 +52,7 @@
     <File name="src/Do.Platform/Do.Platform.Linux/NetworkService.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Widgets/PluginAvailableDialog.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/Do.Platform.Linux.PluginAvailableDialog.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -71,7 +72,7 @@
     <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
 </Project>
\ No newline at end of file

=== modified file 'Do.Platform.Linux/Makefile.am'
--- Do.Platform.Linux/Makefile.am	2009-06-26 11:01:40 +0000
+++ Do.Platform.Linux/Makefile.am	2009-07-23 07:17:00 +0000
@@ -7,7 +7,7 @@
 FILES = \
 	gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs \
 	gtk-gui/Do.Platform.Linux.PluginAvailableDialog.cs \
-        gtk-gui/generated.cs \
+	gtk-gui/generated.cs \
 	src/AssemblyInfo.cs \
 	src/Do.Platform/ConsoleCrayon.cs \
 	src/Do.Platform/Do.Platform.Linux/Do.Platform.Linux.DBus/IController.cs \
@@ -23,6 +23,7 @@
 	src/Do.Platform/Do.Platform.Linux/TrayIconService.cs \
 	src/Do.Platform/Do.Platform.Linux/UniverseFactoryService.cs \
 	src/Do.Platform/Do.Platform.Linux/NetworkService.cs \
+	src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \
 	src/Do.Universe/ApplicationItem.cs \
 	src/Do.Universe/CategoryItem.cs \
 	src/Do.Universe/NullApplicationItem.cs \
@@ -63,3 +64,8 @@
 	Do.Universe \
 	Do.Platform \
 	Do.Interface.Linux
+
+CLEANFILES += Do.Platform.Linux.dll.config
+EXTRA_DIST += Do.Platform.Linux.dll.config.in
+
+module_DATA += Do.Platform.Linux.dll.config

=== modified file 'Do.Platform.Linux/Resources/Do.Platform.Linux.addin.xml'
--- Do.Platform.Linux/Resources/Do.Platform.Linux.addin.xml	2009-06-26 09:44:33 +0000
+++ Do.Platform.Linux/Resources/Do.Platform.Linux.addin.xml	2009-07-22 01:12:59 +0000
@@ -22,6 +22,7 @@
 		<Service type="Do.Platform.Linux.NetworkService" />
 		<Service type="Do.Platform.Linux.TrayIconService" />
 		<Service type="Do.Platform.Linux.ConsoleLogService" />
+		<Service type="Do.Platform.Linux.KeyBindingService" />
 		<Service type="Do.Platform.Linux.EnvironmentService" />
 		<Service type="Do.Platform.Linux.UniverseFactoryService" />
 		<Service type="Do.Platform.Linux.GConfPreferencesService" />

=== added file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs	1970-01-01 00:00:00 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs	2009-07-27 01:25:19 +0000
@@ -0,0 +1,57 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+using Mono.Unix;
+using Gdk;
+using Do.Platform.Common;
+
+namespace Do.Platform.Linux
+{
+	class KeyBindingService : AbstractKeyBindingService
+	{
+		
+		[DllImport("libdo")]
+		static extern void gnomedo_keybinder_init ();
+
+		[DllImport("libdo")]
+		static extern bool gnomedo_keybinder_bind (string keystring, BindkeyHandler handler);
+
+		[DllImport("libdo")]
+		static extern bool gnomedo_keybinder_unbind (string keystring, BindkeyHandler handler);
+
+		public delegate void BindkeyHandler (string key, IntPtr user_data);
+		
+		BindkeyHandler key_handler;
+		
+		public KeyBindingService () : base ()
+		{
+			key_handler = new BindkeyHandler (KeybindingPressed);
+			
+			try {
+				gnomedo_keybinder_init ();
+			} catch (DllNotFoundException) {
+				Log.Error ("libdo not found - keybindings will not work.");
+			}
+		}
+		
+		void KeybindingPressed (string keystring, IntPtr user_data)	{
+			if (Bindings.Any (k => k.KeyString == keystring)) {
+				Bindings.First (k => k.KeyString == keystring).Callback (null);
+			}
+		}
+		
+		public override bool RegisterOSKey (string keyString, EventCallback cb) {
+			return gnomedo_keybinder_bind (keyString, key_handler);
+		}
+
+		public override bool UnRegisterOSKey (string keyString) {
+			
+			if (Bindings.Any (k => k.KeyString == keyString)) {
+				return gnomedo_keybinder_unbind (keyString, key_handler);
+			}
+			return false;
+		}
+	}
+}
\ No newline at end of file

=== modified file 'Do.Platform/Do.Platform.mdp'
--- Do.Platform/Do.Platform.mdp	2009-06-26 11:01:40 +0000
+++ Do.Platform/Do.Platform.mdp	2009-07-23 07:17:00 +0000
@@ -86,6 +86,10 @@
     <File name="src/Do.Platform/Do.Platform.Default/PluginManagerService.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Platform/Do.Platform.ServiceStack/IStrictService.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Universe/Do.Universe.Common/CopyToClipboardAction.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Platform/IKeyBindingService.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Platform/KeyBinding.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Platform/Do.Platform.Default/KeyBindingService.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -95,7 +99,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-</Project>
+</Project>
\ No newline at end of file

=== modified file 'Do.Platform/Makefile.am'
--- Do.Platform/Makefile.am	2009-06-26 11:01:40 +0000
+++ Do.Platform/Makefile.am	2009-07-23 07:17:00 +0000
@@ -14,6 +14,7 @@
 	src/Do.Platform/Do.Platform.Common/DictionaryPreferencesService.cs \
 	src/Do.Platform/Do.Platform.Common/EventsOnlyNotificationsService.cs \
 	src/Do.Platform/Do.Platform.Common/FileLogService.cs \
+	src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs \
 	src/Do.Platform/Do.Platform.Default/CoreService.cs \
 	src/Do.Platform/Do.Platform.Default/DefaultApplicationService.cs \
 	src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs \
@@ -28,6 +29,7 @@
 	src/Do.Platform/Do.Platform.Default/UniverseFactoryService.cs \
 	src/Do.Platform/Do.Platform.Default/WindowingService.cs \
 	src/Do.Platform/Do.Platform.Default/NetworkService.cs \
+	src/Do.Platform/Do.Platform.Default/KeyBindingService.cs \
 	src/Do.Platform/Do.Platform.Preferences/PreferencesFactory.cs \
 	src/Do.Platform/Do.Platform.Preferences/PreferencesImplementation.cs \
 	src/Do.Platform/Do.Platform.ServiceStack/IInitializedService.cs \
@@ -57,6 +59,8 @@
 	src/Do.Platform/Services.cs \
 	src/Do.Platform/INetworkService.cs \
 	src/Do.Platform/NetworkStateChangedEventArgs.cs \
+	src/Do.Platform/IKeyBindingService.cs \
+	src/Do.Platform/KeyBinding.cs \
 	src/Do.Universe/Do.Universe.Common/EmailAction.cs \
 	src/Do.Universe/Do.Universe.Common/OpenAction.cs \
 	src/Do.Universe/Do.Universe.Common/OpenUrlAction.cs \
@@ -89,5 +93,6 @@
 	System \
 	System.Core \
 	Mono.Posix \
+	$(GTK_SHARP_20_LIBS) \
 	$(MONO_ADDINS_LIBS) \
 	$(NUNIT_LIBS)

=== added file 'Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs	1970-01-01 00:00:00 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Common/AbstractKeyBindingService.cs	2009-07-27 01:25:19 +0000
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Do.Platform.Common;
+
+namespace Do.Platform.Common
+{
+	public abstract class AbstractKeyBindingService : IKeyBindingService
+	{
+
+		public abstract bool RegisterOSKey (string keyString, EventCallback cb);
+		public abstract bool UnRegisterOSKey (string keyString);
+
+		IPreferences prefs;
+
+		#region IInitializedService
+
+		public void Initialize () {
+			Bindings = new List<KeyBinding> ();
+			
+			prefs = Services.Preferences.Get<AbstractKeyBindingService> ();
+		}
+
+		#endregion
+
+		#region IKeyBindingService
+
+		public List<KeyBinding> Bindings { get; private set; }
+
+		public bool RegisterKeyBinding (KeyBinding binding) {
+			bool success = true;
+			
+			//first check if this keystring is already used
+			if (Bindings.Any (k => k.KeyString == binding.KeyString)) {
+				Log<AbstractKeyBindingService>.Error ("Key '{0}' is already mapped.", binding.KeyString);
+				return false;
+			}
+
+			//try to get the keystring from the prefs.  We default to the KeyBinding.KeyString, so we can later check
+			//if the prefs value matches that, we're using the default, otherwise we're using a user specified value
+			string prefsKeyString = prefs.Get (binding.Description.Replace (' ', '_'), binding.KeyString);
+			//if these values don't match then the user has specified a new keystring
+			//update the KeyEvent then continue
+			if (prefsKeyString != binding.KeyString)
+				binding.KeyString = prefsKeyString;
+
+			//if we are registering a key with the OS, do something special
+			if (binding.IsOSKey) {
+				//try to register the key from the prefs with the OS
+				if (!string.IsNullOrEmpty (binding.KeyString))
+					success = RegisterOSKey (binding.KeyString, binding.Callback);
+				//if we fail to register the summon key, try again with the default binding
+				if (!success && !string.IsNullOrEmpty (binding.DefaultKeyString)) {
+				    success = RegisterOSKey (binding.DefaultKeyString, binding.Callback);
+					//if we succeeded now, change the event's keystring
+					if (success)
+						binding.KeyString = binding.DefaultKeyString;
+				}
+			}
+
+			if (success) {
+				//add the event to the list of bindings
+				Bindings.Add (binding);
+				//set the bound keystring in the prefs
+				prefs.Set (binding.Description.Replace (' ', '_'), binding.KeyString);
+			}
+
+			return success;
+		}
+
+		public bool SetKeyString (KeyBinding binding, string newKeyString) {
+			bool success = true;
+			
+			//first check if this keystring exists
+			if (!Bindings.Any (k => k.KeyString == binding.KeyString)) {
+				Log<AbstractKeyBindingService>.Error ("Key '{0}' is not mapped.", binding.KeyString);
+				return false;
+			}
+						
+			//if this key should be registered with the OS
+			if (binding.IsOSKey) {
+				//remove the old keystring from the OS
+				if (!string.IsNullOrEmpty (binding.KeyString))
+					UnRegisterOSKey (binding.KeyString);
+				//register again with the new keystring
+				if (!string.IsNullOrEmpty (newKeyString))
+					success = RegisterOSKey (newKeyString, binding.Callback);
+			}
+
+			if (success) {
+				/*
+				//first remove the old binding
+				Bindings.Remove (binding.KeyString);
+				//next set the new keystring
+				binding.KeyString = newKeyString;
+				//now add it back to the dict of bindings
+				Bindings.Add (binding.KeyString, binding);
+				*/
+				//set the new keystring
+				Bindings.First (k => k.KeyString == binding.KeyString).KeyString = newKeyString;
+				
+				//save the new value in the prefs
+				prefs.Set (binding.Description.Replace (' ', '_'), binding.KeyString);
+
+				Log<AbstractKeyBindingService>.Debug ("\"{0}\" now mapped to '{1}'", binding.Description, binding.KeyString);
+			}
+
+			return success;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file

=== added file 'Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs	1970-01-01 00:00:00 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/KeyBindingService.cs	2009-07-27 01:25:19 +0000
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Do.Platform.Common;
+
+namespace Do.Platform.Default
+{
+	class KeyBindingService : IKeyBindingService
+	{
+		public bool RegisterKeyBinding (KeyBinding evnt) {
+			Log.Error ("Default keybinding service cannot register key events. {0}", evnt.KeyString);
+			return false;
+		}
+		public bool SetKeyString (KeyBinding binding, string keyString) {
+			return false;
+		}
+		public List<KeyBinding> Bindings { get { return new List<KeyBinding> (); } }
+		public void Initialize () {
+		}
+	}
+}

=== added file 'Do.Platform/src/Do.Platform/IKeyBindingService.cs'
--- Do.Platform/src/Do.Platform/IKeyBindingService.cs	1970-01-01 00:00:00 +0000
+++ Do.Platform/src/Do.Platform/IKeyBindingService.cs	2009-07-27 01:25:19 +0000
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+using Do.Platform.Common;
+using Do.Platform.ServiceStack;
+
+using Gdk;
+
+namespace Do.Platform
+{
+	public delegate void EventCallback (EventKey evtky);
+
+	public interface IKeyBindingService : IInitializedService
+	{
+		bool RegisterKeyBinding (KeyBinding evnt);
+		bool SetKeyString (KeyBinding binding, string keyString);
+		List<KeyBinding> Bindings { get; }
+	}
+}

=== added file 'Do.Platform/src/Do.Platform/KeyBinding.cs'
--- Do.Platform/src/Do.Platform/KeyBinding.cs	1970-01-01 00:00:00 +0000
+++ Do.Platform/src/Do.Platform/KeyBinding.cs	2009-07-27 01:25:19 +0000
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Do.Platform.Common;
+
+using Gdk;
+
+namespace Do.Platform
+{
+	public class KeyBinding
+	{
+		public string Description { get; private set; }
+		public EventCallback Callback { get; private set; }
+		public string KeyString { get; set; }
+		public string DefaultKeyString { get; private set; }
+		public bool IsOSKey { get; private set; }
+
+		public KeyBinding (string description, string keyString, EventCallback eventFunc) : this (description, keyString, eventFunc, false)
+		{
+		}
+		
+		public KeyBinding (string description, string keyString, EventCallback eventFunc, bool isoskey)
+		{
+			this.Description = description;
+			this.KeyString = keyString;
+			this.DefaultKeyString = keyString;
+			this.Callback = eventFunc;
+			this.IsOSKey = isoskey;
+		}
+	}
+}
\ No newline at end of file

=== modified file 'Do.Platform/src/Do.Platform/Services.cs'
--- Do.Platform/src/Do.Platform/Services.cs	2009-06-26 11:01:40 +0000
+++ Do.Platform/src/Do.Platform/Services.cs	2009-07-22 01:12:59 +0000
@@ -38,6 +38,7 @@
 		static INetworkService network;
 		static IWindowingService windowing;
 		static AbstractSystemService system;
+		static IKeyBindingService keybinder;
 		static IEnumerable<ILogService> logs;
 		static PreferencesFactory preferences;
 		static IEnvironmentService environment;
@@ -198,6 +199,7 @@
 				return package_manager;
 			}
 		}
+		
 		public static IPluginManagerService PluginManager {
 			get {
 				if (plugin_manager == null)
@@ -205,6 +207,14 @@
 				return plugin_manager;
 			}
 		}
+		
+		public static IKeyBindingService Keybinder {
+			get {
+				if (keybinder == null)
+					keybinder = LocateService<IKeyBindingService, Default.KeyBindingService> ();
+				return keybinder;
+			}
+		}
 
 		public static PreferencesFactory Preferences {
 

=== removed file 'Do/Do.exe.config.in'
--- Do/Do.exe.config.in	2008-04-27 01:12:26 +0000
+++ Do/Do.exe.config.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<configuration>
-	<dllmap dll="libc" target="libc.so.6"/>
-	<dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
-</configuration>

=== modified file 'Do/Makefile.am'
--- Do/Makefile.am	2009-06-26 11:01:40 +0000
+++ Do/Makefile.am	2009-07-23 09:29:41 +0000
@@ -16,7 +16,6 @@
 	gtk-gui/generated.cs \
 	src/AssemblyInfo.cs \
 	src/CorePreferences.cs \
-	src/CoreKeybindings.cs \
 	src/Do.Core/Do.Core.Addins/AddinClassifier.cs \
 	src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs \
 	src/Do.Core/Do.Core.Addins/GreedyAddinClassifier.cs \
@@ -73,8 +72,7 @@
 	src/Mono.Addins/AddinExtensions.cs \
 	src/Mono.Addins/Mono.Addins.Setup/AddinRepositoryEntryExtensions.cs \
 	src/PathExtensions.cs \
-	src/Util.cs \
-	src/XKeybinder.cs
+	src/Util.cs
 
 RESOURCES = \
 	gtk-gui/gui.stetic \
@@ -103,10 +101,10 @@
 # Extra rules for our binary, not worth factoring out
 #
 
-CLEANFILES += Do.exe.config gnome-do
-EXTRA_DIST += Do.exe.config.in gnome-do.in Do.addins
+CLEANFILES += gnome-do
+EXTRA_DIST += gnome-do.in Do.addins
 
-module_DATA += Do.exe.config Do.addins
+module_DATA += Do.addins
 bin_SCRIPTS = gnome-do
 
 MCS_FLAGS += -unsafe

=== modified file 'Do/gtk-gui/gui.stetic'
--- Do/gtk-gui/gui.stetic	2009-06-26 11:01:40 +0000
+++ Do/gtk-gui/gui.stetic	2009-07-23 07:17:00 +0000
@@ -5,9 +5,6 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
-    <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
-    <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
     <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <widget-library name="../bin/Debug/Do.exe" internal="true" />
   </import>
@@ -136,6 +133,7 @@
                 <property name="Position">0</property>
                 <property name="AutoSize">False</property>
                 <property name="Expand">False</property>
+                <property name="Fill">False</property>
               </packing>
             </child>
             <child>
@@ -143,7 +141,8 @@
                 <property name="MemberName" />
                 <property name="Ypad">1</property>
                 <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">To edit a shortcut, double-click it and type a new one.</property>
+                <property name="LabelProp" translatable="yes">To edit a shortcut, double-click it and type a new one.
+To restore a shortcut to the default, double click and press Backspace.</property>
                 <property name="Wrap">True</property>
               </widget>
               <packing>

=== removed file 'Do/src/CoreKeybindings.cs'
--- Do/src/CoreKeybindings.cs	2009-03-28 23:09:02 +0000
+++ Do/src/CoreKeybindings.cs	1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-
-/* Keybindings.cs
- *
- * GNOME Do is the legal property of its developers. Please refer to the
- * COPYRIGHT file distributed with this
- * source distribution.
- *
- * 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.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using Env = System.Environment;
-
-using Do.Platform;
-
-namespace Do
-{
-
-	class CoreKeybindings 
-	{
-		Dictionary<string, string> KeycodeMap ; // keybinding -> shortcut name
-		Dictionary<string, Shortcut> ShortcutMap ; // shortcut name -> shortcut
-		Dictionary<string, string> DefaultShortcutMap ; // default keybinding -> shortcut name
-
-		IPreferences Preferences { get; set; }
-
-		public ArrayList Shortcuts ;
-		public Dictionary<string, List<KeyChangedCb>> PreferencesCbs;
-		public delegate void KeyChangedCb (object sender, PreferencesChangedEventArgs e);
-
-		public CoreKeybindings ()
-		{
-
-			Preferences = Services.Preferences.Get<CoreKeybindings> ();
-			Preferences.PreferencesChanged += PreferencesChanged;
-
-			Shortcuts = new ArrayList ();
-			KeycodeMap = new Dictionary<string, string> (); // keybinding -> shortcut name
-			ShortcutMap = new Dictionary<string, Shortcut> (); // shortcut name -> shortcut
-			DefaultShortcutMap = new Dictionary<string, string> (); // default keybinding -> shortcut name
-			PreferencesCbs = new Dictionary<string, List<KeyChangedCb>> ();
-
-			Initialize ();
-		}
-
-		public void Initialize ()
-		{
-			// Read all values out of preferences and populate the KeybindingMap
-			ReadShortcuts ();
-		}
-		
-		public bool RegisterShortcut (Shortcut sc, string defaultBinding)
-		{
-			if (!RegisterShortcut (sc))
-				return false; 
-			if (!BindDefault (sc, defaultBinding))
-				return false;
-			return true;
-		}
-
-		public bool RegisterShortcut (Shortcut sc)
-		{
-			if (Shortcuts.Contains (sc) || ShortcutMap.ContainsKey (sc.ShortcutName)) 
-				return false;
-
-			Shortcuts.Add (sc);
-			ShortcutMap [sc.ShortcutName] = sc;
-			PreferencesCbs [sc.ShortcutName] = new List<KeyChangedCb> ();
-			SaveShortcuts ();
-			return true;
-		}
-
-		public Shortcut GetShortcutByKeycode (string keycode)
-		{
-			if (!KeycodeMap.ContainsKey (keycode)) 
-				return null;
-			
-			string scname = KeycodeMap [keycode];
-
-			if (!ShortcutMap.ContainsKey (scname)) 
-				return null;
-
-			return ShortcutMap [scname];
-
-		}
-
-		public string GetKeybinding (Shortcut sc)
-		{
-			return GetKeybinding (sc.ShortcutName);
-		}
-
-		public string GetKeybinding (string sc)
-		{
-
-			foreach (KeyValuePair<string, string> entry in KeycodeMap) {
-				if (entry.Value == sc) 
-					return entry.Key;
-			}
-			return null;
-		}
-
-		public string GetDefaultKeybinding (Shortcut sc)
-		{
-			return GetDefaultKeybinding (sc.ShortcutName);
-		}
-
-		public string GetDefaultKeybinding (string sc)
-		{
-			foreach (KeyValuePair<string, string> entry in DefaultShortcutMap) {
-				if (entry.Value == sc) 
-					return entry.Key;
-			}
-			return null;
-		}
-
-
-		public bool BindShortcut (Shortcut sc, string keycode)
-		{
-			// Add this function to our keybinding map
-			return BindShortcut (sc.ShortcutName, keycode);
-
-		}
-
-		public bool BindShortcut (string sc, string keycode)
-		{
-			string oldcode = GetKeybinding (sc);
-			if (oldcode != null)
-				KeycodeMap.Remove (oldcode); // remove the old keybinding from the map
-
-			KeycodeMap [keycode] = sc;
-			Preferences.Set (sc, keycode);
-
-			return true;
-		}
-
-		// Add Default Keycode mapping - used for resetting to default or not overwriting read values
-		public bool BindDefault (Shortcut sc, string keycode)
-		{
-			return BindDefault (sc.ShortcutName, keycode);
-
-		}
-
-		public bool BindDefault (string sc, string keycode)
-		{
-
-			string assigned_keycode = GetKeybinding (sc);
-			if (assigned_keycode == null) {
-				// Put this shortcut in the mapping
-				BindShortcut (sc, keycode);
-			}
-
-			DefaultShortcutMap [keycode] = sc;
-			return true;
-
-		}
-
-		public bool UnregisterShortcut (Shortcut sc)
-		{
-			if (!Shortcuts.Contains (sc))
-				return false;
-
-			Shortcuts.Remove (sc);
-			ShortcutMap.Remove (sc.ShortcutName);
-			SaveShortcuts ();
-			return true;
-		}
-
-		public bool RegisterNotification (Shortcut sc, KeyChangedCb cb)
-		{
-			return RegisterNotification (sc.ShortcutName, cb);
-		}
-
-		public bool RegisterNotification (string scname, KeyChangedCb cb)
-		{
-			PreferencesCbs [scname].Add (cb);
-			return true;
-		}
-
-		void SaveShortcuts () 
-		{
-			string scstring = "";
-			foreach (Shortcut sc in Shortcuts) {
-				scstring += sc.ShortcutName.Trim () + ",";
-			}
-			Preferences.Set ("RegisteredShortcuts", scstring);
-		} 
-
-		void ReadShortcuts ()
-		{
-			string scstring = Preferences.Get ("RegisteredShortcuts", "").Trim ();
-			if (scstring == "") 
-				return;
-
-			foreach (string sc in scstring.Split (',')) {
-				if (sc.Trim () == "") 
-					continue;
-
-				string keycode = Preferences.Get (sc, "");
-				if (keycode != "")
-					BindShortcut (sc, keycode);
-			}
-		}
-
-		void PreferencesChanged (object sender, PreferencesChangedEventArgs e)
-		{
-
-			if (PreferencesCbs.ContainsKey (e.Key)) {   
-				foreach (KeyChangedCb cb in PreferencesCbs [e.Key]) {
-					cb (this, e);
-				}
-			}
-		}
-
-	}
-
-}

=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs	2009-06-24 01:42:21 +0000
+++ Do/src/Do.Core/Controller.cs	2009-07-27 01:25:19 +0000
@@ -30,6 +30,7 @@
 using Do.UI;
 using Do.Universe;
 using Do.Platform;
+using Do.Platform.Common;
 using Do.Interface;
 
 namespace Do.Core
@@ -108,96 +109,37 @@
 			Screen.Default.CompositedChanged += OnCompositingChanged;
 			
 			// Register Shortcuts
-			// TODO: Localize the text here.
-			// Previous shortcuts
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("SummonKey", 
-						Catalog.GetString ("Summon GNOME Do"), 
-						OnSummonKeyPressEvent),
-					"<Super>space");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("TextModeKey",
-						Catalog.GetString ("Enter text mode"),
-						OnTextModePressEvent),
-					"period");
-			// New shortcuts
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("CopyKey",
-						Catalog.GetString ("Copy Text"),
-						OnCopyEvent),
-					"<Control>c");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("PasteKey",
-						Catalog.GetString ("Paste Text"),
-						OnPasteEvent),
-					"<Control>v");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("AlternateEscapeKey",
-						Catalog.GetString ("Alternate Escape"),
-						OnEscapeKeyPressEvent));
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("AlternateActivateKey",
-						Catalog.GetString ("Alternate Activate"),
-						OnActivateKeyPressEvent));
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("AlternateDeleteKey",
-						Catalog.GetString ("Alternate Delete"),
-						OnDeleteKeyPressEvent));
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("ShiftTabKey",
-						Catalog.GetString ("Previous Pane"),
-						OnShiftTabKeyPressEvent),
-					"ISO_Left_Tab");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("TabKey",
-						Catalog.GetString ("Next Pane"),
-						OnTabKeyPressEvent),
-					"Tab");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("UpKey",
-						Catalog.GetString ("Previous Result"),
-						OnUpKeyPressEvent),
-					"Up");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("DownKey",
-						Catalog.GetString ("Next Result"),
-						OnDownKeyPressEvent),
-					"Down");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("HomeKey",
-						Catalog.GetString ("First Result"),
-						OnHomeKeyPressEvent),
-					"Home");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("EndKey",
-						Catalog.GetString ("Last Result"),
-						OnEndKeyPressEvent),
-					"End");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("PageUpKey",
-						Catalog.GetString ("Previous 5 Results"),
-						OnPageUpKeyPressEvent),
-					"Page_Up");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("PageDownKey",
-						Catalog.GetString ("Next 5 Results"),
-						OnPageDownKeyPressEvent),
-					"Page_Down");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("LeftKey",
-						Catalog.GetString ("Step out of Item"),
-						OnLeftKeyPressEvent),
-					"Left");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("RightKey",
-						Catalog.GetString ("Browse Into Item"),
-						OnRightKeyPressEvent),
-					"Right");
-			Do.Keybindings.RegisterShortcut (
-					new Shortcut ("CommaKey",
-						Catalog.GetString ("Multiple selection"),
-						OnSelectionKeyPressEvent),
-					"comma");
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Enter Text Mode"), "period",
+				OnTextModePressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Copy to Clipboard"), "<Control>c",
+				OnCopyEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Paste Current Text"), "<Control>v",
+				OnPasteEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Previous Pane"), "<Shift>Tab",
+				OnPreviousPanePressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Next Pane"), "Tab",
+				OnNextPanePressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Previous Item"), "Up",
+				OnUpKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Next Item"), "Down",
+				OnDownKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("First Item"), "Home",
+				OnHomeKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Last Item"), "End",
+				OnEndKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Previous 5 Results"), "Page_Up",
+				OnPageUpKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Next 5 Results"), "Page_Down",
+				OnPageDownKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Step Out of Item"), "Left",
+				OnLeftKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Browse Into Item"), "Right",
+				OnRightKeyPressEvent));
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Select Multiple Items"), "comma",
+				OnSelectionKeyPressEvent));
+			//summon in text mode
+			Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Summon in Text Mode"), "",
+				delegate { this.Summon (); SearchController.TextMode = true; UpdatePane (CurrentPane); } , true));
 		}
 
 		void OnSummoned ()
@@ -507,13 +449,10 @@
 			} else if (key == Key.Delete ||
 				   key == Key.BackSpace) {
 				OnDeleteKeyPressEvent (evnt);
-			} else {
+			} else if (Services.Keybinder.Bindings.Any (k => k.KeyString == KeyEventToString (evnt))) {
 				// User set keybindings
-				Shortcut sc = Do.Keybindings.GetShortcutByKeycode (KeyEventToString (evnt));
-				if (sc != null) {
-					sc.Callback (evnt);
-					return;
-				}
+				Services.Keybinder.Bindings.First (k => k.KeyString == KeyEventToString (evnt)).Callback (evnt);
+			} else {
 				OnInputKeyPressEvent (evnt);
 			}
 		}
@@ -648,7 +587,7 @@
 			if (SearchController.ItemChildSearch ()) GrowResults ();
 		}
 
-		void OnTabKeyPressEvent (EventKey evnt)
+		void OnNextPanePressEvent (EventKey evnt)
 		{
 			im_context.Reset ();
 			ShrinkResults ();
@@ -661,7 +600,7 @@
 			UpdatePane (CurrentPane);
 		}
 
-		void OnShiftTabKeyPressEvent (EventKey evnt)
+		void OnPreviousPanePressEvent (EventKey evnt)
 		{
 			im_context.Reset ();
 			ShrinkResults ();
@@ -760,7 +699,14 @@
 			if ((evnt.State & ModifierType.Mod1Mask) != 0) {
 				modifier += "<Alt>";
 			}
-			return modifier + evnt.Key.ToString ();
+			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, evnt.Key.ToString ());
 		}
 #endregion
 		

=== modified file 'Do/src/Do.UI/KeybindingTreeView.cs'
--- Do/src/Do.UI/KeybindingTreeView.cs	2009-06-20 04:30:05 +0000
+++ Do/src/Do.UI/KeybindingTreeView.cs	2009-07-27 01:25:19 +0000
@@ -20,40 +20,41 @@
 
 
 using System;
+using System.Linq;
+
 using Gtk;
 using Mono.Unix;
 
+using Do.Platform;
+using Do.Platform.Common;
+
 namespace Do.UI
 {
 	public class KeybindingTreeView : TreeView
 	{
 		enum Column {
 			Action = 0,
+			BoundKeyString,
+			DefaultKeybinding,
 			Binding,
-			DefaultKeybinding,
-			ShortcutName, 
 			NumColumns
 		}
 		
 		public KeybindingTreeView ()
 		{	
-			Model = new ListStore (typeof (string), typeof (string), typeof (string), typeof (string));
+			Model = new ListStore (typeof (string), typeof (string), typeof (string), typeof (KeyBinding));
 			
 			CellRendererText actionCell = new CellRendererText ();
 			actionCell.Width = 150;
 			InsertColumn (-1, Catalog.GetString ("Action"), actionCell, "text", (int)Column.Action);
 			
 			CellRendererAccel bindingCell = new CellRendererAccel ();
-			bindingCell.AccelMode = CellRendererAccelMode.Gtk;
+			bindingCell.AccelMode = CellRendererAccelMode.Other;
 			bindingCell.Editable = true;
 			bindingCell.AccelEdited += new AccelEditedHandler (OnAccelEdited);
 			bindingCell.AccelCleared += new AccelClearedHandler (OnAccelCleared);
-			InsertColumn (-1, Catalog.GetString ("Shortcut"), bindingCell, "text", (int)Column.Binding);
-			
-			CellRendererText defaultbindingCell = new CellRendererText ();
-			actionCell.Width = 150;
-//			InsertColumn (-1, Catalog.GetString ("Default Shortcut"), defaultbindingCell, "text", (int)Column.DefaultKeybinding);
-			
+			InsertColumn (-1, Catalog.GetString ("Shortcut"), bindingCell, "text", (int)Column.BoundKeyString);
+						
 			RowActivated += new RowActivatedHandler (OnRowActivated);
 			ButtonPressEvent += new ButtonPressEventHandler (OnButtonPress);
 			
@@ -66,9 +67,8 @@
 			ListStore store = Model as ListStore;
 			store.Clear ();
 
-			foreach (Shortcut sc in Do.Keybindings.Shortcuts) {
-				store.AppendValues (sc.FriendlyName, Do.Keybindings.GetKeybinding (sc), 
-					Do.Keybindings.GetDefaultKeybinding (sc), sc.ShortcutName);
+			foreach (KeyBinding binding in Services.Keybinder.Bindings.OrderBy (k => k.Description)) {
+				store.AppendValues (binding.Description, binding.KeyString, binding.DefaultKeyString, binding);
 			}
 		}
 		
@@ -81,21 +81,21 @@
 				
 			if (GetPathAtPos ((int) args.Event.X, (int) args.Event.Y,out path)) {
 				GrabFocus ();
-				SetCursor (path, GetColumn ((int) Column.Binding), true);
+				SetCursor (path, GetColumn ((int) Column.BoundKeyString), true);
 			}				
 		}
 		
 		private void OnRowActivated (object o, RowActivatedArgs args)
 		{
 			GrabFocus ();
-			SetCursor (args.Path, GetColumn ((int) Column.Binding), true);
+			SetCursor (args.Path, GetColumn ((int) Column.BoundKeyString), true);
 		}
 
 		private bool ClearPreviousBinding (TreeModel model, TreePath path, TreeIter treeiter, string keyBinding) 
 		{
-			string binding = model.GetValue (treeiter, (int) Column.Binding) as string;
+			string binding = model.GetValue (treeiter, (int) Column.BoundKeyString) as string;
 			if (binding == keyBinding) {
-				model.SetValue (treeiter, (int) Column.Binding, "");
+				model.SetValue (treeiter, (int) Column.BoundKeyString, "");
 			}
 			return false;
 		}
@@ -110,10 +110,16 @@
 			
 			string realKey = Gtk.Accelerator.Name (args.AccelKey, args.AccelMods);
 			
+			if (args.AccelKey == (uint) Gdk.Key.Super_L) {
+				//setting CellRenderAccelMode to "Other" ignores the Super key as a modifier
+				//this prevents us from grabbing _only_ the Super key.
+				return;
+			}
+			
 			// Look for any other rows that have the same binding and then zero that binding out
 			Model.Foreach ((model, path, treeiter) => ClearPreviousBinding (model, path, treeiter, realKey));
 
-			store.SetValue (iter, (int) Column.Binding, realKey);
+			store.SetValue (iter, (int) Column.BoundKeyString, realKey);
 
 			SaveBindings ();
 		}
@@ -127,9 +133,9 @@
 			store.GetIter (out iter, new TreePath (args.PathString));
 			try {
 				string defaultVal = store.GetValue (iter, (int) Column.DefaultKeybinding).ToString ();
-				store.SetValue (iter, (int) Column.Binding, defaultVal);
+				store.SetValue (iter, (int) Column.BoundKeyString, defaultVal);
 			} catch (Exception e) {
-				store.SetValue (iter, (int) Column.Binding, "");
+				store.SetValue (iter, (int) Column.BoundKeyString, "");
 			}
 
 			SaveBindings ();
@@ -142,12 +148,18 @@
 		
 		private bool SaveBindingsForeachFunc (TreeModel model, TreePath path, TreeIter iter)
 		{
-			string binding, shortcutname;
-			binding = model.GetValue (iter, (int) Column.Binding) as string;
-			shortcutname = model.GetValue (iter, (int) Column.ShortcutName) as string;
+			string newKeyString = model.GetValue (iter, (int) Column.BoundKeyString) as string;
+			KeyBinding binding = model.GetValue (iter, (int) Column.Binding) as KeyBinding;
 			
-			if (binding != null && binding != "DISABLED" && binding != Do.Keybindings.GetKeybinding (shortcutname))
-				Do.Keybindings.BindShortcut (shortcutname, binding);
+			//only save if the keystring changed
+			if (newKeyString != null && binding.KeyString != newKeyString) {
+				//try to save
+				if (!Services.Keybinder.SetKeyString (binding, newKeyString)) {
+					//if we fail reset to the default value
+					model.SetValue (iter, (int) Column.BoundKeyString, binding.DefaultKeyString);
+					Services.Keybinder.SetKeyString (binding, binding.DefaultKeyString);
+				}
+			}
 			return false;
 		}
 		

=== modified file 'Do/src/Do.cs'
--- Do/src/Do.cs	2009-06-21 02:20:30 +0000
+++ Do/src/Do.cs	2009-07-23 09:29:41 +0000
@@ -27,18 +27,17 @@
 using Do.UI;
 using Do.Core;
 using Do.Platform;
+using Do.Platform.Common;
 
 namespace Do {
 
 	static class Do {
 		
-		static XKeybinder keybinder;
 		static Controller controller;
 		static UniverseManager universe_manager;
 
-		public static CorePreferences Preferences { get; private set; } 
-		public static CoreKeybindings Keybindings { get; private set; } 
-
+		public static CorePreferences Preferences { get; private set; }
+		
 		internal static void Main (string [] args)
 		{
 			Catalog.Init ("gnome-do", AssemblyInfo.LocaleDirectory);
@@ -55,8 +54,6 @@
 
 			Preferences = new CorePreferences ();
 
-			Keybindings = new CoreKeybindings ();
-
 			// Now we can set the preferred log level.
 			if (Preferences.QuietStart)
 				Log.DisplayLevel = LogLevel.Error;
@@ -73,12 +70,11 @@
 			Controller.Initialize ();
 			UniverseManager.Initialize ();
 			
-			keybinder = new XKeybinder ();
 			SetupKeybindings ();
 
 			if (!Preferences.QuietStart)
 				Controller.Summon ();
-			
+
 			Gtk.Application.Run ();
 			
 			RelevanceProvider.Serialize (RelevanceProvider.DefaultProvider);
@@ -100,37 +96,17 @@
 				return universe_manager;
 			}
 		}
-
-		static void SummonKeyCb (object sender, PreferencesChangedEventArgs e)
-		{
-			try {
-				if (e.OldValue != null)
-					keybinder.Unbind (e.OldValue as string);
-				keybinder.Bind (Keybindings.GetKeybinding ("SummonKey"), OnActivate);
-			} catch (Exception ex) {
-				Log.Error ("Could not bind summon key: {0}", ex.Message);
-				Log.Debug (ex.StackTrace);
-			}
-
-		}
 		
 		static void SetupKeybindings ()
 		{
 			try {
-				keybinder.Bind (Keybindings.GetKeybinding ("SummonKey"), OnActivate);
+				if (!Services.Keybinder.RegisterKeyBinding (new KeyBinding (Catalog.GetString ("Summon Do"),
+					"<Super>space", delegate { controller.Summon (); }, true)))
+					throw new Exception ();
 			} catch (Exception e) {
-				Log.Error ("Could not bind summon key: {0}", e.Message);
+				Log.Fatal ("Could not bind summon key!");
 				Log.Debug (e.StackTrace);
 			}
-
-			// Watch preferences for changes to the keybinding so we
-			// can change the binding when the user reassigns it.
-			Keybindings.RegisterNotification ("SummonKey", SummonKeyCb);
-		}
-		
-		static void OnActivate (object sender, EventArgs e)
-		{
-			controller.Summon ();
 		}
 	}
 }

=== removed file 'Do/src/XKeybinder.cs'
--- Do/src/XKeybinder.cs	2008-12-18 18:39:06 +0000
+++ Do/src/XKeybinder.cs	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*****************************************************************************/
-/* XKeybinder.cs - Keybinding code taken from Tomboy			     */
-/* Copyright (C) 2004-2007 Alex Graveley <[e-mail]>	     */
-/* 									     */
-/* This library is free software; you can redistribute it and/or	     */
-/* modify it under the terms of the GNU Lesser General Public		     */
-/* License as published by the Free Software Foundation; either		     */
-/* version 2.1 of the License, or (at your option) any later version.	     */
-/* 									     */
-/* This library 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	     */
-/* Lesser General Public License for more details.			     */
-/* 									     */
-/* You should have received a copy of the GNU Lesser General Public	     */
-/* License along with this library; if not, write to the Free Software	     */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-/*****************************************************************************/
-
-using System;
-using System.Collections;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-
-using Do.Platform;
-
-namespace Do
-{
-	public class XKeybinder 
-	{
-		[DllImport("libdo")]
-		static extern void gnomedo_keybinder_init ();
-
-		[DllImport("libdo")]
-		static extern void gnomedo_keybinder_bind (string keystring, BindkeyHandler handler);
-
-		[DllImport("libdo")]
-		static extern void gnomedo_keybinder_unbind (string keystring, BindkeyHandler handler);
-
-		public delegate void BindkeyHandler (string key, IntPtr user_data);
-
-		ArrayList      bindings;
-		BindkeyHandler key_handler;
-
-		struct Binding {
-			internal string       keystring;
-			internal EventHandler handler;
-		}
-
-		public XKeybinder ()
-			: base ()
-		{
-			bindings = new ArrayList ();
-			key_handler = new BindkeyHandler (KeybindingPressed);
-			
-			try {
-				gnomedo_keybinder_init ();
-			} catch (DllNotFoundException) {
-				Log.Error ("libdo not found - keybindings will not work.");
-			}
-		}
-
-		void KeybindingPressed (string keystring, IntPtr user_data)
-		{
-			foreach (Binding bind in bindings) {
-				if (bind.keystring == keystring) {
-					bind.handler (this, new EventArgs ());
-				}
-			}
-		}
-
-		public void Bind (string keystring, EventHandler handler)
-		{
-			Binding bind = new Binding ();
-			bind.keystring = keystring;
-			bind.handler = handler;
-			bindings.Add (bind);
-			
-			gnomedo_keybinder_bind (bind.keystring, key_handler);
-		}
-
-		public void Unbind (string keystring)
-		{
-			foreach (Binding bind in bindings) {
-				if (bind.keystring == keystring) {
-					gnomedo_keybinder_unbind (bind.keystring, key_handler);
-
-					bindings.Remove (bind);
-					break;
-				}
-			}
-		}
-
-		public virtual void UnbindAll ()
-		{
-			foreach (Binding bind in bindings) {
-				gnomedo_keybinder_unbind (bind.keystring, key_handler);
-			}
-
-			bindings.Clear ();
-		}
-	}
-}

=== modified file 'configure.ac'
--- configure.ac	2009-07-08 09:33:18 +0000
+++ configure.ac	2009-07-23 09:14:01 +0000
@@ -134,7 +134,6 @@
 
 AC_CONFIG_FILES([
 BundledLibraries/Makefile
-Do/Do.exe.config
 Do/Makefile
 Do/gnome-do
 Do/src/AssemblyInfo.cs
@@ -152,6 +151,7 @@
 Do.Platform/Makefile
 Do.Platform/src/AssemblyInfo.cs
 Do.Platform.Linux/Makefile
+Do.Platform.Linux/Do.Platform.Linux.dll.config
 Do.Platform.Linux/src/AssemblyInfo.cs
 Do.Platform.Linux.JoliCloud/Makefile
 Do.Platform.Linux.JoliCloud/src/AssemblyInfo.cs
@@ -201,4 +201,4 @@
     Release Build:      ${enable_release}
     NUnit:              ${have_nunit}
 
-EOF
\ No newline at end of file
+EOF

=== modified file 'libdo/keybinder.c'
--- libdo/keybinder.c	2008-02-18 14:40:44 +0000
+++ libdo/keybinder.c	2009-07-23 07:17:00 +0000
@@ -257,7 +257,7 @@
 			  NULL);
 }
 
-void 
+gboolean 
 gnomedo_keybinder_bind (const char           *keystring,
 		       GnomeDoBindkeyHandler  handler,
 		       gpointer              user_data)
@@ -279,9 +279,11 @@
 		g_free (binding->keystring);
 		g_free (binding);
 	}
+
+	return success;
 }
 
-void
+gboolean
 gnomedo_keybinder_unbind (const char           *keystring, 
 			 GnomeDoBindkeyHandler  handler)
 {
@@ -302,6 +304,8 @@
 		g_free (binding);
 		break;
 	}
+
+	return TRUE;
 }
 
 /* 

=== modified file 'libdo/keybinder.h'
--- libdo/keybinder.h	2008-02-18 14:40:44 +0000
+++ libdo/keybinder.h	2009-07-23 07:17:00 +0000
@@ -32,11 +32,11 @@
 
 void gnomedo_keybinder_init   (void);
 
-void gnomedo_keybinder_bind   (const char           *keystring,
+gboolean gnomedo_keybinder_bind   (const char           *keystring,
 			      GnomeDoBindkeyHandler  handler,
 			      gpointer              user_data);
 
-void gnomedo_keybinder_unbind (const char           *keystring,
+gboolean gnomedo_keybinder_unbind (const char           *keystring,
 			      GnomeDoBindkeyHandler  handler);
 
 gboolean gnomedo_keybinder_is_modifier (guint keycode);