summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views/MainView.xaml
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-03-23 20:00:02 +0000
committersr55 <[email protected]>2012-03-23 20:00:02 +0000
commitf5535905f9ff45c8c25389db9db42049407f8ad8 (patch)
tree76e786c1d6765c210f437f238c5d07ccf7cc2da7 /win/CS/HandBrakeWPF/Views/MainView.xaml
parent6758f8b30570df5e7d9fcc90e5f75f0aedcc6d5a (diff)
WinGui: (WPF) Wired up the queue window and added missing functionality. Fixed issues on the main windows with regards to GUI widgets not updating during encoding.
WinGui: (WinForms): Added >=30fps options in framerate dropdown git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4526 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/MainView.xaml')
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index e6a4e6997..4f243237f 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -16,7 +16,8 @@
</i:EventTrigger>
</i:Interaction.Triggers>
- <Window.Resources>
+ <Window.Resources>
+
<Style TargetType="Button">
<Setter Property="Foreground" Value="DarkOrange" />
<Setter Property="FontWeight" Value="Bold" />
@@ -94,7 +95,7 @@
</MenuItem>
<MenuItem Header="Help">
- <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" >
+ <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" >
<MenuItem.Icon>
<Image Source="Images/Help16.png" Width="16" />
</MenuItem.Icon>
@@ -345,8 +346,8 @@
</StackPanel>
<!-- Status Bar -->
- <StatusBar Grid.Row="6" Height="28" Grid.ColumnSpan="2" VerticalAlignment="Bottom">
- <Label Content="{Binding Path=ProgramStatusLabel}" FontSize="10" VerticalAlignment="Center" />
+ <StatusBar Padding="0" Margin="0" Grid.Row="6" Height="32" Grid.ColumnSpan="2" VerticalAlignment="Bottom" >
+ <Label Content="{Binding Path=StatusLabel}" FontSize="11" Padding="0,0,0,5" VerticalAlignment="Center" />
</StatusBar>
</StackPanel>