f-spot r4087 - in trunk: . src

[rubenv svn gnome org]

Author: rubenv
Date: Tue Jun 24 12:46:45 2008
New Revision: 4087
URL: http://svn.gnome.org/viewvc/f-spot?rev=4087&view=rev

Log:
Merge branch 'delete-hotkey'


Modified:
   trunk/ChangeLog
   trunk/src/MainWindow.cs

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Tue Jun 24 12:46:45 2008
@@ -1216,10 +1216,15 @@
 	void HandleIconViewKeyPressEvent (object sender, Gtk.KeyPressEventArgs args)
 	{
 		bool alt = ModifierType.Mod1Mask == (args.Event.State & ModifierType.Mod1Mask);
+		bool shift = ModifierType.ShiftMask == (args.Event.State & ModifierType.ShiftMask);
 
 		switch (args.Event.Key) {
 		case Gdk.Key.Delete:
-			HandleRemoveCommand (sender, (EventArgs) args);
+			if (shift) {
+				HandleDeleteCommand (sender, (EventArgs) args);
+			} else {
+				HandleRemoveCommand (sender, (EventArgs) args);
+			}
 			args.RetVal = true;
 			break;
 		case Gdk.Key.Key_0: