Merge pull request #159 from agarwaldax/master

Minor UI Changes - Experimental Alpha

Elpis.sln

@@ -1,17 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
 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
@@ -244,11 +238,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

Elpis/Elpis.csproj

@@ -16,6 +16,22 @@
     <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>
@@ -70,16 +86,25 @@
     <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.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web.Extensions" />
@@ -299,6 +324,7 @@
       <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>
@@ -428,10 +454,11 @@
     <Resource Include="Resources\thumbs_up_icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Images\thumbs-down.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Images\thumbs-up.png" />
+    <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>

Elpis/MainBar.xaml

@@ -58,19 +58,19 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <ElpisControls:ImageButton Width="28" Height="28" Margin="8,2,2,2" Grid.Column="0" x:Name="btnStationList"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="20,2,2,2" Grid.Column="0" x:Name="btnStationList"
                                ActiveImageUri="{StaticResource Image_PlaylistHover}" InactiveImageUri="{StaticResource Image_Playlist}"
                                ToolTip="Show Station List"
                                Click="btnStationList_Click" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />
-        <ElpisControls:ImageButton Width="28" Height="28" Margin="8,2,2,2" Grid.Column="0" x:Name="btnStationListClose"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="20,2,2,2" Grid.Column="0" x:Name="btnStationListClose"
                                ActiveImageUri="{StaticResource Image_CloseHover}" InactiveImageUri="{StaticResource Image_Close}"
                                ToolTip="Close Station List"
                                Click="btnStationListClose_Click" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />
-        <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="1" x:Name="btnCreateStation"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="20,2,2,4" Grid.Column="1" x:Name="btnCreateStation"
                                ActiveImageUri="{StaticResource Image_AddHover}" InactiveImageUri="{StaticResource Image_Add}"
                                ToolTip="Create New Station"
                                Click="btnCreateStation_Click" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />
-        <ElpisControls:ImageButton Width="24" Height="24" Margin="8,2,2,2" Grid.Column="2" x:Name="btnVolume"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="20,2,2,4" Grid.Column="2" x:Name="btnVolume"
                                ActiveImageUri="{StaticResource Image_Volume_100_Hover}" InactiveImageUri="{StaticResource Image_Volume_100}"
                                ToolTip="Show Volume Slider"
                                Click="btnVolume_Click" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />
@@ -81,29 +81,29 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="0" x:Name="btnPlay"
+            <ElpisControls:ImageButton Width="26" Height="26" Margin="35,2,2,2" Grid.Column="0" x:Name="btnPlay"
                                  ActiveImageUri="{StaticResource Image_PlayHover}" InactiveImageUri="{StaticResource Image_Play}"
                                  Click="btnPlayPause_Click" VerticalAlignment="Center" HorizontalAlignment="Center"
                                  ToolTip="Play"
                                  Visibility="{Binding Path=Playing, 
                                                 Converter={StaticResource visConverter}, 
                                                 ConverterParameter={StaticResource BoolFalse}}" />
-            <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="0" x:Name="btnPause"
+            <ElpisControls:ImageButton Width="26" Height="26" Margin="35,2,2,2" Grid.Column="0" x:Name="btnPause"
                                  ActiveImageUri="{StaticResource Image_PauseHover}" InactiveImageUri="{StaticResource Image_Pause}"
                                  Click="btnPlayPause_Click" VerticalAlignment="Center" HorizontalAlignment="Center"
                                  ToolTip="Pause"
                                  Visibility="{Binding Path=Playing, 
                                                 Converter={StaticResource visConverter}, 
                                                 ConverterParameter={StaticResource BoolTrue}}" />
-            <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="1" x:Name="btnNext"
+            <ElpisControls:ImageButton Width="18" Height="18" Margin="20,2,2,2" Grid.Column="1" x:Name="btnNext"
                                  ActiveImageUri="{StaticResource Image_NextHover}" InactiveImageUri="{StaticResource Image_Next}" Click="btnNext_Click"
                                  ToolTip="Next Track"
                                  VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Visible" />
         </Grid>
         <Grid Grid.Column="4" Name="gridError" Style="{StaticResource GridFade}"
               Visibility="Hidden">
 
-            <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="1" x:Name="btnError"
+            <ElpisControls:ImageButton Width="20" Height="20" Margin="2" Grid.Column="1" x:Name="btnError"
                                ActiveImageUri="{StaticResource Image_ErrorHover}" InactiveImageUri="{StaticResource Image_Error}"
                                Click="btnError_Click" VerticalAlignment="Center" HorizontalAlignment="Center">
 
@@ -123,11 +123,11 @@
             <Slider Name="sVolume" Height="28" Grid.Column="0" Minimum="0" Maximum="100" Margin="8,5,8,2" ValueChanged="sVolume_VolumeChanged" />
             <Image Name="imgVolume" Grid.Column="1" Width="24" Height="24" Margin="8,2,8,2" Source="/Elpis;component/Images/volume_100.png"  />
         </Grid>
-        <ElpisControls:ImageButton Width="28" Height="28" Margin="2" Grid.Column="5" x:Name="btnSettings"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="2,2,20,2" Grid.Column="5" x:Name="btnSettings"
                                ActiveImageUri="{StaticResource Image_SettingsHover}" InactiveImageUri="{StaticResource Image_Settings}"
                                ToolTip="Show Settings"
                                Click="btnSettings_Click" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />
-        <ElpisControls:ImageButton Width="28" Height="28" Margin="2,2,8,2" Grid.Column="6" x:Name="btnAbout"
+        <ElpisControls:ImageButton Width="20" Height="20" Margin="2,2,20,2" Grid.Column="6" x:Name="btnAbout"
                                ActiveImageUri="{StaticResource Image_InfoHover}" InactiveImageUri="{StaticResource Image_Info}" Click="btnAbout_Click"
                                ToolTip="About Elpis"
                                VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Hidden" />