From commit-watcher at mono-cvs.ximian.com Mon Oct 4 18:51:21 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 4 Oct 2004 18:51:21 -0400 (EDT) Subject: [Monodevelop-patches-list] r1972 - in trunk/MonoDevelop/Core: . src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/CodeCompletion src/AddIns/DisplayBindings/SourceEditor/Gui Message-ID: <20041004225121.5B86194762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-04 18:51:21 -0400 (Mon, 04 Oct 2004) New Revision: 1972 Modified: trunk/MonoDevelop/Core/ChangeLog trunk/MonoDevelop/Core/configure.in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs Log: yay. workaround a weird mono issue with assembly loading. Also provide a potential point to start adding gtk-sharp-2.0 functionality. yay. jackson will fix this bug this weekend he says. Modified: trunk/MonoDevelop/Core/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/ChangeLog 2004-09-26 20:07:38 UTC (rev 1971) +++ trunk/MonoDevelop/Core/ChangeLog 2004-10-04 22:51:21 UTC (rev 1972) @@ -1,3 +1,10 @@ +2004-10-04 Todd Berman + + * configure.in: Add a --with-gtk-sharp-2-0 to allow gtk-sharp-2-0 + to be used. This is a needed workaround for now to allow for people + to get 2.0 completion info. Works around a mono bug. That jackson + is going to fix. :) + 2004-09-20 Tim Gerla * configure.in: Modified: trunk/MonoDevelop/Core/configure.in =================================================================== --- trunk/MonoDevelop/Core/configure.in 2004-09-26 20:07:38 UTC (rev 1971) +++ trunk/MonoDevelop/Core/configure.in 2004-10-04 22:51:21 UTC (rev 1972) @@ -66,15 +66,30 @@ fi +GTK_SHARP_2_0=no + +AC_ARG_WITH(gtk-sharp-2-0, [ --with-gtk-sharp-2-0=yes,no + If you want to build with gtk-sharp-2.0 default=no],[ + if test x$with_gtk_sharp_2_0 = xyes; then + GTK_SHARP_2_0=yes + fi +]) + dnl hard dependencies GTKSHARP_REQUIRED_VERSION=1.0 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.5 GECKOSHARP_REQUIRED_VERSION=0.5 MONODOC_REQUIRED_VERSION=1.0 -PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION glade-sharp >= $GTKSHARP_REQUIRED_VERSION gconf-sharp >= $GTKSHARP_REQUIRED_VERSION -gnome-sharp >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION) -AC_SUBST(BASE_DEPENDENCIES_LIBS) +if test x$GTK_SHARP_2_0 = xyes; then + PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) + PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION) + BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS} + AC_SUBST(BASE_DEPENDENCIES_LIBS) +else + PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION glade-sharp >= $GTKSHARP_REQUIRED_VERSION gconf-sharp >= $GTKSHARP_REQUIRED_VERSION gnome-sharp >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION) + AC_SUBST(BASE_DEPENDENCIES_LIBS) +fi gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp` AC_SUBST(gtksharp_prefix) Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-09-26 20:07:38 UTC (rev 1971) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-10-04 22:51:21 UTC (rev 1972) @@ -1,3 +1,9 @@ +2004-10-04 Todd Berman + + * Gui/SourceEditorView.cs: + * CodeCompletion/ListWindow.cs: Need to use System.Char w/ + gtk-sharp-2-0 for some reason. Not sure why. + 2004-09-18 Lluis Sanchez Gual * Gui/SourceEditorView.cs: Use the new completion window. Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2004-09-26 20:07:38 UTC (rev 1971) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2004-10-04 22:51:21 UTC (rev 1972) @@ -136,12 +136,12 @@ char c = (char)e.KeyValue; - if (Char.IsLetterOrDigit (c) || c == '_') { + if (System.Char.IsLetterOrDigit (c) || c == '_') { word.Insert (curPos++, c); UpdateWordSelection (); return KeyAction.Process; } - else if ((Char.IsPunctuation (c) || c == ' ') && !list.SelectionDisabled) { + else if ((System.Char.IsPunctuation (c) || c == ' ') && !list.SelectionDisabled) { return KeyAction.Complete | KeyAction.Process | KeyAction.CloseWindow; } Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-09-26 20:07:38 UTC (rev 1971) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-10-04 22:51:21 UTC (rev 1972) @@ -358,7 +358,7 @@ { for ( offset-- ; offset >= 0 ; offset--) { - if (Char.IsWhiteSpace (doc, offset)) break; + if (System.Char.IsWhiteSpace (doc, offset)) break; } return ++offset; } @@ -381,7 +381,7 @@ public string GetLeadingWhiteSpace (int line) { string lineText = ((IFormattableDocument)this).GetLineAsString (line); int index = 0; - while (index < lineText.Length && Char.IsWhiteSpace (lineText[index])) { + while (index < lineText.Length && System.Char.IsWhiteSpace (lineText[index])) { index++; } return index > 0 ? lineText.Substring (0, index) : ""; From commit-watcher at mono-cvs.ximian.com Mon Oct 4 21:39:46 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 4 Oct 2004 21:39:46 -0400 (EDT) Subject: [Monodevelop-patches-list] r1973 - trunk/MonoDevelop/Core Message-ID: <20041005013946.707FC94762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-04 21:39:46 -0400 (Mon, 04 Oct 2004) New Revision: 1973 Removed: trunk/MonoDevelop/Core/broad_developer_roadmap Log: that document is just painfully old. Deleted: trunk/MonoDevelop/Core/broad_developer_roadmap =================================================================== --- trunk/MonoDevelop/Core/broad_developer_roadmap 2004-10-04 22:51:21 UTC (rev 1972) +++ trunk/MonoDevelop/Core/broad_developer_roadmap 2004-10-05 01:39:46 UTC (rev 1973) @@ -1,29 +0,0 @@ -* MonoDevelop Roadmap -* Draft -- Wednesday January 21st - -** Short term (next 4 months) goals - - *** Complete the porting of #D to MonoDevelop - - *** Merge changes to the #D codebase to MonoDevelop (always ongoing) - - *** Move to a new build system, this one wont properly support - everything we need (easy .desktop integration, etc). - - *** We need to finish off porting everything in sight, and some more - pieces that are yet not in sight. - - *** Determine what direction to take asp.net and gtk# gui design - in. Potentially as a first step for asp.net design time - support, we can attempt to do some basic html design goodness. - - *** Enhance our xml editing capabilities. - - *** Bug fixing, lots of it, as well as further integration with - the GNOME desktop. - -** Longer term goals - - *** Continue GNOME desktop integration. - - *** Finish off asp.net and gtk# gui design. From commit-watcher at mono-cvs.ximian.com Mon Oct 4 21:47:46 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 4 Oct 2004 21:47:46 -0400 (EDT) Subject: [Monodevelop-patches-list] r1974 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding AddIns/BackendBindings/ILAsmBinding AddIns/BackendBindings/JavaBinding AddIns/BackendBindings/NemerleBinding AddIns/DisplayBindings/SourceEditor AddIns/Misc/StartPage AddIns/prj2make-sharp-lib Libraries/MonoDevelop.Core Libraries/MonoDevelop.Gui.Utils Libraries/MonoDevelop.Gui.Widgets Libraries/SharpAssembly Libraries/SharpRefactory Main/Base Main/StartUp Tools/SharpCoco Tools/dbgen Message-ID: <20041005014746.E2CFF94762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-04 21:47:46 -0400 (Mon, 04 Oct 2004) New Revision: 1974 Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/ trunk/MonoDevelop/Core/src/Libraries/SharpRefactory/ trunk/MonoDevelop/Core/src/Main/Base/ trunk/MonoDevelop/Core/src/Main/StartUp/ trunk/MonoDevelop/Core/src/Tools/SharpCoco/ trunk/MonoDevelop/Core/src/Tools/dbgen/ Log: `cat ../svn-commit.tmp ` Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in CSharpBinding.dll CSharpBinding.pidb CSharpBindingExecutionManager.cs + Makefile Makefile.in CSharpBinding.dll CSharpBinding.dll.mdb CSharpBinding.pidb CSharpBindingExecutionManager.cs Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in ILAsmBinding.dll ILAsmBinding.pidb + Makefile Makefile.in ILAsmBinding.dll ILAsmBinding.pidb ILAsmBinding.dll.mdb Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in *.dll JavaBinding.pidb + Makefile Makefile.in *.dll JavaBinding.pidb JavaBinding.dll.mdb Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in NemerleBinding.dll NemerleBinding.pidb NemerleBindingExecutionServices.cs + Makefile Makefile.in NemerleBinding.dll NemerleBinding.pidb NemerleBinding.dll.mdb NemerleBindingExecutionServices.cs Property changes on: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.SourceEditor.dll MonoDevelop.SourceEditor.dll.config AssemblyInfo.cs SourceEditor.pidb + Makefile Makefile.in MonoDevelop.SourceEditor.dll MonoDevelop.SourceEditor.dll.mdb MonoDevelop.SourceEditor.dll.config AssemblyInfo.cs SourceEditor.pidb Property changes on: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.StartPage.dll AssemblyInfo.cs StartPage.pidb + Makefile Makefile.in MonoDevelop.StartPage.dll MonoDevelop.StartPage.dll.mdb AssemblyInfo.cs StartPage.pidb Property changes on: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in AssemblyInfo.cs *.dll Prj2MakeSharp.pidb + Makefile Makefile.in AssemblyInfo.cs *.dll Prj2MakeSharp.pidb prj2make-sharp-lib.dll.mdb Property changes on: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.Core.dll AssemblyInfo.cs MonoDevelop.Core.pidb + Makefile Makefile.in MonoDevelop.Core.dll MonoDevelop.Core.dll.mdb AssemblyInfo.cs MonoDevelop.Core.pidb Property changes on: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.Gui.Utils.dll MonoDevelop.Gui.Utils.dll.config AssemblyInfo.cs MonoDevelop.Gui.Utils.pidb + Makefile Makefile.in MonoDevelop.Gui.Utils.dll MonoDevelop.Gui.Utils.dll.mdb MonoDevelop.Gui.Utils.dll.config AssemblyInfo.cs MonoDevelop.Gui.Utils.pidb Property changes on: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.Gui.Widgets.dll AssemblyInfo.cs MonoDevelop.Gui.Widgets.pidb + Makefile Makefile.in MonoDevelop.Gui.Widgets.dll MonoDevelop.Gui.Widgets.dll.mdb AssemblyInfo.cs MonoDevelop.Gui.Widgets.pidb Property changes on: trunk/MonoDevelop/Core/src/Libraries/SharpAssembly ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in ICSharpCode.SharpAssembly.dll SharpAssembly.pidb + Makefile Makefile.in ICSharpCode.SharpAssembly.dll ICSharpCode.SharpAssembly.dll.mdb SharpAssembly.pidb Property changes on: trunk/MonoDevelop/Core/src/Libraries/SharpRefactory ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in ICSharpCode.SharpRefactory.dll SharpRefactory.pidb + Makefile Makefile.in ICSharpCode.SharpRefactory.dll ICSharpCode.SharpRefactory.dll.mdb SharpRefactory.pidb Property changes on: trunk/MonoDevelop/Core/src/Main/Base ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.Base.dll MonoDevelop.Base.dll.config AssemblyInfo.cs MonoDevelop.Base.pidb + Makefile Makefile.in MonoDevelop.Base.dll MonoDevelop.Base.dll.mdb MonoDevelop.Base.dll.config AssemblyInfo.cs MonoDevelop.Base.pidb Property changes on: trunk/MonoDevelop/Core/src/Main/StartUp ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in MonoDevelop.exe AssemblyInfo.cs MonoDevelop.pidb + Makefile Makefile.in MonoDevelop.exe MonoDevelop.exe.mdb AssemblyInfo.cs MonoDevelop.pidb Property changes on: trunk/MonoDevelop/Core/src/Tools/SharpCoco ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in SharpCoco.exe + Makefile Makefile.in SharpCoco.exe SharpCoco.exe.mdb Property changes on: trunk/MonoDevelop/Core/src/Tools/dbgen ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile dbgen.exe + Makefile.in Makefile dbgen.exe dbgen.exe.mdb From commit-watcher at mono-cvs.ximian.com Wed Oct 6 22:51:03 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 6 Oct 2004 22:51:03 -0400 (EDT) Subject: [Monodevelop-patches-list] r1975 - in trunk/MonoDevelop/Core/src/Main/Base: . Services/ParserService Message-ID: <20041007025103.519D094762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-06 22:51:03 -0400 (Wed, 06 Oct 2004) New Revision: 1975 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Services/ParserService/CodeCompletionDatabase.cs Log: fix a small bug with the namespace being added multiple times to the list. this was causing 'System' to show up twice in a using completion list if you had referenced System.dll. (One from mscorlib.dll, and one from System.dll) Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-05 01:47:46 UTC (rev 1974) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-07 02:51:03 UTC (rev 1975) @@ -1,3 +1,8 @@ +2004-10-06 Todd Berman + + * Services/ParserService/CodeCompletionDatabase.cs: Check to see if + the namespace is already in the list before adding. + 2004-09-26 Todd Berman * Gui/Components/SdMenu.cs: this should fix i18n for menus Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/ParserService/CodeCompletionDatabase.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/ParserService/CodeCompletionDatabase.cs 2004-10-05 01:47:46 UTC (rev 1974) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/ParserService/CodeCompletionDatabase.cs 2004-10-07 02:51:03 UTC (rev 1975) @@ -554,7 +554,7 @@ if (tns == null) return; foreach (DictionaryEntry en in tns.Contents) { - if (en.Value is NamespaceEntry) + if (en.Value is NamespaceEntry && !list.Contains (en.Key)) list.Add (en.Key); } } From commit-watcher at mono-cvs.ximian.com Thu Oct 7 01:47:15 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Thu, 7 Oct 2004 01:47:15 -0400 (EDT) Subject: [Monodevelop-patches-list] r1976 - in trunk/MonoDevelop/Core/src/Main/Base: . Services Message-ID: <20041007054715.9D5DE94762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-07 01:47:15 -0400 (Thu, 07 Oct 2004) New Revision: 1976 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Services/MessageService.cs Log: fix bug with the show message thread transparent code. closes bug #61674 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-07 02:51:03 UTC (rev 1975) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-07 05:47:15 UTC (rev 1976) @@ -1,3 +1,9 @@ +2004-10-07 Todd Berman + + * Servers/MessageService.cs: Fix a little (but important) bug with + ShowMessage not properly working. Now you can actually *close* the + window. Pretty good. + 2004-10-06 Todd Berman * Services/ParserService/CodeCompletionDatabase.cs: Check to see if Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/MessageService.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/MessageService.cs 2004-10-07 02:51:03 UTC (rev 1975) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/MessageService.cs 2004-10-07 05:47:15 UTC (rev 1976) @@ -163,15 +163,14 @@ void realShowMessage (object state) { string message = state as string; - using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, message)) { - md.Response += new Gtk.ResponseHandler(OnMessageResponse); - md.ShowAll (); - } + Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, message); + md.Response += new Gtk.ResponseHandler(OnMessageResponse); + md.ShowAll (); } void OnMessageResponse (object o, Gtk.ResponseArgs e) { - ((Gtk.Dialog)o).Hide (); + ((Gtk.MessageDialog)o).Hide (); } // call this method to show a dialog and get a response value From commit-watcher at mono-cvs.ximian.com Thu Oct 7 16:57:32 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Thu, 7 Oct 2004 16:57:32 -0400 (EDT) Subject: [Monodevelop-patches-list] r1977 - in trunk/MonoDevelop/Core/src/Main/Base: . Internal/Project/Project Message-ID: <20041007205732.3591B94762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-07 16:57:31 -0400 (Thu, 07 Oct 2004) New Revision: 1977 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs Log: 2004-10-07 Todd Berman * Internal/Project/Project/AbstractProject.cs: Make sure to copy the .mdb file if it exists when pushing the new dll into the AppBase of the executing assembly. This gives debug info for supporting dlls under 1.1.x and HEAD when you click 'Run'. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-07 05:47:15 UTC (rev 1976) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-07 20:57:31 UTC (rev 1977) @@ -1,5 +1,12 @@ 2004-10-07 Todd Berman + * Internal/Project/Project/AbstractProject.cs: Make sure to copy the + .mdb file if it exists when pushing the new dll into the AppBase of + the executing assembly. This gives debug info for supporting dlls + under 1.1.x and HEAD when you click 'Run'. + +2004-10-07 Todd Berman + * Servers/MessageService.cs: Fix a little (but important) bug with ShowMessage not properly working. Now you can actually *close* the window. Pretty good. Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-10-07 05:47:15 UTC (rev 1976) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-10-07 20:57:31 UTC (rev 1977) @@ -550,6 +550,8 @@ try { if (destinationFileName != referenceFileName) { File.Copy(referenceFileName, destinationFileName, true); + if (File.Exists (referenceFileName + ".mdb")) + File.Copy (referenceFileName + ".mdb", destinationFileName + ".mdb", true); } } catch (Exception e) { Console.WriteLine("Can't copy reference file from {0} to {1} reason {2}", referenceFileName, destinationFileName, e); From commit-watcher at mono-cvs.ximian.com Tue Oct 12 12:35:22 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 12 Oct 2004 12:35:22 -0400 (EDT) Subject: [Monodevelop-patches-list] r1978 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . Commands Search Search/DocumentIterator Message-ID: <20041012163522.CC96D94762@mono-cvs.ximian.com> Author: gert Date: 2004-10-12 12:35:22 -0400 (Tue, 12 Oct 2004) New Revision: 1978 Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs Log: * Commands/SearchCommands.cs: use alias to work around mcs change * Search/SearchReplaceManager.cs * Search/DocumentIterator/EditorDocumentInformation.cs * Search/DocumentIterator/CurrentDocumentIterator.cs * Search/DocumentIterator/DirectoryDocumentIterator.cs * Search/DocumentIterator/WholeProjectDocumentIterator.cs * Search/DocumentIterator/AllOpenDocumentIterator.cs Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-10-12 16:35:22 UTC (rev 1978) @@ -1,3 +1,13 @@ +2004-10-12 Gert Driesen + + * Commands/SearchCommands.cs: use alias to work around mcs change + * Search/SearchReplaceManager.cs + * Search/DocumentIterator/EditorDocumentInformation.cs + * Search/DocumentIterator/CurrentDocumentIterator.cs + * Search/DocumentIterator/DirectoryDocumentIterator.cs + * Search/DocumentIterator/WholeProjectDocumentIterator.cs + * Search/DocumentIterator/AllOpenDocumentIterator.cs + 2004-10-04 Todd Berman * Gui/SourceEditorView.cs: Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -23,6 +23,7 @@ using MonoDevelop.Gui.Dialogs; using MonoDevelop.Gui; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.DefaultEditor.Commands { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -12,6 +12,7 @@ using MonoDevelop.TextEditor; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -12,6 +12,7 @@ using MonoDevelop.TextEditor; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -17,6 +17,7 @@ using MonoDevelop.TextEditor; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -12,6 +12,7 @@ using MonoDevelop.Gui; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -16,6 +16,7 @@ using MonoDevelop.TextEditor; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-10-07 20:57:31 UTC (rev 1977) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-10-12 16:35:22 UTC (rev 1978) @@ -17,6 +17,7 @@ using MonoDevelop.TextEditor; using MonoDevelop.SourceEditor.Gui; +using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor; namespace MonoDevelop.TextEditor.Document { From commit-watcher at mono-cvs.ximian.com Tue Oct 12 12:36:06 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 12 Oct 2004 12:36:06 -0400 (EDT) Subject: [Monodevelop-patches-list] r1979 - in trunk/MonoDevelop/Core/src/Main/Base: . Internal/Parser/SharpAssemblyLayer Message-ID: <20041012163606.A964394762@mono-cvs.ximian.com> Author: gert Date: 2004-10-12 12:36:06 -0400 (Tue, 12 Oct 2004) New Revision: 1979 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs Log: * Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs: use alias to workaround mcs change Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-12 16:35:22 UTC (rev 1978) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-12 16:36:06 UTC (rev 1979) @@ -1,3 +1,8 @@ +2004-10-12 Gert Driesen + + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs: + use alias to workaround mcs change + 2004-10-07 Todd Berman * Internal/Project/Project/AbstractProject.cs: Make sure to copy the Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs 2004-10-12 16:35:22 UTC (rev 1978) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs 2004-10-12 16:36:06 UTC (rev 1979) @@ -14,6 +14,7 @@ using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; namespace MonoDevelop.Internal.Parser { From commit-watcher at mono-cvs.ximian.com Thu Oct 14 23:50:14 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Thu, 14 Oct 2004 23:50:14 -0400 (EDT) Subject: [Monodevelop-patches-list] r1980 - in trunk/MonoDevelop/Core: . build/AddIns/AddIns/BackendBindings build/AddIns/AddIns/BackendBindings/templates src/AddIns/BackendBindings/CSharpBinding src/AddIns/DisplayBindings/SourceEditor/Gui Message-ID: <20041015035014.DAB6794762@mono-cvs.ximian.com> Author: fawad Date: 2004-10-14 23:50:14 -0400 (Thu, 14 Oct 2004) New Revision: 1980 Added: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/AppConfigFile.xft.xml Modified: trunk/MonoDevelop/Core/ChangeLog trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs Log: Add missing NemerleGtkSharpWindow.xft.xml reference causing error in File->New. Added support for app.config at compile time for C#, and added template for same under File->New->Misc. Modified: trunk/MonoDevelop/Core/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/ChangeLog 2004-10-12 16:36:06 UTC (rev 1979) +++ trunk/MonoDevelop/Core/ChangeLog 2004-10-15 03:50:14 UTC (rev 1980) @@ -1,3 +1,12 @@ +2004-10-15 Fawad Halim + + * build/AddIns/AddIns/BackendBindings/templates/Makefile.am: Add missing NemerleGtkSharpWindow.xft.xml reference. + * src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs: + * src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs: + * build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml: + * build/AddIns/AddIns/BackendBindings/templates/AppConfigFile.xft.xml: Added support for app.config at compile time for C#, and added template for same under File->New->Misc. + + 2004-10-04 Todd Berman * configure.in: Add a --with-gtk-sharp-2-0 to allow gtk-sharp-2-0 Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml =================================================================== --- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml 2004-10-12 16:36:06 UTC (rev 1979) +++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml 2004-10-15 03:50:14 UTC (rev 1980) @@ -27,6 +27,8 @@ location = "templates/GtkSharpWindow.xft.xml"/> + + Modified: trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am 2004-10-12 16:36:06 UTC (rev 1979) +++ trunk/MonoDevelop/Core/build/AddIns/AddIns/BackendBindings/templates/Makefile.am 2004-10-15 03:50:14 UTC (rev 1980) @@ -34,6 +34,8 @@ JavaConsoleApplicationProject.xpt.xml \ Library.xpt.xml \ NemerleEmptyProject.xpt.xml \ -NemerleGtkSharpProject.xpt.xml +NemerleGtkSharpProject.xpt.xml \ +NemerleGtkSharpWindow.xft.xml \ +AppConfigFile.xft.xml EXTRA_DIST = $(template_DATA) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-10-12 16:36:06 UTC (rev 1979) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-10-15 03:50:14 UTC (rev 1980) @@ -207,8 +207,12 @@ break; } } + + // Treat app.config in the project root directory as the application config + if(Path.GetFileName(finfo.Name).ToUpper()=="app.config".ToUpper() && + Path.GetDirectoryName(finfo.Name)==p.BaseDirectory) + File.Copy(finfo.Name,exe+".config",true); } - if (compilerparameters.GenerateXmlDocumentation) { writer.WriteLine("\"/doc:" + Path.ChangeExtension(exe, ".xml") + '"'); } Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-10-12 16:36:06 UTC (rev 1979) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-10-15 03:50:14 UTC (rev 1980) @@ -40,6 +40,8 @@ return true; if (mimetype == "application/x-python") return true; + if (mimetype == "application/x-config") + return true; return false; } From commit-watcher at mono-cvs.ximian.com Fri Oct 15 13:27:55 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Fri, 15 Oct 2004 13:27:55 -0400 (EDT) Subject: [Monodevelop-patches-list] r1981 - in trunk/MonoDevelop/Core/src/Main/Base: . Internal/Project/Combine Message-ID: <20041015172755.E1A6894762@mono-cvs.ximian.com> Author: tberman Date: 2004-10-15 13:27:55 -0400 (Fri, 15 Oct 2004) New Revision: 1981 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs Log: 2004-10-15 Todd Berman * Internal/Project/Combine/CombineEntry.cs: Before running, copy all dependant output assemblies to the proper place. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-15 03:50:14 UTC (rev 1980) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-15 17:27:55 UTC (rev 1981) @@ -1,3 +1,8 @@ +2004-10-15 Todd Berman + + * Internal/Project/Combine/CombineEntry.cs: Before running, copy + all dependant output assemblies to the proper place. + 2004-10-12 Gert Driesen * Internal/Parser/SharpAssemblyLayer/SharpAssemblyClass.cs: Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-10-15 03:50:14 UTC (rev 1980) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-10-15 17:27:55 UTC (rev 1981) @@ -185,6 +185,7 @@ if (taskService.Errors == 0) { if (taskService.Warnings == 0 || project.ActiveConfiguration != null && ((AbstractProjectConfiguration)project.ActiveConfiguration).RunWithWarnings) { + project.CopyReferencesToOutputPath (true); binding.Execute(project); } } From commit-watcher at mono-cvs.ximian.com Fri Oct 15 22:58:30 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Fri, 15 Oct 2004 22:58:30 -0400 (EDT) Subject: [Monodevelop-patches-list] r1982 - in trunk/MonoDevelop/Core: gdldock/gdl src/Libraries/MonoDevelop.Gui.Widgets Message-ID: <20041016025830.8733494762@mono-cvs.ximian.com> Author: jluke Date: 2004-10-15 22:58:30 -0400 (Fri, 15 Oct 2004) New Revision: 1982 Modified: trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am Log: small make CSC=foo fixes Modified: trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog 2004-10-15 17:27:55 UTC (rev 1981) +++ trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog 2004-10-16 02:58:30 UTC (rev 1982) @@ -1,3 +1,10 @@ +2004-10-16 John Luke + + * Makefile.am: remove MCS and RUNTIME + use $(CSC) from configure.in + use -target:library syntax instead of --target library + allows make CSC=foo to work consistently + 2004-05-16 Todd Berman * Makefile.am: use safer library referencing Modified: trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am 2004-10-15 17:27:55 UTC (rev 1981) +++ trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am 2004-10-16 02:58:30 UTC (rev 1982) @@ -1,5 +1,3 @@ -MCS = mcs -RUNTIME = mono ASSEMBLY = gdl-sharp.dll API = gdl-api.xml @@ -33,7 +31,7 @@ $(ASSEMBLY): $(build_sources) generated-stamp mkdir -p ../../build/bin - $(MCS) --unsafe --target library \ + $(CSC) --unsafe -target:library \ @BASE_DEPENDENCIES_LIBS@ \ $(build_sources) generated/*.cs /out:$(ASSEMBLY) \ && cp -p $(ASSEMBLY) ../../build/bin/. \ Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog 2004-10-15 17:27:55 UTC (rev 1981) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog 2004-10-16 02:58:30 UTC (rev 1982) @@ -1,3 +1,8 @@ +2004-10-16 John Luke + + * Makefile.am: remove MCS use $(CSC) from configure.in, + allows make CSC=foo to work consistently + 2004-09-25 Todd Berman * FileBrowser/FileBrowser.cs: Use a ArrayList instead of a Hashtable Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-10-15 17:27:55 UTC (rev 1981) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-10-16 02:58:30 UTC (rev 1982) @@ -1,6 +1,4 @@ -MCS = mcs -debug - DLL = MonoDevelop.Gui.Widgets.dll REFERENCES = /r:System.Drawing \ @@ -32,7 +30,7 @@ all: $(DLL) $(DLL): $(build_sources) - $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \ + $(CSC) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \ && cp $(DLL) ../../../build/bin/. assemblydir = $(libdir)/monodevelop/bin From commit-watcher at mono-cvs.ximian.com Sun Oct 17 20:02:37 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Sun, 17 Oct 2004 20:02:37 -0400 (EDT) Subject: [Monodevelop-patches-list] r1983 - trunk/MonoDevelop/Core Message-ID: <20041018000237.57C5594763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-17 20:02:37 -0400 (Sun, 17 Oct 2004) New Revision: 1983 Modified: trunk/MonoDevelop/Core/ChangeLog trunk/MonoDevelop/Core/configure.in Log: echo $CSC at the end of configure Modified: trunk/MonoDevelop/Core/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/ChangeLog 2004-10-16 02:58:30 UTC (rev 1982) +++ trunk/MonoDevelop/Core/ChangeLog 2004-10-18 00:02:37 UTC (rev 1983) @@ -1,3 +1,7 @@ +2004-10-17 John Luke + + * configure.in: echo $CSC at the end for the prefix impaired (like me) + 2004-10-15 Fawad Halim * build/AddIns/AddIns/BackendBindings/templates/Makefile.am: Add missing NemerleGtkSharpWindow.xft.xml reference. Modified: trunk/MonoDevelop/Core/configure.in =================================================================== --- trunk/MonoDevelop/Core/configure.in 2004-10-16 02:58:30 UTC (rev 1982) +++ trunk/MonoDevelop/Core/configure.in 2004-10-18 00:02:37 UTC (rev 1983) @@ -225,6 +225,7 @@ echo "" echo " * Installation prefix = $prefix" echo " * GNOME prefix = $gnome_prefix" +echo " * C# compiler = $CSC" echo "" echo " * mono-debugger: disabled in this release." echo "" From commit-watcher at mono-cvs.ximian.com Wed Oct 20 00:11:43 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 20 Oct 2004 00:11:43 -0400 (EDT) Subject: [Monodevelop-patches-list] r1984 - in trunk/MonoDevelop/Core/src/Main/Base: . Services/File Message-ID: <20041020041143.CE3E794763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-20 00:11:43 -0400 (Wed, 20 Oct 2004) New Revision: 1984 Added: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs Removed: trunk/MonoDevelop/Core/src/Main/Base/Services/File/FdoRecentFiles.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentItem.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RingBuffer.cs Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Makefile.am Log: 2004-10-20 John Luke * Makefile.am: remove RingBuffer, add RecentFiles (not used yet) * Services/File/FdoRecentFiles.cs * Services/File/RecentItem.cs * Services/File/RingBuffer.cs: remove old unused stuff * Services/File/RecentFiles.cs: new in-progress implementation not enabled, it shouldnt effect anything Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-20 04:11:43 UTC (rev 1984) @@ -1,3 +1,11 @@ +2004-10-20 John Luke + + * Makefile.am: remove RingBuffer, add RecentFiles (not used yet) + * Services/File/FdoRecentFiles.cs + * Services/File/RecentItem.cs + * Services/File/RingBuffer.cs: remove old unused stuff + * Services/File/RecentFiles.cs: new in-progress implementation + 2004-10-15 Todd Berman * Internal/Project/Combine/CombineEntry.cs: Before running, copy Modified: trunk/MonoDevelop/Core/src/Main/Base/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Makefile.am 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/Makefile.am 2004-10-20 04:11:43 UTC (rev 1984) @@ -170,7 +170,7 @@ ./Services/File/IFileService.cs \ ./Services/File/DefaultFileService.cs \ ./Services/File/FileEventArgs.cs \ -./Services/File/RingBuffer.cs \ +./Services/File/RecentFiles.cs \ ./Services/File/RecentOpen.cs \ ./Services/MenuService/MenuService.cs \ ./Services/DisplayBinding/DisplayBindingService.cs \ Deleted: trunk/MonoDevelop/Core/src/Main/Base/Services/File/FdoRecentFiles.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/FdoRecentFiles.cs 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/FdoRecentFiles.cs 2004-10-20 04:11:43 UTC (rev 1984) @@ -1,151 +0,0 @@ -// -// Author: John Luke -// -// Copyright 2004 John Luke -// - -using System; -using System.Collections; -using System.IO; -using System.Xml; -using System.Xml.XPath; - -// implementation of the freedesktop.org Recent Files spec -// http://freedesktop.org/Standards/recent-file-spec/recent-file-spec-0.2.html - -namespace MonoDevelop.Services -{ - public class FdoRecentFiles - { - // MD only wants to save last 10 in its group - ArrayList lastFiles = new ArrayList (10); // max 10 - ArrayList lastProjects = new ArrayList (10); // max 10 - ArrayList allRecents = new ArrayList (10); // max 500 - - XPathDocument doc; - - public event EventHandler RecentFileChanged; - public event EventHandler RecentProjectChanged; - - public FdoRecentFiles () - { - // The document should be stored in "~/.recently-used", - string recentFile = Path.Combine (Environment.GetEnvironmentVariable ("HOME"), ".recently_used"); - //Console.WriteLine (recentFile); - - if (File.Exists (recentFile)) - { - // use POSIX lockf () - doc = new XPathDocument (recentFile); - - XPathNavigator nav = doc.CreateNavigator (); - XPathNodeIterator xni = nav.Select ("/RecentFiles/RecentItem"); - Console.WriteLine ("Total Items {0}", xni.Count); - } - else - { - // use POSIX lockf () - Console.WriteLine ("{0} does not exist.", recentFile); - // create it - } - - //FileSystemWatcher watcher = new FileSystemWatcher (recentFile); - //watcher.Changed += new FileSystemEventHandler (OnWatcherChanged); - } - - void OnWatcherChanged (object o, FileSystemEventArgs args) - { - // TODO - // decide if projects or files changed or both - Console.WriteLine ("on watcher changed"); - } - - void OnRecentFileChange () - { - if (RecentFileChanged != null) - { - RecentFileChanged (this, null); - } - } - - void OnRecentProjectChange () - { - if (RecentProjectChanged != null) - { - RecentProjectChanged (this, null); - } - } - - public ArrayList RecentFiles - { - get - { - return lastFiles; - } - } - - public ArrayList RecentProjects - { - get - { - return lastProjects; - } - } - - // new entries seem to go on top - // but it is not explicitly stated as so - public void AddFile (string file_uri) - { - // uri must be unique - // or just update timestamp and group - foreach (RecentItem recentItem in allRecents) - { - if (recentItem.Uri == file_uri) - { - recentItem.Update (false); - lastFiles.Add (recentItem); - return; - } - } - - RecentItem ri = new RecentItem (file_uri); - ri.Group = "MonoDevelop Files"; - lastFiles.Add (ri); - } - - public void AddProject (string file_uri) - { - // uri must be unique - // or just update timestamp and group - foreach (RecentItem recentItem in allRecents) - { - if (recentItem.Uri == file_uri) - { - recentItem.Update (true); - lastProjects.Add (recentItem); - return; - } - } - - RecentItem ri = new RecentItem (file_uri); - ri.Group = "MonoDevelop Projects"; - lastProjects.Add (ri); - } - - // spec doesn't mention removal - public void ClearFiles () - { - lastFiles.Clear (); - // remove from allRecents - // write the file - } - - // spec doesn't mention removal - public void ClearProjects () - { - lastProjects.Clear (); - // remove from allRecents - // write the file - } - } -} Added: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-10-20 04:11:43 UTC (rev 1984) @@ -0,0 +1,356 @@ +/* +Copyright (c) 2004 John Luke + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +using System; +using System.Collections; +using System.IO; +using System.Text; +using System.Xml; +using System.Xml.Serialization; + +// implementation of the freedesktop.org Recent Files spec +// http://freedesktop.org/Standards/recent-file-spec/recent-file-spec-0.2.html + +namespace Freedesktop.RecentFiles +{ + // FIXME: make sure locking is ok + // ex. should we survive ctl-c in middle of read/write + // do we fail gracefully if someone else has a lock + public class RecentFiles + { + private static XmlSerializer serializer; + + // expose this so consumers can watch it with FileSystemWatcher for changes + public static readonly string RecentFileStore = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".recently-used"); + + static RecentFiles () + { + serializer = new XmlSerializer (typeof (RecentFiles)); + } + + // required by serializer + public RecentFiles () + { + } + + // currently only emits on our changes + // we should probably use FSW and send those events here + // for now you have to do it on your own + public event EventHandler Changed; + + [XmlElement ("RecentItem")] + public RecentItem[] RecentItems; + + // FIXME: maybe not write until Save at the End + public void AddItem (RecentItem item) + { + if (RecentItems == null) + { + RecentItems = new RecentItem [] {item}; + Save (); + return; + } + + // check for already existing URI + // if it does update timestamp and return unchanged; + // FIXME: but, what about new Groups? private changing? + foreach (RecentItem ri in RecentItems) + { + if (item.Uri == ri.Uri) + { + ri.Timestamp = item.Timestamp; + Save (); + return; + } + } + + int count = RecentItems.Length; + RecentItem[] newItems; + if (count < 500) + { + newItems = new RecentItem[count + 1]; + RecentItems.CopyTo (newItems, 0); + newItems[count + 1] = item; + } + else + { + // FIXME: crashes + newItems = new RecentItem[500]; + // here we chop off the beginning (oldest) + Array.Copy (RecentItems, count - 500, newItems, 0, 499); + newItems[500] = item; + } + + RecentItems = newItems; + Save (); + } + + public void Clear () + { + RecentItems = new RecentItem [0]; + Save (); + } + + public void ClearGroup (string group) + { + if (this.RecentItems == null) + return; + + ArrayList list = new ArrayList (); + foreach (RecentItem ri in RecentItems) + { + // FIXME: needs to Handle 2 groups becoming 1 group + foreach (string g in ri.Groups) + { + if (g != group) + list.Add (ri); + } + } + + RecentItem[] items = new RecentItem [list.Count]; + list.CopyTo (items); + RecentItems = items; + Save (); + } + + private void ClearMissing () + { + ArrayList list = new ArrayList (); + foreach (RecentItem ri in RecentItems) + { + // we cant test !file:// Uris can we? + if (!ri.Uri.StartsWith ("file://")) + list.Add (ri); + else if (File.Exists (ri.Uri.Substring (7))) + list.Add (ri); + } + + RecentItem[] items = new RecentItem [list.Count]; + list.CopyTo (items); + RecentItems = items; + Save (); + } + + private void EmitChangedEvent () + { + if (Changed != null) + Changed (this, EventArgs.Empty); + } + + public static RecentFiles GetInstance () + { + try + { + XmlTextReader reader = new XmlTextReader (RecentFileStore); + RecentFiles rf = (RecentFiles) serializer.Deserialize (reader); + reader.Close (); + return rf; + } + catch (IOException e) + { + // FIXME: this is wrong, because if we later save it, we blow away what was there + // somehow we should ask for the lock or wait for it... + return new RecentFiles (); + } + catch + { + // FIXME: this is wrong, because if we later save it, we blow away what was there + return new RecentFiles (); + } + } + + public RecentItem[] GetItemsInGroup (string group) + { + if (RecentItems == null) + return null; + + ArrayList list = new ArrayList (); + // disable for now + //ClearMissing (); + + foreach (RecentItem ri in RecentItems) + { + foreach (string g in ri.Groups) + { + if (g == group) + list.Add (ri); + } + } + + RecentItem[] items = new RecentItem [list.Count]; + list.CopyTo (items); + return items; + } + + public void RemoveItem (string uri) + { + ArrayList list = new ArrayList (); + foreach (RecentItem ri in RecentItems) + { + if (ri.Uri != uri) + list.Add (ri); + } + + RecentItem[] items = new RecentItem [list.Count]; + list.CopyTo (items); + RecentItems = items; + Save (); + } + + public void RenameItem (string oldUri, string newUri) + { + foreach (RecentItem ri in RecentItems) + { + if (ri.Uri == oldUri) + { + ri.Uri = newUri; + ri.Timestamp = RecentItem.NewTimestamp; + Save (); + return; + } + } + } + + // Save implies EmitChangedEvent (otherwise why would we save?) + private void Save () + { + // if we specifically set Encoding UTF 8 here it writes the BOM + // which confuses others (egg-recent-files) I guess + XmlTextWriter writer = new XmlTextWriter (new StreamWriter (RecentFileStore)); + writer.Formatting = Formatting.Indented; + serializer.Serialize (writer, this); + writer.Close (); + EmitChangedEvent (); + } + + public override string ToString () + { + if (this.RecentItems == null) + return "0 recent files"; + + StringBuilder sb = new StringBuilder (); + foreach (RecentItem ri in this.RecentItems) + { + sb.Append (ri.Uri); + sb.Append (" "); + sb.Append (ri.MimeType); + sb.Append (" "); + sb.Append (ri.Timestamp); + sb.Append ("\n"); + } + sb.Append (RecentItems.Length); + sb.Append (" total recent files\n"); + return sb.ToString (); + } + } + + public class RecentItem + { + [XmlElement ("URI")] + public string Uri; + + [XmlElement ("Mime-Type")] + public string MimeType; + + public string Timestamp; + + public string Private; + + [System.Xml.Serialization.XmlArrayItem(ElementName="Group",IsNullable=false)] + public string[] Groups; + + // required by serialization + public RecentItem () + { + } + + public RecentItem (string uri, string mimetype) : this (uri, mimetype, null) + { + } + + public RecentItem (string uri, string mimetype, string group) + { + Uri = uri; + MimeType = mimetype; + Timestamp = NewTimestamp; + + if (group != null) + { + this.Groups = new string[] {group}; + } + } + + public void AddGroup (string group) + { + if (this.Groups == null) + { + Groups = new string[] {group}; + return; + } + + // if it already has this group no need to add it + foreach (string g in Groups) + { + if (g == group) + return; + } + + int length = this.Groups.Length + 1; + string[] groups = new string [length]; + this.Groups.CopyTo (groups, 0); + groups[length] = group; + } + + public static string NewTimestamp + { + get { + // from the unix epoch + return ((int) (DateTime.UtcNow - new DateTime (1970, 1, 1, 0, 0, 0, 0)).TotalSeconds).ToString (); + } + } + + // FIXME + public void RemoveGroup (string group) + { + if (this.Groups == null) + return; + + ArrayList groups = new ArrayList (); + foreach (string g in Groups) + { + if (g != group) + groups.Add (g); + } + + string[] newGroups = new string [groups.Count]; + groups.CopyTo (newGroups, 0); + this.Groups = newGroups; + } + + // some apps might depend on this, even though they shouldn't + public override string ToString () + { + return this.Uri; + } + } +} + Deleted: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentItem.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentItem.cs 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentItem.cs 2004-10-20 04:11:43 UTC (rev 1984) @@ -1,68 +0,0 @@ -// -// Author: John Luke -// -// Copyright 2004 John Luke -// - -// support class for FdoRecentFiles.cs - -using System; -using MonoDevelop.Gui.Utils; - -namespace MonoDevelop.Services -{ - public class RecentItem - { - // must be a valid uri ex. file:// - private string uri; - private string mime; - // the number of seconds sinced the Epoch when the item was added to the list. - private string timestamp; - private readonly DateTime epoch = new DateTime (1970, 1, 1, 0, 0, 0, 0); - // may need to change to allow for > 1 - // lets wait til it's needed though - private string group; - - // these 3 are required - public RecentItem (string uri) - { - // TODO: uri sanity check - this.uri = uri; - this.mime = Vfs.GetMimeType (uri); - DateTime now = DateTime.UtcNow; - this.timestamp = ((int) (now - epoch).TotalSeconds).ToString (); - } - - // update the group and timestamp - public void Update (bool project) - { - DateTime now = DateTime.UtcNow; - this.timestamp = ((int) (now - epoch).TotalSeconds).ToString (); - if (project) - this.group = "MonoDevelop Projects"; - else - this.group = "MonoDevelop Files"; - } - - public string Mime - { - get { return mime; } - } - - public string Uri - { - get { return uri; } - } - - public string Timestamp - { - get { return timestamp; } - } - - public string Group - { - get { return group; } - set { group = value; } - } - } -} Deleted: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RingBuffer.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RingBuffer.cs 2004-10-18 00:02:37 UTC (rev 1983) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RingBuffer.cs 2004-10-20 04:11:43 UTC (rev 1984) @@ -1,117 +0,0 @@ -/* -// -// -// -// -// -// - -using System; -using System.Xml; -using System.Diagnostics; -using System.Collections; -using System.IO; - -using MonoDevelop.Core.Properties; - -using MonoDevelop.Services; - -namespace MonoDevelop.Services -{ - public class RingBuffer : IXmlConvertable - { - int maxLength = 10; - ArrayList entries = new ArrayList(); - - public ArrayList Entries { - get { - return entries; - } - } - - public RingBuffer(int maxLength) - { - this.maxLength = maxLength; - } - - protected RingBuffer(XmlElement element) - { - maxLength = Int32.Parse(element.Attributes["maxlength"].InnerText); - - foreach (XmlNode node in element.ChildNodes) { - DictionaryEntry newEntry = new DictionaryEntry(node.Attributes["key"].InnerText, node.Attributes["value"].InnerText); - if (!FilterEntry(newEntry)) { - entries.Add(newEntry); - } - } - } - - protected virtual bool FilterEntry(DictionaryEntry entry) - { - return false; - } - - public void AddEntry(string key, string val) - { - for (int i = 0; i < entries.Count; ++i) { - DictionaryEntry entry = (DictionaryEntry)entries[i]; - if (entry.Key.ToString() == key) { - entries.RemoveAt(i); - --i; - } - } - - while (entries.Count >= maxLength) { - entries.RemoveAt(entries.Count - 1); - } - - if (entries.Count > 0) { - entries.Insert(0, name); - } else { - entries.Add(name); - } - - OnChanged(EventArgs.Empty); - } - - public object FromXmlElement(XmlElement element) - { - return new RingBuffer(element); - } - - public XmlElement ToXmlElement(XmlDocument doc) - { - XmlElement entries = doc.CreateElement("Entries"); - - XmlAttribute lengthAttribute = doc.CreateAttribute("maxlength"); - lengthAttribute.InnerText = maxLength.ToString(); - entries.Attributes.Append(lengthAttribute); - - foreach (DictionaryEntry entry in entries) { - XmlElement entryElement = doc.CreateElement("Entry"); - - XmlAttribute keyAttribute = doc.CreateAttribute("key"); - keyAttribute.InnerText = entry.Key.ToString(); - entryElement.Attributes.Append(keyAttribute); - - XmlAttribute valueAttribute = doc.CreateAttribute("value"); - valueAttribute.InnerText = entry.Value.ToString(); - entryElement.Attributes.Append(valueAttribute); - - entries.AppendChild(entryElement); - } - - return entries; - } - - protected virtual void OnChanged(EventArgs e) - { - if (Changed != null) { - Changed(this, e); - } - } - - public event EventHandler Changed; - } -} -*/ From commit-watcher at mono-cvs.ximian.com Wed Oct 20 14:45:32 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 20 Oct 2004 14:45:32 -0400 (EDT) Subject: [Monodevelop-patches-list] r1985 - in trunk/MonoDevelop/Core/src/Main/Base: . Services/File Message-ID: <20041020184532.41B1C94763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-20 14:45:32 -0400 (Wed, 20 Oct 2004) New Revision: 1985 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs Log: fix a bunch of things Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-20 04:11:43 UTC (rev 1984) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-20 18:45:32 UTC (rev 1985) @@ -1,5 +1,9 @@ 2004-10-20 John Luke + * Services/File/RecentFiles.cs: fix a bunch of bugs + +2004-10-20 John Luke + * Makefile.am: remove RingBuffer, add RecentFiles (not used yet) * Services/File/FdoRecentFiles.cs * Services/File/RecentItem.cs Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-10-20 04:11:43 UTC (rev 1984) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-10-20 18:45:32 UTC (rev 1985) @@ -32,9 +32,8 @@ namespace Freedesktop.RecentFiles { - // FIXME: make sure locking is ok - // ex. should we survive ctl-c in middle of read/write - // do we fail gracefully if someone else has a lock + // Currently using XmlSerializer to read/write the recent files list + // other methods may be faster. public class RecentFiles { private static XmlSerializer serializer; @@ -60,7 +59,7 @@ [XmlElement ("RecentItem")] public RecentItem[] RecentItems; - // FIXME: maybe not write until Save at the End + // FIXME: maybe not write until Save () is called manually public void AddItem (RecentItem item) { if (RecentItems == null) @@ -72,66 +71,66 @@ // check for already existing URI // if it does update timestamp and return unchanged; - // FIXME: but, what about new Groups? private changing? foreach (RecentItem ri in RecentItems) { - if (item.Uri == ri.Uri) + if (ri.Uri == item.Uri) { ri.Timestamp = item.Timestamp; + if (item.Groups != null) + ri.AddGroups (item.Groups); Save (); return; } } - int count = RecentItems.Length; - RecentItem[] newItems; - if (count < 500) + while (RecentItems.Length > 499) { - newItems = new RecentItem[count + 1]; - RecentItems.CopyTo (newItems, 0); - newItems[count + 1] = item; + RemoveItem (OldestItem); } - else - { - // FIXME: crashes - newItems = new RecentItem[500]; - // here we chop off the beginning (oldest) - Array.Copy (RecentItems, count - 500, newItems, 0, 499); - newItems[500] = item; - } + int length = RecentItems.Length; + RecentItem[] newItems = new RecentItem[length + 1]; + RecentItems.CopyTo (newItems, 0); + newItems[length] = item; RecentItems = newItems; Save (); } public void Clear () { - RecentItems = new RecentItem [0]; + RecentItems = null; Save (); } public void ClearGroup (string group) { - if (this.RecentItems == null) + if (RecentItems == null) return; ArrayList list = new ArrayList (); foreach (RecentItem ri in RecentItems) { - // FIXME: needs to Handle 2 groups becoming 1 group - foreach (string g in ri.Groups) + if (Array.IndexOf (ri.Groups, group) == -1) { - if (g != group) + list.Add (ri); + } + else + { + ri.RemoveGroup (group); + + // it has other groups so dont delete it + if (ri.Groups.Length > 0) list.Add (ri); } } RecentItem[] items = new RecentItem [list.Count]; - list.CopyTo (items); + list.CopyTo (items, 0); RecentItems = items; Save (); } +/* private void ClearMissing () { ArrayList list = new ArrayList (); @@ -149,6 +148,7 @@ RecentItems = items; Save (); } +*/ private void EmitChangedEvent () { @@ -183,46 +183,93 @@ if (RecentItems == null) return null; - ArrayList list = new ArrayList (); // disable for now - //ClearMissing (); + // ClearMissing (); + ArrayList list = new ArrayList (); foreach (RecentItem ri in RecentItems) { - foreach (string g in ri.Groups) - { - if (g == group) - list.Add (ri); - } + if (ri.Groups == null) + continue; + + if (Array.IndexOf (ri.Groups, group) != -1) + list.Add (ri); } RecentItem[] items = new RecentItem [list.Count]; - list.CopyTo (items); + list.CopyTo (items, 0); return items; } - public void RemoveItem (string uri) + public RecentItem OldestItem { - ArrayList list = new ArrayList (); + get { + RecentItem item = RecentItems[0]; + for (int i = 1; i < RecentItems.Length; i ++) + { + // the lowest number is the oldest + if (RecentItems[i].Timestamp < item.Timestamp) + item = RecentItems[i]; + } + return item; + } + } + + public void RemoveItem (RecentItem item) + { + if (RecentItems == null) + return; + + ArrayList l = new ArrayList (); foreach (RecentItem ri in RecentItems) { - if (ri.Uri != uri) - list.Add (ri); + if (ri == item) + { + // remove the whole thing + } + else if (ri.Uri == item.Uri) + { + // remove the groups + foreach (string g in item.Groups) + ri.RemoveGroup (g); + l.Add (ri); + } + else + { + // keep it + l.Add (ri); + } } - RecentItem[] items = new RecentItem [list.Count]; - list.CopyTo (items); + RecentItem[] items = new RecentItem [l.Count]; + l.CopyTo (items, 0); RecentItems = items; Save (); } - public void RenameItem (string oldUri, string newUri) + public void RemoveItem (Uri uri) { + if (RecentItems == null) + return; + foreach (RecentItem ri in RecentItems) { - if (ri.Uri == oldUri) + if (ri.Uri == uri.ToString ()) + RemoveItem (ri); + } + } + + public void RenameItem (Uri oldUri, Uri newUri) + { + // FIXME: throw exception, cant rename non-existant item + if (RecentItems == null) + return; + + foreach (RecentItem ri in RecentItems) + { + if (ri.Uri == oldUri.ToString ()) { - ri.Uri = newUri; + ri.Uri = newUri.ToString (); ri.Timestamp = RecentItem.NewTimestamp; Save (); return; @@ -244,7 +291,7 @@ public override string ToString () { - if (this.RecentItems == null) + if (RecentItems == null) return "0 recent files"; StringBuilder sb = new StringBuilder (); @@ -271,7 +318,7 @@ [XmlElement ("Mime-Type")] public string MimeType; - public string Timestamp; + public int Timestamp; public string Private; @@ -283,13 +330,13 @@ { } - public RecentItem (string uri, string mimetype) : this (uri, mimetype, null) + public RecentItem (Uri uri, string mimetype) : this (uri, mimetype, null) { } - public RecentItem (string uri, string mimetype, string group) + public RecentItem (Uri uri, string mimetype, string group) { - Uri = uri; + Uri = uri.ToString (); MimeType = mimetype; Timestamp = NewTimestamp; @@ -299,8 +346,9 @@ } } - public void AddGroup (string group) + private void AddGroup (string group) { + Console.WriteLine ("add group"); if (this.Groups == null) { Groups = new string[] {group}; @@ -314,32 +362,51 @@ return; } - int length = this.Groups.Length + 1; - string[] groups = new string [length]; + int length = this.Groups.Length; + string[] groups = new string [length + 1]; this.Groups.CopyTo (groups, 0); groups[length] = group; + this.Groups = groups; } - public static string NewTimestamp + public void AddGroups (string[] groups) { + if (this.Groups == null) + { + Groups = groups; + return; + } + + foreach (string s in groups) + AddGroup (s); + } + + public static int NewTimestamp + { get { // from the unix epoch - return ((int) (DateTime.UtcNow - new DateTime (1970, 1, 1, 0, 0, 0, 0)).TotalSeconds).ToString (); + return ((int) (DateTime.UtcNow - new DateTime (1970, 1, 1, 0, 0, 0, 0)).TotalSeconds); } } - // FIXME public void RemoveGroup (string group) { - if (this.Groups == null) + if (Groups == null) return; ArrayList groups = new ArrayList (); - foreach (string g in Groups) + if (Array.IndexOf (Groups, group) == -1) { - if (g != group) - groups.Add (g); + return; // doesnt have it } + else + { + foreach (string g in Groups) + { + if (g != group) + groups.Add (g); + } + } string[] newGroups = new string [groups.Count]; groups.CopyTo (newGroups, 0); From commit-watcher at mono-cvs.ximian.com Wed Oct 20 21:27:58 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 20 Oct 2004 21:27:58 -0400 (EDT) Subject: [Monodevelop-patches-list] r1986 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Services/File Services/Project Message-ID: <20041021012758.0758E94763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-20 21:27:57 -0400 (Wed, 20 Oct 2004) New Revision: 1986 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs Log: 2004-10-20 John Luke * Commands/MenuItemBuilders.cs: * Commands/FileCommands.cs: * Commands/AutostartCommands.cs: * Services/File/RecentOpen.cs: * Services/File/DefaultFileService.cs: * Services/Project/DefaultProjectService.cs: enable new Recent Files stuff, and small adjustments for it. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-21 01:27:57 UTC (rev 1986) @@ -1,5 +1,15 @@ 2004-10-20 John Luke + * Commands/MenuItemBuilders.cs: + * Commands/FileCommands.cs: + * Commands/AutostartCommands.cs: + * Services/File/RecentOpen.cs: + * Services/File/DefaultFileService.cs: + * Services/Project/DefaultProjectService.cs: enable new Recent Files stuff, + and small adjustments for it. + +2004-10-20 John Luke + * Services/File/RecentFiles.cs: fix a bunch of bugs 2004-10-20 John Luke Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -62,7 +62,7 @@ object recentOpenObj = propertyService.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen"); if (recentOpenObj is MonoDevelop.Services.RecentOpen) { MonoDevelop.Services.RecentOpen recOpen = (MonoDevelop.Services.RecentOpen)recentOpenObj; - if (recOpen.RecentProject.Count > 0) { + if (recOpen.RecentProject != null && recOpen.RecentProject.Length > 0) { projectService.OpenCombine(recOpen.RecentProject[0].ToString()); } } Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -395,7 +395,7 @@ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService)); IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService)); - if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files"))) + if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Length > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files"))) { fileService.RecentOpen.ClearRecentFiles(); } @@ -411,7 +411,7 @@ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService)); IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService)); - if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects"))) + if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Length > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects"))) { fileService.RecentOpen.ClearRecentProjects(); } Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -52,10 +52,10 @@ RecentOpen recentOpen = fileService.RecentOpen; - if (recentOpen.RecentFile.Count > 0) { - RFMItem[] items = new RFMItem[recentOpen.RecentFile.Count]; + if (recentOpen.RecentFile != null && recentOpen.RecentFile.Length > 0) { + RFMItem[] items = new RFMItem[recentOpen.RecentFile.Length]; - for (int i = 0; i < recentOpen.RecentFile.Count; ++i) { + for (int i = 0; i < recentOpen.RecentFile.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; items[i] = new RFMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString().Replace ("_", "__"), new EventHandler(LoadRecentFile)); items[i].Tag = recentOpen.RecentFile[i].ToString(); @@ -93,9 +93,9 @@ RecentOpen recentOpen = fileService.RecentOpen; - if (recentOpen.RecentProject.Count > 0) { - RPMItem[] items = new RPMItem[recentOpen.RecentProject.Count]; - for (int i = 0; i < recentOpen.RecentProject.Count; ++i) { + if (recentOpen.RecentProject != null && recentOpen.RecentProject.Length > 0) { + RPMItem[] items = new RPMItem[recentOpen.RecentProject.Length]; + for (int i = 0; i < recentOpen.RecentProject.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; items[i] = new RPMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentProject[i].ToString().Replace ("_", "__"), new EventHandler(LoadRecentProject)); items[i].Tag = recentOpen.RecentProject[i].ToString(); Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -12,13 +12,10 @@ using System.Xml; using MonoDevelop.Core.AddIns; - using MonoDevelop.Core.Services; - using MonoDevelop.Internal.Project; using MonoDevelop.Gui; using MonoDevelop.Core.AddIns.Codons; - using MonoDevelop.Gui.Utils; namespace MonoDevelop.Services @@ -37,10 +34,8 @@ public RecentOpen RecentOpen { get { - if (recentOpen == null) { - PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService)); - recentOpen = (RecentOpen)propertyService.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen", new RecentOpen()); - } + if (recentOpen == null) + recentOpen = new RecentOpen (); return recentOpen; } } @@ -116,6 +111,10 @@ return; string origName = fileName; + + if (fileName.StartsWith ("file://")) + fileName = fileName.Substring (7); + if (!fileName.StartsWith ("http://")) fileName = System.IO.Path.GetFullPath (fileName); Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -12,38 +12,38 @@ using System.IO; using MonoDevelop.Core.Properties; - +using MonoDevelop.Gui.Utils; using MonoDevelop.Services; +using Freedesktop.RecentFiles; namespace MonoDevelop.Services { ///

- /// This class handles the recent open files and the recent open project files of SharpDevelop - /// it checks, if the files exists at every creation, and if not it doesn't list them in the - /// recent files, and they'll not be saved during the next option save. + /// This class handles the recent open files and the recent open project files of MonoDevelop ///

- public class RecentOpen : IXmlConvertable + public class RecentOpen { ///

/// This variable is the maximal length of lastfile/lastopen entries /// must be > 0 ///

- int MAX_LENGTH = 10; + const int MAX_LENGTH = 10; - ArrayList lastfile = new ArrayList(); - ArrayList lastproject = new ArrayList(); + RecentItem[] lastfile; + RecentItem[] lastproject; + RecentFiles recentFiles; public event EventHandler RecentFileChanged; public event EventHandler RecentProjectChanged; - public ArrayList RecentFile { + public RecentItem[] RecentFile { get { Debug.Assert(lastfile != null, "RecentOpen : set string[] LastFile (value == null)"); return lastfile; } } - public ArrayList RecentProject { + public RecentItem[] RecentProject { get { Debug.Assert(lastproject != null, "RecentOpen : set string[] LastProject (value == null)"); return lastproject; @@ -66,134 +66,84 @@ public RecentOpen() { + recentFiles = RecentFiles.GetInstance (); + UpdateLastFile (); + UpdateLastProject (); } - public RecentOpen(XmlElement element) + public void AddLastFile (string name) { - XmlNodeList nodes = element["FILES"].ChildNodes; - - for (int i = 0; i < nodes.Count; ++i) { - if (File.Exists(nodes[i].InnerText)) { - lastfile.Add(nodes[i].InnerText); + if (lastfile != null && lastfile.Length >= MAX_LENGTH) + { + RecentItem oldestItem = lastfile[0]; + for (int i = 1; i < lastfile.Length - 1; i ++) + { + // the lowest number is the oldest + if (lastfile[i].Timestamp < oldestItem.Timestamp) + oldestItem = lastfile[i]; } + recentFiles.RemoveItem (oldestItem); } - - nodes = element["PROJECTS"].ChildNodes; - - for (int i = 0; i < nodes.Count; ++i) { - if (File.Exists(nodes[i].InnerText)) { - lastproject.Add(nodes[i].InnerText); - } - } + + recentFiles.AddItem (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files")); + UpdateLastFile (); } - public void AddLastFile(string name) // TODO : improve - { - for (int i = 0; i < lastfile.Count; ++i) { - if (lastfile[i].ToString() == name) { - lastfile.RemoveAt(i); - } - } - - while (lastfile.Count >= MAX_LENGTH) { - lastfile.RemoveAt(lastfile.Count - 1); - } - - if (lastfile.Count > 0) { - lastfile.Insert(0, name); - } else { - lastfile.Add(name); - } - - OnRecentFileChange(); - } - public void ClearRecentFiles() { - lastfile.Clear(); - + lastfile = null; + recentFiles.ClearGroup ("MonoDevelop Files"); OnRecentFileChange(); } public void ClearRecentProjects() { - lastproject.Clear(); - + lastproject = null; + recentFiles.ClearGroup ("MonoDevelop Projects"); OnRecentProjectChange(); } - public void AddLastProject(string name) // TODO : improve + public void AddLastProject (string name) { - for (int i = 0; i < lastproject.Count; ++i) { - if (lastproject[i].ToString() == name) { - lastproject.RemoveAt(i); + if (lastproject != null && lastproject.Length >= MAX_LENGTH) + { + RecentItem oldestItem = lastproject[0]; + for (int i = 1; i < lastproject.Length; i ++) + { + // the lowest number is the oldest + if (lastproject[i].Timestamp < oldestItem.Timestamp) + oldestItem = lastproject[i]; } + recentFiles.RemoveItem (oldestItem); } - - while (lastproject.Count >= MAX_LENGTH) { - lastproject.RemoveAt(lastproject.Count - 1); - } - - if (lastproject.Count > 0) { - lastproject.Insert(0, name); - } else { - lastproject.Add(name); - } - OnRecentProjectChange(); + + recentFiles.AddItem (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Projects")); + UpdateLastProject (); } - public object FromXmlElement(XmlElement element) + public void FileRemoved(object sender, FileEventArgs e) { - return new RecentOpen(element); + recentFiles.RemoveItem (new Uri (e.FileName)); + UpdateLastFile (); } - public XmlElement ToXmlElement(XmlDocument doc) + public void FileRenamed(object sender, FileEventArgs e) { - XmlElement recent = doc.CreateElement("RECENT"); - - XmlElement lastfiles = doc.CreateElement("FILES"); - foreach (string file in lastfile) { - XmlElement element = doc.CreateElement("FILE"); - element.InnerText = file; - lastfiles.AppendChild(element); - } - - XmlElement lastprojects = doc.CreateElement("PROJECTS"); - foreach (string project in lastproject) { - XmlElement element = doc.CreateElement("PROJECT"); - element.InnerText = project; - lastprojects.AppendChild(element); - } - - recent.AppendChild(lastfiles); - recent.AppendChild(lastprojects); - - return recent; + recentFiles.RenameItem (new Uri (e.FileName), new Uri (e.TargetFile)); + UpdateLastFile (); } - - public void FileRemoved(object sender, FileEventArgs e) + + void UpdateLastFile () { - for (int i = 0; i < lastfile.Count; ++i) { - string file = lastfile[i].ToString(); - if (e.FileName == file) { - lastfile.RemoveAt(i); - OnRecentFileChange(); - break; - } - } + lastfile = recentFiles.GetItemsInGroup ("MonoDevelop Files"); + OnRecentFileChange(); } - - public void FileRenamed(object sender, FileEventArgs e) + + void UpdateLastProject () { - for (int i = 0; i < lastfile.Count; ++i) { - string file = lastfile[i].ToString(); - if (e.SourceFile == file) { - lastfile.RemoveAt(i); - lastfile.Insert(i, e.TargetFile); - OnRecentFileChange(); - break; - } - } + lastproject = recentFiles.GetItemsInGroup ("MonoDevelop Projects"); + OnRecentFileChange(); } } } + Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-10-20 18:45:32 UTC (rev 1985) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-10-21 01:27:57 UTC (rev 1986) @@ -128,6 +128,9 @@ SaveCombine(); CloseCombine(); } + + if (filename.StartsWith ("file://")) + filename = filename.Substring (7); if (!fileUtilityService.TestFileExists(filename)) { return; From commit-watcher at mono-cvs.ximian.com Wed Oct 20 21:35:55 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Wed, 20 Oct 2004 21:35:55 -0400 (EDT) Subject: [Monodevelop-patches-list] r1987 - trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage Message-ID: <20041021013555.EB5BC94763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-20 21:35:55 -0400 (Wed, 20 Oct 2004) New Revision: 1987 Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ChangeLog trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ICSharpCodePage.cs Log: missed this one Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ChangeLog 2004-10-21 01:27:57 UTC (rev 1986) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ChangeLog 2004-10-21 01:35:55 UTC (rev 1987) @@ -1,3 +1,7 @@ +2004-10-20 John Luke + + * ICSharpCodePage.cs: update to new RecentFiles API + 2004-08-07 Todd Berman * AssemblyInfo.cs.in: Use new ASSEMBLY_VERSION variable. Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ICSharpCodePage.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ICSharpCodePage.cs 2004-10-21 01:27:57 UTC (rev 1986) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/ICSharpCodePage.cs 2004-10-21 01:35:55 UTC (rev 1987) @@ -518,8 +518,8 @@ object recentOpenObj = svc.GetProperty("MonoDevelop.Gui.MainWindow.RecentOpen"); if (recentOpenObj is MonoDevelop.Services.RecentOpen) { MonoDevelop.Services.RecentOpen recOpen = (MonoDevelop.Services.RecentOpen)recentOpenObj; - projectFiles = new string[recOpen.RecentProject.Count]; - for (int i = 0; i < recOpen.RecentProject.Count; ++i) { + projectFiles = new string[recOpen.RecentProject.Length]; + for (int i = 0; i < recOpen.RecentProject.Length; ++i) { string fileName = recOpen.RecentProject[i].ToString(); // if the file does not exist, goto next one From commit-watcher at mono-cvs.ximian.com Thu Oct 21 00:08:56 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Thu, 21 Oct 2004 00:08:56 -0400 (EDT) Subject: [Monodevelop-patches-list] r1988 - in trunk/MonoDevelop/Core: . src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/ILAsmBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/NemerleBinding src/AddIns/DebuggerAddIn src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/TextEditor src/AddIns/Misc/AddInManager src/AddIns/Misc/StartPage src/AddIns/Nunit src/AddIns/prj2make-sharp-lib src/Libraries/CsVbRefactory src/Libraries/ICSharpCode.TextEditor src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Gui.Utils src/Libraries/MonoDevelop.Gui.Widgets src/Libraries/SharpAssembly src/Libraries/SharpRefactory src/Main/Base src/Main/StartUp src/Tools/SharpCoco src/Tools/dbgen Message-ID: <20041021040856.A048F94763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-21 00:08:55 -0400 (Thu, 21 Oct 2004) New Revision: 1988 Modified: trunk/MonoDevelop/Core/ChangeLog trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am trunk/MonoDevelop/Core/src/AddIns/Misc/AddInManager/Makefile.am trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am trunk/MonoDevelop/Core/src/AddIns/Nunit/Makefile.am trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am trunk/MonoDevelop/Core/src/Libraries/CsVbRefactory/Makefile.am trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am trunk/MonoDevelop/Core/src/Libraries/SharpRefactory/Makefile.am trunk/MonoDevelop/Core/src/Main/Base/Makefile.am trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am Log: 2004-10-21 John Luke * *Makefile.am: remove CSC= in individual Makefile.am's (make CSC='mcs -g' for debug) add $(DLL).mdb to CLEANFILES Modified: trunk/MonoDevelop/Core/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/ChangeLog 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/ChangeLog 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,3 +1,8 @@ +2004-10-21 John Luke + + * *Makefile.am: remove CSC= in individual Makefile.am's (make CSC='mcs -g' for debug) + add $(DLL).mdb to CLEANFILES + 2004-10-17 John Luke * configure.in: echo $CSC at the end for the prefix impaired (like me) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,4 +1,3 @@ -CSC = mcs /debug ASSEMBLY = CSharpBinding.dll DLLS = /r:System.Drawing.dll \ @@ -49,7 +48,7 @@ csharpbindinglibdir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings csharpbindinglib_DATA = $(ASSEMBLY) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb DISTCLEANFILES = CSharpBindingExecutionManager.cs Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = ILAsmBinding.dll DLLS = /r:../../../../build/bin/MonoDevelop.Core.dll \ @@ -29,6 +28,6 @@ $(CSC) $(build_sources) $(DLLS) /out:$(ASSEMBLY) /target:library \ && cp $(ASSEMBLY) ../../../../build/AddIns/AddIns/BackendBindings/. -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = JavaBinding.dll DLLS = /r:System.Drawing.dll \ @@ -30,6 +29,6 @@ assemblydir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings assembly_DATA = $(ASSEMBLY) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = NemerleBinding.dll DLLS = /r:System.Drawing.dll \ @@ -30,6 +29,6 @@ assemblydir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings/ assembly_DATA = $(ASSEMBLY) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb DISTCLEANFILES = NemerleBindingExecutionServices.cs EXTRA_DIST = $(FILES) NemerleBindingExecutionServices.cs.in Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = MonoDevelop.Debugger.dll ADDIN = $(srcdir)/MonoDevelopDebugger.addin.xml @@ -34,7 +33,7 @@ assemblydir = $(libdir)/monodevelop/AddIns assembly_DATA = $(ASSEMBLY) $(ADDIN) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb else all: Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -94,7 +94,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) $(DLL).config -CLEANFILES = $(DLL) +CLEANFILES = $(DLL) $(DLL).mdb DISTCLEANFILES = $(DLL).config EXTRA_DIST = $(FILES) $(DLL).config.in Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -54,7 +54,7 @@ /define:GTK /r:gtk-sharp /r:gdk-sharp /r:gnome-sharp\ $(FILES) -CLEANFILES=$(DLL) +CLEANFILES=$(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/AddInManager/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/AddInManager/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/AddInManager/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = AddInManager.dll ADDIN = AddInManager.addin.xml @@ -23,5 +22,5 @@ && cp $(ASSEMBLY) ../../../../build/AddIns/. \ && cp $(ADDIN) ../../../../build/AddIns/. -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) $(ADDIN) Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -23,7 +23,7 @@ startpagelibdir = $(libdir)/monodevelop/AddIns/AddIns/Misc/StartPage startpagelib_DATA = $(DLL) -CLEANFILES=$(DLL) +CLEANFILES=$(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/AddIns/Nunit/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Nunit/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/Nunit/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = MonoDevelop.Nunit.dll ADDIN = $(srcdir)/MonoDevelopNunit.addin.xml @@ -41,7 +40,7 @@ #addindir = $(libdir)/monodevelop/AddIns #addin_DATA = $(ASSEMBLY) $(ADDIN) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) $(ADDIN) Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = prj2make-sharp-lib.dll ADDIN = $(srcdir)/prj2make-sharp-lib.addin.xml @@ -40,5 +39,5 @@ assemblydir = $(libdir)/monodevelop/AddIns assembly_DATA = $(ASSEMBLY) $(ADDIN) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb Modified: trunk/MonoDevelop/Core/src/Libraries/CsVbRefactory/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/CsVbRefactory/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/CsVbRefactory/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = CsVbRefactory.dll FILES = ./CsVbRefactory/AssemblyInfo.cs \ @@ -48,7 +47,7 @@ DLLS = /r:System.Drawing -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -110,4 +110,4 @@ $(DLL): $(FILES) @ mcs /debug /out:$@ /target:library $(REFS) /define:GTK /resource:data/syntaxmodes/SyntaxModes.xml,SyntaxModes.xml /resource:data/syntaxmodes/CSharp-Mode.xshd,CSharp-Mode.xshd /resource:data/Mode.xsd,Mode.xsd /resource:data/syntaxmodes/ASPX.xshd,ASPX.xshd /resource:data/syntaxmodes/BAT-Mode.xshd,BAT-Mode.xshd /resource:data/syntaxmodes/CPP-Mode.xshd,CPP-Modes.xshd /resource:data/syntaxmodes/Coco-Mode.xshd,Coco-Mode.xshd /resource:data/syntaxmodes/HTML-Mode.xshd,HTML-Mode.xshd /resource:data/syntaxmodes/Java-Mode.xshd,Java-Mode.xshd /resource:data/syntaxmodes/JavaScript-Mode.xshd,JavaScript-Mode.xshd /resource:data/syntaxmodes/PHP-Mode.xshd,PHP-Mode.xshd /resource:data/syntaxmodes/Tex-Mode.xshd,Tex-Mode.xshd /resource:data/syntaxmodes/VBNET-Mode.xshd,VBNET-Mode.xshd /resource:data/syntaxmodes/XML-Mode.xshd,XML-Mode.xshd /resource:data/RightArrow.cur,RightArrow.cur $(FILES) -CLEANFILES=$(DLL) +CLEANFILES=$(DLL) $(DLL).mdb Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -85,7 +85,8 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) -CLEANFILES = $(DLL) Services/GettextCatalog.cs +CLEANFILES = $(DLL) $(DLL).mdb +DISTCLEANFILES = Services/GettextCatalog.cs EXTRA_DIST = $(FILES) Services/GettextCatalog.cs.in Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -26,7 +26,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) $(DLL).config -CLEANFILES = $(DLL) +CLEANFILES = $(DLL) $(DLL).mdb DISTCLEANFILES = $(DLL).config EXTRA_DIST = $(FILES) $(DLL).config.in Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -36,7 +36,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) -CLEANFILES = $(DLL) +CLEANFILES = $(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -79,7 +79,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) -CLEANFILES = $(DLL) +CLEANFILES = $(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Libraries/SharpRefactory/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/SharpRefactory/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Libraries/SharpRefactory/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,3 @@ -CSC = mcs /debug - FILES = \ ./src/Lexer/Reader/IReader.cs \ ./src/Lexer/Reader/FileReader.cs \ @@ -130,7 +128,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) -CLEANFILES = $(DLL) +CLEANFILES = $(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Main/Base/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Main/Base/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,6 +1,4 @@ -CSC = mcs /debug - DLLS = /r:System.Drawing /r:ICSharpCode.SharpZipLib.dll \ /r:../../../build/bin/ICSharpCode.SharpRefactory.dll \ /r:../../../build/bin/MonoDevelop.Core.dll \ @@ -390,7 +388,7 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb DISTCLEANFILES = $(ASSEMBLY).config EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in Modified: trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -30,6 +30,6 @@ assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(DLL) -CLEANFILES=$(DLL) +CLEANFILES=$(DLL) $(DLL).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = SharpCoco.exe ATG = src/Coco.ATG @@ -19,6 +18,6 @@ $(ASSEMBLY): $(build_sources) $(CSC) $(build_sources) /out:$(ASSEMBLY) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2004-10-21 01:35:55 UTC (rev 1987) +++ trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) @@ -1,5 +1,4 @@ -CSC = mcs /debug ASSEMBLY = dbgen.exe FILES = src/AssemblyInfo.cs \ @@ -12,12 +11,12 @@ REFS = /r:../../../build/bin/MonoDevelop.Base.dll /r:../../../build/bin/MonoDevelop.Core.dll $(ASSEMBLY): $(build_sources) - $(CSC) $(build_sources) $(REFS) /out:$(ASSEMBLY) - cp $(ASSEMBLY) ../../../build/bin/. + $(CSC) $(build_sources) $(REFS) /out:$(ASSEMBLY) \ + && cp $(ASSEMBLY) ../../../build/bin/. assemblydir = $(libdir)/monodevelop/bin assembly_DATA = $(ASSEMBLY) -CLEANFILES = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) From commit-watcher at mono-cvs.ximian.com Thu Oct 21 00:36:02 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Thu, 21 Oct 2004 00:36:02 -0400 (EDT) Subject: [Monodevelop-patches-list] r1989 - in trunk/MonoDevelop/Core/src: AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/TextEditor AddIns/Misc/Sonata AddIns/Misc/StartPage Libraries/ICSharpCode.TextEditor Libraries/MonoDevelop.Core Libraries/MonoDevelop.Gui.Utils Libraries/SharpAssembly Main/StartUp Message-ID: <20041021043602.9732194763@mono-cvs.ximian.com> Author: jluke Date: 2004-10-21 00:36:02 -0400 (Thu, 21 Oct 2004) New Revision: 1989 Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am trunk/MonoDevelop/Core/src/AddIns/Misc/Sonata/Makefile.am trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am Log: s/mcs/$(CSC)/g Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -86,7 +86,7 @@ all : $(DLL) $(DLL) : $(build_sources) - mcs $(build_sources) /debug /out:$(DLL) /t:library $(REFS) \ + $(CSC) $(build_sources) /debug /out:$(DLL) /t:library $(REFS) \ /resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \ /resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \ && cp $(DLL) ../../../../build/bin/. && cp $(DLL).config ../../../../build/bin/. Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/TextEditor/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -43,7 +43,7 @@ all: $(DLL) $(DLL): $(FILES) ../../../../data/resources/glade/texteditoraddin.glade - @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \ + $(CSC) /out:$(DLL) /target:library /r:System.Drawing \ /r:../../../../build/bin/MonoDevelop.Core.dll \ /r:../../../../build/bin/MonoDevelop.Base.dll \ /r:../../../../build/bin/MonoDevelop.SourceEditor.dll \ Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/Sonata/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/Sonata/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/Sonata/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -11,14 +11,14 @@ all: $(DLL): $(build_sources) -# mcs /debug /out:$(DLL) /target:library $(REFS) \ +# $(CSC) /out:$(DLL) /target:library $(REFS) \ # $(build_sources) \ # && cp $(DLL) ../../../../build/AddIns/AddIns/Misc/Sonata/. #startpagelibdir = $(libdir)/monodevelop/AddIns/AddIns/Misc/Sonata #startpagelib_DATA = $(DLL) -#CLEANFILES = $(DLL) +#CLEANFILES = $(DLL) $(DLL).mdb #EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/AddIns/Misc/StartPage/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -16,7 +16,7 @@ all: $(DLL) $(DLL): $(build_sources) - mcs /debug /out:$(DLL) /target:library $(REFS) \ + $(CSC) /out:$(DLL) /target:library $(REFS) \ $(build_sources) \ && cp $(DLL) ../../../../build/AddIns/AddIns/Misc/StartPage/. Modified: trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/Libraries/ICSharpCode.TextEditor/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -108,6 +108,6 @@ all: $(DLL) $(DLL): $(FILES) - @ mcs /debug /out:$@ /target:library $(REFS) /define:GTK /resource:data/syntaxmodes/SyntaxModes.xml,SyntaxModes.xml /resource:data/syntaxmodes/CSharp-Mode.xshd,CSharp-Mode.xshd /resource:data/Mode.xsd,Mode.xsd /resource:data/syntaxmodes/ASPX.xshd,ASPX.xshd /resource:data/syntaxmodes/BAT-Mode.xshd,BAT-Mode.xshd /resource:data/syntaxmodes/CPP-Mode.xshd,CPP-Modes.xshd /resource:data/syntaxmodes/Coco-Mode.xshd,Coco-Mode.xshd /resource:data/syntaxmodes/HTML-Mode.xshd,HTML-Mode.xshd /resource:data/syntaxmodes/Java-Mode.xshd,Java-Mode.xshd /resource:data/syntaxmodes/JavaScript-Mode.xshd,JavaScript-Mode.xshd /resource:data/syntaxmodes/PHP-Mode.xshd,PHP-Mode.xshd /resource:data/syntaxmodes/Tex-Mode.xshd,Tex-Mode.xshd /resource:data/syntaxmodes/VBNET-Mode.xshd,VBNET-Mode.xshd /resource:data/syntaxmodes/XML-Mode.xshd,XML-Mode.xshd /resource:data/RightArrow.cur,RightArrow.cur $(FILES) + $(CSC) /out:$@ /target:library $(REFS) /define:GTK /resource:data/syntaxmodes/SyntaxModes.xml,SyntaxModes.xml /resource:data/syntaxmodes/CSharp-Mode.xshd,CSharp-Mode.xshd /resource:data/Mode.xsd,Mode.xsd /resource:data/syntaxmodes/ASPX.xshd,ASPX.xshd /resource:data/syntaxmodes/BAT-Mode.xshd,BAT-Mode.xshd /resource:data/syntaxmodes/CPP-Mode.xshd,CPP-Modes.xshd /resource:data/syntaxmodes/Coco-Mode.xshd,Coco-Mode.xshd /resource:data/syntaxmodes/HTML-Mode.xshd,HTML-Mode.xshd /resource:data/syntaxmodes/Java-Mode.xshd,Java-Mode.xshd /resource:data/syntaxmodes/JavaScript-Mode.xshd,JavaScript-Mode.xshd /resource:data/syntaxmodes/PHP-Mode.xshd,PHP-Mode.xshd /resource:data/syntaxmodes/Tex-Mode.xshd,Tex-Mode.xshd /resource:data/syntaxmodes/VBNET-Mode.xshd,VBNET-Mode.xshd /resource:data/syntaxmodes/XML-Mode.xshd,XML-Mode.xshd /resource:data/RightArrow.cur,RightArrow.cur $(FILES) CLEANFILES=$(DLL) $(DLL).mdb Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Core/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -79,7 +79,7 @@ mv $@.tmp $@ $(DLL): $(build_sources) $(build_resources) - mcs /debug /out:$(DLL) /target:library $(REFS) /define:LINUX $(COMPILE_RESOURCES) \ + $(CSC) /out:$(DLL) /target:library $(REFS) /define:LINUX $(COMPILE_RESOURCES) \ $(build_sources) && cp $(DLL) ../../../build/bin/. assemblydir = $(libdir)/monodevelop/bin Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -20,7 +20,7 @@ all: $(DLL) $(DLL): $(build_sources) - mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \ + $(CSC) /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \ && cp $(DLL) ../../../build/bin/. && cp $(DLL).config ../../../build/bin assemblydir = $(libdir)/monodevelop/bin Modified: trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/Libraries/SharpAssembly/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -73,7 +73,7 @@ all: $(DLL) $(DLL): $(build_sources) - @ mcs /debug /out:$(DLL) /target:library $(build_sources) \ + $(CSC) /out:$(DLL) /target:library $(build_sources) \ && cp $(DLL) ../../../build/bin/. assemblydir = $(libdir)/monodevelop/bin Modified: trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am 2004-10-21 04:08:55 UTC (rev 1988) +++ trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am 2004-10-21 04:36:02 UTC (rev 1989) @@ -21,7 +21,7 @@ $(BASE_DEPENDENCIES_LIBS) $(DLL): $(build_sources) - mcs /debug /out:$(DLL) \ + $(CSC) /out:$(DLL) \ /define:GTK $(REFS) \ $(build_sources) \ /resource:$(BASEDIR)/data/resources/SplashScreen.png,SplashScreen.png \ From commit-watcher at mono-cvs.ximian.com Fri Oct 22 01:25:01 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Fri, 22 Oct 2004 01:25:01 -0400 (EDT) Subject: [Monodevelop-patches-list] r1990 - trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn Message-ID: <20041022052501.B7F8D94763@mono-cvs.ximian.com> Author: toshok Date: 2004-10-22 01:25:01 -0400 (Fri, 22 Oct 2004) New Revision: 1990 Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs Log: 2004-10-21 Chris Toshok * DebuggingService.cs: return String.Empty from CurrentFilename * if the frame's SourceAddress is null. Likewise, return -1 from CurrentLineNumber in this case. Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog 2004-10-21 04:36:02 UTC (rev 1989) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog 2004-10-22 05:25:01 UTC (rev 1990) @@ -1,3 +1,9 @@ +2004-10-21 Chris Toshok + + * DebuggingService.cs: return String.Empty from CurrentFilename if + the frame's SourceAddress is null. Likewise, return -1 from + CurrentLineNumber in this case. + 2004-06-25 Todd Berman * DebuggingService.cs: sync with cvs debugger. Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs 2004-10-21 04:36:02 UTC (rev 1989) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs 2004-10-22 05:25:01 UTC (rev 1990) @@ -278,7 +278,8 @@ if (IsRunning) return String.Empty; - if (proc.CurrentFrame.SourceAddress.MethodSource.IsDynamic) + if (proc.CurrentFrame.SourceAddress == null /* there's no source for this frame */ + || proc.CurrentFrame.SourceAddress.MethodSource.IsDynamic) return String.Empty; return proc.CurrentFrame.SourceAddress.MethodSource.SourceFile.FileName; @@ -290,6 +291,9 @@ if (IsRunning) return -1; + if (proc.CurrentFrame.SourceAddress == null /* there's no source for this frame */) + return -1; + return proc.CurrentFrame.SourceAddress.Row; } } From commit-watcher at mono-cvs.ximian.com Fri Oct 22 01:27:40 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Fri, 22 Oct 2004 01:27:40 -0400 (EDT) Subject: [Monodevelop-patches-list] r1991 - in trunk/MonoDevelop/Core/src/Main/Base: . Gui/Workbench Message-ID: <20041022052740.4488B94763@mono-cvs.ximian.com> Author: toshok Date: 2004-10-22 01:27:40 -0400 (Fri, 22 Oct 2004) New Revision: 1991 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs Log: 2004-10-21 Chris Toshok * Gui/Workbench/DefaultWorkbench.cs: don't try to open cur_dbgFilename if it's String.Empty. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-22 05:25:01 UTC (rev 1990) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-22 05:27:40 UTC (rev 1991) @@ -1,3 +1,8 @@ +2004-10-21 Chris Toshok + + * Gui/Workbench/DefaultWorkbench.cs: don't try to open + cur_dbgFilename if it's String.Empty. + 2004-10-20 John Luke * Commands/MenuItemBuilders.cs: Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-10-22 05:25:01 UTC (rev 1990) +++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-10-22 05:27:40 UTC (rev 1991) @@ -206,10 +206,12 @@ cur_dbgFilename = dbgr.CurrentFilename; cur_dbgLineNumber = dbgr.CurrentLineNumber - 1; - IFileService fs = (IFileService)ServiceManager.GetService (typeof (IFileService)); - fs.OpenFile (cur_dbgFilename); - if (ActiveWorkbenchWindow.ViewContent is IDebuggableEditor) - ((IDebuggableEditor)ActiveWorkbenchWindow.ViewContent).ExecutingAt (cur_dbgLineNumber); + if (cur_dbgFilename != String.Empty) { + IFileService fs = (IFileService)ServiceManager.GetService (typeof (IFileService)); + fs.OpenFile (cur_dbgFilename); + if (ActiveWorkbenchWindow.ViewContent is IDebuggableEditor) + ((IDebuggableEditor)ActiveWorkbenchWindow.ViewContent).ExecutingAt (cur_dbgLineNumber); + } } } From commit-watcher at mono-cvs.ximian.com Fri Oct 22 02:38:55 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Fri, 22 Oct 2004 02:38:55 -0400 (EDT) Subject: [Monodevelop-patches-list] r1992 - in trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn: . Gui Message-ID: <20041022063855.96BCA94763@mono-cvs.ximian.com> Author: toshok Date: 2004-10-22 02:38:55 -0400 (Fri, 22 Oct 2004) New Revision: 1992 Added: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Gui/DebuggerStackTracePad.cs Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin.xml Log: 2004-10-22 Chris Toshok * MonoDevelopDebugger.addin.xml: add DebuggerStackTracePad to * the views. * Gui/DebuggerStackTracePad.cs: new file. * Makefile.am (FILES): add DebuggerStackTracePad.cs Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog 2004-10-22 05:27:40 UTC (rev 1991) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog 2004-10-22 06:38:55 UTC (rev 1992) @@ -1,3 +1,12 @@ +2004-10-22 Chris Toshok + + * MonoDevelopDebugger.addin.xml: add DebuggerStackTracePad to the + views. + + * Gui/DebuggerStackTracePad.cs: new file. + + * Makefile.am (FILES): add DebuggerStackTracePad.cs + 2004-10-21 Chris Toshok * DebuggingService.cs: return String.Empty from CurrentFilename if Added: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Gui/DebuggerStackTracePad.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Gui/DebuggerStackTracePad.cs 2004-10-22 05:27:40 UTC (rev 1991) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Gui/DebuggerStackTracePad.cs 2004-10-22 06:38:55 UTC (rev 1992) @@ -0,0 +1,144 @@ +using GLib; +using Gtk; +using GtkSharp; +using System; +using System.IO; +using System.Collections; +using System.Globalization; +using System.Runtime.InteropServices; +using Mono.Debugger; +using Mono.Debugger.Languages; + +using MonoDevelop.Core.Services; +using MonoDevelop.Services; +using MonoDevelop.Gui; + +namespace MonoDevelop.SourceEditor.Gui +{ + public class DebuggerStackTracePad : Gtk.ScrolledWindow, IPadContent + { + StackFrame current_frame; + + Gtk.TreeView tree; + Gtk.TreeStore store; + + public DebuggerStackTracePad () + { + this.ShadowType = ShadowType.In; + + store = new TreeStore (typeof (string)); + + tree = new TreeView (store); + tree.RulesHint = true; + tree.HeadersVisible = true; + + TreeViewColumn FrameCol = new TreeViewColumn (); + CellRenderer FrameRenderer = new CellRendererText (); + FrameCol.Title = "Frame"; + FrameCol.PackStart (FrameRenderer, true); + FrameCol.AddAttribute (FrameRenderer, "text", 0); + FrameCol.Resizable = true; + FrameCol.Alignment = 0.0f; + tree.AppendColumn (FrameCol); + + Add (tree); + ShowAll (); + + DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService)); + dbgr.PausedEvent += new EventHandler (OnPausedEvent); + dbgr.ResumedEvent += new EventHandler (OnResumedEvent); + dbgr.StoppedEvent += new EventHandler (OnStoppedEvent); + } + + void add_frame (string frame) + { + TreeIter iter; + store.Append (out iter); + store.SetValue (iter, 0, new GLib.Value (frame)); + } + + Hashtable iters = null; + + public void CleanDisplay () + { + store.Clear (); + iters = new Hashtable (); + } + + public void UpdateDisplay () + { + CleanDisplay (); + + if ((current_frame == null) || (current_frame.Method == null)) + return; + + DebuggingService dbgr = (DebuggingService)ServiceManager.GetService (typeof (DebuggingService)); + string[] trace = dbgr.Backtrace; + + foreach (string frame in trace) + add_frame (frame); + } + + protected void OnStoppedEvent (object o, EventArgs args) + { + CleanDisplay (); + } + + protected void OnResumedEvent (object o, EventArgs args) + { + CleanDisplay (); + } + + protected void OnPausedEvent (object o, EventArgs args) + { + D