aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common
diff options
context:
space:
mode:
authorRedShirtMB Mark Linton redshirt linton <RedShirtMB Mark Linton redshirt.linton@gmail.com>2012-08-04 19:21:38 -0700
committerRedShirtMB Mark Linton redshirt linton <RedShirtMB Mark Linton redshirt.linton@gmail.com>2012-08-04 19:21:38 -0700
commitdafa97333cb5950c87fb7be10a39bf2e917da923 (patch)
treeb26cb2d4e1d29524656f9a779fe475ab3b296b0b /MediaBrowser.Common
parent1cc2b7c2ccbeaf247b7c0efd027b745a383b7315 (diff)
Moved splashscreen to MediaBrowser.Common and adjusted properties.
Diffstat (limited to 'MediaBrowser.Common')
-rw-r--r--MediaBrowser.Common/MediaBrowser.Common.csproj14
-rw-r--r--MediaBrowser.Common/UI/Splash.xaml9
-rw-r--r--MediaBrowser.Common/UI/Splash.xaml.cs29
3 files changed, 51 insertions, 1 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index a1fbdf6b89..7017b9b57d 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -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.
diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
new file mode 100644
index 0000000000..9bf1c8364c
--- /dev/null
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -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>
diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
new file mode 100644
index 0000000000..e136baa191
--- /dev/null
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -0,0 +1,29 @@
+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.Common.UI
+{
+ /// <summary>
+ /// Interaction logic for Splash.xaml
+ /// </summary>
+ public partial class Splash : Window
+ {
+ public Splash(IProgress<TaskProgress> progress)
+ {
+ InitializeComponent();
+ }
+ }
+}