tasque r65 - in trunk: . src

[sharm svn gnome org]

Author: sharm
Date: Sat May 17 00:01:25 2008
New Revision: 65
URL: http://svn.gnome.org/viewvc/tasque?rev=65&view=rev

Log:
* src/Application.cs: Rename QuitMainLoop to Quit, have it call the
  OnQuit handler used in the StatusIcon menu.
* src/TaskWindow.cs: Bind ctrl+q to Application.Quit.

Modified:
   trunk/ChangeLog
   trunk/src/Application.cs
   trunk/src/TaskWindow.cs

Modified: trunk/src/Application.cs
==============================================================================
--- trunk/src/Application.cs	(original)
+++ trunk/src/Application.cs	Sat May 17 00:01:25 2008
@@ -413,7 +413,7 @@
 
 		private void OnQuit (object sender, EventArgs args)
 		{
-			Logger.Info ("OnQuitAction called - terminating application");
+			Logger.Info ("OnQuit called - terminating application");
 			if (backend != null) {
 				backend.Cleanup();
 			}
@@ -546,9 +546,9 @@
 			program.Run ();
 		}
 
-		public void QuitMainLoop ()
+		public void Quit ()
 		{
-			//	actionManager ["QuitAction"].Activate ();
+			OnQuit (null, null);
 		}
 
 	}

Modified: trunk/src/TaskWindow.cs
==============================================================================
--- trunk/src/TaskWindow.cs	(original)
+++ trunk/src/TaskWindow.cs	Sat May 17 00:01:25 2008
@@ -183,6 +183,12 @@
 			                           Gdk.ModifierType.ControlMask,
 			                           Gtk.AccelFlags.Visible);
 			
+			globalKeys.AddAccelerator (delegate (object sender, EventArgs e) {
+				Application.Instance.Quit (); },
+			                           (uint) Gdk.Key.q,
+			                           Gdk.ModifierType.ControlMask,
+			                           Gtk.AccelFlags.Visible);
+			
 			topHBox.Show ();
 			mainVBox.PackStart (topHBox, false, false, 0);