From 7448c628126024e05d6c66fbc50169bc1da1c31a Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 1 Feb 2014 14:40:26 +0100 Subject: [PATCH] Rename RegisterFixNamespaces to RegisterDesignerNamespaces Rename ChoosedItem to ChosenItem Rename ChoosedItemChanged to ChosenItemChanged --- .../Project/Src/Gui/SideTabDesigner.cs | 4 +- .../Project/Src/ToolboxProvider.cs | 2 +- .../WpfDesign.AddIn/Src/WpfToolbox.cs | 33 +++++++------- .../Project/XamlTypeFinder.cs | 4 +- .../Project/Src/Commands/SideBarCommands.cs | 8 ++-- .../Components/SideBar/TextEditorSideBar.cs | 4 +- .../Project/SideBar/SideBar.cs | 44 +++++++++---------- .../Project/SideBar/SideTab.cs | 30 ++++++------- .../Project/SideBar/SideTabItem.cs | 4 +- 9 files changed, 68 insertions(+), 65 deletions(-) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs index b724ced161..71de47f857 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs @@ -39,7 +39,7 @@ namespace ICSharpCode.FormsDesigner.Gui this.CanSaved = false; AddDefaultItem(); - this.ChoosedItemChanged += SelectedTabItemChanged; + this.ChosenItemChanged += SelectedTabItemChanged; } protected void AddDefaultItem() @@ -66,7 +66,7 @@ namespace ICSharpCode.FormsDesigner.Gui void SelectedTabItemChanged(object sender, EventArgs e) { - SideTabItem item = (sender as SideTab).ChoosedItem; + SideTabItem item = (sender as SideTab).ChosenItem; if (item == null) { toolboxService.SetSelectedToolboxItem(null); } else { diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs index 4197eb3801..149daee471 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs @@ -172,7 +172,7 @@ namespace ICSharpCode.FormsDesigner } if (tab.Items.Count > 0) { - tab.ChoosedItem = tab.Items[0]; + tab.ChosenItem = tab.Items[0]; } sideBar.Refresh(); } diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs index d5a9dd3c87..3d2003fd1a 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs @@ -26,6 +26,7 @@ using System.Linq; using ICSharpCode.Core; using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Designer; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Project; @@ -61,7 +62,7 @@ namespace ICSharpCode.WpfDesign.AddIn SideTab sideTab = new SideTab(sideBar, "Windows Presentation Foundation"); sideTab.DisplayName = StringParser.Parse(sideTab.Name); sideTab.CanBeDeleted = false; - sideTab.ChoosedItemChanged += OnChoosedItemChanged; + sideTab.ChosenItemChanged += OnChosenItemChanged; sideTab.Items.Add(new WpfSideTabItem()); foreach (Type t in Metadata.GetPopularControls()) @@ -76,14 +77,16 @@ namespace ICSharpCode.WpfDesign.AddIn return !t.IsAbstract && !t.IsGenericTypeDefinition && t.IsSubclassOf(typeof(FrameworkElement)); } - static HashSet addedAssemblys = new HashSet(); + static readonly HashSet addedAssemblies = new HashSet(); public void AddProjectDlls(OpenedFile file) { var compilation = SD.ParserService.GetCompilationForFile(file.FileName); + var typeResolutionService = new TypeResolutionService(file.FileName); + foreach (var reference in compilation.ReferencedAssemblies) { - string f = reference.GetReferenceAssemblyLocation(); + string assemblyFileName = reference.GetReferenceAssemblyLocation(); - if (f != null && !addedAssemblys.Contains(f)) { + if (assemblyFileName != null && !addedAssemblies.Contains(assemblyFileName)) { try { // DO NOT USE Assembly.LoadFrom!!! // see http://community.sharpdevelop.net/forums/t/19968.aspx @@ -110,18 +113,18 @@ namespace ICSharpCode.WpfDesign.AddIn // // addedAssemblys.Add(f); } catch (Exception ex) { - WpfViewContent.DllLoadErrors.Add(new SDTask(new BuildError(f, ex.Message))); + WpfViewContent.DllLoadErrors.Add(new SDTask(new BuildError(assemblyFileName, ex.Message))); } } } } - void OnChoosedItemChanged(object sender, EventArgs e) + void OnChosenItemChanged(object sender, EventArgs e) { if (toolService != null) { ITool newTool = null; - if (sideBar.ActiveTab != null && sideBar.ActiveTab.ChoosedItem != null) { - newTool = sideBar.ActiveTab.ChoosedItem.Tag as ITool; + if (sideBar.ActiveTab != null && sideBar.ActiveTab.ChosenItem != null) { + newTool = sideBar.ActiveTab.ChosenItem.Tag as ITool; } toolService.CurrentTool = newTool ?? toolService.PointerTool; } @@ -153,13 +156,13 @@ namespace ICSharpCode.WpfDesign.AddIn } else { tagToFind = toolService.CurrentTool; } - if (sideBar.ActiveTab.ChoosedItem != null) { - if (sideBar.ActiveTab.ChoosedItem.Tag == tagToFind) + if (sideBar.ActiveTab.ChosenItem != null) { + if (sideBar.ActiveTab.ChosenItem.Tag == tagToFind) return; } foreach (SideTabItem item in sideBar.ActiveTab.Items) { if (item.Tag == tagToFind) { - sideBar.ActiveTab.ChoosedItem = item; + sideBar.ActiveTab.ChosenItem = item; sideBar.Refresh(); return; } @@ -168,13 +171,13 @@ namespace ICSharpCode.WpfDesign.AddIn foreach (SideTabItem item in tab.Items) { if (item.Tag == tagToFind) { sideBar.ActiveTab = tab; - sideBar.ActiveTab.ChoosedItem = item; + sideBar.ActiveTab.ChosenItem = item; sideBar.Refresh(); return; } } } - sideBar.ActiveTab.ChoosedItem = null; + sideBar.ActiveTab.ChosenItem = null; sideBar.Refresh(); } @@ -182,8 +185,8 @@ namespace ICSharpCode.WpfDesign.AddIn { protected override object StartItemDrag(SideTabItem draggedItem) { - if (this.ActiveTab.ChoosedItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { - this.ActiveTab.ChoosedItem = draggedItem; + if (this.ActiveTab.ChosenItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { + this.ActiveTab.ChosenItem = draggedItem; } if (draggedItem.Tag != null) { diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs index 55710a4189..81f6a4c50c 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs @@ -216,7 +216,7 @@ namespace ICSharpCode.WpfDesign.XamlDom /// /// Register the Namspaces not found in any Assembly, but used by VS and Expression Blend /// - public void RegisterFixNamespaces() + public void RegisterDesignerNamespaces() { var ns = namespaces[XamlConstants.DesignTimeNamespace] = new XamlNamespace("d", XamlConstants.DesignTimeNamespace); AddMappingToNamespace(ns, new AssemblyNamespaceMapping(typeof(DesignTimeProperties).Assembly, typeof(DesignTimeProperties).Namespace)); @@ -281,7 +281,7 @@ namespace ICSharpCode.WpfDesign.XamlDom static WpfTypeFinder() { Instance = new XamlTypeFinder(); - Instance.RegisterFixNamespaces(); + Instance.RegisterDesignerNamespaces(); Instance.RegisterAssembly(typeof(MarkupExtension).Assembly); // WindowsBase Instance.RegisterAssembly(typeof(IAddChild).Assembly); // PresentationCore Instance.RegisterAssembly(typeof(XamlReader).Assembly); // PresentationFramework diff --git a/src/Main/Base/Project/Src/Commands/SideBarCommands.cs b/src/Main/Base/Project/Src/Commands/SideBarCommands.cs index 4fd5cfa49b..aa7037acfb 100644 --- a/src/Main/Base/Project/Src/Commands/SideBarCommands.cs +++ b/src/Main/Base/Project/Src/Commands/SideBarCommands.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; - SideTabItem item = sideBar.ActiveTab.ChoosedItem; + SideTabItem item = sideBar.ActiveTab.ChosenItem; if (item != null) { sideBar.StartRenamingOf(item); } @@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; - SideTabItem item = sideBar.ActiveTab.ChoosedItem; + SideTabItem item = sideBar.ActiveTab.ChosenItem; if (item != null) { if (MessageBox.Show(StringParser.Parse( "${res:SideBarComponent.ContextMenu.DeleteTabItemQuestion}", new StringTagPair("TabItem", item.Name)), @@ -162,7 +162,7 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; - int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChoosedItem); + int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChosenItem); if (index > 0) { sideBar.ActiveTab.Exchange(index -1, index); sideBar.Refresh(); @@ -175,7 +175,7 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; - int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChoosedItem); + int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChosenItem); if (index >= 0 && index < sideBar.ActiveTab.Items.Count - 1) { sideBar.ActiveTab.Exchange(index, index + 1); sideBar.Refresh(); diff --git a/src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs b/src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs index 9e97fae0c5..a25bb2a328 100644 --- a/src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs +++ b/src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs @@ -223,8 +223,8 @@ namespace ICSharpCode.SharpDevelop.Gui protected override object StartItemDrag(SideTabItem draggedItem) { - if (this.ActiveTab.ChoosedItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { - this.ActiveTab.ChoosedItem = draggedItem; + if (this.ActiveTab.ChosenItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { + this.ActiveTab.ChosenItem = draggedItem; } var dataObject = new System.Windows.DataObject(); dataObject.SetText(draggedItem.Tag.ToString()); diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs index b253d96f1f..43823e460b 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs @@ -205,55 +205,55 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar switch (keyData) { case Keys.Home: if (activeTab.Items.Count > 0 && !isInRenameMode) { - activeTab.ChoosedItem = activeTab.Items[0]; - EnsureVisible(activeTab.ChoosedItem); + activeTab.ChosenItem = activeTab.Items[0]; + EnsureVisible(activeTab.ChosenItem); Refresh(); } break; case Keys.End: if (activeTab.Items.Count > 0 && !isInRenameMode) { - activeTab.ChoosedItem = activeTab.Items[activeTab.Items.Count - 1]; - EnsureVisible(activeTab.ChoosedItem); + activeTab.ChosenItem = activeTab.Items[activeTab.Items.Count - 1]; + EnsureVisible(activeTab.ChosenItem); Refresh(); } break; case Keys.PageUp: if (activeTab.Items.Count > 0 && !isInRenameMode) { - index = Math.Max(0, activeTab.Items.IndexOf(activeTab.ChoosedItem) - scrollBar.LargeChange); - activeTab.ChoosedItem = activeTab.Items[index]; - EnsureVisible(activeTab.ChoosedItem); + index = Math.Max(0, activeTab.Items.IndexOf(activeTab.ChosenItem) - scrollBar.LargeChange); + activeTab.ChosenItem = activeTab.Items[index]; + EnsureVisible(activeTab.ChosenItem); Refresh(); } break; case Keys.PageDown: if (activeTab.Items.Count > 0 && !isInRenameMode) { - index = Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChoosedItem) + scrollBar.LargeChange); - activeTab.ChoosedItem = activeTab.Items[index]; - EnsureVisible(activeTab.ChoosedItem); + index = Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChosenItem) + scrollBar.LargeChange); + activeTab.ChosenItem = activeTab.Items[index]; + EnsureVisible(activeTab.ChosenItem); Refresh(); } break; case Keys.Down: if (activeTab.Items.Count > 0 && !isInRenameMode) { - if (activeTab.ChoosedItem != null) { - activeTab.ChoosedItem = activeTab.Items[Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChoosedItem) + 1)]; + if (activeTab.ChosenItem != null) { + activeTab.ChosenItem = activeTab.Items[Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChosenItem) + 1)]; } else { - activeTab.ChoosedItem = activeTab.Items[0]; + activeTab.ChosenItem = activeTab.Items[0]; } activeTab.SelectedItem = null; - EnsureVisible(activeTab.ChoosedItem); + EnsureVisible(activeTab.ChosenItem); Refresh(); } return true; case Keys.Up: if (activeTab.Items.Count > 0 && !isInRenameMode) { - if (activeTab.ChoosedItem != null) { - activeTab.ChoosedItem = activeTab.Items[Math.Max(0, activeTab.Items.IndexOf(activeTab.ChoosedItem) - 1)]; + if (activeTab.ChosenItem != null) { + activeTab.ChosenItem = activeTab.Items[Math.Max(0, activeTab.Items.IndexOf(activeTab.ChosenItem) - 1)]; } else { - activeTab.ChoosedItem = activeTab.Items[0]; + activeTab.ChosenItem = activeTab.Items[0]; } activeTab.SelectedItem = null; - EnsureVisible(activeTab.ChoosedItem); + EnsureVisible(activeTab.ChosenItem); Refresh(); } return true; @@ -328,7 +328,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar void ItemContextMenuPopup(object sender, EventArgs e) { - activeTab.ChoosedItem = activeTab.SelectedItem; + activeTab.ChosenItem = activeTab.SelectedItem; Refresh(); } @@ -794,7 +794,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar case DragDropEffects.Move: SideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y); - if (item != sideBar.activeTab.ChoosedItem) { + if (item != sideBar.activeTab.ChosenItem) { int idx = sideBar.activeTab.Items.DraggedIndex; if (idx != -1) { sideBar.activeTab.Items.Remove(draggedItem); @@ -847,7 +847,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar sideBar.ClearDraggings(sideBar.activeTab); sideBar.Refresh(); } else - if (item != sideBar.activeTab.ChoosedItem) { + if (item != sideBar.activeTab.ChosenItem) { if (item.SideTabItemStatus != SideTabItemStatus.Drag) { sideBar.ClearDraggings(sideBar.activeTab); item.SideTabItemStatus = SideTabItemStatus.Drag; @@ -933,7 +933,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar base.OnMouseDown(e); if (e.Button == MouseButtons.Left && sideBar.activeTab != null) { mouseDownPos = e.Location; - sideBar.activeTab.ChoosedItem = sideBar.activeTab.SelectedItem; + sideBar.activeTab.ChosenItem = sideBar.activeTab.SelectedItem; } Refresh(); } diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs index 9d273f2041..d23b4bb439 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs @@ -100,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar SideTabItemCollection items = new SideTabItemCollection(); SideTabStatus sideTabStatus; SideTabItem selectedItem = null; - SideTabItem choosedItem = null; + SideTabItem chosenItem = null; ImageList largeImageList = null; ImageList smallImageList = null; @@ -209,37 +209,37 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar return selectedItem; } set { - if (selectedItem != null && selectedItem != choosedItem) { + if (selectedItem != null && selectedItem != chosenItem) { selectedItem.SideTabItemStatus = SideTabItemStatus.Normal; } selectedItem = value; - if (selectedItem != null && selectedItem != choosedItem) { + if (selectedItem != null && selectedItem != chosenItem) { selectedItem.SideTabItemStatus = SideTabItemStatus.Selected; } } } - protected void OnChoosedItemChanged(EventArgs e) + protected void OnChosenItemChanged(EventArgs e) { - if (ChoosedItemChanged != null) { - ChoosedItemChanged(this, e); + if (ChosenItemChanged != null) { + ChosenItemChanged(this, e); } } - public event EventHandler ChoosedItemChanged; + public event EventHandler ChosenItemChanged; - public SideTabItem ChoosedItem { + public SideTabItem ChosenItem { get { - return choosedItem; + return chosenItem; } set { - if (choosedItem != null) { - choosedItem.SideTabItemStatus = SideTabItemStatus.Normal; + if (chosenItem != null) { + chosenItem.SideTabItemStatus = SideTabItemStatus.Normal; } - choosedItem = value; - if (choosedItem != null) { - choosedItem.SideTabItemStatus = SideTabItemStatus.Choosed; + chosenItem = value; + if (chosenItem != null) { + chosenItem.SideTabItemStatus = SideTabItemStatus.Chosen; } - OnChoosedItemChanged(null); + OnChosenItemChanged(null); } } diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs index 333d592f49..df20ff2552 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs @@ -25,7 +25,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar public enum SideTabItemStatus { Normal, Selected, - Choosed, + Chosen, Drag } @@ -150,7 +150,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar } g.DrawString(name, f, SystemBrushes.ControlText, new PointF(rectangle.X + width + 1, rectangle.Y + 1)); break; - case SideTabItemStatus.Choosed: + case SideTabItemStatus.Chosen: ControlPaint.DrawBorder3D(g, rectangle, Border3DStyle.Sunken); rectangle.X += 1; rectangle.Y += 1;