Author: lluis
Date: 2007-05-04 09:40:27 -0400 (Fri, 04 May 2007)
New Revision: 76682
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.addin.xml
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui/IconService.cs
Log:
* MonoDevelop.Projects.Gui.addin.xml, MonoDevelop.Projects.Gui.mdp,
MonoDevelop.Projects.Gui/IconService.cs,
MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs,
MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs,
Makefile.am: Migration to Mono.Addins.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
2007-05-04 13:40:08 UTC (rev 76681)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
2007-05-04 13:40:27 UTC (rev 76682)
@@ -1,3 +1,11 @@
+2007-05-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Projects.Gui.addin.xml, MonoDevelop.Projects.Gui.mdp,
+ MonoDevelop.Projects.Gui/IconService.cs,
+ MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs,
+ MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs,
+ Makefile.am: Migration to Mono.Addins.
+
2007-04-19 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects.Gui.addin.xml, MonoDevelop.Projects.Gui.mdp,
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/Makefile.am
2007-05-04 13:40:08 UTC (rev 76681)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/Makefile.am
2007-05-04 13:40:27 UTC (rev 76682)
@@ -9,6 +9,7 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/contrib/Mono.Addins.dll \
-r:Mono.Posix \
-r:System \
-r:System.Xml
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui/IconService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui/IconService.cs
2007-05-04 13:40:08 UTC (rev 76681)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui/IconService.cs
2007-05-04 13:40:27 UTC (rev 76682)
@@ -15,8 +15,9 @@
using MonoDevelop.Projects.Parser;
using MonoDevelop.Core;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core.Gui;
+using MonoDevelop.Core.Addins;
using Stock = MonoDevelop.Core.Gui.Stock;
namespace MonoDevelop.Projects.Gui
@@ -28,7 +29,7 @@
public override void InitializeService()
{
base.InitializeService();
- InitializeIcons (Runtime.AddInService.GetTreeNode
("/Workspace/Icons"));
+ InitializeIcons ("/Workspace/Icons");
}
public string GetImageForProjectType (string projectType)
@@ -50,25 +51,23 @@
}
- void InitializeIcons (IAddInTreeNode treeNode)
+ void InitializeIcons (string path)
{
extensionHashtable[".PRJX"] = Stock.SolutionIcon;
extensionHashtable[".CMBX"] = Stock.CombineIcon;
extensionHashtable[".MDS"] = Stock.CombineIcon;
extensionHashtable[".MDP"] = Stock.SolutionIcon;
- IconCodon[] icons =
(IconCodon[])treeNode.BuildChildItems(null).ToArray(typeof(IconCodon));
- for (int i = 0; i < icons.Length; ++i) {
- IconCodon iconCodon = icons[i];
+ foreach (IconCodon iconCodon in
AddinManager.GetExtensionNodes (path, typeof(IconCodon))) {
string image;
if (iconCodon.Location != null)
throw new Exception ("This should be
using stock icons");
else if (iconCodon.Resource != null)
image = iconCodon.Resource;
else
- image = iconCodon.ID;
+ image = iconCodon.Id;
- image = ResourceService.GetStockId
(iconCodon.AddIn, image);
+ image = ResourceService.GetStockId
(iconCodon.Addin, image);
if (iconCodon.Extensions != null) {
foreach (string ext in
iconCodon.Extensions)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
2007-05-04 13:40:08 UTC (rev 76681)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
2007-05-04 13:40:27 UTC (rev 76682)
@@ -30,7 +30,7 @@
using System.Collections;
using System.ComponentModel;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core;
using MonoDevelop.Core.Properties;
using MonoDevelop.Projects;
@@ -42,11 +42,11 @@
{
Combine combine;
- IAddInTreeNode configurationNode;
+ ExtensionNode configurationNode;
ConfigurationData configData;
Gtk.TreeIter configIter;
- public CombineOptionsDialog (Gtk.Window parentWindow, Combine
combine, IAddInTreeNode node, IAddInTreeNode configurationNode) : base
(parentWindow, null, null)
+ public CombineOptionsDialog (Gtk.Window parentWindow, Combine
combine, ExtensionNode node, ExtensionNode configurationNode) : base
(parentWindow, null, null)
{
this.combine = combine;
this.configurationNode = configurationNode;
@@ -60,7 +60,7 @@
properties.SetProperty ("CombineEntry", combine);
properties.SetProperty ("CombineConfigData",
configData);
- AddNodes (properties, Gtk.TreeIter.Zero,
node.BuildChildItems (this));
+ AddNodes (properties, Gtk.TreeIter.Zero,
node.GetChildObjects (false));
SelectFirstNode ();
}
@@ -92,8 +92,8 @@
configNodeProperties.SetProperty("Config",
config);
configNodeProperties.SetProperty
("CombineConfigData", configData);
- ArrayList list =
configurationNode.BuildChildItems (this);
- if (list.Count > 1) {
+ object[] list =
configurationNode.GetChildObjects (false);
+ if (list.Length > 1) {
Gtk.TreeIter newNode = AddPath
(config.Name, configIter);
AddNodes (configNodeProperties,
newNode, list);
} else {
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs
2007-05-04 13:40:08 UTC (rev 76681)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/ProjectOptionsDialog.cs
2007-05-04 13:40:27 UTC (rev 76682)
@@ -9,7 +9,7 @@
using System.Collections;
using System.ComponentModel;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core;
using MonoDevelop.Core.Properties;
using MonoDevelop.Projects;
@@ -33,12 +33,12 @@
{
Project project;
- IAddInTreeNode configurationNode;
+ ExtensionNode configurationNode;
Gtk.TreeIter configurationTreeNode;
Gtk.CellRendererText textRenderer; // used to set
an editable node
Gtk.TreeViewColumn textColumn; // used to set
an editable node
- public ProjectOptionsDialog (Gtk.Window parentWindow, Project
project, IAddInTreeNode node, IAddInTreeNode configurationNode) : base
(parentWindow, null, null)
+ public ProjectOptionsDialog (Gtk.Window parentWindow, Project
project, ExtensionNode node, ExtensionNode configurationNode) : base
(parentWindow, null, null)
{
this.project = project;
this.configurationNode = configurationNode;
@@ -48,7 +48,7 @@
properties.SetProperty("Project", project);
properties.SetProperty("CombineEntry", project);
- AddNodes(properties, Gtk.TreeIter.Zero,
node.BuildChildItems(this));
+ AddNodes(properties, Gtk.TreeIter.Zero,
node.GetChildObjects (false));
//
// This code has to add treeview node items to the
treeview. under a configuration node
@@ -79,7 +79,7 @@
configNodeProperties.SetProperty("Project",
project);
configNodeProperties.SetProperty("CombineEntry", project);
configNodeProperties.SetProperty("Config",
config);
- AddNodes(configNodeProperties, newNode,
configurationNode.BuildChildItems(this));
+ AddNodes(configNodeProperties, newNode,
configurationNode.GetChildObjects (false));
}
}
@@ -145,7 +145,7 @@
properties.SetProperty ("Config", newConfig);
// add the child nodes to this new config
- AddNodes (properties, newNode,
configurationNode.BuildChildItems(newConfig));
+ AddNodes (properties, newNode,
configurationNode.GetChildObjects (false));
//select new config node and set it for renaming
Gtk.TreePath newPath = treeStore.GetPath (newNode);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.addin.xml
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.addin.xml
2007-05-04 13:40:08 UTC (rev 76681)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.addin.xml
2007-05-04 13:40:27 UTC (rev 76682)
@@ -1,4 +1,4 @@
-<AddIn id = "MonoDevelop.Projects.Gui"
+<Addin id = "MonoDevelop.Projects.Gui"
name = "MonoDevelop GUI for Project Services"
author = "Todd Berman, Pedro Abelleira Seco, John Luke, Daniel
Kornhauser, Alex Graveley, nricciar, John Bou Antoun, Ben Maurer, Jeroen
Zwartepoorte, Gustavo Giráldez, Miguel de Icaza, Inigo Illan, Iain McCoy, Nick
Drochak, Paweł Różański, Richard Torkar, Paco Martinez, Lluis Sanchez Gual,
Christian Hergert, Mike Krueger"
copyright = "GPL"
@@ -12,12 +12,40 @@
</Runtime>
<Dependencies>
- <AddIn id="MonoDevelop.Core" version="0.13.0"/>
- <AddIn id="MonoDevelop.Core.Gui" version="0.13.0"/>
- <AddIn id="MonoDevelop.Projects" version="0.13.0"/>
+ <Addin id="MonoDevelop.Core" version="0.13.0"/>
+ <Addin id="MonoDevelop.Core.Gui" version="0.13.0"/>
+ <Addin id="MonoDevelop.Projects" version="0.13.0"/>
</Dependencies>
- <Extension path =
"/SharpDevelop/Workbench/ProjectOptions/GeneralOptions"
extension-nodes="DialogPanel" description="Dialog panels for project options.">
+ <!-- Extension points -->
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/ProjectOptions/GeneralOptions">
+ <Description>Dialog panels for project options.</Description>
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
+ <Description>Dialog panels for project configuration
options.</Description>
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/CombineOptions/GeneralOptions">
+ <Description>Dialog panels for solution options.</Description>
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/CombineOptions/ConfigurationProperties">
+ <Description>Dialog panels for solution configuration
options.</Description>
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/Workspace/Icons" name="Project service icons">
+ <ExtensionNode name="Icon"
type="MonoDevelop.Core.Addins.IconCodon"/>
+ </ExtensionPoint>
+
+ <!-- Extensions points -->
+
+ <Extension path =
"/SharpDevelop/Workbench/ProjectOptions/GeneralOptions">
<DialogPanel id = "Common"
_label = "General">
<DialogPanel id = "GeneralProjectPanel"
@@ -29,13 +57,13 @@
</DialogPanel>
</Extension>
- <Extension path =
"/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties"
extension-nodes="DialogPanel" description="Dialog panels for project
configuration options.">
+ <Extension path =
"/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
<DialogPanel id = "CustomCommands"
_label = "Custom Commands"
class =
"MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanel"/>
</Extension>
- <Extension path =
"/SharpDevelop/Workbench/CombineOptions/GeneralOptions"
extension-nodes="DialogPanel" description="Dialog panels for solution options.">
+ <Extension path =
"/SharpDevelop/Workbench/CombineOptions/GeneralOptions">
<DialogPanel id = "Common"
_label = "Common">
<DialogPanel id = "Information"
@@ -54,7 +82,7 @@
class =
"MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CombineEntryConfigurationsPanel"/>
</Extension>
- <Extension path =
"/SharpDevelop/Workbench/CombineOptions/ConfigurationProperties"
extension-nodes="DialogPanel" description="Dialog panels for solution
configuration options.">
+ <Extension path =
"/SharpDevelop/Workbench/CombineOptions/ConfigurationProperties">
<DialogPanel id = "EntryConfigurations"
_label = "Configurations"
class =
"MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CombineConfigurationPanel"/>
@@ -62,4 +90,4 @@
_label = "Custom Commands"
class =
"MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanel"/>
</Extension>
-</AddIn>
+</Addin>
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
2007-05-04 13:40:08 UTC (rev 76681)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.mdp
2007-05-04 13:40:27 UTC (rev 76682)
@@ -66,6 +66,7 @@
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Components" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core.Gui" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
+ <ProjectReference type="Assembly" localcopy="False"
refto="../../../contrib/Mono.Addins.dll" />
<ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
