diff options
Diffstat (limited to 'win/CS/HandBrakeWPF/Views/OptionsView.xaml')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 271b97421..690a1c341 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -120,6 +120,7 @@ <CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
<CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />
<CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />
+ <CheckBox Content="{x:Static Properties:Resources.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" />
</StackPanel>
@@ -191,16 +192,6 @@ </StackPanel>
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="0,0,0,10" Visibility="{Binding IsNightly, Converter={StaticResource boolToVisConverter}}">
-
- <TextBlock Text="{x:Static Properties:Resources.Options_Experimental}" FontSize="14" Margin="0,0,0,10"/>
-
- <StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <TextBlock Text="{x:Static Properties:Resources.Options_ExperimentalFeatures}" Margin="0,0,0,10" TextWrapping="Wrap" />
-
- <CheckBox Content="{x:Static Properties:Resources.Options_ShowQueueInline}" IsChecked="{Binding ShowQueueInline}" Margin="20,5,0,0" />
- </StackPanel>
- </StackPanel>
</StackPanel>
<StackPanel Name="Output" Orientation="Vertical" Margin="10,5,0,0"
@@ -253,6 +244,16 @@ <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_MP4FileExtension}" />
<ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left" />
</StackPanel>
+
+ </StackPanel>
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_UIBehaviour}" FontSize="14" Margin="0,20,0,10"/>
+ <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+ <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+
+ <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.OptionsView_FileOverwriteBehaviour}" />
+ <ComboBox Width="200" ItemsSource="{Binding FileOverwriteBehaviourList, Converter={StaticResource enumComboConverter}}" SelectedIndex="{Binding SelectedOverwriteBehaviour}" HorizontalAlignment="Left" />
+ </StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
@@ -315,6 +316,7 @@ <CheckBox Content="{x:Static Properties:Resources.Options_PreventSleep}" IsChecked="{Binding PreventSleep}" />
<CheckBox Content="{x:Static Properties:Resources.Options_PauseQueueOnLowDiskSpace}"
IsChecked="{Binding PauseOnLowDiskspace}" />
+ <CheckBox Content="{x:Static Properties:Resources.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" />
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
<TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceSize}" VerticalAlignment="Center" Width="250" />
<TextBox x:Name="PauseOnLowDiskspaceLEvel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}" Width="120"/>
@@ -343,15 +345,6 @@ </StackPanel>
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="0,10,0,10">
-
- <TextBlock Text="{x:Static Properties:Resources.Options_DVD}" FontSize="14" Margin="0,0,0,10"/>
-
- <StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <CheckBox Content="{x:Static Properties:Resources.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" />
- </StackPanel>
-
- </StackPanel>
<StackPanel Orientation="Vertical" Margin="0,10,0,10">
|