michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Added MahApps.Metro

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti 2012-08-25 13:05:41 -04:00
parent 37dd0c8bdd
commit fc6b2a7f54
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Common/MediaBrowser.Common.csproj
View File

@ -31,6 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MahApps.Metro">
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\MahApps.Metro.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="protobuf-net">
@ -58,6 +61,9 @@
<HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Windows.Interactivity">
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />

16
MediaBrowser.Common/UI/Splash.xaml
View File

@ -1,11 +1,19 @@
<Window x:Class="MediaBrowser.Common.UI.Splash"
<Controls:MetroWindow 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="MediaBrowser" Height="346" Width="600" ShowInTaskbar="True" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black" Loaded="Splash_Loaded">
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
Title="MediaBrowser"
Height="346"
Width="600"
ShowInTaskbar="True"
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen"
WindowState="Normal"
Background="Black">
<Grid Name="splashGrid">
<Image HorizontalAlignment="Left" VerticalAlignment="Top" Height="225" Source="/MediaBrowser.Common;component/Resources/mblogo1000.png" Stretch="Fill" Grid.Row="0"/>
<ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="30,150,30,0" Width="540" Grid.Row="1"/>
<Label Name="lblProgress" Content="Label" Margin="0,240,10,0" VerticalContentAlignment="Center" HorizontalAlignment="Center" Foreground="White" Grid.Row="2"/>
</Grid>
</Window>
</Controls:MetroWindow>

8
MediaBrowser.Common/UI/Splash.xaml.cs
View File

@ -2,6 +2,7 @@
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Interop;
using MahApps.Metro.Controls;
using MediaBrowser.Common.Logging;
using MediaBrowser.Model.Progress;
@ -10,7 +11,7 @@ namespace MediaBrowser.Common.UI
/// <summary>
/// Interaction logic for Splash.xaml
/// </summary>
public partial class Splash : Window
public partial class Splash : MetroWindow
{
private const int GWL_STYLE = -16;
private const int WS_SYSMENU = 0x80000;
@ -19,12 +20,12 @@ namespace MediaBrowser.Common.UI
[DllImport("user32.dll")]
private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
public Splash(Progress<TaskProgress> progress)
{
InitializeComponent();
progress.ProgressChanged += progress_ProgressChanged;
Loaded+=Splash_Loaded;
}
void progress_ProgressChanged(object sender, TaskProgress e)
@ -43,6 +44,9 @@ namespace MediaBrowser.Common.UI
{
var hwnd = new WindowInteropHelper(this).Handle;
SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU);
// Setting this in markup throws an exception at runtime
ShowTitleBar = false;
}
}
}

1
MediaBrowser.Common/packages.config
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MahApps.Metro" version="0.9.0.0" targetFramework="net45" />
<package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />
<package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />

3
MediaBrowser.Controller/Providers/VideoInfoProvider.cs
View File

@ -2,10 +2,7 @@
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Common.Logging;
using MediaBrowser.Controller.FFMpeg;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.Providers