diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs index 6f3fc97b33..770503c633 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs @@ -12,13 +12,10 @@ namespace ICSharpCode.FormsDesigner { public override void Run() { - #warning test this! - var sidebar = Owner as DesignerSideTab; - if (sidebar != null) { - using (ConfigureSideBarDialog configureSideBarDialog = new ConfigureSideBarDialog(sidebar.Toolbox)) { - if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) { - sidebar.Toolbox.ReloadSideTabs(true); - } + var sidebar = (DesignerSideTab)Owner; + using (ConfigureSideBarDialog configureSideBarDialog = new ConfigureSideBarDialog(sidebar.Toolbox)) { + if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) { + sidebar.Toolbox.ReloadSideTabs(true); } } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/DesignerLoaderProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/DesignerLoaderProvider.cs index d8e7d4b789..65ad90b644 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/DesignerLoaderProvider.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/DesignerLoaderProvider.cs @@ -16,7 +16,6 @@ namespace ICSharpCode.FormsDesigner public class NRefactoryDesignerLoaderProvider : MarshalByRefObject, IDesignerLoaderProviderWithViewContent { readonly SupportedLanguage language; - FormsDesignerViewContent viewContent; public FormsDesignerViewContent ViewContent { get; set; } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj index fe6d190e5e..5657ecb82d 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj @@ -89,6 +89,7 @@ + @@ -111,6 +112,7 @@ ConfigureSideBarDialog.cs + RenameCategoryDialog.cs diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.addin b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.addin index 25204f48bf..669a27dc1b 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.addin +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.addin @@ -289,7 +289,8 @@ - + + diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerAppDomainServer.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerAppDomainServer.cs new file mode 100644 index 0000000000..b71fb58903 --- /dev/null +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerAppDomainServer.cs @@ -0,0 +1,23 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Runtime.Remoting.Lifetime; + +namespace ICSharpCode.FormsDesigner +{ + /// + /// Description of FormsDesignerAppDomainServer. + /// + public class FormsDesignerAppDomainServer : MarshalByRefObject, ISponsor + { + public FormsDesignerAppDomainServer() + { + } + + public TimeSpan Renewal(ILease lease) + { + throw new NotImplementedException(); + } + } +} diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs index 13bedd23fb..58790854a9 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs @@ -753,6 +753,7 @@ namespace ICSharpCode.FormsDesigner this.UserContent = null; this.pleaseWaitLabel.Dispose(); + } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs index d979ac017e..6999f125b8 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs @@ -29,11 +29,19 @@ namespace ICSharpCode.FormsDesigner.Gui public AddComponentsDialog() { InitializeComponent(); - + Translate(this); Icon = null; PrintGACCache(); } + void Translate(Control control) + { + control.Text = StringParser.Parse(control.Text); + foreach (Control child in control.Controls) { + Translate(child); + } + } + void PrintGACCache() { foreach (DomAssemblyName asm in GacInterop.GetAssemblyList()) { diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.Designer.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.Designer.cs index 9c3881d006..2b1dffbc71 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.Designer.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.Designer.cs @@ -222,8 +222,10 @@ namespace ICSharpCode.FormsDesigner.Gui // // ConfigureSideBarDialog // + this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(602, 402); this.Controls.Add(this.renameCategoryButton); this.Controls.Add(this.cancelButton); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs index 73fb894b7f..6d91c2ac75 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs @@ -2,6 +2,7 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; +using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; @@ -12,20 +13,37 @@ namespace ICSharpCode.FormsDesigner.Gui { public partial class ConfigureSideBarDialog : Form { - ArrayList oldComponents; + List oldComponents; ToolboxProvider toolbox; public ConfigureSideBarDialog(ToolboxProvider toolbox) { + if (toolbox == null) + throw new ArgumentNullException("toolbox"); InitializeComponent(); + this.toolbox = toolbox; oldComponents = toolbox.ComponentLibraryLoader.CopyCategories(); - + Translate(this); FillCategories(); CategoryListViewSelectedIndexChanged(this, EventArgs.Empty); ComponentListViewSelectedIndexChanged(this, EventArgs.Empty); } + void Translate(Control control) + { + control.Text = StringParser.Parse(control.Text); + foreach (Control child in control.Controls) { + Translate(child); + } + if (control is ListView) { + var lv = control as ListView; + foreach (ColumnHeader col in lv.Columns) { + col.Text = StringParser.Parse(col.Text); + } + } + } + void FillCategories() { categoryListView.BeginUpdate(); @@ -41,10 +59,10 @@ namespace ICSharpCode.FormsDesigner.Gui void FillComponents() { - categoryListView.ItemCheck -= this.ComponentListViewItemCheck; - categoryListView.BeginUpdate(); - categoryListView.Items.Clear(); - categoryListView.SmallImageList = new ImageList(); + componentListView.ItemCheck -= this.ComponentListViewItemCheck; + componentListView.BeginUpdate(); + componentListView.Items.Clear(); + componentListView.SmallImageList = new ImageList(); if (categoryListView.SelectedItems != null && categoryListView.SelectedItems.Count == 1) { Category category = (Category)categoryListView.SelectedItems[0].Tag; @@ -77,11 +95,9 @@ namespace ICSharpCode.FormsDesigner.Gui componentListView.ItemCheck += this.ComponentListViewItemCheck; } - // THIS METHOD IS MAINTAINED BY THE FORM DESIGNER - // DO NOT EDIT IT MANUALLY! YOUR CHANGES ARE LIKELY TO BE LOST void CategoryListViewSelectedIndexChanged(object sender, System.EventArgs e) { - renameCategoryButton.Enabled = addComponentsButton.Enabled = CurrentCategory != null; + removeCategoryButton.Enabled = renameCategoryButton.Enabled = addComponentsButton.Enabled = CurrentCategory != null; FillComponents(); } @@ -118,7 +134,6 @@ namespace ICSharpCode.FormsDesigner.Gui void RemoveCategoryButtonClick(object sender, System.EventArgs e) { - if (MessageService.AskQuestion("${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.ConfigureSideBarDialog.RemoveCategoryQuestion}")) { CategoryListViewSelectedIndexChanged(this, EventArgs.Empty); toolbox.ComponentLibraryLoader.Categories.Remove(CurrentCategory); @@ -160,6 +175,7 @@ namespace ICSharpCode.FormsDesigner.Gui if (renameCategoryDialog.ShowDialog(this) == DialogResult.OK) { this.CurrentCategory.Name = renameCategoryDialog.CategoryName; FillCategories(); + CategoryListViewSelectedIndexChanged(sender, e); } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs index 21f4eca8ae..50b1218f7a 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs @@ -22,14 +22,12 @@ namespace ICSharpCode.FormsDesigner.Gui public class CustomComponentsSideTab : DesignerSideTab, IDisposable { bool disposed; - ToolboxProvider provider; - + ///Load an assembly's controls public CustomComponentsSideTab(ToolboxProvider provider, SideBarControl sideTab, string name, IToolboxService toolboxService) - : base(sideTab, name, toolboxService) + : base(provider, sideTab, name, toolboxService) { - this.provider = provider; - this.DisplayName = StringParser.Parse(this.Name); + this.DisplayName = StringParser.Parse(name); ScanProjectAssemblies(); ProjectService.BuildFinished += RescanProjectAssemblies; ProjectService.SolutionLoaded += RescanProjectAssemblies; @@ -51,7 +49,7 @@ namespace ICSharpCode.FormsDesigner.Gui Items.Clear(); AddDefaultItem(); ScanProjectAssemblies(); - provider.FormsDesignerSideBar.Refresh(); + Toolbox.FormsDesignerSideBar.Refresh(); } void ProjectItemAdded(object sender, ProjectItemEventArgs e) @@ -115,7 +113,7 @@ namespace ICSharpCode.FormsDesigner.Gui // is not a design component continue; isDesignComponent: - this.Items.Add(new DesignerSideTabItem(provider, c.Name, new CustomComponentToolboxItem(c.CompilationUnit.FileName, c.FullyQualifiedName))); + this.Items.Add(new DesignerSideTabItem(Toolbox, c.Name, new CustomComponentToolboxItem(c.CompilationUnit.FileName, c.FullyQualifiedName))); } } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/DesignerSideTab.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/DesignerSideTab.cs index 16fff63296..2f24f2d774 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/DesignerSideTab.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/DesignerSideTab.cs @@ -16,9 +16,12 @@ namespace ICSharpCode.FormsDesigner.Gui protected bool loadImages = true; IToolboxService toolboxService; - protected DesignerSideTab(SideBarControl sideBar, string name, IToolboxService toolboxService) + protected DesignerSideTab(ToolboxProvider toolbox, SideBarControl sideBar, string name, IToolboxService toolboxService) : base(sideBar, name) { + if (toolbox == null) + throw new ArgumentNullException("toolbox"); + this.toolbox = toolbox; this.DisplayName = StringParser.Parse(name); this.toolboxService = toolboxService; this.CanSaved = false; @@ -40,9 +43,8 @@ namespace ICSharpCode.FormsDesigner.Gui ///Load an assembly's controls public DesignerSideTab(ToolboxProvider toolbox, SideBarControl sideBar, Category category, IToolboxService toolboxService) - : this(sideBar, category.Name, toolboxService) + : this(toolbox, sideBar, category.Name, toolboxService) { - this.toolbox = toolbox; foreach (ToolComponent component in category.ToolComponents) { if (component.IsEnabled) { ToolboxItem toolboxItem = new ToolboxItem(); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/FormsDesignerSideBar.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/FormsDesignerSideBar.cs new file mode 100644 index 0000000000..0b082b464e --- /dev/null +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/FormsDesignerSideBar.cs @@ -0,0 +1,28 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using System.Drawing.Design; +using System.Diagnostics; +using System.IO; +using System.Reflection; +using ICSharpCode.Core; +using ICSharpCode.FormsDesigner.Gui; +using ICSharpCode.FormsDesigner.Services; +using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Project; +using ICSharpCode.SharpDevelop.Widgets.SideBar; + +namespace ICSharpCode.FormsDesigner +{ + public class FormsDesignerSideBar : SharpDevelopSideBar + { + public FormsDesignerSideBar() + { + this.sideTabContextMenuPath = "/SharpDevelop/Workbench/SharpDevelopSideBar/SideTab/FormsDesignerContextMenu"; + } + } +} diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.Designer.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.Designer.cs index 313d751b26..b89a6b9d67 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.Designer.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.Designer.cs @@ -56,6 +56,7 @@ namespace ICSharpCode.FormsDesigner.Gui this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 6; this.okButton.Text = "${res:Global.OKButtonText}"; + this.okButton.Click += new System.EventHandler(this.OkButtonClick); // // categoryNameTextBox // @@ -79,8 +80,10 @@ namespace ICSharpCode.FormsDesigner.Gui // // RenameCategoryDialog // + this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(298, 85); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs index 121de8ec99..1e7e94f242 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs @@ -25,6 +25,7 @@ namespace ICSharpCode.FormsDesigner.Gui { this.toolbox = toolbox; InitializeComponent(); + Translate(this); this.Owner = owner; if (categoryName == null) { @@ -37,6 +38,14 @@ namespace ICSharpCode.FormsDesigner.Gui } } + void Translate(Control control) + { + control.Text = StringParser.Parse(control.Text); + foreach (Control child in control.Controls) { + Translate(child); + } + } + void ShowDuplicateErrorMessage() { MessageService.ShowError("${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.RenameCategoryDialog.DuplicateNameError}"); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs index 711a355b3f..ae5f694fc2 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.FormsDesigner { Debug.Assert(WorkbenchSingleton.InvokeRequired == false); if (toolboxService == null) { - sideBar = new SharpDevelopSideBar(); + sideBar = new FormsDesignerSideBar(); LoadToolbox(); toolboxService = (SharpDevelopToolboxService)services.GetService(typeof(IToolboxService)); ReloadSideTabs(false); @@ -89,7 +89,6 @@ namespace ICSharpCode.FormsDesigner { if (!componentLibraryLoader.LoadToolComponentLibrary(UserConfigFile)) { if (!componentLibraryLoader.LoadToolComponentLibrary(GlobalConfigFile)) { - MessageService.ShowWarning("${res:ICSharpCode.SharpDevelop.FormDesigner.ToolboxProvider.CantLoadSidbarComponentLibraryWarning}"); } } @@ -276,4 +275,6 @@ namespace ICSharpCode.FormsDesigner } } } + + } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs index 8d56d7f44b..bda2eeb4d4 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs @@ -3,6 +3,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Drawing; using System.IO; using System.Reflection; @@ -220,8 +221,8 @@ namespace ICSharpCode.FormsDesigner.Gui { static readonly string VERSION = "1.1.0"; - ArrayList assemblies = new ArrayList(); - ArrayList categories = new ArrayList(); + List assemblies = new List(); + IServiceProvider provider; IFormsDesignerLoggingService logger; @@ -232,31 +233,25 @@ namespace ICSharpCode.FormsDesigner.Gui this.provider = provider; logger = (IFormsDesignerLoggingService)provider.GetService(typeof(IFormsDesignerLoggingService)); appDomainHost = (FormsDesignerAppDomainHost)provider.GetService(typeof(FormsDesignerAppDomainHost)); + Categories = new List(); } - public ArrayList Categories { - get { - return categories; - } - set { - categories = value; - } - } + public List Categories { get; set; } - public ArrayList CopyCategories() + public List CopyCategories() { - ArrayList newCategories = new ArrayList(); - foreach (Category category in categories) { - newCategories.Add(category.Clone()); + List newCategories = new List(); + foreach (Category category in Categories) { + newCategories.Add((Category)category.Clone()); } return newCategories; } public void RemoveCategory(string name) { - foreach (Category category in categories) { + foreach (Category category in Categories) { if (category.Name == name) { - categories.Remove(category); + Categories.Remove(category); break; } } @@ -264,7 +259,7 @@ namespace ICSharpCode.FormsDesigner.Gui public void DisableToolComponent(string categoryName, string fullName) { - foreach (Category category in categories) { + foreach (Category category in Categories) { if (category.Name == categoryName) { foreach (ToolComponent component in category.ToolComponents) { if (component.FullName == fullName) { @@ -281,7 +276,7 @@ namespace ICSharpCode.FormsDesigner.Gui /// public void ExchangeToolComponents(string categoryName, string fullName1, string fullName2) { - foreach (Category category in categories) { + foreach (Category category in Categories) { if (category.Name == categoryName) { int index1 = -1; int index2 = -1; @@ -341,11 +336,11 @@ namespace ICSharpCode.FormsDesigner.Gui IsEnabled(componentNode.Attributes["enabled"])); newCategory.ToolComponents.Add(newToolComponent); } - categories.Add(newCategory); + Categories.Add(newCategory); } } } catch (Exception e) { - logger.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.Message); + logger.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.ToString()); return false; } return true; @@ -360,7 +355,7 @@ namespace ICSharpCode.FormsDesigner.Gui public ToolComponent GetToolComponent(string assemblyName) { - foreach (Category category in categories) { + foreach (Category category in Categories) { foreach (ToolComponent component in category.ToolComponents) { if (component.AssemblyName == assemblyName) { return component; @@ -393,7 +388,7 @@ namespace ICSharpCode.FormsDesigner.Gui XmlElement categoryNode = doc.CreateElement("Categories"); doc.DocumentElement.AppendChild(categoryNode); - foreach (Category category in categories) { + foreach (Category category in Categories) { XmlElement newCategory = doc.CreateElement("Category"); newCategory.SetAttribute("name", category.Name); newCategory.SetAttribute("enabled", category.IsEnabled.ToString()); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/PropertyPadContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/PropertyPadContent.cs index 1fda0ab1d0..8bdafc9b58 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/PropertyPadContent.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/PropertyPadContent.cs @@ -246,8 +246,8 @@ namespace ICSharpCode.FormsDesigner.Gui if (grid != null) { try { grid.SelectedObjects = null; + grid.Dispose(); } catch {} - grid.Dispose(); grid = null; } } diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin index 19c0c124db..18478550a0 100755 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin @@ -1142,8 +1142,6 @@ label = "${res:Global.MoveDown}" class = "ICSharpCode.SharpDevelop.Commands.SideBarMoveTabDown"/> - - @@ -1171,8 +1169,6 @@ label = "${res:Global.MoveDown}" class = "ICSharpCode.SharpDevelop.Commands.SideBarMoveActiveItemDown"/> - - diff --git a/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs b/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs index e9fdb95a8a..fc88fd8e62 100644 --- a/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs +++ b/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs @@ -57,7 +57,7 @@ namespace ICSharpCode.SharpDevelop.Gui { SideTabItemFactory = new SharpDevelopSideTabItemFactory(); - MouseUp += new MouseEventHandler(SetContextMenu); + MouseUp += new MouseEventHandler(SetContextMenu); sideTabContent.MouseUp += new MouseEventHandler(SetItemContextMenu); } @@ -139,7 +139,7 @@ namespace ICSharpCode.SharpDevelop.Gui } if (e.Button == MouseButtons.Right) { - MenuService.ShowContextMenu(this, contextMenuPath, this, e.X, e.Y); + MenuService.ShowContextMenu(ActiveTab, contextMenuPath, this, e.X, e.Y); } } @@ -184,7 +184,7 @@ namespace ICSharpCode.SharpDevelop.Gui internalState = internalState & ~(SidebarState.CanMoveItemDown); } - MenuService.ShowContextMenu(this, sideTabContextMenuPath, sideTabContent, e.X, e.Y); + MenuService.ShowContextMenu(ActiveTab, sideTabContextMenuPath, this, e.X, e.Y); } }