Merge pull request #176 from adammhaile/adammhaile/master

Prepping for beta release 1.5.3
adammhaile · May 31, 2017 · 367c25d · 367c25d
2 parents f9d76fa + aa9fdd3
commit 367c25d
Show file tree

Hide file tree

Showing 8 changed files with 26,259 additions and 46 deletions.
diff --git a/Elpis.sln b/Elpis.sln
@@ -1,11 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elpis", "Elpis\Elpis.csproj", "{F19D43F0-5E7A-4B5C-A5D8-1B683218730B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{CC987F15-1B4B-4F63-95F5-E2E554C11986}"
+	ProjectSection(SolutionItems) = preProject
+		Libs\Microsoft.WindowsAPICodePack.dll = Libs\Microsoft.WindowsAPICodePack.dll
+		Libs\Microsoft.WindowsAPICodePack.Shell.dll = Libs\Microsoft.WindowsAPICodePack.Shell.dll
+		Libs\Microsoft.WindowsAPICodePack.Shell.XML = Libs\Microsoft.WindowsAPICodePack.Shell.XML
+		Libs\Microsoft.WindowsAPICodePack.XML = Libs\Microsoft.WindowsAPICodePack.XML
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BassPlayer", "Libs\BassPlayer\BassPlayer.csproj", "{D054F1ED-6A9C-4C4D-B500-7C1AF01F16C9}"
 EndProject
@@ -238,11 +244,11 @@ Global
 		{64DD2B7D-9069-41FF-A4E4-732F6DF82F09} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
 		{D49B479D-3D9A-4F03-A859-9E0C3A615326} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
 		{A79647D6-4A05-4382-8B6E-4FEC154C3222} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
+		{85EE7CF0-7B4B-4820-971E-154BC9BEF28D} = {E7A90687-1511-4764-AEC7-EE47630FABF6}
+		{B4B2C2FD-9FE7-48A9-BBC5-4D1FF1045E2A} = {E7A90687-1511-4764-AEC7-EE47630FABF6}
 		{E252FF08-F527-4A42-9A69-D28F4AE6052D} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
 		{19FB9DF6-5C82-439D-94C7-521E6EAF3FF3} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
 		{BA7F7E8A-B089-4323-8C8D-F406E7AFCDBE} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
 		{79DDD0CE-6F79-4212-A972-8618AD6E405F} = {CC987F15-1B4B-4F63-95F5-E2E554C11986}
-		{85EE7CF0-7B4B-4820-971E-154BC9BEF28D} = {E7A90687-1511-4764-AEC7-EE47630FABF6}
-		{B4B2C2FD-9FE7-48A9-BBC5-4D1FF1045E2A} = {E7A90687-1511-4764-AEC7-EE47630FABF6}
 	EndGlobalSection
 EndGlobal
diff --git a/Elpis/Elpis.csproj b/Elpis/Elpis.csproj
@@ -16,22 +16,6 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>C:\Users\Daxit\Desktop\Elpis\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -86,23 +70,13 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>EDAFD2963CE8EA0C32F14B3CA62A6C0BFFF3E63F</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>Elpis_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>true</SignManifests>
-  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.WindowsAPICodePack">
+      <HintPath>..\Libs\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell">
+      <HintPath>..\Libs\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -324,7 +298,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.config" />
-    <None Include="Elpis_TemporaryKey.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -453,13 +426,6 @@
     <Resource Include="Resources\thumbs_down_icon.ico" />
     <Resource Include="Resources\thumbs_up_icon.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>"$(ProjectDir)Resources\InsertIcons.exe" "$(TargetPath)" "$(ProjectDir)Resources\icon-list.txt"</PostBuildEvent>

diff --git a/Elpis/Properties/AssemblyInfo.cs b/Elpis/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.3")]
 //[assembly: AssemblyFileVersion("0.0.0.0")]
diff --git a/Elpis/Styles/Colors.xaml b/Elpis/Styles/Colors.xaml
@@ -4,9 +4,9 @@
   <Color x:Key="ShadeDark">#212121</Color>
   <Color x:Key="ShadeMediumDark">#263238</Color>
   <Color x:Key="ShadeMedium">#90A4AE</Color>
-  <Color x:Key="ShadeMediumLight">#90A4AE</Color>
+  <Color x:Key="ShadeMediumLight">#cfd8dc</Color>
   <Color x:Key="ShadeLight">#FFFFFF</Color>
-  <Color x:Key="TransparencyShade">#757575</Color>
+  <Color x:Key="TransparencyShade">#212121</Color>
 
   <Color x:Key="ErrorShade">#EE0000</Color>