tasque r62 - in trunk: . src

[bgmerrell svn gnome org]

Author: bgmerrell
Date: Mon May 12 18:27:21 2008
New Revision: 62
URL: http://svn.gnome.org/viewvc/tasque?rev=62&view=rev

Log:
Organize the status bar messages when syncing with a backend.  They should make
more sense now.

Removed some of my old, commented out code.



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

Modified: trunk/src/PreferencesDialog.cs
==============================================================================
--- trunk/src/PreferencesDialog.cs	(original)
+++ trunk/src/PreferencesDialog.cs	Mon May 12 18:27:21 2008
@@ -129,33 +129,6 @@
 			notebook.Show ();
 			this.VBox.PackStart (notebook, true, true, 0);
 
-			/* Available preferences
-			// Preferences
-			// Show completed tasks
-			showCompletedTasksCheck = new CheckButton("Show Completed Tasks");
-			showCompletedTasksCheck.Show();
-			mainVBox.PackStart(showCompletedTasksCheck, false, false, 0);
-			*/
-
-			/*  Available backends
-			label = new Label();
-			label.Show();
-			label.Justify = Gtk.Justification.Left;
-			label.SetAlignment (0.0f, 0.5f);
-			label.LineWrap = false;
-			label.UseMarkup = true;
-			label.UseUnderline = false;
-			label.Markup = "<span weight=\"bold\" size=\"large\">Backend</span>";
-			mainVBox.PackStart(label, false, false, 0);
-
-			// List of available backends
-			string [] backends = new string[] { "Remember the Milk" };
-			ComboBox backendComboBox = new ComboBox(backends);
-			backendComboBox.Active = 0;
-			backendComboBox.Show();
-			mainVBox.PackStart(backendComboBox, false, false, 0);
-			*/
-
 			DeleteEvent += WindowDeleted;
 		}
 		

Modified: trunk/src/TaskWindow.cs
==============================================================================
--- trunk/src/TaskWindow.cs	(original)
+++ trunk/src/TaskWindow.cs	Mon May 12 18:27:21 2008
@@ -210,13 +210,7 @@
 			scrolledWindow.AddWithViewport(innerEb);
 			
 			statusbar = new Gtk.Statusbar ();
-			statusContext = statusbar.GetContextId ("tasque-statusbar");
-			currentStatusMessageId =
-				statusbar.Push (statusContext,
-								Catalog.GetString ("Loading tasks..."));
-			
 			statusbar.HasResizeGrip = true;
-			
 			statusbar.Show ();
 
 			mainVBox.PackEnd (statusbar, false, false, 0);
@@ -1089,22 +1083,26 @@
 		
 		private void OnBackendSyncStarted ()
 		{
-			TaskWindow.ShowStatus (Catalog.GetString ("Reloading tasks..."));
+			TaskWindow.ShowStatus (Catalog.GetString ("Loading tasks..."));
 		}
 		
 		private void OnBackendSyncFinished ()
 		{
 			Logger.Debug("Backend sync finished");
-			string status =
-				string.Format ("Tasks loaded: {0}",DateTime.Now.ToString ());
-			TaskWindow.ShowStatus (status);
 			if (Application.Backend.Configured) {
+				string status =
+					string.Format ("Tasks loaded: {0}",DateTime.Now.ToString ());
+				TaskWindow.ShowStatus (status);
 				RebuildAddTaskMenu (Application.Backend.Categories);
 				addTaskEntry.Sensitive = true;
 				// Keep insensitive text color
 				Gdk.Color insensitiveColor =
 					addTaskEntry.Style.Text (Gtk.StateType.Insensitive);
 				addTaskEntry.ModifyText (Gtk.StateType.Normal, insensitiveColor);
+			} else {
+				string status =
+					string.Format ("Not connected.");
+				TaskWindow.ShowStatus (status);
 			}
 		}
 		#endregion // Event Handlers