alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moved splashscreen to MediaBrowser.Common and adjusted properties.

Browse Source
This commit is contained in:
RedShirtMB Mark Linton redshirt linton
2012-08-04 19:21:38 -07:00
parent 1cc2b7c2cc
commit dafa97333c
6 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.ServerApplication/MainWindow.xaml.cs
View File

@@ -13,6 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using MediaBrowser.Common;
using MediaBrowser.Controller;
using MediaBrowser.Model.Progress;
@@ -32,7 +33,7 @@ namespace MediaBrowser.ServerApplication
private void LoadKernel()
{
Progress<TaskProgress> progress = new Progress<TaskProgress>();
SplashScreen splash = new SplashScreen(progress);
Common.UI.Splash splash = new Common.UI.Splash(progress);
try
{

7
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@@ -56,9 +56,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="SplashScreen.xaml.cs">
<DependentUpon>SplashScreen.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -71,10 +68,6 @@
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="SplashScreen.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">

8
MediaBrowser.ServerApplication/SplashScreen.xaml
View File

@@ -1,8 +0,0 @@
<Window x:Class="MediaBrowser.ServerApplication.SplashScreen"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="SplashScreen" Height="300" Width="600">
<Grid>
</Grid>
</Window>

29
MediaBrowser.ServerApplication/SplashScreen.xaml.cs
View File

@@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using MediaBrowser.Model.Progress;
namespace MediaBrowser.ServerApplication
{
/// <summary>
/// Interaction logic for SplashScreen.xaml
/// </summary>
public partial class SplashScreen : Window
{
public SplashScreen(IProgress<TaskProgress> progress)
{
InitializeComponent();
}
}
}