diff options
| author | sr55 <[email protected]> | 2012-06-08 02:13:59 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-06-08 02:13:59 +0000 |
| commit | a03739f0457ad9211744e540f33ab8a3c05598b9 (patch) | |
| tree | 2f0dda9a6f9e9c48b2bb58d9cc6462c77bd55715 /win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs | |
| parent | 368023e13a633e9dc94f27696c84f3ce3ca24ed3 (diff) | |
WinGui: Added a Shell View which can host various windows. By default this will host the Main window. Changed the Options window to be a usercontrol so it can be hosted in this shell view, allowing for a chrome-esk style options within the main window without the need for a dialog window. The options window will need some design changes. (Coming soon)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4721 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs index e17c98514..b8fd4b33d 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs @@ -10,11 +10,12 @@ namespace HandBrakeWPF.Views
{
using System.Windows;
+ using System.Windows.Controls;
/// <summary>
/// Interaction logic for OptionsView.xaml
/// </summary>
- public partial class OptionsView : Window
+ public partial class OptionsView : UserControl
{
/// <summary>
/// Initializes a new instance of the <see cref="OptionsView"/> class.
|