[prev in list] [next in list] [prev in thread] [next in thread]
List: mono-patches
Subject: [Mono-patches] r81112 - in
From: "Lluis Sanchez (lluis () ximian ! com)" <mono-patches-list () lists ! ximian ! com>
Date: 2007-06-30 15:26:02
Message-ID: 20070630152602.226F49472C () mono-cvs ! ximian ! com
[Download RAW message or body]
Author: lluis
Date: 2007-06-30 11:26:01 -0400 (Sat, 30 Jun 2007)
New Revision: 81112
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs,
MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs,
MonoDevelop.Ide.Gui/ProjectOperations.cs: Some changes to make the
select reference dialog easier to reuse.
* MonoDevelop.Ide.mdp: Fix gtk versions.
* Makefile.am: Flush.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-06-30 14:52:39 UTC (rev \
81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-06-30 15:26:01 UTC (rev \
81112) @@ -1,3 +1,12 @@
+2007-06-30 Lluis Sanchez Gual <lluis@novell.com>
+
+ * MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs,
+ MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs,
+ MonoDevelop.Ide.Gui/ProjectOperations.cs: Some changes to make the
+ select reference dialog easier to reuse.
+ * MonoDevelop.Ide.mdp: Fix gtk versions.
+ * Makefile.am: Flush.
+
2007-06-22 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
* MonoDevelop.Ide.addin.xml: Adds Shift+Ctrl+F shortcut to "Find in
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am 2007-06-30 14:52:39 UTC \
(rev 81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am 2007-06-30 15:26:01 UTC \
(rev 81112) @@ -79,8 +79,8 @@
MonoDevelop.Ide.ExternalTools/ExternalTool.cs \
MonoDevelop.Ide.ExternalTools/ToolLoader.cs \
MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs \
+ MonoDevelop.Ide.Gui.BrowserDisplayBinding/HTMLInterfaces.cs \
MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs \
- MonoDevelop.Ide.Gui.BrowserDisplayBinding/HTMLInterfaces.cs \
MonoDevelop.Ide.Gui.Content/IBookmarkBuffer.cs \
MonoDevelop.Ide.Gui.Content/IClipboardHandler.cs \
MonoDevelop.Ide.Gui.Content/ICodeStyleOperations.cs \
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs 2007-06-30 \
14:52:39 UTC (rev 81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs 2007-06-30 \
15:26:01 UTC (rev 81112) @@ -723,13 +723,11 @@
public bool AddReferenceToProject (Project project)
{
- bool res = false;
-
try {
if (selDialog == null)
- selDialog = new SelectReferenceDialog(project);
- else
- selDialog.SetProject (project);
+ selDialog = new SelectReferenceDialog ();
+
+ selDialog.SetProject (project);
if (selDialog.Run() == (int)Gtk.ResponseType.Ok) {
ProjectReferenceCollection newRefs = selDialog.ReferenceInformations;
@@ -746,14 +744,36 @@
if (!project.ProjectReferences.Contains (refInfo))
project.ProjectReferences.Add(refInfo);
- res = true;
+ return true;
}
+ else
+ return false;
} finally {
selDialog.Hide ();
}
- return res;
}
+ public bool SelectProjectReferences (ProjectReferenceCollection references, \
ClrVersion targetVersion) + {
+ try {
+ if (selDialog == null)
+ selDialog = new SelectReferenceDialog ();
+
+ selDialog.SetReferenceCollection (references, targetVersion);
+
+ if (selDialog.Run() == (int)Gtk.ResponseType.Ok) {
+ references.Clear ();
+ references.AddRange (selDialog.ReferenceInformations);
+ return true;
+ }
+ else
+ return false;
+ } finally {
+ if (selDialog != null)
+ selDialog.Hide ();
+ }
+ }
+
void RestoreCombinePreferences (object data)
{
Combine combine = (Combine) data;
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs 2007-06-30 \
14:52:39 UTC (rev 81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs 2007-06-30 \
15:26:01 UTC (rev 81112) @@ -66,11 +66,9 @@
BorderWidth = 6;
}
- public void SetProject (Project prj)
+ public void SetClrVersion (ClrVersion version)
{
- DotNetProject netProject = prj as DotNetProject;
- if (netProject != null)
- version = ((DotNetProjectConfiguration)netProject.ActiveConfiguration).ClrVersion;
+ this.version = version;
}
int SortTree (TreeModel model, TreeIter first, TreeIter second)
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs 2007-06-30 \
14:52:39 UTC (rev 81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs 2007-06-30 \
15:26:01 UTC (rev 81112) @@ -74,7 +74,11 @@
((ListStore) ReferencesTreeView.Model).Clear ();
projectRefPanel.SetProject (configureProject);
- gacRefPanel.SetProject (configureProject);
+ projectRefPanel.Show ();
+
+ DotNetProject netProject = configureProject as DotNetProject;
+ if (netProject != null)
+ gacRefPanel.SetClrVersion \
(((DotNetProjectConfiguration)netProject.ActiveConfiguration).ClrVersion); \
gacRefPanel.Reset (); assemblyRefPanel.SetBasePath (configureProject.BaseDirectory);
@@ -84,6 +88,22 @@
OnChanged (null, null);
}
+ public void SetReferenceCollection (ProjectReferenceCollection references, \
ClrVersion targetVersion) + {
+ ((ListStore) ReferencesTreeView.Model).Clear ();
+
+ projectRefPanel.Hide ();
+
+ gacRefPanel.SetClrVersion (targetVersion);
+ gacRefPanel.Reset ();
+ assemblyRefPanel.SetBasePath (Environment.GetFolderPath \
(Environment.SpecialFolder.Personal)); +
+ foreach (ProjectReference refInfo in references)
+ AddReference (refInfo);
+
+ OnChanged (null, null);
+ }
+
TreeIter AddReference (ProjectReference refInfo)
{
switch (refInfo.ReferenceType) {
@@ -122,7 +142,7 @@
return refTreeStore.AppendValues (System.IO.Path.GetFileNameWithoutExtension \
(refInfo.Reference), GetTypeText (refInfo), refInfo.Reference, refInfo, \
"md-package"); }
- public SelectReferenceDialog(Project configureProject)
+ public SelectReferenceDialog ()
{
Glade.XML refXML = new Glade.XML (null, "Base.glade", "AddReferenceDialog", \
null); refXML.Autoconnect (this);
@@ -146,7 +166,6 @@
projectRefPanel = new ProjectReferencePanel (this);
gacRefPanel = new GacReferencePanel (this);
assemblyRefPanel = new AssemblyReferencePanel (this);
- SetProject (configureProject);
mainBook.RemovePage (mainBook.CurrentPage);
mainBook.AppendPage (gacRefPanel, new Label (GettextCatalog.GetString \
("Packages")));
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp 2007-06-30 \
14:52:39 UTC (rev 81111)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp 2007-06-30 \
15:26:01 UTC (rev 81112) @@ -331,10 +331,10 @@
<ProjectReference type="Assembly" localcopy="False" \
refto="../../../contrib/Mono.Addins.Gui.dll" />
<ProjectReference type="Assembly" localcopy="False" \
refto="../../../contrib/Mono.Addins.Setup.dll" />
<ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, \
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, \
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" \
/>
- <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, \
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" \
/>
- <ProjectReference type="Gac" localcopy="True" refto="gtkhtml-sharp, \
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" \
/>
- <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, \
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + \
<ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.8.0.0, \
Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <ProjectReference \
type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, \
PublicKeyToken=35e10195dab3c99f" /> + <ProjectReference type="Gac" \
localcopy="True" refto="gnome-vfs-sharp, Version=2.8.0.0, Culture=neutral, \
PublicKeyToken=35e10195dab3c99f" /> + <ProjectReference type="Gac" \
localcopy="True" refto="gtkhtml-sharp, Version=2.8.0.0, Culture=neutral, \
PublicKeyToken=35e10195dab3c99f" /> </References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" \
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" \
SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../"> \
<ExcludedFiles>
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic