[Monodevelop-patches-list] r2734 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Commands Gui/Dialogs Services/Language Services/Project
Lluis Sanchez <lluis@ximian.com>
lluis at mono-cvs.ximian.com
Wed Aug 10 14:48:36 EDT 2005
Author: lluis
Date: 2005-08-10 14:48:36 -0400 (Wed, 10 Aug 2005)
New Revision: 2734
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/EditCommands.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineOptionsDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ProjectOptionsDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Language/LanguageService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
Log:
2005-08-10 Lluis Sanchez Gual <lluis at novell.com>
* Commands/EditCommands.cs:
* Services/Project/ProjectService.cs:
* Gui/Dialogs/ProjectOptionsDialog.cs:
* Gui/Dialogs/TreeViewOptions.cs:
* Gui/Dialogs/CombineOptionsDialog.cs: TreeViewOptions now takes the
parent window as first parameter of the constructor.
* Services/Language/LanguageService.cs: Commented out some unused stuff.
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-08-10 18:48:36 UTC (rev 2734)
@@ -1,3 +1,14 @@
+2005-08-10 Lluis Sanchez Gual <lluis at novell.com>
+
+ * Commands/EditCommands.cs:
+ * Services/Project/ProjectService.cs:
+ * Gui/Dialogs/ProjectOptionsDialog.cs:
+ * Gui/Dialogs/TreeViewOptions.cs:
+ * Gui/Dialogs/CombineOptionsDialog.cs: TreeViewOptions now takes the
+ parent window as first parameter of the constructor.
+
+ * Services/Language/LanguageService.cs: Commented out some unused stuff.
+
2005-08-10 Lluis Sanchez Gual <lluis at novell.com>
* Services/ProcessService/ProcessHostController.cs: Avoid unneeded
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/EditCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/EditCommands.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/EditCommands.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -1,5 +1,6 @@
using System;
+using MonoDevelop.Gui;
using MonoDevelop.Gui.Dialogs;
using MonoDevelop.Services;
using MonoDevelop.Core.Properties;
@@ -29,8 +30,9 @@
{
protected override void Run ()
{
- new TreeViewOptions((IProperties)Runtime.Properties.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()),
- AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"));
+ new TreeViewOptions ((Gtk.Window)WorkbenchSingleton.Workbench,
+ (IProperties)Runtime.Properties.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()),
+ AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"));
}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineOptionsDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineOptionsDialog.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineOptionsDialog.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -47,7 +47,7 @@
ConfigurationData configData;
Gtk.TreeIter configIter;
- public CombineOptionsDialog (Combine combine, IAddInTreeNode node, IAddInTreeNode configurationNode) : base(null, null)
+ public CombineOptionsDialog (Gtk.Window parentWindow, Combine combine, IAddInTreeNode node, IAddInTreeNode configurationNode) : base (parentWindow, null, null)
{
this.combine = combine;
this.configurationNode = configurationNode;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ProjectOptionsDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ProjectOptionsDialog.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ProjectOptionsDialog.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -33,7 +33,7 @@
Gtk.CellRendererText textRenderer; // used to set an editable node
Gtk.TreeViewColumn textColumn; // used to set an editable node
- public ProjectOptionsDialog(Project project, IAddInTreeNode node, IAddInTreeNode configurationNode) : base(null, null)
+ public ProjectOptionsDialog (Gtk.Window parentWindow, Project project, IAddInTreeNode node, IAddInTreeNode configurationNode) : base (parentWindow, null, null)
{
this.project = project;
this.configurationNode = configurationNode;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -168,14 +168,14 @@
SetOptionPanelTo (descriptor);
}
- public TreeViewOptions (IProperties properties, IAddInTreeNode node)
+ public TreeViewOptions (Gtk.Window parentWindow, IProperties properties, IAddInTreeNode node)
{
this.properties = properties;
Glade.XML treeViewXml = new Glade.XML (null, "Base.glade", "TreeViewOptionDialog", null);
treeViewXml.Autoconnect (this);
- TreeViewOptionDialog.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
+ TreeViewOptionDialog.TransientFor = parentWindow;
TreeViewOptionDialog.WindowPosition = Gtk.WindowPosition.CenterOnParent;
TreeViewOptionDialog.Title = GettextCatalog.GetString ("MonoDevelop options");
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Language/LanguageService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Language/LanguageService.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Language/LanguageService.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -23,10 +23,10 @@
{
string languagePath;
- PixbufList languageImageList = null;
+// PixbufList languageImageList = null;
ArrayList languages = null;
- public PixbufList LanguageImageList {
+/* public PixbufList LanguageImageList {
get {
if (languageImageList == null) {
LoadLanguageDefinitions();
@@ -34,7 +34,7 @@
return languageImageList;
}
}
-
+*/
public ArrayList Languages {
get {
if (languages == null) {
@@ -45,7 +45,7 @@
}
void LoadLanguageDefinitions()
{
- languageImageList = new PixbufList();
+// languageImageList = new PixbufList();
languages = new ArrayList();
XmlDocument doc = new XmlDocument();
@@ -58,8 +58,9 @@
if (el != null) {
languages.Add(new Language(el.Attributes["name"].InnerText,
el.Attributes["code"].InnerText,
- LanguageImageList.Count));
- LanguageImageList.Add(new Gdk.Pixbuf(languagePath + el.Attributes["icon"].InnerText));
+// LanguageImageList.Count));
+ 0));
+// LanguageImageList.Add(new Gdk.Pixbuf(languagePath + el.Attributes["icon"].InnerText));
}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs 2005-08-10 14:09:25 UTC (rev 2733)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs 2005-08-10 18:48:36 UTC (rev 2734)
@@ -712,7 +712,7 @@
IAddInTreeNode generalOptionsNode = AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/ProjectOptions/GeneralOptions");
IAddInTreeNode configurationPropertiesNode = AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties");
- ProjectOptionsDialog optionsDialog = new ProjectOptionsDialog(selectedProject, generalOptionsNode, configurationPropertiesNode);
+ ProjectOptionsDialog optionsDialog = new ProjectOptionsDialog ((Gtk.Window)WorkbenchSingleton.Workbench, selectedProject, generalOptionsNode, configurationPropertiesNode);
if (optionsDialog.Run() == (int)Gtk.ResponseType.Ok) {
selectedProject.NeedsBuilding = true;
}
@@ -722,7 +722,7 @@
IAddInTreeNode generalOptionsNode = AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/CombineOptions/GeneralOptions");
IAddInTreeNode configurationPropertiesNode = AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/CombineOptions/ConfigurationProperties");
- CombineOptionsDialog optionsDialog = new CombineOptionsDialog (combine, generalOptionsNode, configurationPropertiesNode);
+ CombineOptionsDialog optionsDialog = new CombineOptionsDialog ((Gtk.Window)WorkbenchSingleton.Workbench, combine, generalOptionsNode, configurationPropertiesNode);
optionsDialog.Run ();
}
More information about the Monodevelop-patches-list
mailing list