#79 - Added icons

sys27 · Aug 24, 2015 · 576c50c · 576c50c
1 parent db2aeb7
commit 576c50c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 29 deletions.
diff --git a/SharedCode/SharedAssemblyInfo.cs b/SharedCode/SharedAssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("Release")]
 #endif
 
-[assembly: AssemblyVersion("2.16.0")]
-[assembly: AssemblyFileVersion("2.16.0")]
-[assembly: AssemblyInformationalVersion("2.16.0")]
+[assembly: AssemblyVersion("2.16.1")]
+[assembly: AssemblyFileVersion("2.16.1")]
+[assembly: AssemblyInformationalVersion("2.16.1")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/xFunc.sln b/xFunc.sln
@@ -25,9 +25,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Debug|Any CPU.Build.0 = Debug|x86
-		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Release|Any CPU.ActiveCfg = Release|x86
+		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADF55CFC-F01F-4F6E-9B62-3894AA1D7247}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E762246C-21B2-47D9-9D80-54E9E0ED3150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E762246C-21B2-47D9-9D80-54E9E0ED3150}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E762246C-21B2-47D9-9D80-54E9E0ED3150}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/xFunc/Images/Auto.png b/xFunc/Images/Auto.png
diff --git a/xFunc/Images/Exponential.png b/xFunc/Images/Exponential.png
diff --git a/xFunc/Images/Normal.png b/xFunc/Images/Normal.png
diff --git a/xFunc/Presenters/Updater.cs b/xFunc/Presenters/Updater.cs
@@ -23,7 +23,7 @@ internal class Updater
     {
 
         private const string CheckUri = "http://xfunc.codeplex.com/releases/";
-        private const int CurrentRelease = 615107;
+        private const int CurrentRelease = 616963;
         private string updateUri;
         private bool hasUpdates;
 

diff --git a/xFunc/Views/MainView.xaml b/xFunc/Views/MainView.xaml
@@ -165,9 +165,9 @@ limitations under the License. -->
                     </ribbon:ToggleButton>
                 </ribbon:RibbonGroupBox>
                 <ribbon:RibbonGroupBox Header="{x:Static res:Resource.OutputFormatGroupHeader}">
-                    <ribbon:ToggleButton x:Name="autoButton" Header="{x:Static res:Resource.AutoFormatButtonHeader}" Command="views:MainView.AutoFormatCommand" />
-                    <ribbon:ToggleButton x:Name="normalButton" Header="{x:Static res:Resource.NormalFormatButtonHeader}" Command="views:MainView.NormalFormatCommand" />
-                    <ribbon:ToggleButton x:Name="exponentialButton" Header="{x:Static res:Resource.ExponentialFormatButtonHeader}" Command="views:MainView.ExponentialFormatCommand" />
+                    <ribbon:ToggleButton x:Name="autoButton" Header="{x:Static res:Resource.AutoFormatButtonHeader}" LargeIcon="../Images/Auto.png"  Command="views:MainView.AutoFormatCommand" />
+                    <ribbon:ToggleButton x:Name="normalButton" Header="{x:Static res:Resource.NormalFormatButtonHeader}" LargeIcon="../Images/Normal.png"  Command="views:MainView.NormalFormatCommand" />
+                    <ribbon:ToggleButton x:Name="exponentialButton" Header="{x:Static res:Resource.ExponentialFormatButtonHeader}" LargeIcon="../Images/Exponential.png"  Command="views:MainView.ExponentialFormatCommand" />
                 </ribbon:RibbonGroupBox>
                 <ribbon:RibbonGroupBox Header="{x:Static res:Resource.AnswerBaseGroupHeader}">
                     <ribbon:ToggleButton x:Name="binButton" Header="Bin" LargeIcon="../Images/Bin.png" Command="views:MainView.BinCommand" />

diff --git a/xFunc/xFunc.csproj b/xFunc/xFunc.csproj
@@ -16,25 +16,6 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Images\xFunc.ico</ApplicationIcon>
   </PropertyGroup>
@@ -47,6 +28,24 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\key.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Fluent, Version=3.4.2.173, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\packages\Fluent.Ribbon.3.4.2.173\lib\net40\Fluent.dll</HintPath>
@@ -333,6 +332,11 @@
     <Resource Include="Images\Converter.png" />
     <Resource Include="Images\ConverterLarge.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Auto.png" />
+    <Resource Include="Images\Exponential.png" />
+    <Resource Include="Images\Normal.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.