diff --git a/data/templates/file/Misc/EmptyXmlForm.xft b/data/templates/file/Misc/EmptyXmlForm.xft deleted file mode 100644 index fdfe7dc53b..0000000000 --- a/data/templates/file/Misc/EmptyXmlForm.xft +++ /dev/null @@ -1,25 +0,0 @@ - - diff --git a/data/templates/file/Misc/EmptyXmlUserControl.xft b/data/templates/file/Misc/EmptyXmlUserControl.xft deleted file mode 100644 index 80a6d00490..0000000000 --- a/data/templates/file/Misc/EmptyXmlUserControl.xft +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs index cee2685d40..8aeb99201b 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs @@ -24,8 +24,10 @@ namespace ICSharpCode.FormsDesigner.Gui public class CustomComponentsSideTab : SideTabDesigner { ///Load an assembly's controls - public CustomComponentsSideTab(SideBarControl sideTab, string name, IToolboxService toolboxService) : base(sideTab,name, toolboxService) + public CustomComponentsSideTab(SideBarControl sideTab, string name, IToolboxService toolboxService) + : base(sideTab, name, toolboxService) { + this.DisplayName = StringParser.Parse(this.Name); ScanProjectAssemblies(); ProjectService.EndBuild += RescanProjectAssemblies; ProjectService.SolutionLoaded += RescanProjectAssemblies; diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs index 0ae1ad6313..9bb809e8b6 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs @@ -9,6 +9,7 @@ using System; using System.Drawing.Design; using System.Reflection; +using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Widgets.SideBar; @@ -19,8 +20,10 @@ namespace ICSharpCode.FormsDesigner.Gui protected bool loadImages = true; IToolboxService toolboxService; - protected SideTabDesigner(SideBarControl sideBar, string name, IToolboxService toolboxService) : base(sideBar, name) + protected SideTabDesigner(SideBarControl sideBar, string name, IToolboxService toolboxService) + : base(sideBar, name) { + this.DisplayName = StringParser.Parse(name); this.toolboxService = toolboxService; this.CanSaved = false; diff --git a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs index be82ac4454..d5c390892a 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs @@ -152,6 +152,7 @@ namespace SharpReportAddin{ SideTab s; for (int i = SideBarView.sideBar.Tabs.Count -1; i > 0;i -- ) { s = SideBarView.sideBar.Tabs[i]; + #warning Users can add custom tools to tabs with name of their choice - and they might include "Report" in the name if (s.Name.IndexOf("Report") > 0) { SideBarView.sideBar.Tabs.Remove(s); } diff --git a/src/Main/Base/Project/Src/Commands/SideBarCommands.cs b/src/Main/Base/Project/Src/Commands/SideBarCommands.cs index 81a8ec0100..d0afef8d42 100644 --- a/src/Main/Base/Project/Src/Commands/SideBarCommands.cs +++ b/src/Main/Base/Project/Src/Commands/SideBarCommands.cs @@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.Commands { SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; SideTab selectedSideTab = sideBar.GetTabAt(sideBar.SideBarMousePosition.X, sideBar.SideBarMousePosition.Y); - if (MessageBox.Show(StringParser.Parse(ResourceService.GetString("SideBarComponent.ContextMenu.DeleteTabHeaderQuestion"), new string[,] { {"TabHeader", selectedSideTab.Name}}), + if (MessageBox.Show(StringParser.Parse(ResourceService.GetString("SideBarComponent.ContextMenu.DeleteTabHeaderQuestion"), new string[,] { {"TabHeader", selectedSideTab.DisplayName}}), ResourceService.GetString("Global.QuestionText"), MessageBoxButtons.YesNo, MessageBoxIcon.Question, 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 f50d0699aa..8020345625 100644 --- a/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs +++ b/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs @@ -94,6 +94,7 @@ namespace ICSharpCode.SharpDevelop.Gui foreach (TextTemplate template in TextTemplate.TextTemplates) { SideTab tab = new SideTab(this, template.Name); + tab.DisplayName = StringParser.Parse(tab.Name); tab.CanSaved = false; foreach (TextTemplate.Entry entry in template.Entries) { tab.Items.Add(SideTabItemFactory.CreateSideTabItem(entry.Display, entry.Value)); @@ -284,6 +285,7 @@ namespace ICSharpCode.SharpDevelop.Gui { foreach (XmlElement sideTabEl in el.ChildNodes) { SideTab tab = new SideTab(this, sideTabEl.GetAttribute("text")); + tab.DisplayName = StringParser.Parse(tab.Name); if (tab.Name == el.GetAttribute("activetab")) { ActiveTab = tab; } else { @@ -300,7 +302,8 @@ namespace ICSharpCode.SharpDevelop.Gui if (sideTabEl.GetAttribute("clipboardring") == "true") { tab.CanBeDeleted = false; tab.CanDragDrop = false; - tab.Name = "${res:SharpDevelop.SideBar.ClipboardRing}"; + tab.Name = "${res:SharpDevelop.SideBar.ClipboardRing}"; + tab.DisplayName = StringParser.Parse(tab.Name); tab.IsClipboardRing = true; } Tabs.Add(tab); diff --git a/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideTabItem.cs b/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideTabItem.cs index 78aec8eb26..d57d5eeb4d 100644 --- a/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideTabItem.cs +++ b/src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideTabItem.cs @@ -14,19 +14,20 @@ namespace ICSharpCode.SharpDevelop.Gui { public class SharpDevelopSideTabItem : SideTabItem { - - - public SharpDevelopSideTabItem(string name) : base(name) + public SharpDevelopSideTabItem(string name) + : base(name) { Icon = ResourceService.GetBitmap("Icons.16x16.SideBarDocument"); } - public SharpDevelopSideTabItem(string name, object tag) : base(name, tag) + public SharpDevelopSideTabItem(string name, object tag) + : base(name, tag) { Icon = ResourceService.GetBitmap("Icons.16x16.SideBarDocument"); } - public SharpDevelopSideTabItem(string name, object tag, Bitmap icon) : base(name, tag, icon) + public SharpDevelopSideTabItem(string name, object tag, Bitmap icon) + : base(name, tag, icon) { } } diff --git a/src/Main/Base/Project/Src/Gui/Pads/SideBarView.cs b/src/Main/Base/Project/Src/Gui/Pads/SideBarView.cs index ca4af5b113..d940ed0977 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/SideBarView.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/SideBarView.cs @@ -63,11 +63,13 @@ namespace ICSharpCode.SharpDevelop.Gui { sideBar = new SharpDevelopSideBar(); SideTab tab = new SideTab(sideBar, "${res:SharpDevelop.SideBar.GeneralCategory}"); + tab.DisplayName = StringParser.Parse(tab.Name); sideBar.Tabs.Add(tab); sideBar.ActiveTab = tab; tab = new SideTab(sideBar, "${res:SharpDevelop.SideBar.ClipboardRing}"); + tab.DisplayName = StringParser.Parse(tab.Name); tab.IsClipboardRing = true; tab.CanBeDeleted = false; tab.CanDragDrop = false; @@ -91,7 +93,7 @@ namespace ICSharpCode.SharpDevelop.Gui doc.LoadXml(""); doc.DocumentElement.AppendChild(sideBar.ToXmlElement(doc)); - FileUtility.ObservedSave(new NamedFileOperationDelegate(doc.Save), + FileUtility.ObservedSave(new NamedFileOperationDelegate(doc.Save), Path.Combine(PropertyService.ConfigDirectory, "SideBarConfig.xml"), FileErrorPolicy.ProvideAlternative); } diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs index 061bc18568..53930f579d 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs @@ -82,7 +82,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar public class SideTab { - string name; + string name, displayName; bool canDragDrop = true; bool canBeDeleted = true; bool canBeRenamed = true; @@ -168,9 +168,15 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar } set { name = value; + displayName = value; } } + public string DisplayName { + get { return displayName; } + set { displayName = value; } + } + public SideTabItemCollection Items { get { return items; @@ -266,14 +272,14 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar public SideTab(SideBarControl sideBar, string name) : this(sideBar.SideTabItemFactory) { - this.name = name; + this.Name = name; SetCanRename(); items.ItemRemoved += OnSideTabItemRemoved; } public SideTab(string name) { - this.name = name; + this.Name = name; SetCanRename(); items.ItemRemoved += OnSideTabItemRemoved; } @@ -295,12 +301,12 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar switch (sideTabStatus) { case SideTabStatus.Normal: ControlPaint.DrawBorder3D(g, new Rectangle(0, pos.Y, width - 4, font.Height + 4), Border3DStyle.RaisedInner); - g.DrawString(name, font, SystemBrushes.ControlText, new RectangleF(1, pos.Y + 1, width - 5, font.Height + 1)); + g.DrawString(displayName, font, SystemBrushes.ControlText, new RectangleF(1, pos.Y + 1, width - 5, font.Height + 1)); break; case SideTabStatus.Selected: ControlPaint.DrawBorder3D(g, new Rectangle(0, pos.Y, width - 4, font.Height + 4), Border3DStyle.Sunken); - g.DrawString(name, font, SystemBrushes.ControlText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2)); + g.DrawString(displayName, font, SystemBrushes.ControlText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2)); break; case SideTabStatus.Dragged: Rectangle r = new Rectangle(0, pos.Y, width - 4, font.Height + 4); @@ -312,7 +318,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar g.FillRectangle(SystemBrushes.ControlDarkDark, r); - g.DrawString(name, font, SystemBrushes.HighlightText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2)); + g.DrawString(displayName, font, SystemBrushes.HighlightText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2)); break; } }