summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Views
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml41
1 files changed, 38 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index f1ac5df81..bb41c30cc 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -4,7 +4,7 @@
xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options"
xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- Background="White">
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" Background="White">
<UserControl.Resources>
<Style TargetType="Button">
@@ -34,10 +34,9 @@
</Style>
<Options:OptionsTabConverter x:Key="tabConverter" />
+ <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
</UserControl.Resources>
-
-
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150" />
@@ -339,6 +338,42 @@
</StackPanel>
</StackPanel>
+
+ <StackPanel Name="Updates" Orientation="Vertical" Margin="10,10,0,0"
+ Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Updates'}">
+
+
+ <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
+ <TextBlock Text="Updates" FontSize="16" />
+ </Border>
+
+ <TextBlock Text="Current Version" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
+
+ <Grid Margin="20,10,0,20">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="70" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <!-- Version -->
+ <TextBlock Grid.Column="0" Margin="0,0,5,0" Text="Version:" />
+ <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />
+ </Grid>
+
+ <TextBlock Text="Updates" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
+
+ <StackPanel Margin="20,0,0,0" Orientation="Horizontal">
+ <Button Content="Check for Updates" Width="120" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
+ <Button Content="Download Update" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+
+ <StackPanel Margin="20,10,0,0" Orientation="Horizontal">
+ <ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}"
+ Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
+ <TextBlock Text="{Binding UpdateMessage}" Margin="10,0,10,0" VerticalAlignment="Center" />
+ </StackPanel>
+
+ </StackPanel>
</StackPanel>
</ScrollViewer>