|
5 | 5 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
6 | 6 | xmlns:local="clr-namespace:UnityLauncherPro" |
7 | 7 | mc:Ignorable="d" |
8 | | - Title="ThemeEditor" Height="450" Width="500" WindowStyle="ToolWindow" Loaded="Window_Loaded" Background="{DynamicResource ThemeDarkestBackground}"> |
| 8 | + Title="ThemeEditor" Height="450" Width="500" WindowStyle="ToolWindow" Loaded="Window_Loaded" Background="#FF121212"> |
9 | 9 | <!--TODO take from mainwindow?--> |
10 | 10 | <Window.Resources> |
11 | 11 | <!-- custom buttons --> |
|
26 | 26 | <Setter TargetName="shortcutbutton" Property="Background" Value="#FF0F0F0F" /> |
27 | 27 | </Trigger> |
28 | 28 | <Trigger Property="IsFocused" Value="true"> |
29 | | - <Setter TargetName="shortcutbutton" Property="BorderBrush" Value="{DynamicResource ThemeButtonFocusOutline}" /> |
| 29 | + <Setter TargetName="shortcutbutton" Property="BorderBrush" Value="#FF003D61" /> |
30 | 30 | <Setter TargetName="shortcutbutton" Property="BorderThickness" Value="1" /> |
31 | 31 | </Trigger> |
32 | 32 | </ControlTemplate.Triggers> |
|
38 | 38 | <!--TODO move to styles--> |
39 | 39 | <!-- datagrid rows & row selection --> |
40 | 40 | <Style TargetType="DataGridRow"> |
41 | | - <Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}" /> |
| 41 | + <Setter Property="Background" Value="#FF3F3F46" /> |
42 | 42 | <Setter Property="BorderBrush" Value="{x:Null}" /> |
43 | 43 | <Setter Property="BorderThickness" Value="0,0,0,0" /> |
44 | 44 | <Style.Triggers> |
45 | 45 | <!--<Trigger Property="IsMouseOver" Value="True"> |
46 | 46 | <Setter Property="Background" Value="{StaticResource DataGridRowMouseOver}"/> |
47 | 47 | </Trigger>--> |
48 | 48 | <Trigger Property="IsSelected" Value="True"> |
49 | | - <Setter Property="Background" Value="{DynamicResource ThemeDataGridRowSelectedBackground}" /> |
| 49 | + <Setter Property="Background" Value="#FF007ACC" /> |
50 | 50 | </Trigger> |
51 | 51 | </Style.Triggers> |
52 | 52 | </Style> |
|
76 | 76 | <Setter.Value> |
77 | 77 | <ControlTemplate TargetType="{x:Type RepeatButton}"> |
78 | 78 | <!-- button background --> |
79 | | - <Border Name="Border" Margin="1" CornerRadius="0" BorderThickness="0" Background="{DynamicResource ThemeButtonBackground}" BorderBrush="{x:Null}"> |
| 79 | + <Border Name="Border" Margin="1" CornerRadius="0" BorderThickness="0" Background="#FF3F3F46" BorderBrush="{x:Null}"> |
80 | 80 | <!-- arrow sign --> |
81 | | - <Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource ThemeScrollArrowForeground}" Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" /> |
| 81 | + <Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="#FF5E5E64" Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" /> |
82 | 82 | </Border> |
83 | 83 | <ControlTemplate.Triggers> |
84 | 84 | <!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten --> |
85 | 85 | <Trigger Property="IsMouseOver" Value="true"> |
86 | | - <Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeTextBoxBackground}" /> |
| 86 | + <Setter TargetName="Border" Property="Background" Value="#FF333337" /> |
87 | 87 | </Trigger> |
88 | 88 | <Trigger Property="IsPressed" Value="true"> |
89 | | - <Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollArrowPressed}" /> |
| 89 | + <Setter TargetName="Border" Property="Background" Value="#FF838383" /> |
90 | 90 | </Trigger> |
91 | 91 | <Trigger Property="IsEnabled" Value="false"> |
92 | 92 | <Setter Property="Foreground" Value="Black"/> |
|
123 | 123 | <Border Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" /> |
124 | 124 | <ControlTemplate.Triggers> |
125 | 125 | <Trigger Property="IsMouseOver" Value="true"> |
126 | | - <Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollBarThumbFill}" /> |
| 126 | + <Setter TargetName="Border" Property="Background" Value="#FF6A6969" /> |
127 | 127 | </Trigger> |
128 | 128 | </ControlTemplate.Triggers> |
129 | 129 | </ControlTemplate> |
|
139 | 139 | <RowDefinition MaxHeight="18"/> |
140 | 140 | </Grid.RowDefinitions> |
141 | 141 | <!-- scrollbar background --> |
142 | | - <Border Grid.RowSpan="3" CornerRadius="0" Background="{DynamicResource ThemeScrollBarBackground}" /> |
| 142 | + <Border Grid.RowSpan="3" CornerRadius="0" Background="#FF151515" /> |
143 | 143 | <!-- scrollbar top button --> |
144 | 144 | <RepeatButton Grid.Row="0" Style="{StaticResource ScrollBarLineButton}" Height="18" Command="ScrollBar.LineUpCommand" Content="M 0 4 L 8 4 L 4 0 Z" /> |
145 | 145 | <Track Name="PART_Track" Grid.Row="1" IsDirectionReversed="true"> |
|
148 | 148 | </Track.DecreaseRepeatButton> |
149 | 149 | <Track.Thumb> |
150 | 150 | <!-- scrollbar foreground --> |
151 | | - <Thumb Style="{StaticResource ScrollBarThumb}" Margin="1,0,1,0" Background="{DynamicResource ThemeScrollBarFill}" BorderBrush="{x:Null}"/> |
| 151 | + <Thumb Style="{StaticResource ScrollBarThumb}" Margin="1,0,1,0" Background="#FF47474B" BorderBrush="{x:Null}"/> |
152 | 152 | </Track.Thumb> |
153 | 153 | <Track.IncreaseRepeatButton> |
154 | 154 | <RepeatButton Style="{StaticResource ScrollBarPageButton}" Command="ScrollBar.PageDownCommand" /> |
|
181 | 181 | <RowDefinition Height="*"/> |
182 | 182 | </Grid.RowDefinitions> |
183 | 183 | <!--<DataGrid Grid.Row="0" x:Name="gridThemeColors" KeyboardNavigation.TabNavigation="None" SelectionMode="Single" Margin="3,0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" IsTabStop="True" TabIndex="1" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" SelectionChanged="GridThemeColors_SelectionChanged">--> |
184 | | - <DataGrid Grid.Row="0" x:Name="gridThemeColors" KeyboardNavigation.TabNavigation="None" SelectionMode="Single" Margin="3,0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" IsTabStop="True" TabIndex="1" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" SelectionChanged="GridThemeColors_SelectionChanged"> |
| 184 | + <DataGrid Grid.Row="0" x:Name="gridThemeColors" KeyboardNavigation.TabNavigation="None" SelectionMode="Single" Margin="3,0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="#FFC1C1C1" Background="#FF262626" IsTabStop="True" TabIndex="1" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" SelectionChanged="GridThemeColors_SelectionChanged"> |
185 | 185 | <DataGrid.Columns> |
186 | 186 | <DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" CanUserResize="False"/> |
187 | 187 | <DataGridTextColumn Header="Value" Binding="{Binding Brush}" IsReadOnly="True" CanUserResize="False"> |
|
192 | 192 | <Setter Property="Background" Value="{Binding Brush, Converter={StaticResource SolidColorBrushConverter}}" /> |
193 | 193 | <Style.Triggers> |
194 | 194 | <DataTrigger Binding="{Binding Brush, Converter={StaticResource SolidColorBrushConverter}}" Value="true"> |
195 | | - <Setter Property="Foreground" Value="{DynamicResource ThemeGridGreenText}" /> |
| 195 | + <Setter Property="Foreground" Value="White" /> |
196 | 196 | </DataTrigger> |
197 | 197 | </Style.Triggers> |
198 | 198 | </Style> |
|
206 | 206 | <!--<TextBox x:Name="txtSelectedColorHex" VerticalAlignment="Center" IsUndoEnabled="True" TabIndex="0" Width="189" Height="24" Margin="10,0,0,0" />--> |
207 | 207 | <StackPanel Orientation="Vertical" Margin="10,0,0,0"> |
208 | 208 | <StackPanel Orientation="Horizontal"> |
209 | | - <Label Foreground="{DynamicResource ThemeButtonForeground}" Width="40">Red</Label> |
| 209 | + <Label Foreground="#FFC1C1C1" Width="44">Red</Label> |
210 | 210 | <Slider x:Name="sliderRed" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderRed_ValueChanged"/> |
211 | 211 | <TextBox x:Name="txtRed" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" /> |
212 | 212 | </StackPanel> |
213 | 213 | <StackPanel Orientation="Horizontal"> |
214 | | - <Label Foreground="{DynamicResource ThemeButtonForeground}" Width="40">Green</Label> |
| 214 | + <Label Foreground="#FFC1C1C1" Width="44">Green</Label> |
215 | 215 | <Slider x:Name="sliderGreen" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderGreen_ValueChanged"/> |
216 | 216 | <TextBox x:Name="txtGreen" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" /> |
217 | 217 | </StackPanel> |
218 | 218 | <StackPanel Orientation="Horizontal"> |
219 | | - <Label Foreground="{DynamicResource ThemeButtonForeground}" Width="40">Blue</Label> |
| 219 | + <Label Foreground="#FFC1C1C1" Width="44">Blue</Label> |
220 | 220 | <Slider x:Name="sliderBlue" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderBlue_ValueChanged"/> |
221 | 221 | <TextBox x:Name="txtBlue" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" /> |
222 | 222 | </StackPanel> |
223 | 223 | <StackPanel Orientation="Horizontal"> |
224 | | - <Label Foreground="{DynamicResource ThemeButtonForeground}" Width="40">Alpha</Label> |
| 224 | + <Label Foreground="#FFC1C1C1" Width="44">Alpha</Label> |
225 | 225 | <Slider x:Name="sliderAlpha" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderAlpha_ValueChanged"/> |
226 | 226 | <TextBox x:Name="txtAlpha" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" /> |
227 | 227 | </StackPanel> |
228 | 228 | </StackPanel> |
229 | | - |
230 | | - <Button Style="{StaticResource CustomButton}" x:Name="btnSaveTheme" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" VerticalAlignment="Center" Height="35" Click="BtnSaveTheme_Click" TabIndex="3" Width="157" Margin="16,0,0,0"> |
231 | | - <Label Foreground="{DynamicResource ThemeButtonForeground}" Content="Save Theme"/> |
232 | | - </Button> |
| 229 | + <StackPanel Orientation="Vertical" Margin="25,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"> |
| 230 | + <Button x:Name="btnResetTheme" Style="{StaticResource CustomButton}" Background="#FF3F3F46" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" VerticalAlignment="Center" Height="36" Click="BtnResetTheme_Click" TabIndex="3" Width="78.5" Margin="0,0,0,20"> |
| 231 | + <Label Foreground="#FFC1C1C1" Content="Reset Theme"/> |
| 232 | + </Button> |
| 233 | + <Button x:Name="btnSaveTheme" Style="{StaticResource CustomButton}" Background="#FF3F3F46" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" VerticalAlignment="Center" Height="36" TabIndex="3" Width="157" Margin="0" Click="BtnSaveTheme_Click"> |
| 234 | + <Label Foreground="#FFC1C1C1" Content="Save Theme"/> |
| 235 | + </Button> |
| 236 | + </StackPanel> |
233 | 237 | </StackPanel> |
234 | 238 |
|
235 | 239 | </Grid> |
|
0 commit comments