tasque r117 - in trunk: . src

[sharm svn gnome org]

Author: sharm
Date: Mon Sep 29 13:41:06 2008
New Revision: 117
URL: http://svn.gnome.org/viewvc/tasque?rev=117&view=rev

Log:
* src/WindowsApplication.cs: Rename to GtkApplication, mark everything
  virtual.
* src/Application.cs: Expose the StatusIcon as a public property, and
  call nativeApp.InitializeIdle at the end of InitializeIdle.
* src/GnomeApplication.cs, src/NativeApplication.cs: Add InitializeIdle
  method to INativeApplication.

Modified:
   trunk/ChangeLog
   trunk/src/Application.cs
   trunk/src/GnomeApplication.cs
   trunk/src/NativeApplication.cs
   trunk/src/WindowsApplication.cs

Modified: trunk/src/Application.cs
==============================================================================
--- trunk/src/Application.cs	(original)
+++ trunk/src/Application.cs	Mon Sep 29 13:41:06 2008
@@ -161,6 +161,11 @@
 			get { return uiManager; }
 		}
 
+		public StatusIcon Tray
+		{
+			get { return trayIcon; }
+		}
+
 		public static Preferences Preferences
 		{
 			get { return Application.Instance.preferences; }
@@ -179,7 +184,7 @@
 		private void Init(string[] args)
 		{
 #if WIN32
-			nativeApp = new WindowsApplication ();
+			nativeApp = new GtkApplication ();
 #else
 			nativeApp = new GnomeApplication ();
 #endif
@@ -360,6 +365,9 @@
 			if (backend == null || backend.Configured == false){
 				GLib.Timeout.Add(1000, new GLib.TimeoutHandler(RetryBackend));
 			}
+
+			nativeApp.InitializeIdle ();
+			
 			return false;
 		}
 		private bool RetryBackend(){

Modified: trunk/src/GnomeApplication.cs
==============================================================================
--- trunk/src/GnomeApplication.cs	(original)
+++ trunk/src/GnomeApplication.cs	Mon Sep 29 13:41:06 2008
@@ -42,6 +42,10 @@
 			                             args);
 		}
 
+		public void InitializeIdle ()
+		{
+		}
+
 		public event EventHandler ExitingEvent;
 
 		public void Exit (int exitcode)

Modified: trunk/src/NativeApplication.cs
==============================================================================
--- trunk/src/NativeApplication.cs	(original)
+++ trunk/src/NativeApplication.cs	Mon Sep 29 13:41:06 2008
@@ -14,6 +14,7 @@
 		void Exit (int exitcode);
 		void StartMainLoop ();
 		void QuitMainLoop ();
+		void InitializeIdle ();
 
 		string ConfDir { get; }
 

Modified: trunk/src/WindowsApplication.cs
==============================================================================
--- trunk/src/WindowsApplication.cs	(original)
+++ trunk/src/WindowsApplication.cs	Mon Sep 29 13:41:06 2008
@@ -29,15 +29,15 @@
 
 namespace Tasque
 {
-	public class WindowsApplication : INativeApplication
+	public class GtkApplication : INativeApplication
 	{
 		#region INativeApplication implementation 
 
 		private string confDir;
 
-		public event EventHandler ExitingEvent;
+		public virtual event EventHandler ExitingEvent;
 
-		public WindowsApplication ()
+		public GtkApplication ()
 		{
 			confDir = Path.Combine (
 				Environment.GetFolderPath (
@@ -47,29 +47,33 @@
 				Directory.CreateDirectory (confDir);
 		}
 		
-		public void Initialize (string locale_dir, string display_name, string process_name, string[] args)
+		public virtual void Initialize (string locale_dir, string display_name, string process_name, string[] args)
 		{
 			Gtk.Application.Init ();
 		}
+
+		public virtual void InitializeIdle ()
+		{
+		}
 		
-		public void Exit (int exitcode)
+		public virtual void Exit (int exitcode)
 		{
 			if (ExitingEvent != null)
 				ExitingEvent (null, new EventArgs ());
 			System.Environment.Exit (exitcode);
 		}
 		
-		public void StartMainLoop ()
+		public virtual void StartMainLoop ()
 		{
 			Gtk.Application.Run ();
 		}
 		
-		public void QuitMainLoop ()
+		public virtual void QuitMainLoop ()
 		{
 			Gtk.Application.Quit ();
 		}
 
-		public string ConfDir
+		public virtual string ConfDir
 		{
 			get
 			{
@@ -77,7 +81,7 @@
 			}
 		}
 
-		public void OpenUrl (string url)
+		public virtual void OpenUrl (string url)
 		{
 			try {
 				System.Diagnostics.Process.Start (url);