Fixed icons.

MrJul · Feb 1, 2015 · f81970e · f81970e
1 parent 02594cb
commit f81970e
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 117 deletions.
diff --git a/Build.bat → Build.cmd b/Build.bat → Build.cmd
diff --git a/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.csproj b/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.csproj
@@ -18,7 +18,8 @@
     <Compile Include="DocumentMarkup\IdentifierTooltipContentProvider.cs" />
     <Compile Include="DocumentMarkup\SeverityExtensions.cs" />
     <Compile Include="DocumentMarkup\TextStyleHighlighterManager.cs" />
-    <Compile Include="GenericImages\ThemedIcons.Generic.Generated.cs" />
+    <Compile Include="GenericImages\ThemedIcons.cs" />
+    <Compile Include="GenericImages\ThemedIcons.8.2.cs" />
     <Compile Include="ParameterInfo\CandidateExtensions.8.2.cs" />
     <Compile Include="ParameterInfo\EnhancedParameterInfoCandidate.8.2.cs" />
     <Compile Include="ParameterInfo\EnhancedParameterInfoCandidate.cs" />

diff --git a/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.csproj.DotSettings b/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=genericimages/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.nuspec b/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.8.2.nuspec
@@ -3,7 +3,7 @@
 
 	<metadata>
 		<id>EnhancedTooltip</id>
-		<version>2.1.1</version>
+		<version>2.1.3</version>
 		<title>Enhanced Tooltip (for R# 8.2)</title>
 		<authors>Julien Lebosquain</authors>
 		<description>Colorizes the tooltip as well as the parameter information popup.</description>

diff --git a/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.9.0.csproj b/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.9.0.csproj
@@ -148,7 +148,8 @@
     <Compile Include="DocumentMarkup\IdentifierTooltipContentProvider.cs" />
     <Compile Include="DocumentMarkup\SeverityExtensions.cs" />
     <Compile Include="DocumentMarkup\TextStyleHighlighterManager.cs" />
-    <Compile Include="GenericImages\ThemedIcons.Generic.Generated.cs" />
+    <Compile Include="GenericImages\ThemedIcons.9.0.cs" />
+    <Compile Include="GenericImages\ThemedIcons.cs" />
     <Compile Include="ParameterInfo\EnhancedParameterInfoCandidate.cs" />
     <Compile Include="ParameterInfo\EnhancedParameterInfoCandidate.9.0.cs" />
     <Compile Include="ParameterInfo\EnhancedParameterInfoContext.cs" />

diff --git a/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.9.0.nuspec b/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.9.0.nuspec
@@ -3,7 +3,7 @@
 
 	<metadata>
 		<id>JLebosquain.EnhancedTooltip</id>
-		<version>2.1.1</version>
+		<version>2.1.3</version>
 		<title>Enhanced Tooltip (for R# 9.0)</title>
 		<authors>Julien Lebosquain</authors>
 		<description>Colorizes the tooltip as well as the parameter information popup.</description>

diff --git a/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.8.2.cs b/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.8.2.cs
@@ -0,0 +1,9 @@
+namespace GammaJul.ReSharper.EnhancedTooltip {
+
+	public sealed partial class ThemedIcons {
+
+		internal const string IconPackResourceName = "GammaJul.ReSharper.EnhancedTooltip.8.2;component/GenericImages/ThemedIcons.Generic.Generated.Xaml";
+
+	}
+
+}
diff --git a/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.9.0.cs b/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.9.0.cs
@@ -0,0 +1,9 @@
+namespace GammaJul.ReSharper.EnhancedTooltip {
+
+	public sealed partial class ThemedIcons {
+
+		internal const string IconPackResourceName = "GammaJul.ReSharper.EnhancedTooltip.9.0;component/GenericImages/ThemedIcons.Generic.Generated.Xaml";
+
+	}
+
+}
diff --git a/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.Generic.Generated.cs b/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.Generic.Generated.cs
diff --git a/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.cs b/GammaJul.ReSharper.EnhancedTooltip/GenericImages/ThemedIcons.cs
@@ -0,0 +1,24 @@
+using System.Windows.Markup;
+using GammaJul.ReSharper.EnhancedTooltip;
+using JetBrains.UI.Icons;
+using JetBrains.UI.Icons.CompiledIcons;
+
+[assembly: XmlnsDefinition("urn:shemas-jetbrains-com:ui-application-icons-generic", "GammaJul.ReSharper.EnhancedTooltip")]
+[assembly: CompiledIconsPack(
+	IconPackResourceIdentification = ThemedIcons.IconPackResourceName,
+	IconNames = new[] { "Logo16" })]
+
+namespace GammaJul.ReSharper.EnhancedTooltip {
+
+	public sealed partial class ThemedIcons {
+
+		[CompiledIconClass(IconPackResourceName, 0, "Logo16")]
+		public sealed class Logo16 : CompiledIconClass {
+
+			public static IconId Id = new CompiledIconId(IconPackResourceName, 0, "Logo16");
+
+		}
+
+	}
+
+}
diff --git a/GammaJul.ReSharper.EnhancedTooltip/Settings/EnhancedTooltipOptionsPage.xaml.cs b/GammaJul.ReSharper.EnhancedTooltip/Settings/EnhancedTooltipOptionsPage.xaml.cs
@@ -18,7 +18,7 @@
 
 namespace GammaJul.ReSharper.EnhancedTooltip.Settings {
 
-	[OptionsPage(Pid, "Enhanced Tooltip", typeof(GenericThemedIcons.Logo16), ParentId = IntelliSensePage.PID, Sequence = 100)]
+	[OptionsPage(Pid, "Enhanced Tooltip", typeof(ThemedIcons.Logo16), ParentId = IntelliSensePage.PID, Sequence = 100)]
 	public partial class EnhancedTooltipOptionsPage : IOptionsPage {
 
 		public const string Pid = "EnhancedTooltip.OptionsPage";

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -7,4 +7,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
		<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=genericimages/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>