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

fix formatting of pull request changes

pull/512/head
Siegfried Pammer 11 years ago
parent
355e096f49
commit
0d82186161
2 changed files with 101 additions and 109 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. 123
      ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs
  2. 87
      ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs

123
ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs
Unescape View File

@ -26,74 +26,67 @@ using Mono.Cecil;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
[Export(typeof(IResourceNodeFactory))] [Export(typeof(IResourceNodeFactory))]
sealed class IconResourceNodeFactory : IResourceNodeFactory sealed class IconResourceNodeFactory : IResourceNodeFactory
{ {
public ILSpyTreeNode CreateNode(Resource resource) public ILSpyTreeNode CreateNode(Resource resource)
{ {
EmbeddedResource er = resource as EmbeddedResource; EmbeddedResource er = resource as EmbeddedResource;
if (er != null) if (er != null) {
{ return CreateNode(er.Name, er.GetResourceStream());
return CreateNode(er.Name, er.GetResourceStream()); }
} return null;
return null; }
}
public ILSpyTreeNode CreateNode(string key, object data) public ILSpyTreeNode CreateNode(string key, object data)
{ {
if (data is System.Drawing.Icon) if (data is System.Drawing.Icon) {
{ MemoryStream s = new MemoryStream();
MemoryStream s = new MemoryStream(); ((System.Drawing.Icon)data).Save(s);
((System.Drawing.Icon)data).Save(s); return new IconResourceEntryNode(key, s);
return new IconResourceEntryNode(key, s); }
} if (data is Stream && key.EndsWith(".ico", StringComparison.OrdinalIgnoreCase))
if (data is Stream && key.EndsWith(".ico", StringComparison.OrdinalIgnoreCase)) return new IconResourceEntryNode(key, (Stream)data);
return new IconResourceEntryNode(key, (Stream)data); return null;
return null; }
} }
}
sealed class IconResourceEntryNode : ResourceEntryNode sealed class IconResourceEntryNode : ResourceEntryNode
{ {
public IconResourceEntryNode(string key, Stream data) public IconResourceEntryNode(string key, Stream data)
: base(key, data) : base(key, data)
{ {
} }
public override object Icon public override object Icon
{ {
get { return Images.ResourceImage; } get { return Images.ResourceImage; }
} }
public override bool View(DecompilerTextView textView) public override bool View(DecompilerTextView textView)
{ {
try try {
{ AvalonEditTextOutput output = new AvalonEditTextOutput();
AvalonEditTextOutput output = new AvalonEditTextOutput(); Data.Position = 0;
Data.Position = 0; IconBitmapDecoder decoder = new IconBitmapDecoder(Data, BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.None);
IconBitmapDecoder decoder = new IconBitmapDecoder(Data, BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.None); foreach (var frame in decoder.Frames) {
foreach (var frame in decoder.Frames) output.Write(String.Format("{0}x{1}, {2} bit: ", frame.PixelHeight, frame.PixelWidth, frame.Thumbnail.Format.BitsPerPixel));
{ AddIcon(output, frame);
output.Write(String.Format("{0}x{1}, {2} bit: ", frame.PixelHeight, frame.PixelWidth, frame.Thumbnail.Format.BitsPerPixel)); output.WriteLine();
AddIcon(output, frame); }
output.WriteLine(); output.AddButton(Images.Save, "Save", delegate {
} Save(null);
output.AddButton(Images.Save, "Save", delegate });
{ textView.ShowNode(output, this);
Save(null); return true;
}); } catch (Exception) {
textView.ShowNode(output, this); return false;
return true; }
} }
catch (Exception)
{
return false;
}
}
private static void AddIcon(AvalonEditTextOutput output, BitmapFrame frame) private static void AddIcon(AvalonEditTextOutput output, BitmapFrame frame)
{ {
output.AddUIElement(() => new Image { Source = frame }); output.AddUIElement(() => new Image { Source = frame });
} }
} }
} }

87
ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs
Unescape View File

@ -27,65 +27,64 @@ using ICSharpCode.Decompiler;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
[Export(typeof(IResourceNodeFactory))] [Export(typeof(IResourceNodeFactory))]
sealed class ImageListResourceEntryNodeFactory : IResourceNodeFactory sealed class ImageListResourceEntryNodeFactory : IResourceNodeFactory
{ {
#region IResourceNodeFactory Members #region IResourceNodeFactory Members
public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource) public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
{ {
return null; return null;
} }
public ILSpyTreeNode CreateNode(string key, object data) public ILSpyTreeNode CreateNode(string key, object data)
{ {
if (data is ImageListStreamer) if (data is ImageListStreamer)
return new ImageListResourceEntryNode(key, (ImageListStreamer)data); return new ImageListResourceEntryNode(key, (ImageListStreamer)data);
return null; return null;
} }
#endregion #endregion
} }
sealed class ImageListResourceEntryNode : ILSpyTreeNode sealed class ImageListResourceEntryNode : ILSpyTreeNode
{ {
private readonly string key; private readonly string key;
private readonly ImageList data; private readonly ImageList data;
public ImageListResourceEntryNode(string key, ImageListStreamer data) public ImageListResourceEntryNode(string key, ImageListStreamer data)
{ {
this.LazyLoading = true; this.LazyLoading = true;
this.key = key; this.key = key;
this.data = new ImageList(); this.data = new ImageList();
this.data.ImageStream = data; this.data.ImageStream = data;
} }
public override object Text public override object Text
{ {
get { return key; } get { return key; }
} }
public override object Icon public override object Icon
{ {
get { return Images.ResourceImage; } get { return Images.ResourceImage; }
} }
protected override void LoadChildren() protected override void LoadChildren()
{ {
int i = 0; int i = 0;
foreach (Image image in this.data.Images) foreach (Image image in this.data.Images) {
{ var node = ResourceEntryNode.Create("Image" + i.ToString(), image);
var node = ResourceEntryNode.Create("Image" + i.ToString(), image); if (node != null)
if (node != null) Children.Add(node);
Children.Add(node); ++i;
++i; }
} }
}
public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
{ {
EnsureLazyChildren(); EnsureLazyChildren();
} }
} }
} }

Write Preview
Loading…
Cancel
Save