File tomboy-tasks-addin-20070801.diff of Package tomboy

Overview Repositories Revisions Requests Users Attributes Meta

File tomboy-tasks-addin-20070801.diff of Package tomboy (Revision 80584fef9c612b432714591f7c60045d)

Currently displaying revision 80584fef9c612b432714591f7c60045d , Show latest

This patch comes from bugzilla.gnome.org BUG #462626.

Index: configure.in
===================================================================
--- configure.in	(revision 1376)
+++ configure.in	(working copy)
@@ -209,10 +209,8 @@
 Tomboy/Addins/FileSystemSyncService/Makefile
 Tomboy/Addins/WebDavSyncService/Makefile
 Tomboy/Addins/SshSyncService/Makefile
+Tomboy/Addins/Tasks/Makefile
 test/Makefile
 po/Makefile.in
 ])
 
-# Commenting out the Tasks Addin since it's not really ready for 0.8.
-#Tomboy/Addins/Tasks/Makefile
-
Index: Tomboy/Addins/Tasks/TasksNoteAddin.cs
===================================================================
--- Tomboy/Addins/Tasks/TasksNoteAddin.cs	(revision 1376)
+++ Tomboy/Addins/Tasks/TasksNoteAddin.cs	(working copy)
@@ -10,7 +10,6 @@
 	public class TasksNoteAddin : NoteAddin
 	{
 #region Members
-//		TaskManager task_mgr;
 		TaskTag last_removed_tag;
 		
 		// Each time the mouse is clicked in the TextView, update the click_mark
@@ -20,9 +19,6 @@
 		
 		Dictionary<Task, TaskOptionsDialog> options_dialogs;
 		
-		// Use this variable to track the GLib.Idle.Add call to ProcessNewline
-		uint prev_line_handler;
-		
 		const string TASK_REGEX = 
 			@"(^\s*{0}:.*$)";
 
@@ -36,7 +32,6 @@
 					string.Format (TASK_REGEX,
 					Catalog.GetString ("todo")),
 					RegexOptions.IgnoreCase | RegexOptions.Compiled
-//					   | RegexOptions.Multiline);
 					   | RegexOptions.Singleline);
 		}
 #endregion // Constructors
@@ -53,8 +48,6 @@
 			TaskManager.TaskStatusChanged += OnTaskStatusChanged;
 			
 			options_dialogs = new Dictionary<Task, TaskOptionsDialog> ();
-			
-			prev_line_handler = 0;
 		}
 		
 		public override void Shutdown ()
@@ -114,7 +107,15 @@
 		void ApplyTaskTagToBlock (ref Gtk.TextIter start, Gtk.TextIter end)
 		{
 			Gtk.TextIter line_end = start;
-			line_end.ForwardToLineEnd ();
+			while (line_end.EndsLine () == false) {
+				line_end.ForwardChar ();
+			}
+			// For some reason, the above code behaves like it should (i.e.,
+			// without advancing to the next line).  The line below that's
+			// commented out doesn't work.  It ends up advancing the iter to
+			// the end of the next line.  Very strange!
+//			line_end.ForwardToLineEnd ();
+
 			
 			TaskTag task_tag = GetTaskTagFromLineIter (ref start);
 			
@@ -155,10 +156,9 @@
 				task = task_mgr.FindByUri (task_tag.Uri);
 				if (task != null) {
 					task_mgr.Delete (task);
-					last_removed_tag = null;
-				} else {
-					last_removed_tag = null;
 				}
+
+				last_removed_tag = null;
 			}
 		}
 		
@@ -212,8 +212,6 @@
 		/// </summary>
 		bool ProcessNewline ()
 		{
-			prev_line_handler = 0;
-			
 			Gtk.TextIter iter = Buffer.GetIterAtMark (Buffer.InsertMark);
 			Gtk.TextIter prev_line = iter;
 			if (prev_line.BackwardLine () == false)
@@ -242,12 +240,16 @@
 				// If the previous line's task summary is not empty, create a new
 				// task on the current line.
 				
-				Buffer.InsertAtCursor (
-						string.Format ("{0}: ",
-								Catalog.GetString ("todo")));
+				// I'm disabling the following code for now.  It automatically
+				// starts up a new task on the newline.  But since this modifies
+				// the buffer, it sometimes causes problems.
+				// TODO: Make the auto-newline work
+//				Buffer.InsertAtCursor (
+//						string.Format ("{0}: ",
+//								Catalog.GetString ("todo")));
 			}
 			
-			return false;
+			return true; // The buffer was modified
 		}
 		
 		/// <summary>
@@ -273,6 +275,7 @@
 			
 			Buffer.Delete (ref iter, ref line_end);
 			last_removed_tag = null;
+
 			Buffer.RemoveTag (task_tag, iter, line_end);
 			
 			text = GetTaskSummaryFromLine (text);
@@ -402,18 +405,50 @@
 //				args.Pos.Line);
 
 			if (args.Length == 1 && args.Text == "\n") {
+				Gtk.TextIter curr_line = args.Pos;
+				TaskTag task_tag = GetTaskTagFromLineIter (ref curr_line);
+
 				Gtk.TextIter prev_line = args.Pos;
 				prev_line.BackwardLine ();
-				TaskTag task_tag = GetTaskTagFromLineIter (ref prev_line);
+				/*TaskTag*/ task_tag = GetTaskTagFromLineIter (ref prev_line);
 				if (task_tag != null) {
 					// If the user just entered a newline and the previous
 					// line was a task, do some special processing...but
 					// we have to do it on idle since there are other
 					// Buffer.InsertText handlers that we'll screw up if
 					// we modify anything here.
-					if (prev_line_handler != 0)
-						GLib.Source.Remove (prev_line_handler);
-					prev_line_handler = GLib.Idle.Add (ProcessNewline);
+					args.RetVal = ProcessNewline ();
+				} else {
+					// Check to see if the previous line is a todo: line
+					while (prev_line.StartsLine () == false) {
+						prev_line.BackwardChar ();
+					}
+					
+					Gtk.TextIter prev_line_end = prev_line;
+					while (prev_line_end.EndsLine () == false) {
+						prev_line_end.ForwardChar ();
+					}
+					
+					string prev_line_text = prev_line.GetText (prev_line_end);
+					
+					Match match = regex.Match (prev_line_text);
+					if (match.Success && last_removed_tag != null) {
+						TaskManager task_mgr = TasksApplicationAddin.DefaultTaskManager;
+						Task task;
+
+						task = task_mgr.FindByUri (last_removed_tag.Uri);
+						if (task != null) {
+							// Update the task's summary and make sure that
+							// the previous line is appropriately tagged.
+							string summary = GetTaskSummaryFromLine (prev_line_text);
+							task.Summary = summary;
+							Buffer.ApplyTag (last_removed_tag, prev_line, prev_line_end);
+						} else {
+							Logger.Debug ("Shouldn't ever hit this code (hopefully)");
+						}
+					}
+					
+					last_removed_tag = null;
 				}
 			} else {
 				ApplyTaskTagToBlock (ref start, args.Pos);
Index: Tomboy/Addins/Tasks/TaskListWindow.cs
===================================================================
--- Tomboy/Addins/Tasks/TaskListWindow.cs	(revision 1376)
+++ Tomboy/Addins/Tasks/TaskListWindow.cs	(working copy)
@@ -1,5 +1,6 @@
 
 using System;
+using System.Collections.Generic;
 using Gtk;
 using Mono.Unix;
 using Tomboy;
@@ -14,7 +15,7 @@
 			DueDate,
 			CompletionDate,
 			Priority,
-			OriginNote
+//			OriginNote
 		};
 		
 		TaskManager manager;
@@ -33,7 +34,7 @@
 		Gtk.TreeViewColumn note_column;
 		Gtk.TreeViewColumn summary_column;
 		Gtk.TreeViewColumn due_date_column;
-		Gtk.TreeViewColumn completion_column;
+//		Gtk.TreeViewColumn completion_column;
 		Gtk.TreeViewColumn priority_column;
 		
 		Gtk.Menu ctx_menu;
@@ -100,6 +101,13 @@
 				new Gtk.ActionEntry ("OpenOriginNoteAction", null,
 					Catalog.GetString ("Open Associated _Note"), null,
 					Catalog.GetString ("Open the note containing the task"), null),
+				
+				new Gtk.ActionEntry ("TaskListViewMenuAction", null,
+					Catalog.GetString ("_View"), null, null, null),
+				
+				new Gtk.ActionEntry ("ShowCompletedTasksAction", null,
+					Catalog.GetString ("Show _Completed Tasks"), null,
+					Catalog.GetString ("Show completed tasks in the list"), null),
 
 				new Gtk.ActionEntry ("TaskListHelpMenuAction", null,
 					Catalog.GetString ("_Help"), null, null, null),
@@ -182,6 +190,7 @@
 			am ["OpenOriginNoteAction"].Sensitive = false;
 			am ["CloseTaskListWindowAction"].Activated += OnCloseWindow;
 			am ["DeleteTaskAction"].Activated += OnDeleteTask;
+			am ["ShowCompletedTasksAction"].Activated += OnShowCompletedTasks;
 			am ["ShowTaskHelpAction"].Activated += OnShowHelp;
 			
 			return menubar;
@@ -196,6 +205,8 @@
 			tree.Selection.Changed += OnSelectionChanged;
 			tree.ButtonPressEvent += OnButtonPressed;
 			
+			tree.Selection.Mode = Gtk.SelectionMode.Multiple;
+			
 			// Columns: OriginNote, Completion Status Summary, Due Date (No Date/Date), Completed (No Date/Date), Priority
 
 			Gtk.CellRenderer renderer;
@@ -203,21 +214,21 @@
 			///
 			/// OriginNote
 			///
-			note_column = new Gtk.TreeViewColumn ();
-			note_column.Title = string.Empty;
-			note_column.Sizing = Gtk.TreeViewColumnSizing.Autosize;
-			note_column.Resizable = false;
-			note_column.Clickable = true;
-			note_column.Clicked += OnNoteColumnClicked;
-			note_column.Reorderable = true;
-			note_column.SortIndicator = true;
+//			note_column = new Gtk.TreeViewColumn ();
+//			note_column.Title = string.Empty;
+//			note_column.Sizing = Gtk.TreeViewColumnSizing.Autosize;
+//			note_column.Resizable = false;
+//			note_column.Clickable = true;
+//			note_column.Clicked += OnNoteColumnClicked;
+//			note_column.Reorderable = true;
+//			note_column.SortIndicator = true;
+//			
+//			renderer = new Gtk.CellRendererPixbuf ();
+//			note_column.PackStart (renderer, false);
+//			note_column.SetCellDataFunc (renderer,
+//					new Gtk.TreeCellDataFunc (NoteIconCellDataFunc));
+//			tree.AppendColumn (note_column);
 			
-			renderer = new Gtk.CellRendererPixbuf ();
-			note_column.PackStart (renderer, false);
-			note_column.SetCellDataFunc (renderer,
-					new Gtk.TreeCellDataFunc (NoteIconCellDataFunc));
-			tree.AppendColumn (note_column);
-			
 			///
 			/// Completion Status
 			///
@@ -286,24 +297,24 @@
 			///
 			/// Completion Date
 			///
-			completion_column = new Gtk.TreeViewColumn ();
-			completion_column.Title = Catalog.GetString ("Completion Date");
-			completion_column.Sizing = Gtk.TreeViewColumnSizing.Autosize;
-			completion_column.Resizable = false;
-			completion_column.Clickable = true;
-			completion_column.Clicked += OnCompletionColumnClicked;
-			completion_column.Reorderable = true;
-			completion_column.SortIndicator = true;
+//			completion_column = new Gtk.TreeViewColumn ();
+//			completion_column.Title = Catalog.GetString ("Completion Date");
+//			completion_column.Sizing = Gtk.TreeViewColumnSizing.Autosize;
+//			completion_column.Resizable = false;
+//			completion_column.Clickable = true;
+//			completion_column.Clicked += OnCompletionColumnClicked;
+//			completion_column.Reorderable = true;
+//			completion_column.SortIndicator = true;
+//			
+//			renderer = new Gtk.Extras.CellRendererDate ();
+//			(renderer as Gtk.Extras.CellRendererDate).Editable = false;
+//			(renderer as Gtk.Extras.CellRendererDate).ShowTime = true;
+//			renderer.Xalign = 0.0f;
+//			completion_column.PackStart (renderer, true);
+//			completion_column.SetCellDataFunc (renderer,
+//					new Gtk.TreeCellDataFunc (CompletionDateCellDataFunc));
+//			tree.AppendColumn (completion_column);
 			
-			renderer = new Gtk.Extras.CellRendererDate ();
-			(renderer as Gtk.Extras.CellRendererDate).Editable = false;
-			(renderer as Gtk.Extras.CellRendererDate).ShowTime = true;
-			renderer.Xalign = 0.0f;
-			completion_column.PackStart (renderer, true);
-			completion_column.SetCellDataFunc (renderer,
-					new Gtk.TreeCellDataFunc (CompletionDateCellDataFunc));
-			tree.AppendColumn (completion_column);
-			
 			///
 			/// Priority
 			///
@@ -334,17 +345,17 @@
 			tree.AppendColumn (priority_column);
 		}
 		
-		void NoteIconCellDataFunc (Gtk.TreeViewColumn tree_column,
-				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
-				Gtk.TreeIter iter)
-		{
-			Gtk.CellRendererPixbuf crp = cell as Gtk.CellRendererPixbuf;
-			Task task = tree_model.GetValue (iter, 0) as Task;
-			if (task != null && task.OriginNoteUri != string.Empty)
-				crp.Pixbuf = note_pixbuf;
-			else
-				crp.Pixbuf = null;
-		}
+//		void NoteIconCellDataFunc (Gtk.TreeViewColumn tree_column,
+//				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
+//				Gtk.TreeIter iter)
+//		{
+//			Gtk.CellRendererPixbuf crp = cell as Gtk.CellRendererPixbuf;
+//			Task task = tree_model.GetValue (iter, 0) as Task;
+//			if (task != null && task.OriginNoteUri != string.Empty)
+//				crp.Pixbuf = note_pixbuf;
+//			else
+//				crp.Pixbuf = null;
+//		}
 
 		void ToggleCellDataFunc (Gtk.TreeViewColumn tree_column,
 				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
@@ -383,17 +394,17 @@
 				crd.Date = task.DueDate;
 		}
 		
-		void CompletionDateCellDataFunc (Gtk.TreeViewColumn tree_column,
-				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
-				Gtk.TreeIter iter)
-		{
-			Gtk.Extras.CellRendererDate crd = cell as Gtk.Extras.CellRendererDate;
-			Task task = tree_model.GetValue (iter, 0) as Task;
-			if (task == null)
-				crd.Date = DateTime.MinValue;
-			else
-				crd.Date = task.CompletionDate;
-		}
+//		void CompletionDateCellDataFunc (Gtk.TreeViewColumn tree_column,
+//				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
+//				Gtk.TreeIter iter)
+//		{
+//			Gtk.Extras.CellRendererDate crd = cell as Gtk.Extras.CellRendererDate;
+//			Task task = tree_model.GetValue (iter, 0) as Task;
+//			if (task == null)
+//				crd.Date = DateTime.MinValue;
+//			else
+//				crd.Date = task.CompletionDate;
+//		}
 		
 		void PriorityCellDataFunc (Gtk.TreeViewColumn tree_column,
 				Gtk.CellRenderer cell, Gtk.TreeModel tree_model,
@@ -421,7 +432,6 @@
 		void SetUpTreeModel ()
 		{
 			store_sort = new Gtk.TreeModelSort (manager.Tasks);
-Logger.Debug ("store_sort has {0} columns", store_sort.NColumns);
 			store_sort.DefaultSortFunc = 
 				new Gtk.TreeIterCompareFunc (TaskSortFunc);
 				
@@ -449,12 +459,18 @@
 		
 		void OnSelectionChanged (object sender, EventArgs args)
 		{
-			Task task = GetSelectedTask ();
-			if (task != null) {
-				Tomboy.ActionManager ["OpenTaskAction"].Sensitive = true;
+			List<Task> tasks = GetSelectedTasks ();
+//			Task task = GetSelectedTask ();
+			if (tasks != null && tasks.Count > 0) {
+				if (tasks.Count == 1) {
+					Tomboy.ActionManager ["OpenTaskAction"].Sensitive = true;
+				} else {
+					Tomboy.ActionManager ["OpenTaskAction"].Sensitive = false;
+				}
+				
 				Tomboy.ActionManager ["DeleteTaskAction"].Sensitive = true;
 				
-				if (task.OriginNoteUri != string.Empty)
+				if (tasks.Count == 1 && tasks [0].OriginNoteUri != string.Empty)
 					Tomboy.ActionManager ["OpenOriginNoteAction"].Sensitive = true;
 				else
 					Tomboy.ActionManager ["OpenOriginNoteAction"].Sensitive = false;
@@ -472,33 +488,28 @@
 				Gtk.TreePath path = null;
 				Gtk.TreeViewColumn column = null;
 				
-				if (tree.GetPathAtPos ((int) args.Event.X,
-						(int) args.Event.Y,
-						out path,
-						out column) == false)
-					break;
+				if (tree.Selection.CountSelectedRows () == 0) {
+					if (tree.GetPathAtPos ((int) args.Event.X,
+							(int) args.Event.Y,
+							out path,
+							out column) == false)
+						break;
+
+					Gtk.TreeIter iter;
+					if (store_sort.GetIter (out iter, path) == false)
+						break;
 				
-				Gtk.TreeIter iter;
-				if (store_sort.GetIter (out iter, path) == false)
-					break;
+					tree.Selection.SelectIter (iter);
+				}
 				
-				tree.Selection.SelectIter (iter);
-				
-				Task task = store_sort.GetValue (iter, 0) as Task;
-				if (task == null)
-					break;
-				
-				PopupContextMenuAtLocation (task, (int) args.Event.X,
+				PopupContextMenuAtLocation ((int) args.Event.X,
 						(int) args.Event.Y);
 
 				break;
 			}
 		}
 		
-		/// <summary>
-		/// <param name="task">The selected task</param>
-		/// </summary>
-		void PopupContextMenuAtLocation (Task task, int x, int y)
+		void PopupContextMenuAtLocation (int x, int y)
 		{
 			if (ctx_menu == null) {
 				ctx_menu = Tomboy.ActionManager.GetWidget (
@@ -534,8 +545,13 @@
 			y = 0;
 			
 			selection = tree.Selection;
-			if (!selection.GetSelected (out iter))
-				return;
+			if (selection.CountSelectedRows () > 1) {
+				Gtk.TreePath [] paths = selection.GetSelectedRows ();
+				store_sort.GetIter (out iter, paths [0]);
+			} else {
+				if (!selection.GetSelected (out iter))
+					return;
+			}
 			
 			path = store_sort.GetPath (iter);
 			
@@ -578,15 +594,32 @@
 			y += widget_y;
 		}
 
+		List<Task> GetSelectedTasks ()
+		{
+			List<Task> list = new List<Task> ();
+			Gtk.TreeModel model;
+			Gtk.TreePath [] paths = tree.Selection.GetSelectedRows (out model);
+			if (paths != null && paths.Length > 0) {
+				foreach (Gtk.TreePath path in paths) {
+					Gtk.TreeIter iter; 
+					if (model.GetIter (out iter, path)) {
+						Task task = model.GetValue (iter, 0) as Task;
+						if (task != null)
+							list.Add (task);
+					}
+				}
+			}
+			
+			return list;
+		}
+		
 		Task GetSelectedTask ()
 		{
-			Gtk.TreeModel model;
-			Gtk.TreeIter iter;
-
-			if (!tree.Selection.GetSelected (out model, out iter))
+			List<Task> list = GetSelectedTasks ();
+			if (list == null || list.Count == 0)
 				return null;
-
-			return (Task) model.GetValue (iter, 0);
+			
+			return list [0];
 		}
 
 		/// <summary>
@@ -627,13 +660,18 @@
 		
 		void OnDeleteTask (object sender, EventArgs args)
 		{
-			Task task = GetSelectedTask ();
-			if (task == null)
+			List<Task> tasks = GetSelectedTasks ();
+			if (tasks == null || tasks.Count == 0)
 				return;
 			
-			ShowDeletionDialog (task);
+			ShowDeletionDialog (tasks);
 		}
 		
+		void OnShowCompletedTasks (object sender, EventArgs args)
+		{
+			
+		}
+		
 		void OnShowHelp (object sender, EventArgs args)
 		{
 			GuiUtils.ShowHelp ("tomboy.xml", "tasks", Screen, this);
@@ -681,9 +719,8 @@
 				break;
 			case Gdk.Key.Menu:
 				// Pop up the context menu if a note is selected
-				Task task = GetSelectedTask ();
-				if (task != null)
-					PopupContextMenuAtLocation (task, 0, 0);
+				if (tree.Selection.CountSelectedRows () > 0)
+					PopupContextMenuAtLocation (0, 0);
 
 				break;
 			}
@@ -695,10 +732,10 @@
 			Gtk.TreeIter iter;
 			
 			selection = tree.Selection;
-			if (!selection.GetSelected (out iter))
+			if (selection.CountSelectedRows () != 1)
 				return;
 			
-			Task task = store_sort.GetValue (iter, 0) as Task;
+			Task task = GetSelectedTask ();
 			if (task == null || task.OriginNoteUri == string.Empty)
 				return;
 			
@@ -729,8 +766,8 @@
 					result = CompareTasks (task_a, task_b, SortColumn.Priority);
 				if (result == 0)
 					result = CompareTasks (task_a, task_b, SortColumn.Summary);
-				if (completion_column.SortOrder == Gtk.SortType.Descending)
-					result = result * -1;
+//				if (completion_column.SortOrder == Gtk.SortType.Descending)
+//					result = result * -1;
 				break;
 			case SortColumn.DueDate:
 				result = CompareTasks (task_a, task_b, SortColumn.DueDate);
@@ -743,17 +780,17 @@
 				if (due_date_column.SortOrder == Gtk.SortType.Descending)
 					result = result * -1;
 				break;
-			case SortColumn.OriginNote:
-				result = CompareTasks (task_a, task_b, SortColumn.OriginNote);
-				if (result == 0)
-					result = CompareTasks (task_a, task_b, SortColumn.CompletionDate);
-				if (result == 0)
-					result = CompareTasks (task_a, task_b, SortColumn.Priority);
-				if (result == 0)
-					result = CompareTasks (task_a, task_b, SortColumn.Summary);
-				if (note_column.SortOrder == Gtk.SortType.Descending)
-					result = result * -1;
-				break;
+//			case SortColumn.OriginNote:
+//				result = CompareTasks (task_a, task_b, SortColumn.OriginNote);
+//				if (result == 0)
+//					result = CompareTasks (task_a, task_b, SortColumn.CompletionDate);
+//				if (result == 0)
+//					result = CompareTasks (task_a, task_b, SortColumn.Priority);
+//				if (result == 0)
+//					result = CompareTasks (task_a, task_b, SortColumn.Summary);
+//				if (note_column.SortOrder == Gtk.SortType.Descending)
+//					result = result * -1;
+//				break;
 			case SortColumn.Priority:
 				result = CompareTasks (task_a, task_b, SortColumn.Priority);
 				if (result == 0)
@@ -795,8 +832,8 @@
 					return DateTime.Compare (a.CompletionDate, b.CompletionDate);
 				case SortColumn.DueDate:
 					return DateTime.Compare (a.DueDate, b.DueDate);
-				case SortColumn.OriginNote:
-					return a.OriginNoteUri.CompareTo (b.OriginNoteUri);
+//				case SortColumn.OriginNote:
+//					return a.OriginNoteUri.CompareTo (b.OriginNoteUri);
 				case SortColumn.Priority:
 					return (int) a.Priority - (int) b.Priority;
 				case SortColumn.Summary:
@@ -815,7 +852,7 @@
 			Tomboy.ActionManager ["OpenTaskAction"].Activate ();
 		}
 		
-		void ShowDeletionDialog (Task task)
+		void ShowDeletionDialog (List<Task> tasks)
 		{
 			HIGMessageDialog dialog = 
 				new HIGMessageDialog (
@@ -823,7 +860,9 @@
 					Gtk.DialogFlags.DestroyWithParent,
 					Gtk.MessageType.Question,
 					Gtk.ButtonsType.None,
-					Catalog.GetString ("Really delete this task?"),
+					tasks.Count > 1 ?
+						Catalog.GetString ("Really delete these tasks?") :
+						Catalog.GetString ("Really delete this task?"),
 					Catalog.GetString ("If you delete a task it is " +
 							   "permanently lost."));
 
@@ -842,7 +881,14 @@
 
 			int result = dialog.Run ();
 			if (result == 666) {
-				task.Manager.Delete (task);
+				// Disable the selection changed handler while we nuke tasks
+				tree.Selection.Changed -= OnSelectionChanged;
+				
+				foreach (Task task in tasks) {
+					task.Manager.Delete (task);
+				}
+				
+				tree.Selection.Changed += OnSelectionChanged;
 			}
 
 			dialog.Destroy();
@@ -867,8 +913,6 @@
 		
 		void OnTaskSummaryEdited (object sender, Gtk.EditedArgs args)
 		{
-	Logger.Debug ("TaskListWindow.OnTaskSummaryEdited");
-			
 			Gtk.TreeIter iter;
 			Gtk.TreePath path = new TreePath (args.Path);
 			if (store_sort.GetIter (out iter, path) == false)
@@ -880,8 +924,6 @@
 		
 		void OnDueDateEdited (Gtk.Extras.CellRendererDate renderer, string path)
 		{
-			Logger.Debug ("OnDueDateEdited");
-			
 			Gtk.TreeIter iter;
 			Gtk.TreePath tree_path = new TreePath (path);
 			if (store_sort.GetIter (out iter, tree_path) == false)
@@ -920,6 +962,8 @@
 				// A user just created this task inside this window
 				expecting_newly_created_task = false;
 				
+				tree.Selection.UnselectAll ();
+				
 				SelectTask (task);
 			}
 			
@@ -956,33 +1000,29 @@
 			} while (store_sort.IterNext (ref iter));
 		}
 		
-		void OnNoteColumnClicked (object sender, EventArgs args)
-		{
-			Logger.Debug ("TaskListWindow.OnNoteColumnClicked");
-			OnColumnClicked (note_column, SortColumn.OriginNote);
-		}
+//		void OnNoteColumnClicked (object sender, EventArgs args)
+//		{
+//			Logger.Debug ("TaskListWindow.OnNoteColumnClicked");
+//			OnColumnClicked (note_column, SortColumn.OriginNote);
+//		}
 		
 		void OnSummaryColumnClicked (object sender, EventArgs args)
 		{
-			Logger.Debug ("TaskListWindow.OnSummaryColumnClicked");
 			OnColumnClicked (summary_column, SortColumn.Summary);
 		}
 		
 		void OnDueDateColumnClicked (object sender, EventArgs args)
 		{
-			Logger.Debug ("TaskListWindow.OnDueDateColumnClicked");
 			OnColumnClicked (due_date_column, SortColumn.DueDate);
 		}
 		
 		void OnCompletionColumnClicked (object sender, EventArgs args)
 		{
-			Logger.Debug ("TaskListWindow.OnCompletionColumnClicked");
-			OnColumnClicked (completion_column, SortColumn.CompletionDate);
+//			OnColumnClicked (completion_column, SortColumn.CompletionDate);
 		}
 		
 		void OnPriorityColumnClicked (object sender, EventArgs args)
 		{
-			Logger.Debug ("TaskListWindow.OnPriorityColumnClicked");
 			OnColumnClicked (priority_column, SortColumn.Priority);
 		}
 		
Index: Tomboy/Addins/Tasks/TaskManager.cs
===================================================================
--- Tomboy/Addins/Tasks/TaskManager.cs	(revision 1376)
+++ Tomboy/Addins/Tasks/TaskManager.cs	(working copy)
@@ -168,6 +168,26 @@
 				} while (tasks.IterNext (ref iter));
 			}
 		}
+		
+		/// <summary>
+		/// Return a list of tasks whose origin note is the note specified.
+		/// </summary>
+		public List<Task> GetTasksForNote (Note note)
+		{
+			List<Task> list = new List<Task> ();
+			
+			Gtk.TreeIter iter;
+			if (tasks.GetIterFirst (out iter)) {
+				do {
+					Task task = tasks.GetValue (iter, 0) as Task;
+					if (task.OriginNoteUri != null &&
+							task.OriginNoteUri.CompareTo (note.Uri) == 0)
+						list.Add (task);
+				} while (tasks.IterNext (ref iter));
+			}
+			
+			return list;
+		}
 	#endregion // Public Methods
 
 	#region Events
Index: Tomboy/Addins/Tasks/Tasks.addin.xml
===================================================================
--- Tomboy/Addins/Tasks/Tasks.addin.xml	(revision 1376)
+++ Tomboy/Addins/Tasks/Tasks.addin.xml	(working copy)
@@ -3,8 +3,8 @@
 	name="Tasks"
 	author="Tomboy Project"
 	description="Add-in to enable tasks support for Tomboy"
-	category="Experimental (WARNING: Use at your own risk)"
-	defaultEnabled="false"
+	category="Tools"
+	defaultEnabled="true"
 	version="0.1">
 
 	<Runtime>
Index: Tomboy/Addins/Tasks/TasksUIManagerLayout.xml
===================================================================
--- Tomboy/Addins/Tasks/TasksUIManagerLayout.xml	(revision 1376)
+++ Tomboy/Addins/Tasks/TasksUIManagerLayout.xml	(working copy)
@@ -11,6 +11,9 @@
         <menu name="TaskListEditMenu" action="TaskListEditMenuAction">
             <menuitem name="DeleteTask" action="DeleteTaskAction" />
         </menu>
+        <menu name="TaskListViewMenu" action="TaskListViewMenuAction">
+        	<menuitem name="ShowCompletedTasks" action="ShowCompletedTasksAction" />
+        </menu>
         <menu name="TaskListHelpMenu" action="TaskListHelpMenuAction">
             <menuitem name="ShowTaskHelp" action="ShowTaskHelpAction" />
         </menu>
Index: Tomboy/Addins/Tasks/TasksApplicationAddin.cs
===================================================================
--- Tomboy/Addins/Tasks/TasksApplicationAddin.cs	(revision 1376)
+++ Tomboy/Addins/Tasks/TasksApplicationAddin.cs	(working copy)
@@ -78,6 +78,8 @@
 				
 				Tomboy.ActionManager.UI.InsertActionGroup (action_group, 0);
 				
+				Tomboy.DefaultNoteManager.NoteDeleted += OnNoteDeleted;
+				
 				initialized = true;
 			}
 		}
@@ -110,5 +112,14 @@
 		{
 			get { return initialized; }
 		}
+		
+		private void OnNoteDeleted (object sender, Note note)
+		{
+			// Delete all the tasks associated with this note
+			foreach (Task task in DefaultTaskManager.GetTasksForNote (note)) {
+				Logger.Info ("Deleting task: {0}", task.Summary);
+				DefaultTaskManager.Delete (task);
+			}
+		}
 	}
 }
Index: Tomboy/Addins/Makefile.am
===================================================================
--- Tomboy/Addins/Makefile.am	(revision 1376)
+++ Tomboy/Addins/Makefile.am	(working copy)
@@ -10,9 +10,6 @@
 	StickyNoteImport	\
 	FileSystemSyncService	\
 	WebDavSyncService	\
-	SshSyncService
+	SshSyncService		\
+	Tasks
 
-# Commenting out tasks from being built right now since it's
-# not ready for prime-time yet.
-#	Tasks
-

Places

File tomboy-tasks-addin-20070801.diff of Package tomboy (Revision 80584fef9c612b432714591f7c60045d)

Places