tasque r167 - in branches/new_cache: . src

[bgmerrell svn gnome org]

Author: bgmerrell
Date: Sun Dec 14 08:17:49 2008
New Revision: 167
URL: http://svn.gnome.org/viewvc/tasque?rev=167&view=rev

Log:
* src/Application.cs,
* src/BackendsDialog.cs: Add a "Backends" configuration dialog opened
by right-clicking the Tasque system tray icon.
* src/Makefile.am: Add BackendDialog.cs


Added:
   branches/new_cache/src/BackendsDialog.cs   (contents, props changed)
      - copied, changed from r166, /branches/new_cache/src/PreferencesDialog.cs
Modified:
   branches/new_cache/ChangeLog
   branches/new_cache/src/Application.cs
   branches/new_cache/src/Makefile.am

Modified: branches/new_cache/src/Application.cs
==============================================================================
--- branches/new_cache/src/Application.cs	(original)
+++ branches/new_cache/src/Application.cs	Sun Dec 14 08:17:49 2008
@@ -62,6 +62,7 @@
 		private EventBox eb;
 		private IBackend backend;
 		private PreferencesDialog preferencesDialog;
+		private BackendsDialog backendsDialog;
 		private bool quietStart = false;
 		
 		private DateTime currentDay = DateTime.Today;
@@ -82,6 +83,7 @@
 		<menuitem action=""NewTaskAction""/>
 		<separator/>
 		<menuitem action=""PreferencesAction""/>
+		<menuitem action=""BackendsAction""/>
 		<menuitem action=""AboutAction""/>
 		<separator/>
 		<menuitem action=""RefreshAction""/>
@@ -457,17 +459,39 @@
 			
 			preferencesDialog.Present ();
 		}
+
+		private void OnBackends (object sender, EventArgs args)
+		{
+			Logger.Info ("OnBackends called");
+			if (backendsDialog == null) {
+				backendsDialog = new BackendsDialog ();
+				backendsDialog.Hidden += OnBackendsDialogHidden;
+			}
+			
+			backendsDialog.Present ();
+		}
 		
 		private void OnPreferencesDialogHidden (object sender, EventArgs args)
 		{
 			preferencesDialog.Destroy ();
 			preferencesDialog = null;
 		}
+
+		private void OnBackendsDialogHidden (object sender, EventArgs args)
+		{
+			backendsDialog.Destroy ();
+			backendsDialog = null;
+		}
 		
 		public static void ShowPreferences()
 		{
 			application.OnPreferences(null, EventArgs.Empty);
 		}
+	
+		public static void ShowBackends()
+		{
+			application.OnBackends(null, EventArgs.Empty);
+		}
 
 		private void OnAbout (object sender, EventArgs args)
 		{
@@ -629,6 +653,13 @@
 				new ActionEntry ("PreferencesAction",
 				                 Stock.Preferences,
 				                 OnPreferences),
+
+				new ActionEntry ("BackendsAction",
+				                 Stock.Preferences,
+						 Catalog.GetString ("Backends"),
+						 null,
+						 null,
+				                 OnBackends),
 				
 				new ActionEntry ("RefreshAction",
 				                 Stock.Execute,

Copied: branches/new_cache/src/BackendsDialog.cs (from r166, /branches/new_cache/src/PreferencesDialog.cs)
==============================================================================
--- /branches/new_cache/src/PreferencesDialog.cs	(original)
+++ branches/new_cache/src/BackendsDialog.cs	Sun Dec 14 08:17:49 2008
@@ -1,5 +1,5 @@
 /***************************************************************************
- *  PreferencesDialog.cs
+ *  BackendsDialog.cs
  *
  *  Copyright (C) 2008 Novell, Inc.
  *  Written by Scott Reeves <sreeves gmail com>
@@ -35,7 +35,7 @@
 namespace Tasque
 {
 
-	public class PreferencesDialog : Gtk.Dialog
+	public class BackendsDialog : Gtk.Dialog
 	{
 //		private CheckButton		showCompletedTasksCheck;
 		
@@ -52,7 +52,7 @@
 		Gtk.CheckButton			showCompletedTasksCheckButton;
 		Gtk.TreeModelFilter		filteredCategories;
 		List<string>			categoriesToHide;
-		Gtk.TreeView			categoriesTree;
+		Gtk.TreeView			backendsTree;
 		
 		//
 		// Backend Page Widgets
@@ -60,7 +60,7 @@
 		Gtk.Widget				backendPage;
 		int						backendPageId;
 
-		public PreferencesDialog() : base ()
+		public BackendsDialog() : base ()
 		{
 			LoadPreferences();
 			Init();
@@ -136,7 +136,8 @@
 		{
 			VBox vbox = new VBox (false, 6);
 			vbox.BorderWidth = 10;
-			
+		
+			/*	
 			//
 			// Task Management System
 			//
@@ -178,14 +179,15 @@
 			sectionVBox.PackStart (hbox, false, false, 0);
 			sectionVBox.Show ();
 			vbox.PackStart (sectionVBox, false, false, 0);
+			*/
 			
 			//
-			// Task Filtering
+			// Backends
 			//
-			sectionVBox = new VBox (false, 4);
-			l = new Label ();
+			VBox sectionVBox = new VBox (false, 4);
+			Label l = new Label ();
 			l.Markup = string.Format ("<span size=\"large\" weight=\"bold\">{0}</span>",
-									  Catalog.GetString ("Task Filtering"));
+									  Catalog.GetString ("Backend Selection"));
 			l.UseUnderline = false;
 			l.UseMarkup = true;
 			l.Wrap = false;
@@ -199,21 +201,14 @@
 			l.Show ();
 			sectionHBox.PackStart (l, false, false, 0);
 			VBox innerSectionVBox = new VBox (false, 6);
-			hbox = new HBox (false, 6);
+			HBox hbox = new HBox (false, 6);
 			
-			bool showCompletedTasks = Application.Preferences.GetBool (
-											Preferences.ShowCompletedTasksKey);
-			showCompletedTasksCheckButton =
-				new CheckButton (Catalog.GetString ("Sh_ow completed tasks"));
-			showCompletedTasksCheckButton.UseUnderline = true;
-			showCompletedTasksCheckButton.Active = showCompletedTasks;
-			showCompletedTasksCheckButton.Show ();
 			hbox.PackStart (showCompletedTasksCheckButton, true, true, 0);
 			hbox.Show ();
 			innerSectionVBox.PackStart (hbox, false, false, 0);
 			
 			// Categories TreeView
-			l = new Label (Catalog.GetString ("Only _show these categories when \"All\" is selected:"));
+			l = new Label (Catalog.GetString ("Enable the following backends"));
 			l.UseUnderline = true;
 			l.Xalign = 0;
 			l.Show ();
@@ -224,11 +219,11 @@
 			sw.VscrollbarPolicy = PolicyType.Automatic;
 			sw.ShadowType = ShadowType.EtchedIn;
 			
-			categoriesTree = new TreeView ();
-			categoriesTree.Selection.Mode = SelectionMode.None;
-			categoriesTree.RulesHint = false;
-			categoriesTree.HeadersVisible = false;
-			l.MnemonicWidget = categoriesTree;
+			backendsTree = new TreeView ();
+			backendsTree.Selection.Mode = SelectionMode.None;
+			backendsTree.RulesHint = false;
+			backendsTree.HeadersVisible = false;
+			l.MnemonicWidget = backendsTree;
 			
 			Gtk.TreeViewColumn column = new Gtk.TreeViewColumn ();
 			column.Title = Catalog.GetString ("Category");
@@ -236,7 +231,7 @@
 			column.Resizable = false;
 			
 			Gtk.CellRendererToggle toggleCr = new CellRendererToggle ();
-			toggleCr.Toggled += OnCategoryToggled;
+			toggleCr.Toggled += OnBackendToggled;
 			column.PackStart (toggleCr, false);
 			column.SetCellDataFunc (toggleCr,
 						new Gtk.TreeCellDataFunc (ToggleCellDataFunc));
@@ -246,10 +241,10 @@
 			column.SetCellDataFunc (textCr,
 						new Gtk.TreeCellDataFunc (TextCellDataFunc));
 			
-			categoriesTree.AppendColumn (column);
+			backendsTree.AppendColumn (column);
 			
-			categoriesTree.Show ();
-			sw.Add (categoriesTree);
+			backendsTree.Show ();
+			sw.Add (backendsTree);
 			sw.Show ();
 			innerSectionVBox.PackStart (sw, true, true, 0);
 			innerSectionVBox.Show ();
@@ -276,9 +271,9 @@
 
 		private void LoadPreferences()
 		{
-			Logger.Debug("Loading preferences");
-			categoriesToHide =
-				Application.Preferences.GetStringList (Preferences.HideInAllCategory);
+			//Logger.Debug("Loading preferences");
+			//categoriesToHide =
+			//	Application.Preferences.GetStringList (Preferences.HideInAllCategory);
 			//if (categoriesToHide == null || categoriesToHide.Count == 0)
 			//	categoriesToHide = BuildNewCategoryList ();
 		}
@@ -286,13 +281,16 @@
 		private void ConnectEvents()
 		{
 			// showCompletedTasksCheckbox delegate
+			/*
 			showCompletedTasksCheckButton.Toggled += delegate {
 				Application.Preferences.SetBool (
 					Preferences.ShowCompletedTasksKey,
 					showCompletedTasksCheckButton.Active);
 			};
+			*/
 		}
 		
+		// XXX: change this to OnBackend	
 		private void OnBackendComboBoxChanged (object sender, EventArgs args)
 		{
 			if (selectedBackend >= 0) {
@@ -361,7 +359,7 @@
 			//categoriesToHide = BuildNewCategoryList ();
 			//Application.Preferences.SetStringList (Preferences.HideInAllCategory,
 			//									   categoriesToHide);
-			RebuildCategoryTree ();
+			// RebuildCategoryTree ();
 		}
 		
 		private void ToggleCellDataFunc (Gtk.TreeViewColumn column,
@@ -406,6 +404,7 @@
 			crt.Text = GLib.Markup.EscapeText (category.Name);
 		}
 		
+		/*
 		void OnCategoryToggled (object sender, Gtk.ToggledArgs args)
 		{
 			Logger.Debug ("OnCategoryToggled");
@@ -429,6 +428,12 @@
 			Application.Preferences.SetStringList (Preferences.HideInAllCategory,
 												   categoriesToHide);
 		}
+		*/
+
+		void OnBackendToggled (object sender, Gtk.ToggledArgs args)
+		{
+			Logger.Debug("initialize the backend");
+		}
 		
 /*
 		/// <summary>
@@ -462,22 +467,22 @@
 		}
 */
 		
-		void RebuildCategoryTree ()
+		void RebuildBackendsTree ()
 		{
 			if (!backendComboMap.ContainsKey (selectedBackend)) {
-				categoriesTree.Model = null;
+				backendsTree.Model = null;
 				return;
 			}
 			
 			IBackend backend = backendComboMap [selectedBackend];
 			filteredCategories = new TreeModelFilter (backend.Categories, null);
 			filteredCategories.VisibleFunc = FilterFunc;
-			categoriesTree.Model = filteredCategories;
+			backendsTree.Model = filteredCategories;
 		}
 		
 		void OnShown (object sender, EventArgs args)
 		{
-			RebuildCategoryTree ();
+			// RebuildCategoryTree ();
 		}
 		
 		/// <summary>

Modified: branches/new_cache/src/Makefile.am
==============================================================================
--- branches/new_cache/src/Makefile.am	(original)
+++ branches/new_cache/src/Makefile.am	Sun Dec 14 08:17:49 2008
@@ -77,6 +77,7 @@
 	$(srcdir)/NoteWidget.cs \
 	$(srcdir)/Preferences.cs \
 	$(srcdir)/PreferencesDialog.cs \
+	$(srcdir)/BackendsDialog.cs \
 	$(srcdir)/RemoteControl.cs \
 	$(srcdir)/RemoteControlProxy.cs \
 	$(srcdir)/TaskCalendar.cs \