diff options
| author | sr55 <[email protected]> | 2011-12-27 22:52:43 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-12-27 22:52:43 +0000 |
| commit | 5b745b8f17f8acc6d3799eb3cb86e09c7ca99017 (patch) | |
| tree | 5a97790d448b6ac3b85b46f1803df00c34a39820 /win/CS/HandBrakeWPF/Views | |
| parent | 20fd52b888f111ac2d7670fa3c41e495661cdebd (diff) | |
WinGui: (WPF) Initial work to hookup the log viewer + some additional helper classes ported over form the WinForms version.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4390 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/LogView.xaml | 14 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/LogView.xaml.cs | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml index 1d26ef28c..24e05acdd 100644 --- a/win/CS/HandBrakeWPF/Views/LogView.xaml +++ b/win/CS/HandBrakeWPF/Views/LogView.xaml @@ -1,7 +1,7 @@ <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="{Binding Title}" Height="600" Width="420">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
+ Title="{Binding Title}" Height="600" Width="500">
<Grid>
<Grid>
<Grid.RowDefinitions>
@@ -9,24 +9,26 @@ <RowDefinition Height="*" />
</Grid.RowDefinitions>
<ToolBar Grid.Row="0">
- <Button>
+ <Button cal:Message.Attach="[Event Click] = [Action CopyLog]">
<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" >
+ <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]">
<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">
+ <Separator />
+
+ <ComboBox Width="100" HorizontalAlignment="Right" ItemsSource="{Binding LogModes}" SelectedIndex="{Binding SelectedMode}">
</ComboBox>
</ToolBar>
- <RichTextBox Grid.Row="1" />
+ <TextBox AcceptsReturn="True" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" IsReadOnly="True" Grid.Row="1" Text="{Binding Log}" />
</Grid>
</Grid>
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs index 375cbed43..79a8986a9 100644 --- a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs @@ -1,18 +1,16 @@ -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="LogView.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 LogView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrakeWPF.Views
{
+ using System.Windows;
+
/// <summary>
/// Interaction logic for LogView.xaml
/// </summary>
|