Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 7196a27

Browse files
disable support for custom controls in WPF designer, due to http://community.sharpdevelop.net/forums/p/19968/50794.aspx#50794
1 parent 240d4e6 commit 7196a27

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/MyTypeFinder.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ public static MyTypeFinder Create(OpenedFile file)
2222
f.file = file;
2323
f.ImportFrom(CreateWpfTypeFinder());
2424

25-
var pc = MyTypeFinder.GetProjectContent(file);
26-
foreach (var referencedProjectContent in pc.ThreadSafeGetReferencedContents()) {
27-
string fileName = null;
28-
try{
29-
if (referencedProjectContent is ParseProjectContent)
30-
{
31-
var prj = ((ParseProjectContent)referencedProjectContent).Project as AbstractProject;
32-
if (prj != null)
33-
fileName = prj.OutputAssemblyFullPath;
34-
}
35-
else if (referencedProjectContent is ReflectionProjectContent)
36-
{
37-
fileName = ((ReflectionProjectContent) referencedProjectContent).AssemblyLocation;
38-
}
39-
var assembly = Assembly.LoadFrom(fileName);
40-
f.RegisterAssembly(assembly);
41-
}
42-
catch (Exception ex) {
43-
ICSharpCode.Core.LoggingService.Warn("Error loading Assembly : "+ (fileName ?? ""), ex);
44-
}
45-
}
25+
// var pc = MyTypeFinder.GetProjectContent(file);
26+
// foreach (var referencedProjectContent in pc.ThreadSafeGetReferencedContents()) {
27+
// string fileName = null;
28+
// try{
29+
// if (referencedProjectContent is ParseProjectContent)
30+
// {
31+
// var prj = ((ParseProjectContent)referencedProjectContent).Project as AbstractProject;
32+
// if (prj != null)
33+
// fileName = prj.OutputAssemblyFullPath;
34+
// }
35+
// else if (referencedProjectContent is ReflectionProjectContent)
36+
// {
37+
// fileName = ((ReflectionProjectContent) referencedProjectContent).AssemblyLocation;
38+
// }
39+
// var assembly = Assembly.LoadFrom(fileName);
40+
// f.RegisterAssembly(assembly);
41+
// }
42+
// catch (Exception ex) {
43+
// ICSharpCode.Core.LoggingService.Warn("Error loading Assembly : "+ (fileName ?? ""), ex);
44+
// }
45+
// }
4646
return f;
4747
}
4848

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,27 +83,29 @@ public void AddProjectDlls(OpenedFile file)
8383
{
8484
try
8585
{
86-
var assembly = Assembly.LoadFrom(f);
87-
88-
SideTab sideTab = new SideTab(sideBar, assembly.FullName.Split(new[] {','})[0]);
89-
sideTab.DisplayName = StringParser.Parse(sideTab.Name);
90-
sideTab.CanBeDeleted = false;
91-
sideTab.ChoosedItemChanged += OnChoosedItemChanged;
92-
93-
sideTab.Items.Add(new WpfSideTabItem());
94-
95-
foreach (var t in assembly.GetExportedTypes())
96-
{
97-
if (IsControl(t))
98-
{
99-
sideTab.Items.Add(new WpfSideTabItem(t));
100-
}
101-
}
102-
103-
if (sideTab.Items.Count > 1)
104-
sideBar.Tabs.Add(sideTab);
105-
106-
addedAssemblys.Add(f);
86+
// DO NOT USE Assembly.LoadFrom!!!
87+
// see http://community.sharpdevelop.net/forums/t/19968.aspx
88+
// var assembly = Assembly.LoadFrom(f);
89+
//
90+
// SideTab sideTab = new SideTab(sideBar, assembly.FullName.Split(new[] {','})[0]);
91+
// sideTab.DisplayName = StringParser.Parse(sideTab.Name);
92+
// sideTab.CanBeDeleted = false;
93+
// sideTab.ChoosedItemChanged += OnChoosedItemChanged;
94+
//
95+
// sideTab.Items.Add(new WpfSideTabItem());
96+
//
97+
// foreach (var t in assembly.GetExportedTypes())
98+
// {
99+
// if (IsControl(t))
100+
// {
101+
// sideTab.Items.Add(new WpfSideTabItem(t));
102+
// }
103+
// }
104+
//
105+
// if (sideTab.Items.Count > 1)
106+
// sideBar.Tabs.Add(sideTab);
107+
//
108+
// addedAssemblys.Add(f);
107109
}
108110
catch (Exception ex)
109111
{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public WpfViewContent(OpenedFile file) : base(file)
3939

4040
BasicMetadata.Register();
4141

42-
WpfToolbox.Instance.AddProjectDlls(file);
42+
//WpfToolbox.Instance.AddProjectDlls(file);
4343

4444
ProjectService.ProjectItemAdded += ProjectService_ProjectItemAdded;
4545

@@ -49,8 +49,8 @@ public WpfViewContent(OpenedFile file) : base(file)
4949

5050
void ProjectService_ProjectItemAdded(object sender, ProjectItemEventArgs e)
5151
{
52-
if (e.ProjectItem is ReferenceProjectItem)
53-
WpfToolbox.Instance.AddProjectDlls(this.Files[0]);
52+
// if (e.ProjectItem is ReferenceProjectItem)
53+
// WpfToolbox.Instance.AddProjectDlls(this.Files[0]);
5454
}
5555

5656
static WpfViewContent()

0 commit comments

Comments
 (0)