Author: lluis
Date: 2005-11-04 07:09:04 -0500 (Fri, 04 Nov 2005)
New Revision: 52563
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditable.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
Log:
2005-11-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Content/IEditable.cs: Added InsertText method.
* MonoDevelop.Ide.Gui.Content/ITextBuffer.cs: Added
GetPositionFromLineColumn method.
* MonoDevelop.Ide.Gui/IdeStartup.cs:
* MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs:
* MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs: Fixed warnings.
* MonoDevelop.Ide.Gui/Workbench.cs: Fix NRE when opening a file in an
external editor.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2005-11-04
12:02:31 UTC (rev 52562)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2005-11-04
12:09:04 UTC (rev 52563)
@@ -1,3 +1,16 @@
+2005-11-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui.Content/IEditable.cs: Added InsertText method.
+ * MonoDevelop.Ide.Gui.Content/ITextBuffer.cs: Added
+ GetPositionFromLineColumn method.
+
+ * MonoDevelop.Ide.Gui/IdeStartup.cs:
+ * MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs:
+ * MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs: Fixed warnings.
+
+ * MonoDevelop.Ide.Gui/Workbench.cs: Fix NRE when opening a file in an
+ external editor.
+
2005-10-25 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/Workbench.cs: Don't show the main window until
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -9,7 +9,7 @@
using System.Net.Sockets;
using System.Text;
-using Mono.Posix;
+using Mono.Unix;
using Mono.GetOptions;
using MonoDevelop.Core.Properties;
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -215,7 +215,10 @@
if (!pm.AsyncOperation.Success)
return null;
- return WrapDocument
(openFileInfo.NewContent.WorkbenchWindow);
+ if (openFileInfo.NewContent != null)
+ return WrapDocument
(openFileInfo.NewContent.WorkbenchWindow);
+ else
+ return null;
}
public Document OpenDocument (IViewContent content, bool
bringToFront)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditable.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditable.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/IEditable.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -25,6 +25,8 @@
new string SelectedText { get; set; }
+ void InsertText (object position, string text);
+
event EventHandler TextChanged;
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/ITextBuffer.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -35,6 +35,7 @@
object CursorPosition { get; set; }
object GetPositionFromOffset (int offset);
+ object GetPositionFromLineColumn (int line, int column);
int GetOffsetFromPosition (object position);
object SelectionStartPosition { get; }
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -143,7 +143,7 @@
TreeIter iter;
if (catView.Selection.GetSelected (out mdl, out iter)) {
//templateStore.Clear ();
- TemplateView.Clear ();
+ TemplateView.Clear ();
foreach (TemplateItem item in
(ArrayList)((Gtk.TreeStore)mdl).GetValue (iter, 2)) {
//templateStore.AppendValues
(item.Name, item.Template);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -110,7 +110,10 @@
get { return false; }
}
- public event MonitorHandler CancelRequested;
+ public event MonitorHandler CancelRequested {
+ add { }
+ remove { }
+ }
// The returned IAsyncOperation object must be thread safe
IAsyncOperation IProgressMonitor.AsyncOperation {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs
2005-11-04 12:02:31 UTC (rev 52562)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs
2005-11-04 12:09:04 UTC (rev 52563)
@@ -96,9 +96,6 @@
[Glade.Widget] Button addButton;
[Glade.Widget] Button removeButton;
- MenuButtonEntry argumentMbe;
- MenuButtonEntry workingDirMbe;
-
// these are the control names which are
enabled/disabled depending if tool is selected
Widget[] dependendControls;
@@ -129,8 +126,8 @@
toolListBox.AppendColumn
(GettextCatalog.GetString ("_Tools"), new CellRendererText (), "text", 0);
- argumentMbe = new MenuButtonEntry
(argumentTextBox, argumentQuickInsertButton, argumentQuickInsertMenu);
- workingDirMbe = new MenuButtonEntry
(workingDirTextBox, workingDirQuickInsertButton, workingDirInsertMenu);
+ new MenuButtonEntry (argumentTextBox,
argumentQuickInsertButton, argumentQuickInsertMenu);
+ new MenuButtonEntry (workingDirTextBox,
workingDirQuickInsertButton, workingDirInsertMenu);
toolListBox.Selection.Changed += new
EventHandler (selectEvent);
removeButton.Clicked += new EventHandler
(removeEvent);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
