diff options
| author | sr55 <[email protected]> | 2017-08-18 21:50:54 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2017-08-18 21:50:54 +0100 |
| commit | 63add3c308571c1018fd1f8801100ead98e989b4 (patch) | |
| tree | 65830fd0bbe9d5504038dcf176a579029abf0a2f /win/CS/HandBrakeWPF/Views | |
| parent | a5d09db0caec7c880e9b280d72a2fafeb122815b (diff) | |
WinGui: Make the app UWP aware. When in a UWP container, the update options will now be disabled.
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 641026e29..6577b2fd1 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -117,8 +117,8 @@ <Image Width="16" Height="16" Source="Images/information.png" />
</MenuItem.Icon>
</MenuItem>
- <Separator />
- <MenuItem Header="_Check for Updates" cal:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
+ <Separator Visibility="{Binding IsUWP, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <MenuItem Header="_Check for Updates" cal:Message.Attach="[Event Click] = [Action CheckForUpdates]" Visibility="{Binding IsUWP, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
<Separator />
<MenuItem Header="_About..." cal:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
</MenuItem>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 4be816551..65f2d7800 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -37,6 +37,7 @@ <Converters:EnumComboConverter x:Key="enumComboConverter" />
<Options:LogLevelConverter x:Key="LogLevelConverter" />
<Options:FileSizeConverter x:Key="fileSizeConverter" />
+ <Converters:OptionTabConverter x:Key="optionTabConverter" />
<Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
@@ -72,7 +73,7 @@ <Border BorderBrush="DarkGray" Grid.Column="0" Grid.Row="1" BorderThickness="0,0,1,0">
<StackPanel Orientation="Vertical" Margin="11,5,-1,0">
- <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}}" SelectedItem="{Binding SelectedTab}"
+ <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"
BorderThickness="0" Background="Transparent">
<ListBox.ItemTemplate>
<DataTemplate>
|