From 576c50cd5261f5cf413e9a95509e83a5ba3f9a18 Mon Sep 17 00:00:00 2001
From: sys_27 <sys2712@gmail.com>
Date: Mon, 24 Aug 2015 12:04:03 +0300
Subject: [PATCH] #79 - Added icons

---
 SharedCode/SharedAssemblyInfo.cs |   6 ++---
 xFunc.sln                        |   7 +++---
 xFunc/Images/Auto.png            | Bin 0 -> 534 bytes
 xFunc/Images/Exponential.png     | Bin 0 -> 603 bytes
 xFunc/Images/Normal.png          | Bin 0 -> 464 bytes
 xFunc/Presenters/Updater.cs      |   2 +-
 xFunc/Views/MainView.xaml        |   6 ++---
 xFunc/xFunc.csproj               |  42 +++++++++++++++++--------------
 8 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 xFunc/Images/Auto.png
 create mode 100644 xFunc/Images/Exponential.png
 create mode 100644 xFunc/Images/Normal.png

diff --git a/SharedCode/SharedAssemblyInfo.cs b/SharedCode/SharedAssemblyInfo.cs
index 0cf8ec53a..6d95dafa3 100644
--- 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")]
\ No newline at end of file
diff --git a/xFunc.sln b/xFunc.sln
index e0fda9dec..a47508bcb 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..e32cff58caa9875bb0c15acc9ec6c63e79796262
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq001BW000XJ1^@s69ubcL00004b3#c}2nYxW
zd<bNS00009a7bBm000Ho000Ho0e{qlrvLx|8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h38YK~y-6rPR$zmQfG~@SpmIwNMK(v$DvNXcrMuP@n{wxJZa7
z(OtC&qAMtf?x5}<s5a`}D<~w0(iTy<DhUEB5UGV)i!%?M_f(K?1BaRUKl6R&Jk--w
zY~a4e=>S?9b$)`6_=463{5$ajL;vc~oXLl964%gy(ZaTdo&syZ{_OkqklU~WTMGLl
zIE6ibD&{s8LVk*w;`@22yY>t_7uZgWhn%15VRsnM16!4@`4P6}30~t?$T#sV>j=go
zKu3m+1lB1{qc8Le(gbSKlwV;E-Jy?0{5w^k6XDnwdN<Z^WfKMPYX^oioBqH~tEb19
zuXbPpZ?KMDY?DSd>Hn!}>Scj1;9yM}-DT{?Vqvs_efSVEn}1^K!OMkg#Y!{IM)IR*
z%1&1#9S?`k!S`lCju%1Kg6E6+Hh6gj1DJ;gejiUovv?75oAiH}#TneiC-pnf6opPj
z!m6n`Ea8&$4DUs;gYXPD{!+k2=~}u%ACfkD71KC|cj^~&67TU<db+R+53!8zk#huo
Y0;@n*aLwTucmMzZ07*qoM6N<$f(lvZ+5i9m

literal 0
HcmV?d00001

diff --git a/xFunc/Images/Exponential.png b/xFunc/Images/Exponential.png
new file mode 100644
index 0000000000000000000000000000000000000000..5618bd18abf67e1f9563f8fb68917a2bf007ba70
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001BW000yS1^@s6?2$iD00004b3#c}2nYxW
zd<bNS00009a7bBm000PR000PR0iGIV;{X5v8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oX}IK~zYI<<&imO+gd~@ZYi#tkqEPBoa0xER9IE(-5Tw9T5^+
z_-b^bpiyarVnafrKtm%!K}5DtpxH)3;xoQQf{69`6!+YHv)6q$`(C_l{FBL?d*(lL
z{`btB8F+wtMcb}}=*E(;Z{k-8=V>Pe(D>7toeornDU%$pSC;j0m}mwz;sdVuTlgT}
z;$Y&tireVIE<A}iKX3^PS`{!I4}&|H_-ptWt(N#l@EYf0&Rtx<oA|z;$IJ!niG|bF
zUl6fAxbHD1eCNZrx4<0<|2J$&{B!Xr#`dKG%G&XgOymJiVqMsGFtv$*vNGNuV>i0O
zfUTi6#l29QV!kYWy?BLr7zl1rz)JL$tg$Nik7=(A^FOHLbQ4aVfyE_bwHW)_ZW*pg
z?6v4=asIUEf3_oF6E@&Fu3@3^<u?)ZMgN@EwqQ11;5(LKDMn>yXL*5}Z^1FyU6A6G
z#z7tv&@bDsVw;gnJQ3WZiSJ1GZWRLM0_qsTtnhD^T}HpLS{PNOcsM2w$R4Ygk%=5V
zcoy7kB?8WB+z0Q9>vrP+7HN**=vUyP?9_is#=l?(c1o_-1czid;BHw75916jSH%1$
ps4BxTO!jN|e+l?3J9wj2q(8%PnI?`P7PJ5W002ovPDHLkV1iS+4zmCN

literal 0
HcmV?d00001

diff --git a/xFunc/Images/Normal.png b/xFunc/Images/Normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..865cd9bb4571440e70958e5fd50deaf6be4c9b78
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW000OG1^@s6n1%hX00004b3#c}2nYxW
zd<bNS00009a7bBm000Bq000Bq0mJ@6SO5S38FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ZmCnK~y-6z0$u+6;Koh@Q=@@1|q275JnI*)#RX?imN;bRGI~&
z{(*uZT67Z!btq`iNk!1np+Fpj$l7cS5duL?dL)*DKXSN7yuMM;v)psf`QCfZ_j^t?
zUSJ=;CF@2t%5L5^;SgU@6~S@z-9mBLDq<JE(2s=*Km(rRE|#!@0)}vad-#A}iAX2j
zqZLmuk2Ta`5Rb8rDV&MVs_+KGC{{GEgyT3T(G{36^x!+1@eXa0q$^Qu6^p2e!l#(V
zQ<U-|KjWOmGnXTHh;JEg2otEqcGm0ze93ToK}@i}AAUXBL!p-u+bU!a-{N)11&yvQ
z;vd`z{~u1WT<#wUc_sCV=#Z4@K~vVCynzjT#6aAC;1OElUczVBvl8Yoik&=Bs0fTm
ztjiMPS6G%tv5y)2mt?-MV^@{h&HQrY7o@%TBq{s%0(%a2mQSwi&qh)J0000<MNUMn
GLSTXjo5Upm

literal 0
HcmV?d00001

diff --git a/xFunc/Presenters/Updater.cs b/xFunc/Presenters/Updater.cs
index f8fb3c4cb..b931f0890 100644
--- 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
index 069eb7f2d..98989fc97 100644
--- 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
index 5f73efb15..80c49fcc1 100644
--- 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.