diff options
| author | sr55 <[email protected]> | 2013-12-26 17:02:32 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-12-26 17:02:32 +0000 |
| commit | 840cb1e3448867a3d56bafc980dce39189d4814f (patch) | |
| tree | 2d96e373fa47eddcdce08283f0fffd19c3c1dd30 /win/CS/HandBrakeWPF/Views | |
| parent | 9c2f166bc71277e98ced2d39eb56aa88ff5452af (diff) | |
WinGui: Some more minor tweaks to the new source menu and tidyup on the options screen.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5941 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Views')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 47 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 5 |
2 files changed, 4 insertions, 48 deletions
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 4ea954437..1fcbd9daa 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -200,52 +200,7 @@ />
</StackPanel>
</Button>
-
-
- <Menu Background="Transparent" Visibility="Collapsed">
- <MenuItem ItemsSource="{Binding SourceMenu}" attachedProperties:DriveMenu.ShowAvailableDrives="true">
- <MenuItem.Header>
- <StackPanel Orientation="Horizontal">
- <Image Width="32"
- Height="32"
- Source="Images/Movies.png"
- />
- <Label Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="Source"
- />
- </StackPanel>
- </MenuItem.Header>
-
- <MenuItem.Resources>
- <Image x:Key="Movie" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/file.png" />
- <Image x:Key="Folder" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/folder.png" />
- <Image x:Key="Disc" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/disc_small.png" />
- </MenuItem.Resources>
- <MenuItem.ItemContainerStyle>
- <Style TargetType="{x:Type MenuItem}" x:Shared="True">
- <Setter Property="Header" Value="{Binding Text}" />
- <Setter Property="Command" Value="{Binding Command}"/>
- <Setter Property="ItemsSource" Value="{Binding Children}" />
- <Setter Property="InputGestureText" Value="{Binding InputGestureText}" />
- <Setter Property="Tag" Value="{Binding}" />
-
- <Style.Triggers>
- <DataTrigger Binding="{Binding Path=IsDrive}" Value="true">
- <Setter Property="Icon" Value="{StaticResource Disc}"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding Path=IsOpenFolder}" Value="true">
- <Setter Property="Icon" Value="{StaticResource Folder}"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding Path=IsOpenFile}" Value="true">
- <Setter Property="Icon" Value="{StaticResource Movie}"/>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </MenuItem.ItemContainerStyle>
- </MenuItem>
- </Menu>
-
+
<Separator />
<Button Name="Start"
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 961d31582..aa4ed6a64 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -320,7 +320,7 @@ <StackPanel Orientation="Vertical" Margin="20,0,0,0" >
<CheckBox Content="Enable DXVA Hardware Accelerated Decoding" IsChecked="{Binding EnableDxvaDecoding}" />
- <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" Margin="17,2,0,0" />
+ <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" Margin="17,2,0,0" />
</StackPanel>
@@ -340,7 +340,8 @@ </StackPanel>
<StackPanel Orientation="Vertical" Margin="26,2,0,0" >
- <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap "/>
+ <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap "
+ Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />
</StackPanel>
</StackPanel>
|