WinGui: (WPF) Added backing properties for binding on the options window & some general tidy up of the code/comments.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4310 b64f7644-9d1e-0410-96f1-a4d463321fa5

7 files changed, 86 insertions, 43 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index ce52f61a5..0c8bf0ecb 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -1,16 +1,20 @@
 <Window x:Class="HandBrakeWPF.Views.AboutView"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="AboutView" Height="268" Width="511">

-    

+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="AboutView" 

+        Height="270" Width="500">

+

     <StackPanel Orientation="Horizontal">

         <Image Source="Images/logo64.png" Width="64" Height="64" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />

 

         <StackPanel Orientation="Vertical">

-            <Label Content="HandBrake WPF Demo App" FontWeight="Bold" FontSize="14" Margin="0,10,0,0" />

-            <Label Content="Copyright 2003-2011 HandBrake Team" />

-            

+            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

+                <TextBlock Text="HandBrake" FontWeight="Bold" FontSize="14" Margin="0,0,5,0" />

+                <TextBlock Text="{Binding Version}" Margin="0,0,0,1" VerticalAlignment="Bottom" />

+            </StackPanel>

+            <TextBlock Text="Copyright 2003-2011 HandBrake Team" />

+

             <Label Content="License:" />

-            <TextBox Width="380" Height="100" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">

+            <TextBox Width="380" Height="125" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">

                 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

 

 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

@@ -18,11 +22,9 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

             </TextBox>

 

-            <Button Content="OK" Micro:Message.Attach="[Event Click] = [Action Close]"

-                    HorizontalAlignment="Right" Padding="10,2" Margin="0,0,10,10" />

-            

-         </StackPanel>

-

+            <Button Content="Close" Micro:Message.Attach="[Event Click] = [Action Close]"

+                    HorizontalAlignment="Right" Padding="12,2" Margin="0,0,10,10" />

 

+        </StackPanel>

     </StackPanel>

 </Window>

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
index 22de6967b..55665fc8b 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
@@ -1,4 +1,13 @@
-namespace HandBrakeWPF.Views

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AboutView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for AboutView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrakeWPF.Views

 {

     using System.Windows;

 

@@ -7,6 +16,9 @@
     /// </summary>

     public partial class AboutView : Window

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="AboutView"/> class.

+        /// </summary>

         public AboutView()

         {

             InitializeComponent();

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs
index b99e48b26..9cb9e39e1 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs
@@ -1,24 +1,24 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-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.Navigation;

-using System.Windows.Shapes;

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AddPresetView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for VideoView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrakeWPF.Views

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for VideoView.xaml

     /// </summary>

     public partial class AddPresetView : UserControl

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="AddPresetView"/> class.

+        /// </summary>

         public AddPresetView()

         {

             InitializeComponent();

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
index efb3e7d6e..165e74923 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
@@ -1,7 +1,11 @@
-/*  MainView.xaml.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="MainView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for MainView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrakeWPF.Views

 {

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
index 9d0fc947c..e17c98514 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
@@ -1,23 +1,24 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-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;

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="OptionsView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for OptionsView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrakeWPF.Views

 {

+    using System.Windows;

+

     /// <summary>

     /// Interaction logic for OptionsView.xaml

     /// </summary>

     public partial class OptionsView : Window

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="OptionsView"/> class.

+        /// </summary>

         public OptionsView()

         {

             InitializeComponent();

diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml.cs b/win/CS/HandBrakeWPF/Views/PreviewView.xaml.cs
index 0bbf84b0a..e64f70411 100644
--- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml.cs
@@ -1,4 +1,13 @@
-namespace HandBrakeWPF.Views

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="PreviewView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for VideoView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrakeWPF.Views

 {

     using System.Windows.Controls;

 

@@ -7,6 +16,9 @@
     /// </summary>

     public partial class PreviewView : UserControl

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="PreviewView"/> class.

+        /// </summary>

         public PreviewView()

         {

             InitializeComponent();

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
index ae0743166..7b6fa9fdf 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
@@ -1,4 +1,13 @@
-namespace HandBrakeWPF.Views

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="QueueView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for VideoView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrakeWPF.Views

 {

     using System.Windows.Controls;

 

@@ -7,6 +16,9 @@
     /// </summary>

     public partial class QueueView : UserControl

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="QueueView"/> class.

+        /// </summary>

         public QueueView()

         {

             InitializeComponent();