Author: lluis
Date: 2006-11-14 08:19:03 -0500 (Tue, 14 Nov 2006)
New Revision: 67838
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
Log:
2006-11-14 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs:
Fix warning.
* MonoDevelop.Ide.Tasks/UserTasksView.cs: Don't use CellRendererCombo
since it's gtk 2.6.
* MonoDevelop.Ide.Tasks/TaskService.cs: Disabled loading of tasks
since it hangs when loading the MD solution. Fixed warning.
Make sure OnCommentTasksChanged is called asynchronously to
avoid deadlocks in the parser service.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-11-14
12:23:20 UTC (rev 67837)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-11-14
13:19:03 UTC (rev 67838)
@@ -1,3 +1,14 @@
+2006-11-14 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs:
+ Fix warning.
+ * MonoDevelop.Ide.Tasks/UserTasksView.cs: Don't use CellRendererCombo
+ since it's gtk 2.6.
+ * MonoDevelop.Ide.Tasks/TaskService.cs: Disabled loading of tasks
+ since it hangs when loading the MD solution. Fixed warning.
+ Make sure OnCommentTasksChanged is called asynchronously to
+ avoid deadlocks in the parser service.
+
2006-11-13 David Makovský (Yakeen) <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Tasks/CommentTasksView.cs:
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs
2006-11-14 12:23:20 UTC (rev 67837)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs
2006-11-14 13:19:03 UTC (rev 67838)
@@ -29,7 +29,6 @@
using System;
using MonoDevelop.Projects;
using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
using MonoDevelop.Core;
using MonoDevelop.Core.Gui;
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
2006-11-14 12:23:20 UTC (rev 67837)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
2006-11-14 13:19:03 UTC (rev 67838)
@@ -40,8 +40,11 @@
{
base.InitializeService ();
ReloadPriories ();
- IdeApp.ProjectOperations.CombineOpened += new
CombineEventHandler (ProjectServiceSolutionOpened);
- IdeApp.ProjectOperations.CombineClosed += new
CombineEventHandler (ProjectServiceSolutionClosed);
+
+// Disabled until hang is fixed
+// IdeApp.ProjectOperations.CombineOpened += new
CombineEventHandler (ProjectServiceSolutionOpened);
+// IdeApp.ProjectOperations.CombineClosed += new
CombineEventHandler (ProjectServiceSolutionClosed);
+
Runtime.Properties.PropertyChanged +=
(PropertyEventHandler) Services.DispatchService.GuiDispatch (new
PropertyEventHandler (OnPropertyUpdated));
}
@@ -114,7 +117,6 @@
void OnPropertyUpdated (object sender, PropertyEventArgs e)
{
- bool change = false;
if (e.Key == "Monodevelop.TaskListTokens" && e.NewValue
!= e.OldValue)
{
ReloadPriories ();
@@ -159,6 +161,7 @@
}
}
+ [AsyncDispatch]
void OnCommentTasksChanged (object sender,
CommentTasksChangedEventArgs e)
{
UpdateCommentTags (e.FileName, e.TagComments);
@@ -341,7 +344,7 @@
}
List<Task> oldTasks = new List<Task>();
- foreach (Task task in CommentTasks) {
+ foreach (Task task in CommentTasks) {
if (Path.GetFullPath (task.FileName) ==
Path.GetFullPath (fileName)) {
oldTasks.Add (task);
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
2006-11-14 12:23:20 UTC (rev 67837)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
2006-11-14 13:19:03 UTC (rev 67838)
@@ -36,6 +36,7 @@
using MonoDevelop.Projects;
using MonoDevelop.Ide;
using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components;
namespace MonoDevelop.Ide.Tasks
{
@@ -64,8 +65,8 @@
Clipboard clipboard;
bool solutionLoaded = false;
+ string[] priorities = { GettextCatalog.GetString ("High"),
GettextCatalog.GetString ("Normal"), GettextCatalog.GetString ("Low")};
-
public UserTasksView ()
{
@@ -92,17 +93,10 @@
TreeViewColumn col;
- ListStore comboStore = new ListStore (typeof (string));
- comboStore.AppendValues (GettextCatalog.GetString
("High"));
- comboStore.AppendValues (GettextCatalog.GetString
("Normal"));
- comboStore.AppendValues (GettextCatalog.GetString
("Low"));
-
- CellRendererCombo cellRendPriority = new
CellRendererCombo ();
- cellRendPriority.Model = comboStore;
+ CellRendererComboBox cellRendPriority = new
CellRendererComboBox ();
+ cellRendPriority.Values = priorities;
cellRendPriority.Editable = true;
- cellRendPriority.TextColumn = 0;
- cellRendPriority.HasEntry = false;
- cellRendPriority.Edited += new EditedHandler
(UserTaskPriorityEdited);
+ cellRendPriority.Changed += new
ComboSelectionChangedHandler (UserTaskPriorityEdited);
col = view.AppendColumn (GettextCatalog.GetString
("Priority"), cellRendPriority, "text", Columns.Priority, "foreground-gdk",
Columns.Foreground, "weight", Columns.Bold);
col.Clickable = true;
col.Resizable = true;
@@ -231,22 +225,22 @@
}
}
- void UserTaskPriorityEdited (object o, EditedArgs args)
+ void UserTaskPriorityEdited (object o,
ComboSelectionChangedArgs args)
{
Gtk.TreeIter iter;
if (store.GetIterFromString (out iter, args.Path)) {
UserTask task = (UserTask) store.GetValue
(iter, (int)Columns.UserTask);
- if (args.NewText == GettextCatalog.GetString
("High"))
+ if (args.Active == 0)
{
task.Priority = TaskPriority.High;
- } else if (args.NewText ==
GettextCatalog.GetString ("Normal"))
+ } else if (args.Active == 1)
{
task.Priority = TaskPriority.Normal;
} else
{
task.Priority = TaskPriority.Low;
}
- store.SetValue (iter, (int)Columns.Priority,
args.NewText);
+ store.SetValue (iter, (int)Columns.Priority,
priorities [args.Active]);
store.SetValue (iter, (int)Columns.Foreground,
GetColorByPriority (task.Priority));
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
