Permalink
Browse files

Further improvements on UI

Improved UI for player
  • Loading branch information...
agarwaldax committed Feb 5, 2017
1 parent 0fc75cd commit 993b69d57101c27995fabb5864208e9a42f400dc
View
Binary file not shown.
View
@@ -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>
@@ -74,6 +90,18 @@
<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="System" />
<Reference Include="System.Data" />
@@ -296,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>
@@ -424,6 +453,13 @@
<Resource Include="Resources\thumb-down.ico" />
<Resource Include="Resources\thumb-up.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>
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -58,19 +58,19 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <ElpisControls:ImageButton Width="20" Height="20" Margin="20,2,20,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="20" Height="20" Margin="30,2,20,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="20" Height="20" Margin="0,0,0,4" 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="20" Height="20" Margin="-5,2,2,5" 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" />
View
@@ -34,7 +34,7 @@
/>
</Window.CommandBindings>
- <Border Name="borderMain" Margin="0" BorderThickness="0" Background="#FF0F0F0F">
+ <Border Name="borderMain" Margin="0" BorderThickness="0">
<!-- Choice, borderless with drop shadow and crap performance or borderless without drop shadow and good performance. -->
<!--<Border Name="borderMain"
Margin="{Binding Path=WindowState,
@@ -74,20 +74,20 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Grid Grid.Column="0" Name="TitleBar" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,0,51,0" Height="40">
- <TextBlock Name="TitleText" Padding="8,0" HorizontalAlignment="Stretch"
+ <Grid Grid.Column="0" Name="TitleBar" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,0,0,0" Height="40">
+ <TextBlock Name="TitleText" Padding="10" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Text="{Binding Path=Title,
RelativeSource={RelativeSource
AncestorType={x:Type Window}}}"
- TextTrimming="CharacterEllipsis" Foreground="{StaticResource MainFontBrush}" FontSize="16" FontFamily="Roboto" FontWeight="Medium" Margin="10" />
+ TextTrimming="CharacterEllipsis" Foreground="{StaticResource MainFontBrush}" FontSize="16" FontFamily="Roboto" FontWeight="Medium" />
</Grid>
<TextBlock Name="MinimizeButton" Text="0" FontFamily="Webdings" FontSize="16"
- Foreground="{StaticResource MainFontBrush}" Margin="0,10,25,0" HorizontalAlignment="Right" VerticalAlignment="Top" />
+ Foreground="{StaticResource MainFontBrush}" Margin="0,6,25,0" HorizontalAlignment="Right" VerticalAlignment="Top" />
<TextBlock Name="CloseButton" Text="r" FontFamily="Webdings" FontSize="16"
- Foreground="{StaticResource MainFontBrush}" Margin="0,14,7,0" HorizontalAlignment="Right" VerticalAlignment="Top" />
+ Foreground="{StaticResource MainFontBrush}" Margin="0,10,5,0" HorizontalAlignment="Right" VerticalAlignment="Top" />
</Grid>
- <elpis:MainBar x:Name="mainBar" Grid.Row="1" Height="45" Foreground="#FF141414" Background="#FF0F0F0F" BorderThickness="0" Margin="0,10,0,10" />
+ <elpis:MainBar x:Name="mainBar" Grid.Row="1" Height="70" Background="{StaticResource ShadeDarkBrush}" BorderThickness="0" Padding="0,10,0,10" />
<Grid Grid.Row="2">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
@@ -98,7 +98,7 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<trans:PageTransition Grid.Row="0" Grid.ColumnSpan="2" x:Name="transitionControl"
- Background="#FF0F0F0F" Margin="0" TransitionType="Next" HorizontalAlignment="Stretch"
+ Margin="0" TransitionType="Next" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" CurrentPageSet="transitionControl_CurrentPageSet" FontFamily="Roboto" BorderThickness="0" />
</Grid>
</Grid>
@@ -14,7 +14,7 @@
<ResourceDictionary Source="/Elpis;component/Styles/Misc.xaml" />
<ResourceDictionary Source="/Elpis;component/Styles/Images.xaml" />
</ResourceDictionary.MergedDictionaries>
- <ContextMenu x:Key="SongMenu" Closed="SongMenu_Closed">
+ <ContextMenu x:Key="SongMenu" Closed="SongMenu_Closed">
<!-- Must changes inits in constructor if the order of these changes -->
<MenuItem x:Name="mnuPurchase" Header="Purchase">
<MenuItem x:Name="mnuPurchaseAmazonAlbum"
@@ -73,20 +73,20 @@
</Grid.RowDefinitions>
<ElpisControls:ContentSpinner x:Name="SpinUp" Grid.Row="0" NumberOfFrames="32"
RevolutionsPerSecond="1.5" AutoStart="False">
- <ElpisControls:ImageButton Width="20" Height="20" x:Name="btnThumbUp"
+ <ElpisControls:ImageButton Width="25" Height="25" x:Name="btnThumbUp"
ActiveImageUri="{StaticResource Image_ThumbLove}" InactiveImageUri="{StaticResource Image_ThumbUp}"
ToolTip="Like Song"
IsActive="{Binding Loved}" Click="btnThumbUp_Click" VerticalAlignment="Center" HorizontalAlignment="Center" />
</ElpisControls:ContentSpinner>
- <ElpisControls:ImageButton Width="20" Height="20" x:Name="btnMenu" Grid.Row="1"
+ <ElpisControls:ImageButton Padding="5" Width="25" Height="25" x:Name="btnMenu" Grid.Row="1"
ActiveImageUri="{StaticResource Image_MenuRightHover}" InactiveImageUri="{StaticResource Image_MenuRight}"
ToolTip="Show Song Menu"
VerticalAlignment="Center" HorizontalAlignment="Center" Click="btnMenu_Click">
-
+
</ElpisControls:ImageButton>
<ElpisControls:ContentSpinner x:Name="SpinDown" Grid.Row="2" NumberOfFrames="32"
RevolutionsPerSecond="1.5" AutoStart="False">
- <ElpisControls:ImageButton Width="20" Height="20" x:Name="btnThumbDown"
+ <ElpisControls:ImageButton Width="25" Height="25" x:Name="btnThumbDown"
ActiveImageUri="{StaticResource Image_ThumbBan}" InactiveImageUri="{StaticResource Image_ThumbDown}"
ToolTip="Dislike Song"
IsActive="{Binding Banned}" Click="btnThumbDown_Click" VerticalAlignment="Center" HorizontalAlignment="Center" />
@@ -106,7 +106,7 @@
Margin="8,0" Style="{StaticResource TextBase}">
<Hyperlink Name="TitleLink" Style="{StaticResource LinkStyle}"
NavigateUri="{Binding Path=SongDetailUrl}" RequestNavigate="RequestNavigate">
- <TextBlock Text="{Binding Path=SongTitle}" FontWeight="Bold"
+ <TextBlock Text="{Binding Path=SongTitle}" FontWeight="Normal"
Style="{StaticResource TextBase}" ElpisControls:TextBlockUtils.AutoTooltip="True"
ElpisControls:TextBlockUtils.AutoTooltipFontSize="12" />
</Hyperlink>
@@ -153,7 +153,8 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Name="txtStationName"
Background="{StaticResource MainBGBrush}" Foreground="{StaticResource MainFontBrush}" Text="Loading Songs..."
- FontSize="16" FontWeight="Normal" TextAlignment="Center" FontFamily="Roboto" Padding="0,4,0,4" ></TextBlock> <Grid Grid.Row="1" Margin="0,0,0,10">
+ FontSize="20" FontWeight="NOrmal" TextAlignment="Center" FontFamily="Roboto" Padding="0,4,0,4" ></TextBlock>
+ <Grid Grid.Row="1" Margin="0,10,0,20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
@@ -168,8 +169,7 @@
Foreground="{StaticResource MainFontBrush}" />
</Grid>
<ContentControl Name="CurrentSong" Grid.Row="2" ContentTemplate="{StaticResource SongTemplate}" Height="96" />
- <Border Name="WaitScreen" BorderBrush="{StaticResource MainBGBrush}" BorderThickness="0" Grid.Row="2"
- Height="96" Background="{StaticResource MainWaitBrush}" Visibility="Visible">
+ <Border Name="WaitScreen" BorderBrush="{StaticResource MainBGBrush}" BorderThickness="0" Grid.Row="2" Background="{StaticResource MainWaitBrush}" Visibility="Visible" Margin="0,0.2,0,269" Grid.RowSpan="2">
<Grid x:Name="LayoutRoot">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -182,7 +182,7 @@
</Border>
<Image Grid.Row="3" Grid.ColumnSpan="3" Source="/Elpis;component/Images/background.png"
Margin="100" Opacity="0.25"/>
- <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
+ <ScrollViewer Margin="0,0,0,0" Grid.Row="3" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
Style="{StaticResource FadeScroller}">
<ItemsControl Name="lstOldSongs" HorizontalContentAlignment="Stretch">
</ItemsControl>
View
@@ -1,12 +1,12 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Color x:Key="ShadeDark">#0F0F0F</Color>
- <Color x:Key="ShadeMediumDark">#071C21</Color>
- <Color x:Key="ShadeMedium">#29ABE2</Color>
- <Color x:Key="ShadeMediumLight">#29ABE2</Color>
+ <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="ShadeLight">#FFFFFF</Color>
- <Color x:Key="TransparencyShade">#880D0D0D</Color>
+ <Color x:Key="TransparencyShade">#757575</Color>
<Color x:Key="ErrorShade">#EE0000</Color>
@@ -32,7 +32,7 @@
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <Image x:Name="ButtonImage" Grid.Column="0"
+ <Image Margin="0,0,0,0" x:Name="ButtonImage" Grid.Column="0"
Source="{Binding InactiveImageUri, RelativeSource={RelativeSource TemplatedParent}}"
RenderOptions.BitmapScalingMode="HighQuality" />
<ContentPresenter Grid.Column="1"

3 comments on commit 993b69d

@DougOH

This comment has been minimized.

Show comment
Hide comment
@DougOH

DougOH Jun 6, 2017

Just installed the new V1.5.3.0. Can the blank space at the top of the window be reduced. This is the area around the control buttons. Both above and below the buttons. To much screen is taken in the new GUI design.

Just installed the new V1.5.3.0. Can the blank space at the top of the window be reduced. This is the area around the control buttons. Both above and below the buttons. To much screen is taken in the new GUI design.

@Wires77

This comment has been minimized.

Show comment
Hide comment
@Wires77

Wires77 Jun 8, 2017

Collaborator

@DougOH Thanks for the input. I'm going to go ahead and release this version as v1.6.0, since there is already so many issues and bugs being fixed by it. For the next version we're planning for even more UI updates, so I'll make the space changes at that time (and get it into the first beta release so you can check that out!)

Collaborator

Wires77 replied Jun 8, 2017

@DougOH Thanks for the input. I'm going to go ahead and release this version as v1.6.0, since there is already so many issues and bugs being fixed by it. For the next version we're planning for even more UI updates, so I'll make the space changes at that time (and get it into the first beta release so you can check that out!)

@DougOH

This comment has been minimized.

Show comment
Hide comment
@DougOH

DougOH Jun 8, 2017

Please sign in to comment.