summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF')
-rw-r--r--win/CS/HandBrakeWPF/Views/AddPresetView.xaml39
-rw-r--r--win/CS/HandBrakeWPF/Views/ErrorView.xaml26
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml1
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml12
-rw-r--r--win/CS/HandBrakeWPF/Views/PreviewView.xaml17
-rw-r--r--win/CS/HandBrakeWPF/Views/QueueView.xaml20
-rw-r--r--win/CS/HandBrakeWPF/Views/ShellView.xaml2
-rw-r--r--win/CS/HandBrakeWPF/Views/Styles/Styles.xaml2
8 files changed, 101 insertions, 18 deletions
diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index 0c398eaaf..b71178bdc 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -25,8 +25,7 @@
</Window.Resources>
<Grid HorizontalAlignment="Stretch"
- VerticalAlignment="Stretch"
- Background="#FFF1F0EF">
+ VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -34,12 +33,32 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="#FFF1F0EF" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+
+
<!-- Header -->
<StackPanel Grid.Row="0"
Height="30"
Margin="0,0,0,10"
- Background="White"
Orientation="Horizontal">
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
<Image Width="24"
Height="24"
Margin="10,0,5,0"
@@ -134,8 +153,18 @@
<!-- Controls -->
<Grid Grid.Row="3"
- Margin="0,20,0,0"
- Background="LightGray">
+ Margin="0,20,0,0">
+
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index e4e7ab885..95b6e85cb 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -7,7 +7,7 @@
Height="380"
MinWidth="680"
MinHeight="380"
- Background="#FFF0F0F0"
+ Style="{StaticResource windowStyle}"
FontSize="11"
TextOptions.TextFormattingMode="Display"
WindowStartupLocation="CenterScreen">
@@ -21,8 +21,18 @@
<!-- Header -->
<StackPanel Grid.Row="0"
Margin="0,0,0,0"
- Background="White"
Orientation="Horizontal">
+
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
<Image Width="64"
Height="64"
Margin="10,0,0,0"
@@ -61,13 +71,23 @@
<!-- Controls -->
- <Grid Grid.Row="2" Background="LightGray">
+ <Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+
<Button Grid.Column="1"
Margin="5"
cal:Message.Attach="[Event Click] = [Action Copy]"
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 1fcbd9daa..68b7d739e 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -380,6 +380,7 @@
SelectedItem="{Binding Path=SelectedTitle}"
/>
<Label Margin="8,0,0,0" Content="Angle" />
+
<ComboBox Name="Angles"
MinWidth="60"
Margin="8,0,0,0"
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index aa4ed6a64..ad1a20ca4 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -492,7 +492,17 @@
</StackPanel>
</ScrollViewer>
- <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >
+ <StackPanel HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2" >
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
<Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
</StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
index db6acfb9b..bb15e7ce4 100644
--- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
@@ -6,7 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="{Binding Title}"
Width="380"
- Background="#FFF1F0EF"
+ Style="{StaticResource windowStyle}"
ResizeMode="NoResize"
SizeToContent="Height"
WindowStartupLocation="CenterScreen"
@@ -24,11 +24,20 @@
<StackPanel Orientation="Vertical">
- <StackPanel Grid.Row="0"
- Height="34"
+ <StackPanel Height="34"
Margin="0,0,0,10"
- Background="White"
Orientation="Horizontal">
+
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
<Image Width="32"
Height="32"
Margin="10,0,5,0"
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 77532e924..5ff075455 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -16,7 +16,7 @@
Height="500"
MinWidth="350"
MinHeight="250"
- Background="#FFF0F0F0"
+ Style="{StaticResource windowStyle}"
WindowStartupLocation="CenterScreen"
TextOptions.TextFormattingMode="Display"
mc:Ignorable="d">
@@ -156,12 +156,21 @@
<ListBox Grid.Row="2"
Margin="10,0,10,10"
- Background="LightGray"
dd:DragDrop.DropHandler="{Binding}"
dd:DragDrop.IsDragSource="True"
dd:DragDrop.IsDropTarget="True"
ItemsSource="{Binding QueueTasks, Mode=OneWay}"
SelectionMode="Extended">
+
+ <ListBox.Style>
+ <Style TargetType="ListBox">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ListBox.Style>
<ListBox.ContextMenu>
<ContextMenu>
@@ -176,7 +185,6 @@
<ListBox.ItemContainerStyle>
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
- <Setter Property="Background" Value="WhiteSmoke" />
<Setter Property="Margin" Value="0,0,0,1" />
<Setter Property="ToolTip">
<Setter.Value>
@@ -226,6 +234,12 @@
</Setter.Value>
</Setter>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding DataContext.UseSystemColours, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+ <Setter Property="Background" Value="WhiteSmoke" />
+ </DataTrigger>
+ </Style.Triggers>
+
</Style>
</ListBox.ItemContainerStyle>
diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 84411cdca..c9702a7a7 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -14,7 +14,7 @@
UseLayoutRounding="True"
WindowStartupLocation="CenterScreen"
TextOptions.TextFormattingMode="Display"
- Style="{StaticResource mainWindowStyle}"
+ Style="{StaticResource windowStyle}"
x:Name="shellView"
>
<Window.Resources>
diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index 1fd0b7e94..2472a6b28 100644
--- a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
+++ b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Style x:Key="mainWindowStyle" TargetType="Window">
+ <Style x:Key="windowStyle" TargetType="Window">
<Style.Triggers>
<DataTrigger Binding="{Binding UseSystemColours}" Value="False">
<Setter Property="Background" Value="#FFF0F0F0" />
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 14:57:39 +0000