diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index c54f80f84..bd64bc246 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -347,12 +347,15 @@ + + + @@ -548,6 +551,9 @@ MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile @@ -569,6 +575,12 @@ Designer MSBuild:Compile + + MSBuild:Compile + + + MSBuild:Compile + MSBuild:Compile diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs index 8db74138e..c5c33641f 100644 --- a/ILSpy/Images/Images.cs +++ b/ILSpy/Images/Images.cs @@ -68,15 +68,15 @@ namespace ICSharpCode.ILSpy public static readonly object ReferenceFolder = Load("ReferenceFolder"); - public static readonly BitmapImage SubTypes = LoadBitmap("SubTypes"); - public static readonly BitmapImage SuperTypes = LoadBitmap("SuperTypes"); + public static readonly object SubTypes = Load("SubTypes"); + public static readonly object SuperTypes = Load("SuperTypes"); public static readonly object FolderOpen = Load("Folder.Open"); public static readonly object FolderClosed = Load("Folder.Closed"); public static readonly object Resource = Load("Resource"); public static readonly object ResourceImage = Load("ResourceImage"); - public static readonly BitmapImage ResourceResourcesFile = LoadBitmap("ResourceResourcesFile"); + public static readonly object ResourceResourcesFile = Load("ResourceResourcesFile"); public static readonly object ResourceXml = Load("ResourceXml"); public static readonly object ResourceXsd = Load("ResourceXslt"); public static readonly object ResourceXslt = Load("ResourceXslt"); diff --git a/ILSpy/Images/Resource.svg b/ILSpy/Images/Resource.svg index 7f463d7ef..7b36178ab 100644 --- a/ILSpy/Images/Resource.svg +++ b/ILSpy/Images/Resource.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ILSpy/Images/Resource.xaml b/ILSpy/Images/Resource.xaml index 22555471b..4e973ba91 100644 --- a/ILSpy/Images/Resource.xaml +++ b/ILSpy/Images/Resource.xaml @@ -3,21 +3,8 @@ - - - - - - - - - - - - - - - - + + + diff --git a/ILSpy/Images/ResourceResourcesFile.svg b/ILSpy/Images/ResourceResourcesFile.svg new file mode 100644 index 000000000..7f463d7ef --- /dev/null +++ b/ILSpy/Images/ResourceResourcesFile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ILSpy/Images/ResourceResourcesFile.xaml b/ILSpy/Images/ResourceResourcesFile.xaml new file mode 100644 index 000000000..22555471b --- /dev/null +++ b/ILSpy/Images/ResourceResourcesFile.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ILSpy/Images/SubTypes.svg b/ILSpy/Images/SubTypes.svg new file mode 100644 index 000000000..fbe0b6840 --- /dev/null +++ b/ILSpy/Images/SubTypes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ILSpy/Images/SubTypes.xaml b/ILSpy/Images/SubTypes.xaml new file mode 100644 index 000000000..f04b0a283 --- /dev/null +++ b/ILSpy/Images/SubTypes.xaml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ILSpy/Images/SuperTypes.svg b/ILSpy/Images/SuperTypes.svg new file mode 100644 index 000000000..201af86b7 --- /dev/null +++ b/ILSpy/Images/SuperTypes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ILSpy/Images/SuperTypes.xaml b/ILSpy/Images/SuperTypes.xaml new file mode 100644 index 000000000..9563b07e1 --- /dev/null +++ b/ILSpy/Images/SuperTypes.xaml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs index 3b6e50a30..0e85a1c5e 100644 --- a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs +++ b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs @@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.TreeNodes public override object Text => Resources.DerivedTypes; - public override object Icon => Images.SubTypes; + public override object Icon => Images.GetIcon(Images.SubTypes); protected override void LoadChildren() {