lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Common/MediaBrowser.Common.csproj
View File

@ -31,6 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="ServiceStack.Text, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ServiceStack.Text.3.9.3\lib\net35\ServiceStack.Text.dll</HintPath>
@ -43,11 +45,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration\ApplicationPaths.cs" />
@ -71,6 +75,9 @@
<Compile Include="Net\StreamExtensions.cs" />
<Compile Include="Plugins\BasePlugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\Splash.xaml.cs">
<DependentUpon>Splash.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
@ -81,7 +88,12 @@
<Name>MediaBrowser.Model</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Page Include="UI\Splash.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

9
MediaBrowser.Common/UI/Splash.xaml Normal file
View File

@ -0,0 +1,9 @@
<Window x:Class="MediaBrowser.Common.UI.Splash"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="SplashScreen" Height="300" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
WindowState="Normal" WindowStyle="None" Background="White" AllowsTransparency="True">
<Grid>
</Grid>
</Window>

8
MediaBrowser.ServerApplication/SplashScreen.xaml.cs → MediaBrowser.Common/UI/Splash.xaml.cs
View File

@ -14,14 +14,14 @@ using System.Windows.Shapes;
using MediaBrowser.Model.Progress;
namespace MediaBrowser.ServerApplication
namespace MediaBrowser.Common.UI
{
/// <summary>
/// Interaction logic for SplashScreen.xaml
/// Interaction logic for Splash.xaml
/// </summary>
public partial class SplashScreen : Window
public partial class Splash : Window
{
public SplashScreen(IProgress<TaskProgress> progress)
public Splash(IProgress<TaskProgress> progress)
{
InitializeComponent();
}

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>