diff options
71 files changed, 270 insertions, 187 deletions
@@ -1,3 +1,7 @@ +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.mds: API cleanup. + 2007-12-05 Lluis Sanchez Gual <lluis@novell.com> * README: Add mono-addins dependency. diff --git a/MonoDevelop.mds b/MonoDevelop.mds index 228ea90c20..2737f159d7 100644 --- a/MonoDevelop.mds +++ b/MonoDevelop.mds @@ -2,11 +2,11 @@ <Configurations active="Debug"> <Configuration name="Debug" ctype="CombineConfiguration"> <Entry build="True" name="Main" configuration="Debug" /> - <Entry build="True" name="extras" configuration="" /> + <Entry build="True" name="Extras" configuration="" /> </Configuration> <Configuration name="Release" ctype="CombineConfiguration"> <Entry build="True" name="Main" configuration="Release" /> - <Entry build="True" name="extras" configuration="" /> + <Entry build="True" name="Extras" configuration="" /> </Configuration> </Configurations> <StartMode startupentry="Main" single="True"> diff --git a/main/src/addins/AspNetAddIn/ChangeLog b/main/src/addins/AspNetAddIn/ChangeLog index d03588f2de..bbbed20371 100644 --- a/main/src/addins/AspNetAddIn/ChangeLog +++ b/main/src/addins/AspNetAddIn/ChangeLog @@ -1,5 +1,9 @@ 2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * Project/AspNetAppProject.cs: API cleanup. + +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs, gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs, gtk-gui/gui.stetic: Fix alignment of some labels. diff --git a/main/src/addins/AspNetAddIn/Project/AspNetAppProject.cs b/main/src/addins/AspNetAddIn/Project/AspNetAppProject.cs index 30b87d52ba..1b815dd031 100644 --- a/main/src/addins/AspNetAddIn/Project/AspNetAppProject.cs +++ b/main/src/addins/AspNetAddIn/Project/AspNetAppProject.cs @@ -134,7 +134,7 @@ namespace AspNetAddIn webTypeManager = new WebTypeManager (this); } - public override void Deserialize (ITypeSerializer handler, DataCollection data) + protected override void Deserialize (ITypeSerializer handler, DataCollection data) { loading = true; base.Deserialize (handler, data); diff --git a/main/src/addins/MonoDevelop.Gettext/ChangeLog b/main/src/addins/MonoDevelop.Gettext/ChangeLog index bd42586da7..0d14a48337 100644 --- a/main/src/addins/MonoDevelop.Gettext/ChangeLog +++ b/main/src/addins/MonoDevelop.Gettext/ChangeLog @@ -1,5 +1,9 @@ 2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * MonoDevelop.Gettext/TranslationProject.cs: API cleanup. + +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * gtk-gui/gui.stetic: Updated. 2007-12-12 Lluis Sanchez Gual <lluis@novell.com> diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs index bd243b697d..8607ce6ecd 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs @@ -313,7 +313,7 @@ namespace MonoDevelop.Gettext } } - public override void Deserialize (ITypeSerializer handler, DataCollection data) + protected override void Deserialize (ITypeSerializer handler, DataCollection data) { base.Deserialize (handler, data); foreach (Translation translation in this.Translations) diff --git a/main/src/core/MonoDevelop.Core.Gui/ChangeLog b/main/src/core/MonoDevelop.Core.Gui/ChangeLog index d712103adf..590fbbb2e3 100644 --- a/main/src/core/MonoDevelop.Core.Gui/ChangeLog +++ b/main/src/core/MonoDevelop.Core.Gui/ChangeLog @@ -1,3 +1,13 @@ +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Core.Gui.mdp, + MonoDevelop.Core.Gui.Dialogs/MultiTaskProgressDialog.cs, + MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs, + MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs, + gtk-gui/MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog.cs, + gtk-gui/gui.stetic, Freedesktop.RecentFiles/RecentFileStorage.cs: API + cleanup. + 2007-12-12 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Core.Gui.addin.xml: Bump add-in versions. diff --git a/main/src/core/MonoDevelop.Core.Gui/Freedesktop.RecentFiles/RecentFileStorage.cs b/main/src/core/MonoDevelop.Core.Gui/Freedesktop.RecentFiles/RecentFileStorage.cs index ac4fc0da16..be0a43211f 100644 --- a/main/src/core/MonoDevelop.Core.Gui/Freedesktop.RecentFiles/RecentFileStorage.cs +++ b/main/src/core/MonoDevelop.Core.Gui/Freedesktop.RecentFiles/RecentFileStorage.cs @@ -47,7 +47,7 @@ namespace Freedesktop.RecentFiles /// /// http://standards.freedesktop.org/recent-file-spec/recent-file-spec-0.2.html /// </summary> - public sealed class RecentFileStorage + internal sealed class RecentFileStorage { const int MaxRecentItemsCount = 500; // max. items according to the spec. const string FileName = ".recently-used"; diff --git a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs index c24558f0d9..59a9339ba4 100644 --- a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs +++ b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs @@ -30,7 +30,7 @@ using MonoDevelop.Core.Gui.Dialogs; namespace MonoDevelop.Core.Gui.Codons { [ExtensionNode (Description="A dialog panel to be shown in an options dialog. The specified class must implement MonoDevelop.Core.Gui.Dialogs.IDialogPanel.")] - public class DialogPanelCodon : TypeExtensionNode + internal class DialogPanelCodon : TypeExtensionNode { [NodeAttribute("_label", true, "Name of the panel", Localizable=true)] string label = null; diff --git a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs index 7ddc229370..abda9da90e 100644 --- a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs +++ b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs @@ -27,7 +27,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Core.Gui.Dialogs { - public class DefaultDialogPanelDescriptor : IDialogPanelDescriptor + internal class DefaultDialogPanelDescriptor : IDialogPanelDescriptor { string id = String.Empty; string label = String.Empty; diff --git a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/MultiTaskProgressDialog.cs b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/MultiTaskProgressDialog.cs index a98d70bd37..a44690966c 100644 --- a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/MultiTaskProgressDialog.cs +++ b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/MultiTaskProgressDialog.cs @@ -31,9 +31,7 @@ using Gtk; namespace MonoDevelop.Core.Gui.Dialogs { - - - public partial class MultiTaskProgressDialog : Gtk.Dialog + internal partial class MultiTaskProgressDialog : Gtk.Dialog { ListStore statusStore = new ListStore (typeof(string), typeof(string), typeof (int)); const int STORE_TaskName = 0; diff --git a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp index 573d82de64..6a47f393d8 100644 --- a/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp +++ b/main/src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp @@ -136,7 +136,6 @@ <File name="MonoDevelop.Core.Gui.Components/MenuButtonEntry.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Core.Gui.ProgressMonitoring/MessageDialogProgressMonitor.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Core.Gui.Codons/StockIconCodon.cs" subtype="Code" buildaction="Compile" /> - <File name="MonoDevelop.Core.Gui.Utils/DesktopApplication.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Core.Gui.addin.xml" subtype="Code" buildaction="EmbedAsResource" /> <File name="Makefile.am" subtype="Code" buildaction="Nothing" /> <File name="ChangeLog" subtype="Code" buildaction="Nothing" /> diff --git a/main/src/core/MonoDevelop.Core.Gui/gtk-gui/MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog.cs b/main/src/core/MonoDevelop.Core.Gui/gtk-gui/MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog.cs index 2ca8a02627..7d2d0f9a95 100644 --- a/main/src/core/MonoDevelop.Core.Gui/gtk-gui/MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog.cs +++ b/main/src/core/MonoDevelop.Core.Gui/gtk-gui/MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.Core.Gui.Dialogs { - public partial class MultiTaskProgressDialog { + internal partial class MultiTaskProgressDialog { private Gtk.Label title; diff --git a/main/src/core/MonoDevelop.Core.Gui/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Core.Gui/gtk-gui/gui.stetic index eb0e7d47f7..84fbac4dcc 100644 --- a/main/src/core/MonoDevelop.Core.Gui/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Core.Gui/gtk-gui/gui.stetic @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> - <images-root-path>../</images-root-path> + <images-root-path>..</images-root-path> <target-gtk-version>2.8.3</target-gtk-version> </configuration> <import> @@ -9,6 +9,7 @@ </import> <widget class="Gtk.Dialog" id="MonoDevelop.Core.Gui.Dialogs.MultiTaskProgressDialog" design-size="491 418"> <property name="MemberName" /> + <property name="GeneratePublic">False</property> <property name="Title" translatable="yes">Progress</property> <property name="WindowPosition">CenterOnParent</property> <property name="Modal">True</property> diff --git a/main/src/core/MonoDevelop.Documentation/ChangeLog b/main/src/core/MonoDevelop.Documentation/ChangeLog index 8817cc6ad5..bc06cb4325 100644 --- a/main/src/core/MonoDevelop.Documentation/ChangeLog +++ b/main/src/core/MonoDevelop.Documentation/ChangeLog @@ -1,3 +1,7 @@ +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Documentation/DocumentationService.cs: API cleanup. + 2007-12-12 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Documentation.addin.xml: Bump add-in versions. diff --git a/main/src/core/MonoDevelop.Documentation/MonoDevelop.Documentation/DocumentationService.cs b/main/src/core/MonoDevelop.Documentation/MonoDevelop.Documentation/DocumentationService.cs index 8ef78b38ac..b0a0efd252 100644 --- a/main/src/core/MonoDevelop.Documentation/MonoDevelop.Documentation/DocumentationService.cs +++ b/main/src/core/MonoDevelop.Documentation/MonoDevelop.Documentation/DocumentationService.cs @@ -36,8 +36,7 @@ using MonoDevelop.Projects.Documentation; namespace MonoDevelop.Documentation { - - public class DocumentationService : IDocumentationService + internal class DocumentationService : IDocumentationService { RootTree helpTree; diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index 6c471424ea..cccb46fe39 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,5 +1,25 @@ 2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs, + MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs, + MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs, + MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs, + MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs, + MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs, + MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs, + MonoDevelop.Ide.mdp, + gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs, + gtk-gui/gui.stetic, gtk-gui/objects.xml, + gtk-gui/MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.cs, + gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs, + gtk-gui/MonoDevelop.Ide.NewHeaderTemplateDialog.cs, + gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs, + Makefile.am, MonoDevelop.Ide.Gui/IdeStartup.cs, + MonoDevelop.Ide.Gui/ExitEventHandler.cs, + MonoDevelop.Ide.Gui/HelpViewer.cs: API cleanup. + +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + * gtk-gui/gui.stetic, gtk-gui/MonoDevelop.Ide.CodeTemplates.CodeTemplatePanelWidget.cs, gtk-gui/MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector.cs, diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am index a2b87a29ab..6152ca8070 100644 --- a/main/src/core/MonoDevelop.Ide/Makefile.am +++ b/main/src/core/MonoDevelop.Ide/Makefile.am @@ -57,8 +57,8 @@ FILES = \ gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.LoadSavePanelWidget.cs \ gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.SelectStylePanelWidget.cs \ gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.TasksPanelWidget.cs \ - gtk-gui/MonoDevelop.Ide.NewHeaderTemplateDialog.cs \ gtk-gui/MonoDevelop.Ide.SelectEncodingsDialog.cs \ + gtk-gui/MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.cs \ gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs \ MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs \ MonoDevelop.Ide.CodeTemplates/CodeTemplateGroup.cs \ diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs index 2080c8e217..a564f2c3ee 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs @@ -381,7 +381,7 @@ namespace MonoDevelop.Ide.CodeTemplates } } - public class CodeTemplatePane : AbstractOptionPanel + internal class CodeTemplatePane : AbstractOptionPanel { CodeTemplatePanelWidget widget; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs index 30e60e01ce..0d656b48d3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs @@ -26,7 +26,7 @@ using MonoDevelop.Ide.CodeTemplates; namespace MonoDevelop.Ide.CodeTemplates { - public class EditTemplateDialog : Gtk.Dialog + internal class EditTemplateDialog : Gtk.Dialog { CodeTemplate codeTemplate; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs index f6e507faf6..36b92a0b63 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs @@ -25,7 +25,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Ide.CodeTemplates { - public class EditTemplateGroupDialog : Gtk.Dialog + internal class EditTemplateGroupDialog : Gtk.Dialog { CodeTemplateGroup codeTemplateGroup; string titlePrefix = string.Empty; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs index c0faf909f9..7619f7e7b2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs @@ -50,7 +50,7 @@ namespace MonoDevelop.Ide.Gui.Content if (currentCompletionContext != null) { autoHideCompletionWindow = false; - if (CompletionListWindow.ProcessKeyEvent (key, modifier)) { + if (CompletionWindowManager.ProcessKeyEvent (key, modifier)) { autoHideCompletionWindow = true; return true; } @@ -72,7 +72,7 @@ namespace MonoDevelop.Ide.Gui.Content ICompletionDataProvider cp = HandleCodeCompletion (currentCompletionContext, (char)(uint)key); if (cp != null) - CompletionListWindow.ShowWindow ((char)(uint)key, cp, completionWidget, currentCompletionContext, OnCompletionWindowClosed); + CompletionWindowManager.ShowWindow ((char)(uint)key, cp, completionWidget, currentCompletionContext, OnCompletionWindowClosed); else currentCompletionContext = null; } @@ -103,7 +103,7 @@ namespace MonoDevelop.Ide.Gui.Content { if (autoHideCompletionWindow) { if (currentCompletionContext != null) - CompletionListWindow.HideWindow (); + CompletionWindowManager.HideWindow (); ParameterInformationWindowManager.HideWindow (); } } @@ -134,7 +134,7 @@ namespace MonoDevelop.Ide.Gui.Content cp = CodeCompletionCommand (currentCompletionContext); if (cp != null) - CompletionListWindow.ShowWindow ((char)0, cp, completionWidget, currentCompletionContext, OnCompletionWindowClosed); + CompletionWindowManager.ShowWindow ((char)0, cp, completionWidget, currentCompletionContext, OnCompletionWindowClosed); else currentCompletionContext = null; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs index ea1ef21330..90dd3e34e3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/LinkedFilesFolder.cs @@ -29,7 +29,7 @@ using System; using MonoDevelop.Projects; -namespace MonoDevelop.Ide +namespace MonoDevelop.Ide.Gui.Pads.ProjectPad { public class LinkedFilesFolder { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ExitEventHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ExitEventHandler.cs index 11426992d7..06b8d4e5b9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ExitEventHandler.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ExitEventHandler.cs @@ -28,7 +28,7 @@ using System; -namespace MonoDevelop.Ide +namespace MonoDevelop.Ide.Gui { public delegate void ExitEventHandler (object sender, ExitEventArgs args); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs index aa953e49de..809124d82c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs @@ -188,8 +188,8 @@ namespace MonoDevelop.Ide.Gui //IMG tags; what we're looking for! else if (input[pos+1] == 'i' && input [pos+2] == 'm' && input [pos+3] == 'm' ){ //WriteImage - string url = ""; - string path = Path.Combine (tempDir, "image" + imageIndex); + //string url = ""; + //string path = Path.Combine (tempDir, "image" + imageIndex); //WriteImage (path, url); imageIndex++; System.Console.WriteLine(input.Substring (pos, 10)); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs index 9bce61f2de..e662d5b988 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs @@ -93,7 +93,6 @@ namespace MonoDevelop.Ide.Gui } } - string name = Assembly.GetEntryAssembly ().GetName ().Name; string version = Assembly.GetEntryAssembly ().GetName ().Version.Major + "." + Assembly.GetEntryAssembly ().GetName ().Version.Minor; if (Assembly.GetEntryAssembly ().GetName ().Version.Build != 0) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs index adc3c694e9..eabd836fc0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs @@ -28,9 +28,9 @@ using System; -namespace MonoDevelop.Ide +namespace MonoDevelop.Ide.StandardHeaders { - public partial class NewHeaderTemplateDialog : Gtk.Dialog + internal partial class NewHeaderTemplateDialog : Gtk.Dialog { public string HeaderName { get { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs index 2f90b2ee4f..334961be9d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs @@ -38,7 +38,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Ide.StandardHeaders { - public partial class StandardHeaderPanel : Gtk.Bin, IDialogPanel + internal partial class StandardHeaderPanel : Gtk.Bin, IDialogPanel { public StandardHeaderPanel() { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp index c35adaab0b..3102b68d26 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp @@ -286,7 +286,6 @@ <File name="gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Ide.StandardHeader/StandardHeaderTemplates.xml" subtype="Code" buildaction="EmbedAsResource" /> <File name="MonoDevelop.Ide.StandardHeader/NewHeaderTemplateDialog.cs" subtype="Code" buildaction="Compile" /> - <File name="gtk-gui/MonoDevelop.Ide.NewHeaderTemplateDialog.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs" subtype="Code" buildaction="Compile" /> <File name="MonoDevelop.Ide.CodeTemplates/EditTemplateGroupDialog.cs" subtype="Code" buildaction="Compile" /> @@ -333,6 +332,7 @@ <File name="MonoDevelop.Ide.Gui/DragNotebook.cs" subtype="Code" buildaction="Compile" /> <File name="templates/Workspace.xpt.xml" subtype="Code" buildaction="EmbedAsResource" /> <File name="MonoDevelop.Ide.Gui/ToolbarComboBox.cs" subtype="Code" buildaction="Compile" /> + <File name="gtk-gui/MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.cs" subtype="Code" buildaction="Compile" /> </Contents> <References> <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" /> diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs index ff3ac9ab00..14ec03b716 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs @@ -52,6 +52,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs { Gtk.VBox w1 = this.VBox; w1.Name = "dialog1_VBox"; w1.Spacing = 6; + w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild this.vbox = new Gtk.VBox(); this.vbox.Name = "vbox"; @@ -146,7 +147,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs { this.radioUpdateExternal = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("_External")); this.radioUpdateExternal.CanFocus = true; this.radioUpdateExternal.Name = "radioUpdateExternal"; - this.radioUpdateExternal.Active = true; this.radioUpdateExternal.DrawIndicator = true; this.radioUpdateExternal.UseUnderline = true; this.radioUpdateExternal.Group = new GLib.SList(System.IntPtr.Zero); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs index c2c520287e..963aa9935a 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs @@ -119,7 +119,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs { w7.Fill = false; // Container child hbox5.Gtk.Box+BoxChild this.hbuttonbox1 = new Gtk.HButtonBox(); - this.hbuttonbox1.Name = "hbuttonbox1"; this.hbuttonbox1.Spacing = 10; this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NewHeaderTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.cs index d008accf5d..26e429ecd3 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NewHeaderTemplateDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.cs @@ -8,10 +8,10 @@ // </autogenerated> // ------------------------------------------------------------------------------ -namespace MonoDevelop.Ide { +namespace MonoDevelop.Ide.StandardHeaders { - public partial class NewHeaderTemplateDialog { + internal partial class NewHeaderTemplateDialog { private Gtk.HBox hbox1; @@ -25,9 +25,9 @@ namespace MonoDevelop.Ide { protected virtual void Build() { Stetic.Gui.Initialize(this); - // Widget MonoDevelop.Ide.NewHeaderTemplateDialog + // Widget MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog this.WidthRequest = 320; - this.Name = "MonoDevelop.Ide.NewHeaderTemplateDialog"; + this.Name = "MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog"; this.Title = Mono.Unix.Catalog.GetString("Add New Standard Header Template"); this.TypeHint = ((Gdk.WindowTypeHint)(1)); this.WindowPosition = ((Gtk.WindowPosition)(4)); @@ -37,7 +37,7 @@ namespace MonoDevelop.Ide { this.AllowGrow = false; this.DefaultWidth = 320; this.HasSeparator = false; - // Internal child MonoDevelop.Ide.NewHeaderTemplateDialog.VBox + // Internal child MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.VBox Gtk.VBox w1 = this.VBox; w1.Name = "dialog1_VBox"; w1.Spacing = 6; @@ -69,7 +69,7 @@ namespace MonoDevelop.Ide { w4.Position = 0; w4.Expand = false; w4.Fill = false; - // Internal child MonoDevelop.Ide.NewHeaderTemplateDialog.ActionArea + // Internal child MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog.ActionArea Gtk.HButtonBox w5 = this.ActionArea; w5.Name = "dialog1_ActionArea"; w5.Spacing = 10; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs index 199475826c..64602ac6e0 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.Ide.StandardHeaders { - public partial class StandardHeaderPanel { + internal partial class StandardHeaderPanel { private Gtk.VBox vbox2; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 19e9773035..914cc007b6 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -1240,6 +1240,7 @@ <widget class="Gtk.VBox" id="dialog1_VBox"> <property name="MemberName" /> <property name="Spacing">6</property> + <property name="BorderWidth">2</property> <child> <widget class="Gtk.VBox" id="vbox"> <property name="MemberName" /> @@ -1481,6 +1482,7 @@ </widget> <widget class="Gtk.Bin" id="MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel" design-size="491 298"> <property name="MemberName" /> + <property name="GeneratePublic">False</property> <child> <widget class="Gtk.VBox" id="vbox2"> <property name="MemberName" /> @@ -1489,8 +1491,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow1"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <property name="BorderWidth">6</property> <child> @@ -1690,9 +1690,10 @@ </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.NewHeaderTemplateDialog" design-size="400 127"> + <widget class="Gtk.Dialog" id="MonoDevelop.Ide.StandardHeaders.NewHeaderTemplateDialog" design-size="400 127"> <property name="MemberName" /> <property name="WidthRequest">320</property> + <property name="GeneratePublic">False</property> <property name="Title" translatable="yes">Add New Standard Header Template</property> <property name="TypeHint">Dialog</property> <property name="WindowPosition">CenterOnParent</property> diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml index 2190db537f..ce8d4a404a 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml @@ -5,7 +5,7 @@ <signals> </signals> </object> - <object type="MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel" palette-category="MonoDevelop.Ide" allow-children="false" base-type="Gtk.Bin"> + <object type="MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel" palette-category="MonoDevelop.Ide" allow-children="false" base-type="Gtk.Bin" internal="true"> <itemgroups> <itemgroup label="StandardHeaderPanel Properties"> <property name="EnableFinish" /> diff --git a/main/src/core/MonoDevelop.Projects.Gui/ChangeLog b/main/src/core/MonoDevelop.Projects.Gui/ChangeLog index e28adb815e..8e73b19d67 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/ChangeLog +++ b/main/src/core/MonoDevelop.Projects.Gui/ChangeLog @@ -1,3 +1,28 @@ +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Projects.Gui.Dialogs/DeleteConfigDialog.cs, + gtk-gui/MonoDevelop.Projects.Gui.Dialogs.NewConfigurationDialog.cs, + gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences.cs, + gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanelWidget.cs, + gtk-gui/MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog.cs, + gtk-gui/MonoDevelop.Projects.Gui.Dialogs.RenameConfigDialog.cs, + gtk-gui/gui.stetic, + MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs, + MonoDevelop.Projects.Gui.Completion/ListWindow.cs, + MonoDevelop.Projects.Gui.Completion/DeclarationViewWindow.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CompileFileProjectOptions.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/OutputOptionsPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineStartupPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/GeneralProjectOptions.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineInformationPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineConfigurationPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineBuildOptions.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineEntryConfigurationsPanel.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CommonAssemblySigningPreferences.cs, + MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandPanel.cs: API + cleanup. + 2007-12-12 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Projects.Gui.addin.xml: Bump add-in versions. diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs index 848a4fa0a6..fe2b32bd77 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionListWindow.cs @@ -35,9 +35,41 @@ using MonoDevelop.Core.Gui; namespace MonoDevelop.Projects.Gui.Completion { - public class CompletionListWindow : ListWindow, IListDataProvider + public class CompletionWindowManager { - ICompletionWidget completionWidget; + static CompletionListWindow wnd; + + static CompletionWindowManager () + { + wnd = new CompletionListWindow (); + } + + public static void ShowWindow (char firstChar, ICompletionDataProvider provider, ICompletionWidget completionWidget, ICodeCompletionContext completionContext, CompletionDelegate closedDelegate) + { + try { + if (!wnd.ShowListWindow (firstChar, provider, completionWidget, completionContext, closedDelegate)) { + provider.Dispose (); + return; + } + } catch (Exception ex) { + LoggingService.LogError (ex.ToString ()); + } + } + + public static bool ProcessKeyEvent (Gdk.Key key, Gdk.ModifierType modifier) + { + return wnd.ProcessKeyEvent (key, modifier); + } + + public static void HideWindow () + { + wnd.Hide (); + } + } + + internal class CompletionListWindow : ListWindow, IListDataProvider + { + internal ICompletionWidget completionWidget; ICodeCompletionContext completionContext; ICompletionData[] completionData; DeclarationViewWindow declarationviewwindow = new DeclarationViewWindow (); @@ -62,51 +94,46 @@ namespace MonoDevelop.Projects.Gui.Completion } } - static CompletionListWindow wnd; - - static CompletionListWindow () - { - wnd = new CompletionListWindow (); - } - internal CompletionListWindow () { SizeAllocated += new SizeAllocatedHandler (ListSizeChanged); } - public static void ShowWindow (char firstChar, ICompletionDataProvider provider, ICompletionWidget completionWidget, ICodeCompletionContext completionContext, CompletionDelegate closedDelegate) + public bool ProcessKeyEvent (Gdk.Key key, Gdk.ModifierType modifier) { - try { - if (!wnd.ShowListWindow (firstChar, provider, completionWidget, completionContext, closedDelegate)) { - provider.Dispose (); - return; - } - - // makes control-space in midle of words to work - string text = wnd.completionWidget.GetCompletionText (completionContext); - if (text.Length == 0) { - text = provider.DefaultCompletionString; - if (text != null && text.Length > 0) - wnd.SelectEntry (text); - wnd.initialWordLength = wnd.completionWidget.SelectedLength; - return; - } + ListWindow.KeyAction ka = ProcessKey (key, modifier); + + if ((ka & ListWindow.KeyAction.CloseWindow) != 0) + Hide (); - wnd.initialWordLength = text.Length + wnd.completionWidget.SelectedLength; - wnd.PartialWord = text; - //if there is only one matching result we take it by default - if (wnd.IsUniqueMatch && !wnd.IsChanging) - { - wnd.UpdateWord (); - wnd.Hide (); + if ((ka & ListWindow.KeyAction.Complete) != 0) { + UpdateWord (); + } + + if ((ka & ListWindow.KeyAction.Ignore) != 0) + return true; + + if ((ka & ListWindow.KeyAction.Process) != 0) { + if (key == Gdk.Key.Left || key == Gdk.Key.Right) { + if (modifier != 0) { + Hide (); + return false; + } + if (declarationviewwindow.Multiple) { + if (key == Gdk.Key.Left) + declarationviewwindow.OverloadLeft (); + else + declarationviewwindow.OverloadRight (); + UpdateDeclarationView (); + } + return true; } - - } catch (Exception ex) { - LoggingService.LogError (ex.ToString ()); } + + return false; } - bool ShowListWindow (char firstChar, ICompletionDataProvider provider, ICompletionWidget completionWidget, ICodeCompletionContext completionContext, CompletionDelegate closedDelegate) + internal bool ShowListWindow (char firstChar, ICompletionDataProvider provider, ICompletionWidget completionWidget, ICodeCompletionContext completionContext, CompletionDelegate closedDelegate) { if (mutableProvider != null) { mutableProvider.CompletionDataChanging -= OnCompletionDataChanging; @@ -130,7 +157,29 @@ namespace MonoDevelop.Projects.Gui.Completion this.completionWidget = completionWidget; this.firstChar = firstChar; - return FillList (); + if (FillList ()) { + // makes control-space in midle of words to work + string text = completionWidget.GetCompletionText (completionContext); + if (text.Length == 0) { + text = provider.DefaultCompletionString; + if (text != null && text.Length > 0) + SelectEntry (text); + initialWordLength = completionWidget.SelectedLength; + return true; + } + + initialWordLength = text.Length + completionWidget.SelectedLength; + PartialWord = text; + //if there is only one matching result we take it by default + if (IsUniqueMatch && !IsChanging) + { + UpdateWord (); + Hide (); + } + return true; + } + else + return false; } bool FillList () @@ -168,60 +217,19 @@ namespace MonoDevelop.Projects.Gui.Completion return true; } - public static void HideWindow () - { - wnd.Hide (); - } - - public static bool ProcessKeyEvent (Gdk.Key key, Gdk.ModifierType modifier) - { - if (!wnd.Visible) return false; - - ListWindow.KeyAction ka = wnd.ProcessKey (key, modifier); - - if ((ka & ListWindow.KeyAction.CloseWindow) != 0) - wnd.Hide (); - - if ((ka & ListWindow.KeyAction.Complete) != 0) { - wnd.UpdateWord (); - } - - if ((ka & ListWindow.KeyAction.Ignore) != 0) - return true; - - if ((ka & ListWindow.KeyAction.Process) != 0) { - if (key == Gdk.Key.Left || key == Gdk.Key.Right) { - if (modifier != 0) { - wnd.Hide (); - return false; - } - if (wnd.declarationviewwindow.Multiple) { - if (key == Gdk.Key.Left) - wnd.declarationviewwindow.OverloadLeft (); - else - wnd.declarationviewwindow.OverloadRight (); - wnd.UpdateDeclarationView (); - } - return true; - } - } - - return false; - } - void UpdateWord () { - string word = wnd.CompleteWord; + string word = CompleteWord; if (word != null) { - if (wnd.Selection != -1) { - IActionCompletionData ac = completionData [wnd.Selection] as IActionCompletionData; + if (Selection != -1) { + IActionCompletionData ac = completionData [Selection] as IActionCompletionData; if (ac != null) { ac.InsertAction (completionWidget, completionContext); return; } } - int replaceLen = completionContext.TriggerWordLength + wnd.PartialWord.Length - initialWordLength; + int replaceLen = completionContext.TriggerWordLength + PartialWord.Length - initialWordLength; string pword = completionWidget.GetText (completionContext.TriggerOffset, completionContext.TriggerOffset + replaceLen); completionWidget.SetCompletionText (completionContext, pword, word); @@ -251,8 +259,8 @@ namespace MonoDevelop.Projects.Gui.Completion { bool ret = base.OnButtonPressEvent (evnt); if (evnt.Button == 1 && evnt.Type == Gdk.EventType.TwoButtonPress) { - wnd.UpdateWord (); - wnd.Hide (); + UpdateWord (); + Hide (); } return ret; } @@ -375,12 +383,12 @@ namespace MonoDevelop.Projects.Gui.Completion hbox.ShowAll (); parsingMessage = hbox; } - wnd.ShowFooter (parsingMessage); + ShowFooter (parsingMessage); } void OnCompletionDataChanged (object s, EventArgs args) { - wnd.HideFooter (); + HideFooter (); if (Visible) { Reset (); FillList (); diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/DeclarationViewWindow.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/DeclarationViewWindow.cs index eb2e571cfc..27ea48374e 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/DeclarationViewWindow.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/DeclarationViewWindow.cs @@ -26,7 +26,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Completion { - public class DeclarationViewWindow : Window + internal class DeclarationViewWindow : Window { static char[] newline = {'\n'}; static char[] whitespace = {' '}; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/ListWindow.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/ListWindow.cs index 6fa10bbac0..c3e7631fb2 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/ListWindow.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/ListWindow.cs @@ -33,7 +33,7 @@ using System.Text; namespace MonoDevelop.Projects.Gui.Completion { - public class ListWindow: Gtk.Window + internal class ListWindow: Gtk.Window { VScrollbar scrollbar; ListWidget list; @@ -301,7 +301,7 @@ namespace MonoDevelop.Projects.Gui.Completion } } - public class ListWidget: Gtk.DrawingArea + internal class ListWidget: Gtk.DrawingArea { int margin = 0; int padding = 4; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineBuildOptions.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineBuildOptions.cs index 4cd3ad659d..1a6e83145f 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineBuildOptions.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineBuildOptions.cs @@ -30,7 +30,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CombineBuildOptions : AbstractOptionPanel + internal class CombineBuildOptions : AbstractOptionPanel { CombineBuildOptionsWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineConfigurationPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineConfigurationPanel.cs index a979243426..7aaf8ab775 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineConfigurationPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineConfigurationPanel.cs @@ -37,7 +37,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CombineConfigurationPanel : AbstractOptionPanel + internal class CombineConfigurationPanel : AbstractOptionPanel { CombineConfigurationPanelWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineEntryConfigurationsPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineEntryConfigurationsPanel.cs index 98f0c40ae4..8240a62396 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineEntryConfigurationsPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineEntryConfigurationsPanel.cs @@ -39,7 +39,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CombineEntryConfigurationsPanel : AbstractOptionPanel + internal class CombineEntryConfigurationsPanel : AbstractOptionPanel { CombineEntryConfigurationsPanelWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineInformationPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineInformationPanel.cs index be1fa456c2..729fd91275 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineInformationPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineInformationPanel.cs @@ -38,7 +38,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CombineInformationPanel : AbstractOptionPanel + internal class CombineInformationPanel : AbstractOptionPanel { CombineInformationWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineStartupPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineStartupPanel.cs index d8eb913976..2907007576 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineStartupPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CombineStartupPanel.cs @@ -31,7 +31,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CombineStartupPanel : AbstractOptionPanel + internal class CombineStartupPanel : AbstractOptionPanel { CombineStartupPanelWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CommonAssemblySigningPreferences.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CommonAssemblySigningPreferences.cs index 20cbe6cb64..b210275982 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CommonAssemblySigningPreferences.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CommonAssemblySigningPreferences.cs @@ -33,7 +33,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public partial class CommonAssemblySigningPreferences : Gtk.Bin, IDialogPanel + internal partial class CommonAssemblySigningPreferences : Gtk.Bin, IDialogPanel { Project project; AbstractProjectConfiguration configuration; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CompileFileProjectOptions.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CompileFileProjectOptions.cs index 054c7b91e8..787e595c0e 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CompileFileProjectOptions.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CompileFileProjectOptions.cs @@ -31,7 +31,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CompileFileProjectOptions : AbstractOptionPanel + internal class CompileFileProjectOptions : AbstractOptionPanel { CompileFileOptionsWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandPanel.cs index fbfc1ac4b9..e7df3987db 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandPanel.cs @@ -33,7 +33,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class CustomCommandPanel: AbstractOptionPanel + internal class CustomCommandPanel: AbstractOptionPanel { AbstractConfiguration configuration; CustomCommandCollection commands; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/GeneralProjectOptions.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/GeneralProjectOptions.cs index 04a8e58db6..1762d30177 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/GeneralProjectOptions.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/GeneralProjectOptions.cs @@ -33,7 +33,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class GeneralProjectOptions : AbstractOptionPanel + internal class GeneralProjectOptions : AbstractOptionPanel { GeneralProjectOptionsWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/OutputOptionsPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/OutputOptionsPanel.cs index bd5a8e6f01..555e1bdcce 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/OutputOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/OutputOptionsPanel.cs @@ -30,7 +30,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class OutputOptionsPanel : AbstractOptionPanel + internal class OutputOptionsPanel : AbstractOptionPanel { OutputOptionsPanelWidget widget; public override void LoadPanelContents() diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs index e32bb7d967..36be393aa0 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/RuntimeOptionsPanel.cs @@ -39,7 +39,7 @@ using Gtk; namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public class RuntimeOptionsPanel : AbstractOptionPanel + internal class RuntimeOptionsPanel : AbstractOptionPanel { RuntimeOptionsPanelWidget widget; diff --git a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/DeleteConfigDialog.cs b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/DeleteConfigDialog.cs index 5c68042ca8..905ace744b 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/DeleteConfigDialog.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/DeleteConfigDialog.cs @@ -29,7 +29,7 @@ using System; namespace MonoDevelop.Projects.Gui.Dialogs { - partial class DeleteConfigDialog: Gtk.Dialog + internal partial class DeleteConfigDialog: Gtk.Dialog { public DeleteConfigDialog() { diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog.cs b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog.cs index fbc319db47..43f3334989 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.Projects.Gui.Dialogs { - public partial class DeleteConfigDialog { + internal partial class DeleteConfigDialog { private Gtk.HBox hbox64; @@ -94,8 +94,6 @@ namespace MonoDevelop.Projects.Gui.Dialogs { this.button11.UseUnderline = true; this.button11.Label = "gtk-no"; this.AddActionWidget(this.button11, -9); - Gtk.ButtonBox.ButtonBoxChild w8 = ((Gtk.ButtonBox.ButtonBoxChild)(w7[this.button11])); - w8.Position = 0; // Container child dialog-action_area7.Gtk.ButtonBox+ButtonBoxChild this.button12 = new Gtk.Button(); this.button12.CanDefault = true; diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.NewConfigurationDialog.cs b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.NewConfigurationDialog.cs index e438cb8b4a..6f7ba985a6 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.NewConfigurationDialog.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.NewConfigurationDialog.cs @@ -96,8 +96,6 @@ namespace MonoDevelop.Projects.Gui.Dialogs { this.cancelbutton1.UseUnderline = true; this.cancelbutton1.Label = "gtk-cancel"; this.AddActionWidget(this.cancelbutton1, -6); - Gtk.ButtonBox.ButtonBoxChild w8 = ((Gtk.ButtonBox.ButtonBoxChild)(w7[this.cancelbutton1])); - w8.Position = 0; // Container child dialog-action_area6.Gtk.ButtonBox+ButtonBoxChild this.okbutton1 = new Gtk.Button(); this.okbutton1.Name = "okbutton1"; diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences.cs b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences.cs index f663f4158d..e6cdb95501 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { - public partial class CommonAssemblySigningPreferences { + internal partial class CommonAssemblySigningPreferences { private Gtk.VBox vbox1; diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanelWidget.cs b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanelWidget.cs index 2c32e13919..1c5b3ea692 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanelWidget.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CustomCommandPanelWidget.cs @@ -47,7 +47,6 @@ namespace MonoDevelop.Projects.Gui.Dialogs.OptionPanels { this.scrolledwindow1 = new Gtk.ScrolledWindow(); this.scrolledwindow1.CanFocus = true; this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(2)); // Container child scrolledwindow1.Gtk.Container+ContainerChild Gtk.Viewport w2 = new Gtk.Viewport(); diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.RenameConfigDialog.cs b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.RenameConfigDialog.cs index b0de686819..ac8158f6bf 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.RenameConfigDialog.cs +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/MonoDevelop.Projects.Gui.Dialogs.RenameConfigDialog.cs @@ -96,8 +96,6 @@ namespace MonoDevelop.Projects.Gui.Dialogs { this.button9.UseUnderline = true; this.button9.Label = "gtk-cancel"; this.AddActionWidget(this.button9, -6); - Gtk.ButtonBox.ButtonBoxChild w8 = ((Gtk.ButtonBox.ButtonBoxChild)(w7[this.button9])); - w8.Position = 0; // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild this.button10 = new Gtk.Button(); this.button10.Name = "button10"; diff --git a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/gui.stetic index 555c804fca..9014289968 100644 --- a/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Projects.Gui/gtk-gui/gui.stetic @@ -365,7 +365,6 @@ Custom Command</property> <widget class="Gtk.ScrolledWindow" id="scrolledwindow1"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> <property name="HscrollbarPolicy">Never</property> <child> <widget class="Gtk.Viewport" id="GtkViewport"> @@ -399,6 +398,7 @@ Custom Command</property> </widget> <widget class="Gtk.Bin" id="MonoDevelop.Projects.Gui.Dialogs.OptionPanels.CommonAssemblySigningPreferences" design-size="363 300"> <property name="MemberName" /> + <property name="GeneratePublic">False</property> <child> <widget class="Gtk.VBox" id="vbox1"> <property name="MemberName" /> @@ -1279,10 +1279,6 @@ Custom Command</property> <property name="ResponseId">-6</property> <property name="label">gtk-cancel</property> </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - </packing> </child> <child> <widget class="Gtk.Button" id="okbutton1"> @@ -1295,7 +1291,6 @@ Custom Command</property> </widget> <packing> <property name="Position">1</property> - <property name="AutoSize">False</property> </packing> </child> </widget> @@ -1392,10 +1387,6 @@ Custom Command</property> <property name="ResponseId">-6</property> <property name="label">gtk-cancel</property> </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - </packing> </child> <child> <widget class="Gtk.Button" id="button10"> @@ -1408,7 +1399,6 @@ Custom Command</property> </widget> <packing> <property name="Position">1</property> - <property name="AutoSize">False</property> </packing> </child> </widget> @@ -1416,6 +1406,7 @@ Custom Command</property> </widget> <widget class="Gtk.Dialog" id="MonoDevelop.Projects.Gui.Dialogs.DeleteConfigDialog"> <property name="MemberName" /> + <property name="GeneratePublic">False</property> <property name="Title" translatable="yes">Delete Configuration</property> <property name="TypeHint">Dialog</property> <property name="Buttons">2</property> @@ -1502,10 +1493,6 @@ Custom Command</property> <property name="ResponseId">-9</property> <property name="label">gtk-no</property> </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - </packing> </child> <child> <widget class="Gtk.Button" id="button12"> @@ -1520,7 +1507,6 @@ Custom Command</property> </widget> <packing> <property name="Position">1</property> - <property name="AutoSize">False</property> </packing> </child> </widget> diff --git a/main/src/core/MonoDevelop.Projects/ChangeLog b/main/src/core/MonoDevelop.Projects/ChangeLog index a203d8ebeb..f3e97c4dce 100644 --- a/main/src/core/MonoDevelop.Projects/ChangeLog +++ b/main/src/core/MonoDevelop.Projects/ChangeLog @@ -1,3 +1,18 @@ +2007-12-13 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Projects/ProjectService.cs, + MonoDevelop.Projects/CombineEntry.cs, + MonoDevelop.Projects/ConvertXml.cs, + MonoDevelop.Projects/CustomCommandExtension.cs, + MonoDevelop.Projects/Combine.cs, MonoDevelop.Projects/DotNetProject.cs, + MonoDevelop.Projects/DefaultFileFormat.cs, + MonoDevelop.Projects/BuildTool.cs, + MonoDevelop.Projects/CombineConfiguration.cs, + MonoDevelop.Projects/Project.cs, + MonoDevelop.Projects.Utility/DiffUtility.cs, + MonoDevelop.Projects.Extensions/DataTypeCodon.cs, + MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs: API cleanup. + 2007-12-12 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Projects.addin.xml: Bump add-in versions. diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs index ac6ccb9e8a..7954c8451c 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs @@ -36,7 +36,7 @@ using Mono.Addins; namespace MonoDevelop.Projects.Extensions { [ExtensionNode (Description="A type name.")] - public class DataTypeCodon: ExtensionNode + internal class DataTypeCodon: ExtensionNode { [NodeAttribute ("class", true)] string typeName; diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs index 8ded5d2245..a766bff837 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs @@ -33,7 +33,7 @@ using Mono.Addins; namespace MonoDevelop.Projects.Extensions { - public class ItemPropertyCodon: DataTypeCodon + internal class ItemPropertyCodon: DataTypeCodon { [NodeAttribute("name", true, Description="Name of the property")] string propName; diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Utility/DiffUtility.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Utility/DiffUtility.cs index 6efef06ee2..68affba641 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Utility/DiffUtility.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Utility/DiffUtility.cs @@ -3,7 +3,7 @@ using System.Collections; namespace MonoDevelop.Projects.Utility { - public class DiffUtility + internal class DiffUtility { public static int GetAddedItems(IList original, IList changed, IList result) { diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs index 33192a58a0..3842e15449 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/BuildTool.cs @@ -36,7 +36,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Projects { - public class BuildTool : IApplication + internal class BuildTool : IApplication { bool help; string file; diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs index 11d9a05324..1dd1707748 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs @@ -334,7 +334,7 @@ namespace MonoDevelop.Projects entry.Saved += entrySavedHandler; } - public override DataCollection Serialize (ITypeSerializer handler) + protected override DataCollection Serialize (ITypeSerializer handler) { if (StartupEntry != null) startEntryName = StartupEntry.Name; @@ -342,7 +342,7 @@ namespace MonoDevelop.Projects return base.Serialize (handler); } - public override void Deserialize (ITypeSerializer handler, DataCollection data) + protected override void Deserialize (ITypeSerializer handler, DataCollection data) { try { deserializing = true; diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs index 5151709587..4766352238 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineConfiguration.cs @@ -126,6 +126,7 @@ namespace MonoDevelop.Projects string entryName; string configName; Combine combine; + bool build; [ItemProperty ("name")] internal string EntryName { @@ -133,7 +134,7 @@ namespace MonoDevelop.Projects set { entryName = value; } } - public CombineEntry entry; + CombineEntry entry; [ItemProperty ("configuration")] public string ConfigurationName { @@ -146,7 +147,10 @@ namespace MonoDevelop.Projects } [ItemProperty ("build")] - public bool Build; + public bool Build { + get { return build; } + set { build = value; } + } public CombineEntry Entry { get { return entry; } diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs index 4a130cfc42..0779b5125c 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs @@ -237,7 +237,17 @@ namespace MonoDevelop.Projects } } - public virtual DataCollection Serialize (ITypeSerializer handler) + DataCollection ICustomDataItem.Serialize (ITypeSerializer handler) + { + return Serialize (handler); + } + + void ICustomDataItem.Deserialize (ITypeSerializer handler, DataCollection data) + { + Deserialize (handler, data); + } + + protected virtual DataCollection Serialize (ITypeSerializer handler) { DataCollection data = handler.Serialize (this); if (activeConfiguration != null) { @@ -249,7 +259,7 @@ namespace MonoDevelop.Projects return data; } - public virtual void Deserialize (ITypeSerializer handler, DataCollection data) + protected virtual void Deserialize (ITypeSerializer handler, DataCollection data) { DataValue ac = null; DataItem confItem = data ["Configurations"] as DataItem; diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ConvertXml.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ConvertXml.cs index e606d8daca..3ee3b47f4c 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ConvertXml.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ConvertXml.cs @@ -31,7 +31,7 @@ namespace MonoDevelop.Projects /// <summary> /// This class is used to convert xml files using xslt /// </summary> - public class ConvertXml + internal class ConvertXml { /// <remarks> /// The main module loads the three required input vars diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CustomCommandExtension.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CustomCommandExtension.cs index ef0bec0884..053dbe1af5 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CustomCommandExtension.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/CustomCommandExtension.cs @@ -32,7 +32,7 @@ using System.CodeDom.Compiler; namespace MonoDevelop.Projects { - public class CustomCommandExtension: ProjectServiceExtension + internal class CustomCommandExtension: ProjectServiceExtension { public override ICompilerResult Build (IProgressMonitor monitor, CombineEntry entry) { diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DefaultFileFormat.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DefaultFileFormat.cs index 2ba2c58511..629bf01ca3 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DefaultFileFormat.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DefaultFileFormat.cs @@ -35,7 +35,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Projects { - public class DefaultFileFormat: IFileFormat + internal class DefaultFileFormat: IFileFormat { public string Name { get { return "MonoDevelop Solution Item"; } diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs index df0ede8a0f..37a6e845a2 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs @@ -158,7 +158,7 @@ namespace MonoDevelop.Projects } } - public override void Deserialize (ITypeSerializer handler, DataCollection data) + protected override void Deserialize (ITypeSerializer handler, DataCollection data) { base.Deserialize (handler, data); languageBinding = FindLanguage (language); diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs index b32bd8033e..94a458ee66 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs @@ -165,7 +165,7 @@ namespace MonoDevelop.Projects return prj; } - public override void Deserialize (ITypeSerializer handler, DataCollection data) + protected override void Deserialize (ITypeSerializer handler, DataCollection data) { base.Deserialize (handler, data); projectReferences.SetProject (this); diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs index 171b116433..0fa57679e1 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs @@ -382,7 +382,7 @@ namespace MonoDevelop.Projects } } - public class DefaultProjectServiceExtension: ProjectServiceExtension + internal class DefaultProjectServiceExtension: ProjectServiceExtension { Dictionary <CombineEntry,bool> needsBuildingCache; |