Browse Source

Add overlay icon for private protected.

pull/1010/head
Siegfried Pammer 8 years ago
parent
commit
b91cf16aa0
  1. 1
      ILSpy/ILSpy.csproj
  2. 1
      ILSpy/Images/AccessOverlayIcon.cs
  3. 2
      ILSpy/Images/ILSpyNewIconList.txt
  4. 4
      ILSpy/Images/Images.cs
  5. BIN
      ILSpy/Images/OverlayPrivateProtected.png
  6. 3
      ILSpy/TreeNodes/EventTreeNode.cs
  7. 3
      ILSpy/TreeNodes/FieldTreeNode.cs
  8. 3
      ILSpy/TreeNodes/MethodTreeNode.cs
  9. 3
      ILSpy/TreeNodes/PropertyTreeNode.cs
  10. 4
      ILSpy/TreeNodes/TypeTreeNode.cs

1
ILSpy/ILSpy.csproj

@ -349,6 +349,7 @@
<Resource Include="Images\FieldReadOnly.png" /> <Resource Include="Images\FieldReadOnly.png" />
<Resource Include="Images\OverlayInternal.png" /> <Resource Include="Images\OverlayInternal.png" />
<Resource Include="Images\OverlayPrivate.png" /> <Resource Include="Images\OverlayPrivate.png" />
<Resource Include="Images\OverlayPrivateProtected.png" />
<Resource Include="Images\OverlayProtected.png" /> <Resource Include="Images\OverlayProtected.png" />
<Resource Include="Images\OverlayProtectedInternal.png" /> <Resource Include="Images\OverlayProtectedInternal.png" />
<Resource Include="Images\OverlayCompilerControlled.png" /> <Resource Include="Images\OverlayCompilerControlled.png" />

1
ILSpy/Images/AccessOverlayIcon.cs

@ -26,6 +26,7 @@ namespace ICSharpCode.ILSpy
Internal, Internal,
ProtectedInternal, ProtectedInternal,
Private, Private,
PrivateProtected,
CompilerControlled CompilerControlled
} }
} }

2
ILSpy/Images/ILSpyNewIconList.txt

@ -39,7 +39,7 @@ OverlayProtected.png new (Fugue derived)
OverlayProtectedInternal.png new (Fugue derived) OverlayProtectedInternal.png new (Fugue derived)
OverlayStatic.png new (Fugue derived) OverlayStatic.png new (Fugue derived)
PInvokeMethod.png new (Fugue-Icon-Mashup) PInvokeMethod.png new (Fugue-Icon-Mashup)
PrivateInternal.png new (Fugue derived) OverlayPrivateProtected.png new (Fugue derived)
Property.png ClassBrowserIcons\Icons.16x16.Property.png Property.png ClassBrowserIcons\Icons.16x16.Property.png
ReferenceFolder.Closed.png ProjectBrowserIcons\ReferenceFolder.Closed.png ReferenceFolder.Closed.png ProjectBrowserIcons\ReferenceFolder.Closed.png
ReferenceFolder.Open.png ProjectBrowserIcons\ReferenceFolder.Open.png ReferenceFolder.Open.png ProjectBrowserIcons\ReferenceFolder.Open.png

4
ILSpy/Images/Images.cs

@ -95,6 +95,7 @@ namespace ICSharpCode.ILSpy
private static readonly BitmapImage OverlayInternal = LoadBitmap("OverlayInternal"); private static readonly BitmapImage OverlayInternal = LoadBitmap("OverlayInternal");
private static readonly BitmapImage OverlayProtectedInternal = LoadBitmap("OverlayProtectedInternal"); private static readonly BitmapImage OverlayProtectedInternal = LoadBitmap("OverlayProtectedInternal");
private static readonly BitmapImage OverlayPrivate = LoadBitmap("OverlayPrivate"); private static readonly BitmapImage OverlayPrivate = LoadBitmap("OverlayPrivate");
private static readonly BitmapImage OverlayPrivateProtected = LoadBitmap("OverlayPrivateProtected");
private static readonly BitmapImage OverlayCompilerControlled = LoadBitmap("OverlayCompilerControlled"); private static readonly BitmapImage OverlayCompilerControlled = LoadBitmap("OverlayCompilerControlled");
private static readonly BitmapImage OverlayStatic = LoadBitmap("OverlayStatic"); private static readonly BitmapImage OverlayStatic = LoadBitmap("OverlayStatic");
@ -295,6 +296,9 @@ namespace ICSharpCode.ILSpy
case AccessOverlayIcon.Private: case AccessOverlayIcon.Private:
overlayImage = Images.OverlayPrivate; overlayImage = Images.OverlayPrivate;
break; break;
case AccessOverlayIcon.PrivateProtected:
overlayImage = Images.OverlayPrivateProtected;
break;
case AccessOverlayIcon.CompilerControlled: case AccessOverlayIcon.CompilerControlled:
overlayImage = Images.OverlayCompilerControlled; overlayImage = Images.OverlayCompilerControlled;
break; break;

BIN
ILSpy/Images/OverlayPrivateProtected.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

3
ILSpy/TreeNodes/EventTreeNode.cs

@ -73,8 +73,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
case MethodAttributes.Public: case MethodAttributes.Public:
return AccessOverlayIcon.Public; return AccessOverlayIcon.Public;
case MethodAttributes.Assembly: case MethodAttributes.Assembly:
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.Internal; return AccessOverlayIcon.Internal;
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.PrivateProtected;
case MethodAttributes.Family: case MethodAttributes.Family:
return AccessOverlayIcon.Protected; return AccessOverlayIcon.Protected;
case MethodAttributes.FamORAssem: case MethodAttributes.FamORAssem:

3
ILSpy/TreeNodes/FieldTreeNode.cs

@ -87,8 +87,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
case FieldAttributes.Public: case FieldAttributes.Public:
return AccessOverlayIcon.Public; return AccessOverlayIcon.Public;
case FieldAttributes.Assembly: case FieldAttributes.Assembly:
case FieldAttributes.FamANDAssem:
return AccessOverlayIcon.Internal; return AccessOverlayIcon.Internal;
case FieldAttributes.FamANDAssem:
return AccessOverlayIcon.PrivateProtected;
case FieldAttributes.Family: case FieldAttributes.Family:
return AccessOverlayIcon.Protected; return AccessOverlayIcon.Protected;
case FieldAttributes.FamORAssem: case FieldAttributes.FamORAssem:

3
ILSpy/TreeNodes/MethodTreeNode.cs

@ -104,8 +104,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
case MethodAttributes.Public: case MethodAttributes.Public:
return AccessOverlayIcon.Public; return AccessOverlayIcon.Public;
case MethodAttributes.Assembly: case MethodAttributes.Assembly:
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.Internal; return AccessOverlayIcon.Internal;
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.PrivateProtected;
case MethodAttributes.Family: case MethodAttributes.Family:
return AccessOverlayIcon.Protected; return AccessOverlayIcon.Protected;
case MethodAttributes.FamORAssem: case MethodAttributes.FamORAssem:

3
ILSpy/TreeNodes/PropertyTreeNode.cs

@ -101,8 +101,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
case MethodAttributes.Public: case MethodAttributes.Public:
return AccessOverlayIcon.Public; return AccessOverlayIcon.Public;
case MethodAttributes.Assembly: case MethodAttributes.Assembly:
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.Internal; return AccessOverlayIcon.Internal;
case MethodAttributes.FamANDAssem:
return AccessOverlayIcon.PrivateProtected;
case MethodAttributes.Family: case MethodAttributes.Family:
return AccessOverlayIcon.Protected; return AccessOverlayIcon.Protected;
case MethodAttributes.FamORAssem: case MethodAttributes.FamORAssem:

4
ILSpy/TreeNodes/TypeTreeNode.cs

@ -147,9 +147,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
break; break;
case TypeAttributes.NotPublic: case TypeAttributes.NotPublic:
case TypeAttributes.NestedAssembly: case TypeAttributes.NestedAssembly:
case TypeAttributes.NestedFamANDAssem:
overlay = AccessOverlayIcon.Internal; overlay = AccessOverlayIcon.Internal;
break; break;
case TypeAttributes.NestedFamANDAssem:
overlay = AccessOverlayIcon.PrivateProtected;
break;
case TypeAttributes.NestedFamily: case TypeAttributes.NestedFamily:
case TypeAttributes.NestedFamORAssem: case TypeAttributes.NestedFamORAssem:
overlay = AccessOverlayIcon.Protected; overlay = AccessOverlayIcon.Protected;

Loading…
Cancel
Save