[Monodevelop-patches-list] r1553 - in branches/MonoDevelop-generate-what/src: AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels Main/Base Main/Base/Gui/Dialogs/OptionPanels Main/Base/Gui/Dialogs/ReferenceDialog Main/Base/Gui/Pads/HelpBrowser Main/Base/Services/ParserService
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 30 08:22:01 EDT 2004
Author: iainmc
Date: 2004-04-30 08:22:01 -0400 (Fri, 30 Apr 2004)
New Revision: 1553
Modified:
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
tracking HEAD:
svn merge -r 1546:1552 svn+ssh://iainmc@mono-cvs.ximian.com/svn/monodevelop/trunk/MonoDevelop
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-04-30 12:22:01 UTC (rev 1553)
@@ -1,3 +1,7 @@
+2004-04-29 Todd Berman <tberman at sevenl.net>
+
+ * Gui/OptionPanels/CodeTemplatePanel.cs: match gtk-sharp from cvs.
+
2004-04-29 Iain McCoy <iain at mccoy.id.au>
* CodeCompletion/CodeCompletionData.cs:
* CodeCompletion/CodeCompletionDataProvider.cs: changed to
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -239,7 +239,7 @@
// now delete each item in that list
foreach(TreeIter toDelete in selectedIters) {
TreeIter itr = toDelete;
- ((ListStore)lv).Remove(out itr);
+ ((ListStore)lv).Remove(ref itr);
}
StoreTemplateGroup();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog 2004-04-30 12:22:01 UTC (rev 1553)
@@ -1,3 +1,26 @@
+2004-04-30 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Pads/HelpBrowser/MonodocTreePad.cs: Hide doc nodes without
+ any docs. This is an ugly ugly solution, but it works. Feel free
+ to replace it with something better that looks nice.
+
+2004-04-29 Todd Berman <tberman at sevenl.net>
+
+ * Services/ParserService/DefaultParserService.cs: commenting out
+ a GC.Collect () per lluis' instructions, this results in monodevelops
+ cpu usage at idle going from 20% to 2%. Good stuff :)
+
+2004-04-29 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/OptionPanels/ExternalToolPanel.cs: fix up to match gtk#
+ from cvs.
+ * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs:
+ * Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs:
+ Now we actually pull assemblies from the gac.
+ NOTE: Until gtk-sharp, and other libraries actually start using the gac
+ it will not be possible to add a proper gac reference to them.
+ This will be fixed on their end by beta1 however.
+
2004-04-29 Iain McCoy <iain at mccoy.id.au>
* Makefile.am:
* Services/ParserService/DatabaseBackedCompletionDataService.cs:
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -296,7 +296,7 @@
foreach(TreeIter toDelete in selectedIters) {
TreeIter itr = toDelete;
toolListBoxItemCount --;
- ((ListStore)lv).Remove(out itr);
+ ((ListStore)lv).Remove(ref itr);
}
if (toolListBoxItemCount == 0) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -1,4 +1,4 @@
-// <file>
+// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
@@ -16,6 +16,8 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
+using System.IO;
+
using Gtk;
namespace MonoDevelop.Gui.Dialogs
@@ -61,7 +63,6 @@
public void AddReference(object sender, Gtk.ToggledArgs e)
{
- //foreach (ListViewItem item in SelectedItems) {
Gtk.TreeIter iter;
store.GetIterFromString (out iter, e.Path);
if ((bool)store.GetValue (iter, 3) == false) {
@@ -73,8 +74,8 @@
} else {
store.SetValue (iter, 3, false);
selectDialog.RemoveReference (ReferenceType.Gac,
- (string)store.GetValue (iter, 0),
- (string)store.GetValue (iter, 2));
+ (string)store.GetValue (iter, 0),
+ (string)store.GetValue (iter, 2));
}
}
@@ -115,28 +116,22 @@
Items.Add(item);
}
#endif
- //FIXME: Oh wow this is *hackery* but it will work
- //FIXME: on mono alone. well, this tosses xplatform
- //FIXME: out the window a hell of a lot more than
- //FIXME: gnome or not ;)
- //FIXME: This needs to change once mono gets a real
- //FIXME: gac.
System.Reflection.MethodInfo gac = typeof (System.Environment).GetMethod ("internalGetGacPath", System.Reflection.BindingFlags.Static|System.Reflection.BindingFlags.NonPublic);
if (gac == null) {
Console.WriteLine (GettextCatalog.GetString ("ERROR: non-mono runtime detected, please use the mono runtime for this piece of MonoDevelop for the time being"));
Environment.Exit (1);
}
string gac_path = System.IO.Path.Combine ((string)gac.Invoke (null, null), "");
- string[] assemblies = System.IO.Directory.GetFiles (gac_path, "*.dll");
- foreach (string assembly in assemblies) {
- try {
- System.Reflection.AssemblyName an = System.Reflection.AssemblyName.GetAssemblyName (assembly);
-
- string name = an.Name;
- string ver = an.Version.ToString ();
+ DirectoryInfo d = new DirectoryInfo (System.IO.Path.Combine (System.IO.Path.Combine (gac_path, "mono"), "gac"));
+ foreach (DirectoryInfo namedDir in d.GetDirectories ()) {
+ foreach (DirectoryInfo assemblyDir in namedDir.GetDirectories ()) {
+ FileInfo[] files = assemblyDir.GetFiles ("*.dll");
+ try {
+ System.Reflection.AssemblyName an = System.Reflection.AssemblyName.GetAssemblyName (files[0].FullName);
- store.AppendValues (name, ver, assembly, false, an.FullName);
- } catch {
+ store.AppendValues (an.Name, an.Version.ToString (), System.IO.Path.GetFileName (files[0].FullName), false, an.FullName);
+ } catch {
+ }
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -91,9 +91,8 @@
}
}
mainBook.RemovePage (mainBook.CurrentPage);
- mainBook.AppendPage (gacRefPanel, new Gtk.Label (GettextCatalog.GetString ("System Assemblies")));
+ mainBook.AppendPage (gacRefPanel, new Gtk.Label (GettextCatalog.GetString ("Global Assembly Cache")));
mainBook.AppendPage (new ProjectReferencePanel (this), new Gtk.Label (GettextCatalog.GetString ("Projects")));
- // FIXME il8n the assembly tab name
mainBook.AppendPage (new AssemblyReferencePanel (this), new Gtk.Label (GettextCatalog.GetString (".Net Assembly")));
//comTabPage.Controls.Add(new COMReferencePanel(this));
AddReferenceDialog.ShowAll ();
@@ -106,8 +105,8 @@
void AddGacReference (ProjectReference refInfo)
{
- gacRefPanel.SignalRefChange (System.IO.Path.GetFullPath (refInfo.GetReferencedFileName (configureProject)), true);
- refTreeStore.AppendValues (System.IO.Path.GetFileName (refInfo.Reference), refInfo.ReferenceType.ToString (), System.IO.Path.GetFullPath (refInfo.GetReferencedFileName (configureProject)), refInfo);
+ gacRefPanel.SignalRefChange (refInfo.Reference, true);
+ refTreeStore.AppendValues (refInfo.Reference, refInfo.ReferenceType.ToString (), refInfo.Reference, refInfo);
}
public void RemoveReference (ReferenceType referenceType, string referenceName, string referenceLocation)
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -33,9 +33,9 @@
tree_view = new TreeView ();
tree_view.AppendColumn ("name_col", new CellRendererText (), "text", 0);
- tree_view.RowExpanded += new Gtk.RowExpandedHandler (RowExpanded);
- tree_view.Selection.Changed += new EventHandler (RowActivated);
-
+ tree_view.RowExpanded += new Gtk.RowExpandedHandler (RowExpanded);
+ tree_view.Selection.Changed += new EventHandler (RowActivated);
+
store = new TreeStore (typeof (string), typeof (Node));
root_iter = store.AppendValues (GettextCatalog.GetString ("Mono Documentation"), mds.HelpTree);
@@ -49,6 +49,16 @@
scroller.Add (tree_view);
tree_view.ExpandRow (new TreePath ("0"), false);
+ TreeIter child_iter;
+ ArrayList itersToDrop = new ArrayList ();
+ start:
+ store.IterChildren (out child_iter, root_iter);
+ do {
+ if (!store.IterHasChild (child_iter)) {
+ store.Remove (ref child_iter);
+ goto start;
+ }
+ } while (store.IterNext (out child_iter));
}
Hashtable populated = new Hashtable ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-30 04:22:07 UTC (rev 1552)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-30 12:22:01 UTC (rev 1553)
@@ -142,7 +142,7 @@
} catch {}
}
Thread.Sleep(500); // not required
- System.GC.Collect();
+ //System.GC.Collect();
}
}
More information about the Monodevelop-patches-list
mailing list