f-spot r4088 - in trunk: . src

[rubenv svn gnome org]

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

Log:
2008-06-24  Ruben Vermeersch  <ruben savanne be>

	* MainWindow.cs: Apparently, the delete hotkey has to be defined in two
	places.


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

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Tue Jun 24 18:41:12 2008
@@ -1220,11 +1220,10 @@
 
 		switch (args.Event.Key) {
 		case Gdk.Key.Delete:
-			if (shift) {
+			if (shift)
 				HandleDeleteCommand (sender, (EventArgs) args);
-			} else {
+			else
 				HandleRemoveCommand (sender, (EventArgs) args);
-			}
 			args.RetVal = true;
 			break;
 		case Gdk.Key.Key_0:
@@ -1374,6 +1373,8 @@
 	void HandlePhotoViewKeyPressEvent (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.F:
 		case Gdk.Key.f:
@@ -1385,7 +1386,10 @@
 			args.RetVal = true;
 			break;
 		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: