WinGui: (WPF) Initial setup for the Log Window.

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

6 files changed, 62 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index c600cd1a4..48710e7df 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -81,6 +81,7 @@
     <Compile Include="UserSettingConstants.cs" />

     <Compile Include="ViewModels\AboutViewModel.cs" />

     <Compile Include="ViewModels\AddPresetViewModel.cs" />

+    <Compile Include="ViewModels\Interfaces\ILogViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\IAboutViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\IMainViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\IOptionsViewModel.cs" />

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs
new file mode 100644
index 000000000..6aa1020d4
--- /dev/null
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ILogViewModel.cs
@@ -0,0 +1,18 @@
+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="ILogViewModel.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>

+//   The Log View Model Interface

+// </summary>

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

+

+namespace HandBrakeWPF.ViewModels.Interfaces

+{

+    /// <summary>

+    /// The Log View Model Interface

+    /// </summary>

+    public interface ILogViewModel

+    {

+    }

+}
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index b0159669f..aebdd7e73 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -11,10 +11,12 @@ namespace HandBrakeWPF.ViewModels
 {

     using Caliburn.Micro;

 

+    using HandBrakeWPF.ViewModels.Interfaces;

+

     /// <summary>

     /// The Log View Model

     /// </summary>

-    public class LogViewModel : ViewModelBase

+    public class LogViewModel : ViewModelBase, ILogViewModel

     {

         /// <summary>

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

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index e1976cbdd..6e5153e85 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -221,6 +221,15 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

+        /// Open the Log Window

+        /// </summary>

+        public void OpenLogWindow()

+        {

+            this.WindowManager.ShowWindow(new LogViewModel(this.WindowManager));

+        }

+

+

+        /// <summary>

         /// Open the Queue Window.

         /// </summary>

         public void OpenQueueWindow()

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index ee6656788..908cee484 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -1,8 +1,33 @@
 <Window x:Class="HandBrakeWPF.Views.LogView"

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

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

-        Title="LogView" Height="300" Width="300">

+        Title="LogView" Height="600" Width="420">

     <Grid>

-        

+        <Grid>

+            <Grid.RowDefinitions>

+                <RowDefinition Height="Auto" />

+                <RowDefinition Height="*" />

+            </Grid.RowDefinitions>

+            <ToolBar Grid.Row="0">

+                <Button>

+                    <StackPanel Orientation="Horizontal">

+                        <Image Source="Images/copy.png" Width="16"/>

+                        <TextBlock Text="Copy" Margin="2,0,0,0" />

+                    </StackPanel>

+                </Button>

+                <Button Margin="5,0,0,0" >

+                    <StackPanel Orientation="Horizontal">

+                        <Image Source="Images/folder.png" Width="16"/>

+                        <TextBlock Text="Open Log Directory" Margin="2,0,0,0" />

+                    </StackPanel>

+                </Button>

+                

+                <ComboBox Width="75" HorizontalAlignment="Right">

+                </ComboBox>

+            </ToolBar>

+

+            <RichTextBox Grid.Row="1"  />

+        </Grid>

+

     </Grid>

 </Window>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 6b0e9ca66..1994f7434 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -26,10 +26,10 @@
                     </MenuItem>

 

                     <MenuItem Header="Tools">

-                        <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" />

-                       

                         <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />

-                        <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />

+                        <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" />

+                        <Separator />

+                        <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" />

                     </MenuItem>

 

                     <MenuItem Header="Help">

@@ -81,7 +81,7 @@
                             <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />

                         </StackPanel>

                     </Button>

-                    <Button Name="ActivityWindow">

+                    <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]"> 

                         <StackPanel Orientation="Horizontal">

                             <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />

                             <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />