Author: lluis
Date: 2006-11-30 10:21:15 -0500 (Thu, 30 Nov 2006)
New Revision: 68749
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/Task.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.mdp: Added some missing resources.
* MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs: Added some null
checks.
* MonoDevelop.Ide.Tasks/Task.cs, MonoDevelop.Ide.Tasks/TaskService.cs:
Avoid relative path names in the task service.
* MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs: Fix endless loop
issue. Fixes bug #79526.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-11-30
15:16:53 UTC (rev 68748)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-11-30
15:21:15 UTC (rev 68749)
@@ -1,3 +1,13 @@
+2006-11-30 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.mdp: Added some missing resources.
+ * MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs: Added some null
+ checks.
+ * MonoDevelop.Ide.Tasks/Task.cs, MonoDevelop.Ide.Tasks/TaskService.cs:
+ Avoid relative path names in the task service.
+ * MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs: Fix endless loop
+ issue. Fixes bug #79526.
+
2006-11-28 Jacob Ilsø Christensen <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Commands/SearchCommands.cs:
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
2006-11-30 15:16:53 UTC (rev 68748)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
2006-11-30 15:21:15 UTC (rev 68749)
@@ -47,20 +47,25 @@
this.title = title;
Gdk.Pixbuf img = Services.Resources.GetBitmap
(iconName, Gtk.IconSize.Menu);
icon = Services.StatusBar.ShowStatusIcon (img);
+ if (icon == null)
+ Runtime.LoggingService.Error ("Icon '" +
iconName + "' not found.");
}
protected override void OnProgressChanged ()
{
- if (UnknownWork)
- icon.ToolTip = string.Format ("{0}\n{1}",
title, CurrentTask);
- else
- icon.ToolTip = string.Format ("{0}
({1}%)\n{2}", title, (int)(GlobalWork * 100), CurrentTask);
+ if (icon != null) {
+ if (UnknownWork)
+ icon.ToolTip = string.Format
("{0}\n{1}", title, CurrentTask);
+ else
+ icon.ToolTip = string.Format ("{0}
({1}%)\n{2}", title, (int)(GlobalWork * 100), CurrentTask);
+ }
}
public override void Dispose()
{
base.Dispose ();
- icon.Dispose ();
+ if (icon != null)
+ icon.Dispose ();
}
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs
2006-11-30 15:16:53 UTC (rev 68748)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Search/SearchReplaceManager.cs
2006-11-30 15:21:15 UTC (rev 68749)
@@ -185,9 +185,8 @@
find.Reset ();
else {
ITextBuffer textArea = OpenView
(lastResult.FileName) as ITextBuffer;
- if (textArea == null || (lastResult !=
null && textArea.CursorPosition != lastResult.DocumentOffset +
lastResult.Length)) {
+ if (textArea == null || (lastResult !=
null && textArea.CursorPosition != lastResult.DocumentOffset +
lastResult.Length))
find.Reset();
- }
}
}
else
@@ -199,6 +198,18 @@
Services.MessageService.ShowMessage
(GettextCatalog.GetString ("Search pattern is invalid"), DialogPointer);
return;
}
+
+ FindInternal (reverse);
+ }
+
+ static void FindInternal (bool reverse)
+ {
+ try {
+
find.SearchStrategy.CompilePattern(searchOptions);
+ } catch {
+ Services.MessageService.ShowMessage
(GettextCatalog.GetString ("Search pattern is invalid"), DialogPointer);
+ return;
+ }
ISearchResult result;
if (!reverse)
@@ -219,7 +230,7 @@
if (startPos ==
textArea.SelectionStartPosition && endPos == textArea.SelectionEndPosition) {
// If the result is the same of
what we have selected, search again.
- Find (reverse);
+ FindInternal (reverse);
return;
}
@@ -227,7 +238,7 @@
textArea.Select (endPos, startPos);
}
}
- }
+ }
static object OpenView (string fileName)
{
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/Task.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/Task.cs
2006-11-30 15:16:53 UTC (rev 68748)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/Task.cs
2006-11-30 15:21:15 UTC (rev 68749)
@@ -79,7 +79,10 @@
return fileName;
}
set {
- fileName = value;
+ if (System.IO.File.Exists (fileName))
+ fileName = System.IO.Path.GetFullPath
(value);
+ else
+ fileName = value;
}
}
@@ -122,10 +125,10 @@
public Task (string fileName, string description, int column,
int line, TaskType type)
{
this.type = type;
- this.fileName = fileName;
this.description = description.Trim();
this.column = column;
this.line = line;
+ FileName = fileName;
}
public Task (Project project, CompilerError error)
@@ -137,7 +140,7 @@
description = error.ErrorText;
if (error.ErrorNumber != String.Empty &&
error.ErrorNumber != null)
description += "(" + error.ErrorNumber + ")";
- fileName = error.FileName;
+ FileName = error.FileName;
}
public void JumpToPosition()
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-30 15:16:53 UTC (rev 68748)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskService.cs
2006-11-30 15:21:15 UTC (rev 68749)
@@ -138,7 +138,11 @@
{
for (int i = 0; i < tasks.Count; ++i) {
Task curTask = tasks[i];
- if (Path.GetFullPath (curTask.FileName) ==
Path.GetFullPath (e.ProjectFile.Name)) {
+ string fname = e.ProjectFile.Name;
+ // The method GetFullPath only works if the
file exists
+ if (File.Exists (fname))
+ fname = Path.GetFullPath (fname);
+ if (curTask.FileName == fname) {
Remove (curTask);
--i;
}
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2006-11-30 15:16:53 UTC (rev 68748)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2006-11-30 15:21:15 UTC (rev 68749)
@@ -261,6 +261,8 @@
<File name="./MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs"
subtype="Code" buildaction="Compile" />
<File
name="./MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolderNodeBuilder.cs"
subtype="Code" buildaction="Compile" />
<File name="./icons/Icons.16x16.LinkOverlay.png" subtype="Code"
buildaction="EmbedAsResource" />
+ <File name="./icons/mono-powered.png" subtype="Code"
buildaction="EmbedAsResource" />
+ <File name="./icons/parsing.png" subtype="Code"
buildaction="EmbedAsResource" />
<File name="./MonoDevelop.Ide.Gui/LayoutComboBox.cs" subtype="Code"
buildaction="Compile" />
</Contents>
<References>
@@ -271,7 +273,6 @@
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Components" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Documentation" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Dock"
/>
- <ProjectReference type="Assembly" localcopy="True"
refto="../../../contrib/log4net" />
<ProjectReference type="Gac" localcopy="True" refto="gecko-sharp,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
<ProjectReference type="Gac" localcopy="True" refto="monodoc,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -301,6 +302,7 @@
<ProjectReference type="Gac" localcopy="True" refto="Mono.Posix,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.GetOptions,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True"
refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Assembly" localcopy="True"
refto="../../../contrib/log4net.dll" />
</References>
<GtkDesignInfo>
<ExportedWidgets />
@@ -308,4 +310,4 @@
<DeploymentInformation strategy="File">
<excludeFiles />
</DeploymentInformation>
-</Project>
+</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
