mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-04 13:22:52 +01:00
Added taskbar icon and standardized locations of images
This commit is contained in:
parent
3c47375229
commit
e4b0eb5779
@@ -30,6 +30,9 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="MahApps.Metro">
|
||||
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\MahApps.Metro.dll</HintPath>
|
||||
@@ -132,7 +135,13 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources\mblogo.png" />
|
||||
<Resource Include="Resources\Images\mblogoblack.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Images\Icon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Images\mblogowhite.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.
|
||||
|
||||
BIN
MediaBrowser.Common/Resources/Images/Icon.ico
Normal file
BIN
MediaBrowser.Common/Resources/Images/Icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
BIN
MediaBrowser.Common/Resources/Images/mblogowhite.png
Normal file
BIN
MediaBrowser.Common/Resources/Images/mblogowhite.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
@@ -68,18 +68,5 @@ namespace MediaBrowser.Common.UI
|
||||
|
||||
Kernel.Dispose();
|
||||
}
|
||||
|
||||
public BitmapImage GetLogoImage()
|
||||
{
|
||||
BitmapImage bitmap = new BitmapImage();
|
||||
|
||||
bitmap.CacheOption = BitmapCacheOption.Default;
|
||||
|
||||
bitmap.BeginInit();
|
||||
bitmap.StreamSource = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Common.Resources.mblogo.png");
|
||||
bitmap.EndInit();
|
||||
|
||||
return bitmap;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
WindowState="Normal"
|
||||
FontSize="14">
|
||||
<Window.Background>
|
||||
<RadialGradientBrush>
|
||||
<GradientStop Color="#ffffff" Offset="1"/>
|
||||
<GradientStop Color="#f8f8f8"/>
|
||||
<RadialGradientBrush RadiusX=".75" RadiusY=".75">
|
||||
<GradientStop Color="White" Offset="0.0"/>
|
||||
<GradientStop Color="WhiteSmoke" Offset="0.65"/>
|
||||
<GradientStop Color="#cfcfcf" Offset="1.0"/>
|
||||
</RadialGradientBrush>
|
||||
</Window.Background>
|
||||
<Grid Name="splashGrid">
|
||||
<Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10"/>
|
||||
<Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10" Source="../Resources/Images/mblogoblack.png"/>
|
||||
<ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="30,110,30,0" Width="460" Grid.Row="1"/>
|
||||
<Label Name="lblProgress" Content="Label" Margin="0,190,10,0" VerticalContentAlignment="Center" HorizontalAlignment="Center" Grid.Row="2"/>
|
||||
</Grid>
|
||||
|
||||
@@ -35,8 +35,6 @@ namespace MediaBrowser.Common.UI
|
||||
{
|
||||
// Setting this in markup throws an exception at runtime
|
||||
ShowTitleBar = false;
|
||||
|
||||
imgLogo.Source = (Application.Current as BaseApplication).GetLogoImage();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user