diff options
| author | sr55 <[email protected]> | 2011-10-30 22:08:47 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-10-30 22:08:47 +0000 |
| commit | ee03feea6ff45d159bd4060e5f7492ac727ec600 (patch) | |
| tree | 4fc617500921dd7bb764ebe759955b761b8afb70 /win/CS/HandBrakeWPF/Views | |
| parent | 1fae5640fafcc3a4613eba99dcbb56f3e98430ae (diff) | |
WinGui: (WPF) Initial setup for the Log Window.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4331 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/LogView.xaml | 29 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 8 |
2 files changed, 31 insertions, 6 deletions
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" />
|