pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merged Corsavy r1166:1183 to trunk: 

Fixed SD2-695.  Unsetting a breakpoint when viewing an xml document no longer leaves red text behind.
Fixed SD2-693 - ToolstripContainer designer loading problem
Fixed SD2-700: Exception when selecting AddIn Manager About option
Fixed SD2-687: Cannot build entire solution after importing SharpDevelop 1.1 project
Fixed exception when loading a project when a referenced library was missing dependencies.
Fixed forum-5455: Importing old Visual Studio projects with non-ASCII characters in system encoding fails.
Fixed SD2-662, SD2-664 - Replace all inserting incorrect text or getting stuck in an infinite loop.
Fixed SD2-688: Selecting GAC list items in the Add Components dialog
Fixed SD2-676: Code completion for a class with many methods can be slow

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1185 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
374b7737d2 4dbfac0f4e
commit
35d50ec12e
28 changed files with 399 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      src/AddIns/DisplayBindings/FormsDesigner/Project/Resources/AddSidebarComponentsDialog.xfrm
  2. 6
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
  3. 132
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
  4. 21
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
  5. 2
      src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
  6. 10
      src/Main/Base/Project/Src/Dom/IDecoration.cs
  7. 5
      src/Main/Base/Project/Src/Dom/Implementations/AbstractDecoration.cs
  8. 30
      src/Main/Base/Project/Src/Dom/Implementations/DefaultReturnType.cs
  9. 12
      src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionLoader.cs
  10. 4
      src/Main/Base/Project/Src/Gui/AbstractBaseViewContent.cs
  11. 6
      src/Main/Base/Project/Src/Gui/IBaseViewContent.cs
  12. 46
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
  13. 24
      src/Main/Base/Project/Src/Project/Converter/PrjxToSolutionProject.cs
  14. 6
      src/Main/Base/Project/Src/Project/Solution/Solution.cs
  15. 2
      src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
  16. 16
      src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
  17. 4
      src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs
  18. 6
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
  19. 2
      src/Main/Core/Project/Src/AddInTree/AddIn/IBuildItemsModifier.cs
  20. 28
      src/Main/Core/Project/Src/AddInTree/AddInTree.cs
  21. 33
      src/Main/Core/Project/Src/AddInTree/AddInTreeNode.cs
  22. 2
      src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
  23. 16
      src/Main/StartUp/Project/Dialogs/ExceptionBox.cs
  24. 14
      src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj
  25. 5
      src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj.user
  26. 16
      src/Tools/SVNChangeLogToXml/SVNChangelogToXml.sln
  27. 16
      src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.sln
  28. 13
      src/Tools/UpdateAssemblyInfo/UpdateAssemblyInfo.csproj

99
src/AddIns/DisplayBindings/FormsDesigner/Project/Resources/AddSidebarComponentsDialog.xfrm
Unescape View File

@ -1,64 +1,61 @@
<Components version="1.0"> <Components version="1.0">
<System.Windows.Forms.Form> <System.Windows.Forms.Form>
<Name value="AddComponentsDialog" /> <Name value="AddComponentsDialog" />
<ShowInTaskbar value="False" />
<FormBorderStyle value="FixedDialog" />
<StartPosition value="CenterScreen" />
<ClientSize value="{Width=522, Height=394}" />
<MinimizeBox value="False" /> <MinimizeBox value="False" />
<DockPadding value="" /> <StartPosition value="CenterScreen" />
<ShowInTaskbar value="False" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.DialogName}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.DialogName}" />
<AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" /> <AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
<CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" /> <CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
<MaximizeBox value="False" /> <MaximizeBox value="False" />
<ClientSize value="{Width=685, Height=394}" />
<Controls> <Controls>
<System.Windows.Forms.Button> <System.Windows.Forms.Button>
<Name value="cancelButton" /> <Name value="cancelButton" />
<Location value="{X=437,Y=363}" /> <DialogResult value="Cancel" />
<ClientSize value="{Width=75, Height=23}" /> <Location value="{X=600,Y=363}" />
<Text value="${res:Global.CancelButtonText}" /> <Text value="${res:Global.CancelButtonText}" />
<Anchor value="Bottom, Right" /> <Anchor value="Bottom, Right" />
<Size value="{Width=75, Height=23}" />
<TabIndex value="2" /> <TabIndex value="2" />
<DialogResult value="Cancel" />
</System.Windows.Forms.Button> </System.Windows.Forms.Button>
<System.Windows.Forms.Button> <System.Windows.Forms.Button>
<Name value="okButton" /> <Name value="okButton" />
<Location value="{X=357,Y=363}" /> <DialogResult value="OK" />
<ClientSize value="{Width=75, Height=23}" /> <Location value="{X=520,Y=363}" />
<Text value="${res:Global.OKButtonText}" /> <Text value="${res:Global.OKButtonText}" />
<Anchor value="Bottom, Right" /> <Anchor value="Bottom, Right" />
<Size value="{Width=75, Height=23}" />
<TabIndex value="1" /> <TabIndex value="1" />
<DialogResult value="OK" />
</System.Windows.Forms.Button> </System.Windows.Forms.Button>
<System.Windows.Forms.Panel> <System.Windows.Forms.Panel>
<Name value="panel" /> <Name value="panel" />
<Location value="{X=8,Y=8}" /> <Location value="{X=8,Y=8}" />
<ClientSize value="{Width=504, Height=347}" />
<DockPadding value="" />
<Anchor value="Top, Bottom, Left, Right" />
<TabIndex value="0" /> <TabIndex value="0" />
<Anchor value="Top, Bottom, Left, Right" />
<Size value="{Width=667, Height=347}" />
<Controls> <Controls>
<System.Windows.Forms.ListView> <System.Windows.Forms.ListView>
<Name value="componentListView" /> <Name value="componentListView" />
<GridLines value="True" /> <CheckBoxes value="True" />
<Dock value="Fill" /> <Size value="{Width=403, Height=331}" />
<TabIndex value="3" /> <TabIndex value="3" />
<View value="Details" />
<FullRowSelect value="True" /> <FullRowSelect value="True" />
<Location value="{X=203,Y=16}" /> <GridLines value="True" />
<ClientSize value="{Width=297, Height=327}" /> <View value="Details" />
<CheckBoxes value="True" />
<HideSelection value="False" /> <HideSelection value="False" />
<Dock value="Fill" />
<Location value="{X=264,Y=16}" />
<Columns> <Columns>
<System.Windows.Forms.ColumnHeader> <System.Windows.Forms.ColumnHeader>
<Width value="82" /> <Width value="128" />
<Name value="componentColumnHeader1" />
<Text value="${res:Global.Name}" /> <Text value="${res:Global.Name}" />
<Name value="componentColumnHeader1" />
</System.Windows.Forms.ColumnHeader> </System.Windows.Forms.ColumnHeader>
<System.Windows.Forms.ColumnHeader> <System.Windows.Forms.ColumnHeader>
<Width value="88" /> <Width value="88" />
<Name value="componentColumnHeader2" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.Components.Namespace}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.Components.Namespace}" />
<Name value="componentColumnHeader2" />
</System.Windows.Forms.ColumnHeader> </System.Windows.Forms.ColumnHeader>
<System.Windows.Forms.ColumnHeader> <System.Windows.Forms.ColumnHeader>
<Name value="componentColumnHeader3" /> <Name value="componentColumnHeader3" />
@ -72,53 +69,50 @@
</System.Windows.Forms.ListView> </System.Windows.Forms.ListView>
<System.Windows.Forms.Label> <System.Windows.Forms.Label>
<Name value="label2" /> <Name value="label2" />
<Location value="{X=264,Y=0}" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.ComponentsToAddLabel}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.ComponentsToAddLabel}" />
<TabIndex value="2" /> <Size value="{Width=403, Height=16}" />
<ClientSize value="{Width=301, Height=16}" />
<Location value="{X=203,Y=0}" />
<Dock value="Top" /> <Dock value="Top" />
<TabIndex value="2" />
</System.Windows.Forms.Label> </System.Windows.Forms.Label>
<System.Windows.Forms.Splitter> <System.Windows.Forms.Splitter>
<Name value="splitter" /> <Name value="splitter" />
<Location value="{X=261,Y=0}" />
<TabIndex value="1" /> <TabIndex value="1" />
<ClientSize value="{Width=3, Height=347}" /> <Size value="{Width=3, Height=347}" />
<Location value="{X=200,Y=0}" />
</System.Windows.Forms.Splitter> </System.Windows.Forms.Splitter>
<System.Windows.Forms.Panel> <System.Windows.Forms.Panel>
<Name value="panel2" /> <Name value="panel2" />
<Location value="{X=0,Y=0}" /> <Location value="{X=0,Y=0}" />
<ClientSize value="{Width=200, Height=347}" />
<DockPadding value="" />
<TabIndex value="0" /> <TabIndex value="0" />
<Size value="{Width=261, Height=347}" />
<Dock value="Left" /> <Dock value="Left" />
<Controls> <Controls>
<System.Windows.Forms.TabControl> <System.Windows.Forms.TabControl>
<Name value="tabControl" /> <Name value="tabControl" />
<TabIndex value="1" />
<Dock value="Fill" />
<ClientSize value="{Width=200, Height=347}" />
<Location value="{X=0,Y=0}" /> <Location value="{X=0,Y=0}" />
<Dock value="Fill" />
<TabIndex value="1" />
<Size value="{Width=261, Height=347}" />
<TabPages> <TabPages>
<System.Windows.Forms.TabPage> <System.Windows.Forms.TabPage>
<Name value="gacTabPage" /> <Name value="gacTabPage" />
<DockPadding value="" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.GACTabPage}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.GACTabPage}" />
<ClientSize value="{Width=192, Height=321}" /> <Size value="{Width=253, Height=321}" />
<Location value="{X=4,Y=22}" />
<Controls> <Controls>
<System.Windows.Forms.ListView> <System.Windows.Forms.ListView>
<Name value="gacListView" /> <Name value="gacListView" />
<Dock value="Fill" /> <Size value="{Width=253, Height=321}" />
<MultiSelect value="False" />
<TabIndex value="0" /> <TabIndex value="0" />
<View value="Details" />
<FullRowSelect value="True" /> <FullRowSelect value="True" />
<Location value="{X=0,Y=0}" /> <MultiSelect value="False" />
<ClientSize value="{Width=188, Height=317}" /> <View value="Details" />
<HideSelection value="False" /> <HideSelection value="False" />
<Dock value="Fill" />
<Location value="{X=0,Y=0}" />
<Columns> <Columns>
<System.Windows.Forms.ColumnHeader> <System.Windows.Forms.ColumnHeader>
<Width value="100" /> <Width value="147" />
<Name value="columnHeader5" /> <Name value="columnHeader5" />
<Text value="${res:Global.Name}" /> <Text value="${res:Global.Name}" />
</System.Windows.Forms.ColumnHeader> </System.Windows.Forms.ColumnHeader>
@ -133,41 +127,38 @@
</System.Windows.Forms.TabPage> </System.Windows.Forms.TabPage>
<System.Windows.Forms.TabPage> <System.Windows.Forms.TabPage>
<Name value="customTabPage" /> <Name value="customTabPage" />
<DockPadding value="" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.CustomTabPage}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.CustomTabPage}" />
<ClientSize value="{Width=192, Height=326}" /> <Size value="{Width=253, Height=321}" />
<Location value="{X=4,Y=22}" />
<Controls> <Controls>
<System.Windows.Forms.Button> <System.Windows.Forms.Button>
<Name value="browseButton" /> <Name value="browseButton" />
<Location value="{X=157,Y=27}" /> <Location value="{X=218,Y=27}" />
<ClientSize value="{Width=32, Height=20}" />
<Text value="..." /> <Text value="..." />
<Anchor value="Top, Right" /> <Anchor value="Top, Right" />
<Size value="{Width=32, Height=20}" />
<TabIndex value="2" /> <TabIndex value="2" />
</System.Windows.Forms.Button> </System.Windows.Forms.Button>
<System.Windows.Forms.TextBox> <System.Windows.Forms.TextBox>
<Name value="fileNameTextBox" /> <Name value="fileNameTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" /> <TabIndex value="1" />
<Size value="{Width=205, Height=21}" />
<Location value="{X=8,Y=28}" /> <Location value="{X=8,Y=28}" />
<ClientSize value="{Width=140, Height=17}" /> <Anchor value="Top, Left, Right" />
<Text value="" />
</System.Windows.Forms.TextBox> </System.Windows.Forms.TextBox>
<System.Windows.Forms.Label> <System.Windows.Forms.Label>
<Name value="label3" /> <Name value="label3" />
<Location value="{X=8,Y=8}" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponentsFileNameLabel}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponentsFileNameLabel}" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" /> <Anchor value="Top, Left, Right" />
<TextAlign value="BottomLeft" />
<Size value="{Width=237, Height=16}" />
<TabIndex value="0" /> <TabIndex value="0" />
<ClientSize value="{Width=176, Height=16}" />
<Location value="{X=8,Y=8}" />
</System.Windows.Forms.Label> </System.Windows.Forms.Label>
<System.Windows.Forms.Button> <System.Windows.Forms.Button>
<Name value="loadButton" /> <Name value="loadButton" />
<Location value="{X=8,Y=60}" /> <Location value="{X=8,Y=60}" />
<ClientSize value="{Width=150, Height=23}" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.ShowComponentsButton}" /> <Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.ShowComponentsButton}" />
<Size value="{Width=150, Height=23}" />
<TabIndex value="3" /> <TabIndex value="3" />
</System.Windows.Forms.Button> </System.Windows.Forms.Button>
</Controls> </Controls>

6
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
Unescape View File

@ -347,17 +347,17 @@ namespace ICSharpCode.FormsDesigner
{ {
disposing = true; disposing = true;
if (IsFormsDesignerVisible) { if (IsFormsDesignerVisible) {
Deselected(); Deselecting();
} }
base.Dispose(); base.Dispose();
} }
public override void Deselected() public override void Deselecting()
{ {
// can happen if form designer is disposed and then deselected // can happen if form designer is disposed and then deselected
if (!IsFormsDesignerVisible) if (!IsFormsDesignerVisible)
return; return;
LoggingService.Info("Deselected form designer, unloading..." + viewContent.TitleName); LoggingService.Info("Deselecting form designer, unloading..." + viewContent.TitleName);
PropertyPad.PropertyValueChanged -= PropertyValueChanged; PropertyPad.PropertyValueChanged -= PropertyValueChanged;
propertyContainer.Clear(); propertyContainer.Clear();
IsFormsDesignerVisible = false; IsFormsDesignerVisible = false;

132
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
Unescape View File

@ -25,6 +25,7 @@ namespace ICSharpCode.FormsDesigner.Gui
public class AddComponentsDialog : BaseSharpDevelopForm public class AddComponentsDialog : BaseSharpDevelopForm
{ {
ArrayList selectedComponents; ArrayList selectedComponents;
ListView componentListView;
public ArrayList SelectedComponents { public ArrayList SelectedComponents {
get { get {
@ -36,6 +37,8 @@ namespace ICSharpCode.FormsDesigner.Gui
{ {
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.AddSidebarComponentsDialog.xfrm")); SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.AddSidebarComponentsDialog.xfrm"));
componentListView = (ListView)ControlDictionary["componentListView"];
Icon = null; Icon = null;
PrintGACCache(); PrintGACCache();
@ -53,11 +56,11 @@ namespace ICSharpCode.FormsDesigner.Gui
IAssemblyName assemblyName = null; IAssemblyName assemblyName = null;
Fusion.CreateAssemblyEnum(out assemblyEnum, null, null, 2, 0); Fusion.CreateAssemblyEnum(out assemblyEnum, null, null, 2, 0);
while (assemblyEnum.GetNextAssembly(out applicationContext, out assemblyName, 0) == 0) { while (assemblyEnum.GetNextAssembly(out applicationContext, out assemblyName, 0) == 0) {
uint nChars = 0; uint nChars = 0;
assemblyName.GetDisplayName(null, ref nChars, 0); assemblyName.GetDisplayName(null, ref nChars, 0);
StringBuilder sb = new StringBuilder((int)nChars); StringBuilder sb = new StringBuilder((int)nChars);
assemblyName.GetDisplayName(sb, ref nChars, 0); assemblyName.GetDisplayName(sb, ref nChars, 0);
@ -74,8 +77,9 @@ namespace ICSharpCode.FormsDesigner.Gui
void FillComponents(Assembly assembly, string loadPath) void FillComponents(Assembly assembly, string loadPath)
{ {
((ListView)ControlDictionary["componentListView"]).BeginUpdate(); componentListView.BeginUpdate();
((ListView)ControlDictionary["componentListView"]).Items.Clear(); componentListView.Items.Clear();
componentListView.Controls.Clear();
if (assembly != null) { if (assembly != null) {
Hashtable images = new Hashtable(); Hashtable images = new Hashtable();
@ -92,84 +96,88 @@ namespace ICSharpCode.FormsDesigner.Gui
} catch {} } catch {}
} }
try { try {
Module[] ms = assembly.GetModules(false); componentListView.SmallImageList = il;
((ListView)ControlDictionary["componentListView"]).SmallImageList = il; foreach (Type t in assembly.GetExportedTypes()) {
foreach (Module m in ms) { if (!t.IsAbstract) {
Type[] ts = m.GetTypes(); if (t.IsDefined(typeof(ToolboxItemFilterAttribute), true) || t.IsDefined(typeof(ToolboxItemAttribute), true) || typeof(System.ComponentModel.IComponent).IsAssignableFrom(t)) {
foreach (Type t in ts) { object[] attributes = t.GetCustomAttributes(false);
if (t.IsPublic && !t.IsAbstract) { object[] filterAttrs = t.GetCustomAttributes(typeof(DesignTimeVisibleAttribute), true);
if (t.IsDefined(typeof(ToolboxItemFilterAttribute), true) || t.IsDefined(typeof(ToolboxItemAttribute), true) || typeof(System.ComponentModel.IComponent).IsAssignableFrom(t)) { foreach (DesignTimeVisibleAttribute visibleAttr in filterAttrs) {
object[] attributes = t.GetCustomAttributes(false); if (!visibleAttr.Visible) {
object[] filterAttrs = t.GetCustomAttributes(typeof(DesignTimeVisibleAttribute), true); goto skip;
foreach (DesignTimeVisibleAttribute visibleAttr in filterAttrs) {
if (!visibleAttr.Visible) {
goto skip;
}
} }
}
if (images[t.FullName + ".bmp"] == null) {
if (t.IsDefined(typeof(ToolboxBitmapAttribute), false)) { if (images[t.FullName + ".bmp"] == null) {
foreach (object attr in attributes) { if (t.IsDefined(typeof(ToolboxBitmapAttribute), false)) {
if (attr is ToolboxBitmapAttribute) { foreach (object attr in attributes) {
ToolboxBitmapAttribute toolboxBitmapAttribute = (ToolboxBitmapAttribute)attr; if (attr is ToolboxBitmapAttribute) {
images[t.FullName + ".bmp"] = il.Images.Count; ToolboxBitmapAttribute toolboxBitmapAttribute = (ToolboxBitmapAttribute)attr;
Bitmap b = new Bitmap(toolboxBitmapAttribute.GetImage(t)); images[t.FullName + ".bmp"] = il.Images.Count;
b.MakeTransparent(); Bitmap b = new Bitmap(toolboxBitmapAttribute.GetImage(t));
il.Images.Add(b); b.MakeTransparent();
break; il.Images.Add(b);
} break;
} }
} }
} }
ListViewItem newItem = new ListViewItem(t.Name);
newItem.SubItems.Add(t.Namespace);
newItem.SubItems.Add(assembly.ToString());
newItem.SubItems.Add(assembly.Location);
newItem.SubItems.Add(t.Namespace);
if (images[t.FullName + ".bmp"] != null) {
newItem.ImageIndex = (int)images[t.FullName + ".bmp"];
}
newItem.Checked = true;
ToolComponent toolComponent = new ToolComponent(t.FullName, new ComponentAssembly(assembly.FullName, loadPath));
toolComponent.IsEnabled = true;
newItem.Tag = toolComponent;
((ListView)ControlDictionary["componentListView"]).Items.Add(newItem);
ToolboxItem item = new ToolboxItem(t);
skip:;
} }
ListViewItem newItem = new ListViewItem(t.Name);
newItem.SubItems.Add(t.Namespace);
newItem.SubItems.Add(assembly.ToString());
newItem.SubItems.Add(assembly.Location);
newItem.SubItems.Add(t.Namespace);
if (images[t.FullName + ".bmp"] != null) {
newItem.ImageIndex = (int)images[t.FullName + ".bmp"];
}
newItem.Checked = true;
ToolComponent toolComponent = new ToolComponent(t.FullName, new ComponentAssembly(assembly.FullName, loadPath));
toolComponent.IsEnabled = true;
newItem.Tag = toolComponent;
componentListView.Items.Add(newItem);
ToolboxItem item = new ToolboxItem(t);
skip:;
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
MessageService.ShowError(e); ClearComponentsList(e.Message);
}
if (componentListView.Items.Count == 0) {
if (componentListView.Controls.Count == 0) {
ClearComponentsList(StringParser.Parse("${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.NoComponentsFound}", new string[,] {{"Name", assembly.FullName}}));
}
} }
} }
((ListView)ControlDictionary["componentListView"]).EndUpdate(); componentListView.EndUpdate();
} }
/* changed this unexpected behaviour -- added a load button, G.B. void gacListViewSelectedIndexChanged(object sender, System.EventArgs e)
void fileNameTextBoxTextChanged(object sender, System.EventArgs e)
{ {
if (File.Exists(this.fileNameTextBox.Text)) { if (((ListView)ControlDictionary["gacListView"]).SelectedItems != null && ((ListView)ControlDictionary["gacListView"]).SelectedItems.Count == 1) {
string assemblyName = ((ListView)ControlDictionary["gacListView"]).SelectedItems[0].Tag.ToString();
try { try {
FillComponents(Assembly.LoadFrom(this.fileNameTextBox.Text)); Assembly asm = Assembly.Load(assemblyName);
FillComponents(asm, null);
} catch (Exception ex) { } catch (Exception ex) {
ClearComponentsList(ex.Message);
MessageService.ShowError(ex);
} }
} else {
ClearComponentsList(null);
} }
} }
*/
void gacListViewSelectedIndexChanged(object sender, System.EventArgs e) void ClearComponentsList(string message)
{ {
if (((ListView)ControlDictionary["gacListView"]).SelectedItems != null && ((ListView)ControlDictionary["gacListView"]).SelectedItems.Count == 1) { componentListView.Items.Clear();
string assemblyName = ((ListView)ControlDictionary["gacListView"]).SelectedItems[0].Tag.ToString(); componentListView.Controls.Clear();
Assembly asm = Assembly.Load(assemblyName); if (message != null) {
FillComponents(asm, null); Label lbl = new Label();
} else { lbl.BackColor = SystemColors.Window;
FillComponents(null, null); lbl.Text = StringParser.Parse(message);
lbl.Dock = DockStyle.Fill;
componentListView.Controls.Add(lbl);
} }
} }
@ -193,7 +201,7 @@ namespace ICSharpCode.FormsDesigner.Gui
void buttonClick(object sender, System.EventArgs e) void buttonClick(object sender, System.EventArgs e)
{ {
selectedComponents = new ArrayList(); selectedComponents = new ArrayList();
foreach (ListViewItem item in ((ListView)ControlDictionary["componentListView"]).Items) { foreach (ListViewItem item in componentListView.Items) {
if (item.Checked) { if (item.Checked) {
selectedComponents.Add((ToolComponent)item.Tag); selectedComponents.Add((ToolComponent)item.Tag);
} }

21
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlEditorControl.cs
Unescape View File

@ -7,6 +7,7 @@
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.DefaultEditor; using ICSharpCode.SharpDevelop.DefaultEditor;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
@ -41,6 +42,8 @@ namespace ICSharpCode.XmlEditor
Document.FoldingManager.FoldingStrategy = new XmlFoldingStrategy(); Document.FoldingManager.FoldingStrategy = new XmlFoldingStrategy();
TextEditorProperties = new SharpDevelopTextEditorProperties(); TextEditorProperties = new SharpDevelopTextEditorProperties();
Document.BookmarkManager.Removed += new ICSharpCode.TextEditor.Document.BookmarkEventHandler(BookmarkRemoved);
GenerateEditActions(); GenerateEditActions();
} }
@ -324,5 +327,23 @@ namespace ICSharpCode.XmlEditor
ActiveTextAreaControl.TextArea.MotherTextEditorControl.EndUpdate(); ActiveTextAreaControl.TextArea.MotherTextEditorControl.EndUpdate();
} }
/// <summary>
/// Have to remove the bookmark from the document otherwise the text will
/// stay marked in red if the bookmark is a breakpoint. This is because
/// there are two bookmark managers, one in SharpDevelop itself and one
/// in the TextEditor library. By default, only the one in the text editor's
/// bookmark manager will be removed, so SharpDevelop will not know about it.
/// Removing it from the SharpDevelop BookMarkManager informs the debugger
/// service that the breakpoint has been removed so it triggers the removal
/// of the text marker.
/// </summary>
void BookmarkRemoved(object sender, ICSharpCode.TextEditor.Document.BookmarkEventArgs e)
{
ICSharpCode.SharpDevelop.Bookmarks.SDBookmark b = e.Bookmark as ICSharpCode.SharpDevelop.Bookmarks.SDBookmark;
if (b != null) {
ICSharpCode.SharpDevelop.Bookmarks.BookmarkManager.RemoveMark(b);
}
}
} }
} }

2
src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
Unescape View File

@ -121,6 +121,8 @@ namespace ICSharpCode.AddInManager
string GetLink(string text) string GetLink(string text)
{ {
if (text == null)
return null;
switch (text) { switch (text) {
case "GNU General Public License": case "GNU General Public License":
case "GPL": case "GPL":

10
src/Main/Base/Project/Src/Dom/IDecoration.cs
Unescape View File

@ -46,6 +46,10 @@ namespace ICSharpCode.SharpDevelop.Dom
get; get;
} }
/// <summary>
/// Gets if the member is virtual. Is true only if the "virtual" modifier was used, but non-virtual
/// members can be overridden, too; if they are already overriding a method.
/// </summary>
bool IsVirtual { bool IsVirtual {
get; get;
} }
@ -86,6 +90,12 @@ namespace ICSharpCode.SharpDevelop.Dom
bool IsOverride { bool IsOverride {
get; get;
} }
/// <summary>
/// Gets if the member can be overridden. Returns true when the member is "virtual" or "override" but not "sealed".
/// </summary>
bool IsOverridable {
get;
}
bool IsNew { bool IsNew {
get; get;

5
src/Main/Base/Project/Src/Dom/Implementations/AbstractDecoration.cs
Unescape View File

@ -164,6 +164,11 @@ namespace ICSharpCode.SharpDevelop.Dom
return (modifiers & ModifierEnum.Override) == ModifierEnum.Override; return (modifiers & ModifierEnum.Override) == ModifierEnum.Override;
} }
} }
public bool IsOverridable {
get {
return (IsOverride || IsVirtual) && !IsSealed;
}
}
public bool IsNew { public bool IsNew {
get { get {
return (modifiers & ModifierEnum.New) == ModifierEnum.New; return (modifiers & ModifierEnum.New) == ModifierEnum.New;

30
src/Main/Base/Project/Src/Dom/Implementations/DefaultReturnType.cs
Unescape View File

@ -57,12 +57,15 @@ namespace ICSharpCode.SharpDevelop.Dom
// do not add methods that were overridden // do not add methods that were overridden
bool ok = true; bool ok = true;
foreach (IMethod oldMethod in l) { if (m.IsOverridable) {
if (string.Equals(oldMethod.Name, m.Name, StringComparison.InvariantCultureIgnoreCase)) { StringComparer comparer = m.DeclaringType.ProjectContent.Language.NameComparer;
if (m.IsStatic == oldMethod.IsStatic) { foreach (IMethod oldMethod in l) {
if (DiffUtility.Compare(oldMethod.Parameters, m.Parameters) == 0) { if (comparer.Equals(oldMethod.Name, m.Name)) {
ok = false; if (m.IsStatic == oldMethod.IsStatic) {
break; if (DiffUtility.Compare(oldMethod.Parameters, m.Parameters) == 0) {
ok = false;
break;
}
} }
} }
} }
@ -84,12 +87,15 @@ namespace ICSharpCode.SharpDevelop.Dom
foreach (IProperty p in bc.Properties) { foreach (IProperty p in bc.Properties) {
// do not add methods that were overridden // do not add methods that were overridden
bool ok = true; bool ok = true;
foreach (IProperty oldProperty in l) { if (p.IsOverridable) {
if (string.Equals(oldProperty.Name, p.Name, StringComparison.InvariantCultureIgnoreCase)) { StringComparer comparer = p.DeclaringType.ProjectContent.Language.NameComparer;
if (p.IsStatic == oldProperty.IsStatic) { foreach (IProperty oldProperty in l) {
if (DiffUtility.Compare(oldProperty.Parameters, p.Parameters) == 0) { if (comparer.Equals(oldProperty.Name, p.Name)) {
ok = false; if (p.IsStatic == oldProperty.IsStatic) {
break; if (DiffUtility.Compare(oldProperty.Parameters, p.Parameters) == 0) {
ok = false;
break;
}
} }
} }
} }

12
src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionLoader.cs
Unescape View File

@ -27,7 +27,11 @@ namespace ICSharpCode.SharpDevelop.Dom
return null; return null;
return DomPersistence.SaveProjectContent(content); return DomPersistence.SaveProjectContent(content);
} catch (Exception ex) { } catch (Exception ex) {
LoggingService.Error(ex); if (ex is FileLoadException) {
LoggingService.Info(ex);
} else {
LoggingService.Error(ex);
}
throw; throw;
} }
} }
@ -48,10 +52,10 @@ namespace ICSharpCode.SharpDevelop.Dom
if (assembly != null) if (assembly != null)
return new ReflectionProjectContent(assembly); return new ReflectionProjectContent(assembly);
else else
return null; throw new FileLoadException("Assembly not found.");
} catch (BadImageFormatException) { } catch (BadImageFormatException ex) {
LoggingService.Warn("BadImageFormat: " + include); LoggingService.Warn("BadImageFormat: " + include);
return null; throw new FileLoadException(ex.Message, ex);
} finally { } finally {
AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= AssemblyResolve; AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= AssemblyResolve;
lookupDirectory = null; lookupDirectory = null;

4
src/Main/Base/Project/Src/Gui/AbstractBaseViewContent.cs
Unescape View File

@ -55,6 +55,10 @@ namespace ICSharpCode.SharpDevelop.Gui
public virtual void Deselected() public virtual void Deselected()
{ {
} }
public virtual void Deselecting()
{
}
public virtual void RedrawContent() public virtual void RedrawContent()
{ {

6
src/Main/Base/Project/Src/Gui/IBaseViewContent.cs
Unescape View File

@ -50,6 +50,12 @@ namespace ICSharpCode.SharpDevelop.Gui
/// tab. NOT when the windows is selected. /// tab. NOT when the windows is selected.
/// </summary> /// </summary>
void Selected(); void Selected();
/// <summary>
/// Is called just before the view content is deselected inside the window
/// tab before the other window is selected. NOT when the windows is deselected.
/// </summary>
void Deselecting();
/// <summary> /// <summary>
/// Is called when the view content is deselected inside the window /// Is called when the view content is deselected inside the window

46
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
Unescape View File

@ -136,7 +136,9 @@ namespace ICSharpCode.SharpDevelop.Gui
viewTabControl = new TabControl(); viewTabControl = new TabControl();
viewTabControl.Alignment = TabAlignment.Bottom; viewTabControl.Alignment = TabAlignment.Bottom;
viewTabControl.Dock = DockStyle.Fill; viewTabControl.Dock = DockStyle.Fill;
viewTabControl.SelectedIndexChanged += new EventHandler(viewTabControlIndexChanged); viewTabControl.Selected += viewTabControlSelected;
viewTabControl.Deselecting += viewTabControlDeselecting;
viewTabControl.Deselected += viewTabControlDeselected;
} }
internal void InitControls() internal void InitControls()
@ -200,11 +202,6 @@ namespace ICSharpCode.SharpDevelop.Gui
WorkbenchSingleton.SafeThreadAsyncCall(new MethodInvoker(this.RefreshSecondaryViewContents)); WorkbenchSingleton.SafeThreadAsyncCall(new MethodInvoker(this.RefreshSecondaryViewContents));
} }
void LeaveTabPage(object sender, EventArgs e)
{
OnWindowDeselected(EventArgs.Empty);
}
public IViewContent ViewContent { public IViewContent ViewContent {
get { get {
return content; return content;
@ -260,6 +257,9 @@ namespace ICSharpCode.SharpDevelop.Gui
if (viewTabControl != null) { if (viewTabControl != null) {
foreach (TabPage page in viewTabControl.TabPages) { foreach (TabPage page in viewTabControl.TabPages) {
if (viewTabControl.SelectedTab == page && page.Tag is IBaseViewContent) {
((IBaseViewContent)page.Tag).Deselecting();
}
page.Controls.Clear(); page.Controls.Clear();
if (viewTabControl.SelectedTab == page && page.Tag is IBaseViewContent) { if (viewTabControl.SelectedTab == page && page.Tag is IBaseViewContent) {
((IBaseViewContent)page.Tag).Deselected(); ((IBaseViewContent)page.Tag).Deselected();
@ -319,28 +319,40 @@ namespace ICSharpCode.SharpDevelop.Gui
return content.SecondaryViewContents[index - 1]; return content.SecondaryViewContents[index - 1];
} }
int oldIndex = 0; void viewTabControlSelected(object sender, TabControlEventArgs e)
void viewTabControlIndexChanged(object sender, EventArgs e)
{ {
if (oldIndex >= 0) { if (e.Action == TabControlAction.Selected && e.TabPageIndex >= 0) {
IBaseViewContent secondaryViewContent = GetSubViewContent(oldIndex); IBaseViewContent secondaryViewContent = GetSubViewContent(e.TabPageIndex);
if (secondaryViewContent != null) { if (secondaryViewContent != null) {
secondaryViewContent.Deselected(); secondaryViewContent.Deselected();
}
}
if (viewTabControl.SelectedIndex >= 0) {
IBaseViewContent secondaryViewContent = GetSubViewContent(viewTabControl.SelectedIndex);
if (secondaryViewContent != null) {
secondaryViewContent.SwitchedTo(); secondaryViewContent.SwitchedTo();
secondaryViewContent.Selected(); secondaryViewContent.Selected();
} }
} }
oldIndex = viewTabControl.SelectedIndex;
WorkbenchSingleton.Workbench.WorkbenchLayout.OnActiveWorkbenchWindowChanged(EventArgs.Empty); WorkbenchSingleton.Workbench.WorkbenchLayout.OnActiveWorkbenchWindowChanged(EventArgs.Empty);
ActiveViewContent.Control.Focus(); ActiveViewContent.Control.Focus();
} }
void viewTabControlDeselecting(object sender, TabControlCancelEventArgs e)
{
if (e.Action == TabControlAction.Deselecting && e.TabPageIndex >= 0) {
IBaseViewContent secondaryViewContent = GetSubViewContent(e.TabPageIndex);
if (secondaryViewContent != null) {
secondaryViewContent.Deselecting();
}
}
}
void viewTabControlDeselected(object sender, TabControlEventArgs e)
{
if (e.Action == TabControlAction.Deselected && e.TabPageIndex >= 0) {
IBaseViewContent secondaryViewContent = GetSubViewContent(e.TabPageIndex);
if (secondaryViewContent != null) {
secondaryViewContent.Deselected();
}
}
}
public virtual void RedrawContent() public virtual void RedrawContent()
{ {
if (viewTabControl != null) { if (viewTabControl != null) {

24
src/Main/Base/Project/Src/Project/Converter/PrjxToSolutionProject.cs
Unescape View File

@ -209,10 +209,8 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
static Dictionary<string, XslCompiledTransform> xsltDict = new Dictionary<string, XslCompiledTransform>(); static Dictionary<string, XslCompiledTransform> xsltDict = new Dictionary<string, XslCompiledTransform>();
public static void RunConverter(string inFile, string outFile, string script, Conversion conversion) public static void RunConverter(TextReader inFile, string outFile, string script, Conversion conversion)
{ {
conversion.basePath = Path.GetDirectoryName(inFile);
XslCompiledTransform xslt; XslCompiledTransform xslt;
if (xsltDict.ContainsKey(script)) { if (xsltDict.ContainsKey(script)) {
xslt = xsltDict[script]; xslt = xsltDict[script];
@ -255,9 +253,13 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
else else
convertedFileName = Path.ChangeExtension(fileName, ".csproj"); convertedFileName = Path.ChangeExtension(fileName, ".csproj");
RunConverter(fileName, convertedFileName, "CSharp_prjx2csproj.xsl", conversion); conversion.basePath = Path.GetDirectoryName(fileName);
using (StreamReader fileReader = new StreamReader(fileName)) {
RunConverter(fileName, convertedFileName + ".user", "CSharp_prjx2csproj_user.xsl", conversion); RunConverter(fileReader, convertedFileName, "CSharp_prjx2csproj.xsl", conversion);
}
using (StreamReader fileReader = new StreamReader(fileName)) {
RunConverter(fileReader, convertedFileName + ".user", "CSharp_prjx2csproj_user.xsl", conversion);
}
return LanguageBindingService.LoadProject(convertedFileName, Conversion.GetProjectName(fileName)); return LanguageBindingService.LoadProject(convertedFileName, Conversion.GetProjectName(fileName));
} }
@ -279,9 +281,15 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
if (Solution.SolutionBeingLoaded != null) { if (Solution.SolutionBeingLoaded != null) {
Solution.ReadSolutionInformation(Solution.SolutionBeingLoaded.FileName, conversion); Solution.ReadSolutionInformation(Solution.SolutionBeingLoaded.FileName, conversion);
} }
RunConverter(old, fileName, "vsnet2msbuild.xsl", conversion);
conversion.basePath = Path.GetDirectoryName(fileName);
Encoding tmp = Encoding.Default;
string content = ICSharpCode.TextEditor.Util.FileReader.ReadFileContent(old, ref tmp, tmp);
RunConverter(new StringReader(content), fileName, "vsnet2msbuild.xsl", conversion);
if (File.Exists(oldUserFile)) { if (File.Exists(oldUserFile)) {
RunConverter(oldUserFile, userFile, "vsnet2msbuild_user.xsl", conversion); content = ICSharpCode.TextEditor.Util.FileReader.ReadFileContent(oldUserFile, ref tmp, tmp);
RunConverter(new StringReader(content), userFile, "vsnet2msbuild_user.xsl", conversion);
} }
} }
} }

6
src/Main/Base/Project/Src/Project/Solution/Solution.cs
Unescape View File

@ -593,12 +593,18 @@ namespace ICSharpCode.SharpDevelop.Project
} }
newSolution.fileName = Path.ChangeExtension(fileName, ".sln"); newSolution.fileName = Path.ChangeExtension(fileName, ".sln");
ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertSolution(newSolution, fileName); ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertSolution(newSolution, fileName);
if (newSolution.FixSolutionConfiguration(newSolution.Projects)) {
newSolution.Save();
}
} else if (extension == ".PRJX") { } else if (extension == ".PRJX") {
if (!MessageService.AskQuestion("${res:SharpDevelop.Solution.ImportPrjx}")) { if (!MessageService.AskQuestion("${res:SharpDevelop.Solution.ImportPrjx}")) {
return null; return null;
} }
newSolution.fileName = Path.ChangeExtension(fileName, ".sln"); newSolution.fileName = Path.ChangeExtension(fileName, ".sln");
ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertProject(newSolution, fileName); ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertProject(newSolution, fileName);
if (newSolution.FixSolutionConfiguration(newSolution.Projects)) {
newSolution.Save();
}
} else { } else {
newSolution.fileName = fileName; newSolution.fileName = fileName;
if (!SetupSolution(newSolution, fileName)) { if (!SetupSolution(newSolution, fileName)) {

2
src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
Unescape View File

@ -55,7 +55,7 @@ namespace ICSharpCode.Core
project = ProjectService.OpenSolution.StartupProject; project = ProjectService.OpenSolution.StartupProject;
} }
foreach (DebuggerDescriptor d in debuggers) { foreach (DebuggerDescriptor d in debuggers) {
if (d.Debugger.CanDebug(project)) { if (d.Debugger != null && d.Debugger.CanDebug(project)) {
return d.Debugger; return d.Debugger;
} }
} }

16
src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
Unescape View File

@ -172,9 +172,13 @@ namespace ICSharpCode.Core
object o = domain.CreateInstanceAndUnwrap(typeof(ReflectionLoader).Assembly.FullName, typeof(ReflectionLoader).FullName); object o = domain.CreateInstanceAndUnwrap(typeof(ReflectionLoader).Assembly.FullName, typeof(ReflectionLoader).FullName);
ReflectionLoader loader = (ReflectionLoader)o; ReflectionLoader loader = (ReflectionLoader)o;
database = loader.LoadAndCreateDatabase(filename, include); database = loader.LoadAndCreateDatabase(filename, include);
} catch (FileLoadException e) {
database = null;
WorkbenchSingleton.SafeThreadAsyncCall((Action3<string, string, string>)ShowErrorMessage,
new object[] { filename, include, e.Message });
} catch (Exception e) { } catch (Exception e) {
database = null; database = null;
MessageService.ShowError(e, "Error loading " + include + " from " + filename); MessageService.ShowError(e, "Error loading code-completion information for " + include + " from " + filename);
} finally { } finally {
AppDomain.Unload(domain); AppDomain.Unload(domain);
} }
@ -187,6 +191,16 @@ namespace ICSharpCode.Core
} }
} }
delegate void Action3<A, B, C>(A a, B b, C c);
static void ShowErrorMessage(string filename, string include, string message)
{
WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).BringPadToFront();
TaskService.BuildMessageViewCategory.AppendText("Error loading code-completion information for "
+ include + " from " + filename
+ ":\r\n" + message + "\r\n");
}
public static Assembly MscorlibAssembly { public static Assembly MscorlibAssembly {
get { get {
return typeof(object).Assembly; return typeof(object).Assembly;

4
src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs
Unescape View File

@ -138,7 +138,9 @@ namespace SearchAndReplace
string transformedPattern = result.TransformReplacePattern(SearchOptions.ReplacePattern); string transformedPattern = result.TransformReplacePattern(SearchOptions.ReplacePattern);
find.Replace(result.Offset, result.Length, transformedPattern); find.Replace(result.Offset, result.Length, transformedPattern);
textArea.Document.Replace(result.Offset, result.Length, transformedPattern); if (find.CurrentDocumentInformation.Document == null) {
textArea.Document.Replace(result.Offset, result.Length, transformedPattern);
}
} }
} }
} }

6
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
Unescape View File

@ -67,12 +67,14 @@ namespace ICSharpCode.Core
this.path = path; this.path = path;
} }
public void Apply(ArrayList items) public void Apply(IList items)
{ {
AddInTreeNode node; AddInTreeNode node;
try { try {
node = AddInTree.GetTreeNode(path); node = AddInTree.GetTreeNode(path);
items.AddRange(node.BuildChildItems(caller)); foreach (object o in node.BuildChildItems(caller)) {
items.Add(o);
}
} catch (TreePathNotFoundException) { } catch (TreePathNotFoundException) {
MessageService.ShowError("IncludeDoozer: AddinTree-Path not found: " + path); MessageService.ShowError("IncludeDoozer: AddinTree-Path not found: " + path);
} }

2
src/Main/Core/Project/Src/AddInTree/AddIn/IBuildItemsModifier.cs
Unescape View File

@ -21,6 +21,6 @@ namespace ICSharpCode.Core
/// </summary> /// </summary>
public interface IBuildItemsModifier public interface IBuildItemsModifier
{ {
void Apply(ArrayList items); void Apply(IList items);
} }
} }

28
src/Main/Core/Project/Src/AddInTree/AddInTree.cs
Unescape View File

@ -131,6 +131,34 @@ namespace ICSharpCode.Core
return node.BuildChildItems(caller); return node.BuildChildItems(caller);
} }
/// <summary>
/// Builds the items in the path. Ensures that all items have the type T.
/// Throws an exception if the path is not found.
/// </summary>
/// <param name="path">A path in the addin tree.</param>
/// <param name="caller">The owner used to create the objects.</param>
public static List<T> BuildItems<T>(string path, object caller)
{
return BuildItems<T>(path, caller, true);
}
/// <summary>
/// Builds the items in the path. Ensures that all items have the type T.
/// </summary>
/// <param name="path">A path in the addin tree.</param>
/// <param name="caller">The owner used to create the objects.</param>
/// <param name="throwOnNotFound">If true, throws an TreePathNotFoundException
/// if the path is not found. If false, an empty ArrayList is returned when the
/// path is not found.</param>
public static List<T> BuildItems<T>(string path, object caller, bool throwOnNotFound)
{
AddInTreeNode node = GetTreeNode(path, throwOnNotFound);
if (node == null)
return new List<T>();
else
return node.BuildChildItems<T>(caller);
}
static AddInTreeNode CreatePath(AddInTreeNode localRoot, string path) static AddInTreeNode CreatePath(AddInTreeNode localRoot, string path)
{ {
if (path == null || path.Length == 0) { if (path == null || path.Length == 0) {

33
src/Main/Core/Project/Src/AddInTree/AddInTreeNode.cs
Unescape View File

@ -36,7 +36,7 @@ namespace ICSharpCode.Core
public AddInTreeNode() public AddInTreeNode()
{ {
} }
// //
// public void BinarySerialize(BinaryWriter writer) // public void BinarySerialize(BinaryWriter writer)
// { // {
// if (!isSorted) { // if (!isSorted) {
@ -47,7 +47,7 @@ namespace ICSharpCode.Core
// foreach (Codon codon in codons) { // foreach (Codon codon in codons) {
// codon.BinarySerialize(writer); // codon.BinarySerialize(writer);
// } // }
// //
// writer.Write((ushort)childNodes.Count); // writer.Write((ushort)childNodes.Count);
// foreach (KeyValuePair<string, AddInTreeNode> child in childNodes) { // foreach (KeyValuePair<string, AddInTreeNode> child in childNodes) {
// writer.Write(AddInTree.GetNameOffset(child.Key)); // writer.Write(AddInTree.GetNameOffset(child.Key));
@ -127,6 +127,35 @@ namespace ICSharpCode.Core
} }
} }
public List<T> BuildChildItems<T>(object caller)
{
List<T> items = new List<T>(codons.Count);
if (!isSorted) {
codons = (new TopologicalSort(codons)).Execute();
isSorted = true;
}
foreach (Codon codon in codons) {
ArrayList subItems = null;
if (childNodes.ContainsKey(codon.Id)) {
subItems = childNodes[codon.Id].BuildChildItems(caller);
}
object result = codon.BuildItem(caller, subItems);
if (result == null)
continue;
IBuildItemsModifier mod = result as IBuildItemsModifier;
if (mod != null) {
mod.Apply(items);
} else if (result is T) {
items.Add((T)result);
} else {
throw new InvalidCastException("The AddInTreeNode <" + codon.Name + " id='" + codon.Id
+ "' returned an instance of " + result.GetType().FullName
+ " but the type " + typeof(T).FullName + " is expected.");
}
}
return items;
}
public ArrayList BuildChildItems(object caller) public ArrayList BuildChildItems(object caller)
{ {
ArrayList items = new ArrayList(codons.Count); ArrayList items = new ArrayList(codons.Count);

2
src/Main/Core/Project/Src/AddInTree/CoreStartup.cs
Unescape View File

@ -105,7 +105,7 @@ namespace ICSharpCode.Core
// run workspace autostart commands // run workspace autostart commands
LoggingService.Info("Running autostart commands..."); LoggingService.Info("Running autostart commands...");
foreach (ICommand command in AddInTree.BuildItems("/Workspace/Autostart", null, false)) { foreach (ICommand command in AddInTree.BuildItems<ICommand>("/Workspace/Autostart", null, false)) {
command.Run(); command.Run();
} }
} }

16
src/Main/StartUp/Project/Dialogs/ExceptionBox.cs
Unescape View File

@ -12,6 +12,7 @@ using System.Diagnostics;
using System.Resources; using System.Resources;
using System.Reflection; using System.Reflection;
using System.Drawing; using System.Drawing;
using System.Threading;
using System.Globalization; using System.Globalization;
using ICSharpCode.Core; using ICSharpCode.Core;
@ -54,7 +55,7 @@ namespace ICSharpCode.SharpDevelop
string getClipboardString() string getClipboardString()
{ {
string str = ""; string str = "";
str += ".NET Version : " + Environment.Version.ToString() + Environment.NewLine; str += ".NET Version : " + Environment.Version.ToString() + Environment.NewLine;
str += "OS Version : " + Environment.OSVersion.ToString() + Environment.NewLine; str += "OS Version : " + Environment.OSVersion.ToString() + Environment.NewLine;
string cultureName = null; string cultureName = null;
try { try {
@ -67,6 +68,9 @@ namespace ICSharpCode.SharpDevelop
} }
} catch {} } catch {}
try { try {
if (IntPtr.Size != 4) {
str += "Running as " + (IntPtr.Size * 8) + " bit process" + Environment.NewLine;
}
if (SystemInformation.TerminalServerSession) { if (SystemInformation.TerminalServerSession) {
str += "Terminal Server Session" + Environment.NewLine; str += "Terminal Server Session" + Environment.NewLine;
} }
@ -90,7 +94,15 @@ namespace ICSharpCode.SharpDevelop
void CopyInfoToClipboard() void CopyInfoToClipboard()
{ {
if (copyErrorCheckBox.Checked) { if (copyErrorCheckBox.Checked) {
ClipboardWrapper.SetText(getClipboardString()); if (Application.OleRequired() == ApartmentState.STA) {
ClipboardWrapper.SetText(getClipboardString());
} else {
Thread th = new Thread((ThreadStart)delegate {
ClipboardWrapper.SetText(getClipboardString());
});
th.SetApartmentState(ApartmentState.STA);
th.Start();
}
} }
} }

14
src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj
Unescape View File

@ -11,11 +11,21 @@
<NoStdLib>False</NoStdLib> <NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig> <NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent> <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>x86</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<NoWarn>1607</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
@ -23,7 +33,7 @@
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
@ -44,4 +54,4 @@
<Compile Include="Main.cs" /> <Compile Include="Main.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project> </Project>

5
src/Tools/SVNChangeLogToXml/SVNChangelogToXml.csproj.user
Unescape View File

@ -1,4 +1 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
</Project>

16
src/Tools/SVNChangeLogToXml/SVNChangelogToXml.sln
Unescape View File

@ -0,0 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1166
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SVNChangelogToXml", "SVNChangelogToXml.csproj", "{c6159c5e-f6ef-4a63-b152-0e49159b6059}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C6159C5E-F6EF-4A63-B152-0E49159B6059}.Debug|Any CPU.Build.0 = Debug|AnyCPU
{C6159C5E-F6EF-4A63-B152-0E49159B6059}.Debug|Any CPU.ActiveCfg = Debug|AnyCPU
{C6159C5E-F6EF-4A63-B152-0E49159B6059}.Release|Any CPU.Build.0 = Release|AnyCPU
{C6159C5E-F6EF-4A63-B152-0E49159B6059}.Release|Any CPU.ActiveCfg = Release|AnyCPU
EndGlobalSection
EndGlobal

16
src/Tools/StringResourceToolAddIn/StringResourceToolAddIn.sln
Unescape View File

@ -0,0 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.1.0.9999
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringResourceToolAddIn", "StringResourceToolAddIn.csproj", "{3648E209-B853-4168-BFB5-7A60EAF316F8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|AnyCPU = Debug|AnyCPU
Release|AnyCPU = Release|AnyCPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3648E209-B853-4168-BFB5-7A60EAF316F8}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{3648E209-B853-4168-BFB5-7A60EAF316F8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{3648E209-B853-4168-BFB5-7A60EAF316F8}.Release|AnyCPU.Build.0 = Release|Any CPU
{3648E209-B853-4168-BFB5-7A60EAF316F8}.Release|AnyCPU.ActiveCfg = Release|Any CPU
EndGlobalSection
EndGlobal

13
src/Tools/UpdateAssemblyInfo/UpdateAssemblyInfo.csproj
Unescape View File

@ -6,6 +6,19 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{605C8CDB-F0AD-4A21-9F4A-959B8DECB0F3}</ProjectGuid> <ProjectGuid>{605C8CDB-F0AD-4A21-9F4A-959B8DECB0F3}</ProjectGuid>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<NoStdLib>False</NoStdLib>
<DebugType>None</DebugType>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>x86</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>false</DebugSymbols>
<NoWarn>1607</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>

Write Preview
Loading…
Cancel
Save