Skip to content

Commit 779f957

Browse files
unitycoderunitycoder
committed
update theme colors for upgrade and new project windows
1 parent 89e4384 commit 779f957

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎UnityLauncherPro/NewProject.xaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:UnityLauncherPro"
77
mc:Ignorable="d"
8-
Title="Create New Project" Height="296" Width="300" Background="{DynamicResource DarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
8+
Title="Create New Project" Height="296" Width="300" Background="{DynamicResource ThemeDarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
99
<Window.Resources>
1010
<!-- custom buttons -->
1111
<Style x:Key="CustomButton" TargetType="{x:Type Button}">
@@ -33,15 +33,15 @@
3333
<!--TODO move to styles-->
3434
<!-- datagrid rows & row selection -->
3535
<Style TargetType="DataGridRow">
36-
<Setter Property="Background" Value="{StaticResource ButtonBackground}" />
36+
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}" />
3737
<Setter Property="BorderBrush" Value="{x:Null}" />
3838
<Setter Property="BorderThickness" Value="0,0,0,0" />
3939
<Style.Triggers>
4040
<!--<Trigger Property="IsMouseOver" Value="True">
4141
<Setter Property="Background" Value="{StaticResource DataGridRowMouseOver}"/>
4242
</Trigger>-->
4343
<Trigger Property="IsSelected" Value="True">
44-
<Setter Property="Background" Value="{StaticResource DataGridRowSelectedBackground}" />
44+
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}" />
4545
</Trigger>
4646
</Style.Triggers>
4747
</Style>
@@ -78,10 +78,10 @@
7878
<ControlTemplate.Triggers>
7979
<!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten -->
8080
<Trigger Property="IsMouseOver" Value="true">
81-
<Setter TargetName="Border" Property="Background" Value="{StaticResource TextBoxBackground}" />
81+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeTextBoxBackground}" />
8282
</Trigger>
8383
<Trigger Property="IsPressed" Value="true">
84-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ScrollArrowPressed}" />
84+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollArrowPressed}" />
8585
</Trigger>
8686
<Trigger Property="IsEnabled" Value="false">
8787
<Setter Property="Foreground" Value="Black"/>
@@ -118,7 +118,7 @@
118118
<Border Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
119119
<ControlTemplate.Triggers>
120120
<Trigger Property="IsMouseOver" Value="true">
121-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ScrollBarThumbFill}" />
121+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollBarThumbFill}" />
122122
</Trigger>
123123
</ControlTemplate.Triggers>
124124
</ControlTemplate>
@@ -170,25 +170,25 @@
170170

171171
<Grid>
172172
<StackPanel Margin="10,3">
173-
<Label Content="Unity Version " Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
174-
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" Height="120" Margin="3,0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" KeyboardNavigation.TabNavigation = "None" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False">
173+
<Label Content="Unity Version " Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
174+
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" Height="120" Margin="3,0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" KeyboardNavigation.TabNavigation = "None" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False">
175175
<DataGrid.Columns>
176176
<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" CanUserResize="False" MinWidth="300" />
177177
</DataGrid.Columns>
178178
</DataGrid>
179-
<Label Content="Project Name:" Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
179+
<Label Content="Project Name:" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
180180
<TextBox x:Name="txtNewProjectName" VerticalAlignment="Center" Margin="3,0,3,3" IsUndoEnabled="True" TextChanged="TxtNewProjectName_TextChanged" PreviewKeyDown="TxtNewProjectName_PreviewKeyDown" TabIndex="0" />
181-
<Label x:Name="lblNewProjectFolder" Content="(folder)" Foreground="{DynamicResource ButtonBackground}" Margin="0" FontSize="10" Padding="5,0,5,3" />
181+
<Label x:Name="lblNewProjectFolder" Content="(folder)" Foreground="{DynamicResource ThemeButtonBackground}" Margin="0" FontSize="10" Padding="5,0,5,3" />
182182
<Grid HorizontalAlignment="Stretch" Margin="0,8,0,0">
183183
<Grid.ColumnDefinitions>
184184
<ColumnDefinition Width="*"/>
185185
<ColumnDefinition Width="*"/>
186186
</Grid.ColumnDefinitions>
187-
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="3,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" IsTabStop="False" >
188-
<Label Foreground="{DynamicResource ButtonForeground}" Content="Cancel"/>
187+
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="3,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" IsTabStop="False" >
188+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="Cancel"/>
189189
</Button>
190-
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="3,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" IsTabStop="False">
191-
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Create"/>
190+
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="3,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" IsTabStop="False">
191+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Create"/>
192192
</Button>
193193
</Grid>
194194
</StackPanel>

‎UnityLauncherPro/UpgradeWindow.xaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:UnityLauncherPro"
77
mc:Ignorable="d"
8-
Title="Upgrade Project Version" Height="533.165" Width="418.684" Background="{DynamicResource DarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
8+
Title="Upgrade Project Version" Height="533.165" Width="418.684" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
99
<Window.Resources>
1010
<!-- custom buttons -->
1111
<Style x:Key="CustomButton" TargetType="{x:Type Button}">
@@ -34,15 +34,15 @@
3434

3535
<!-- datagrid rows & row selection -->
3636
<Style TargetType="DataGridRow">
37-
<Setter Property="Background" Value="{StaticResource ButtonBackground}" />
37+
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}" />
3838
<Setter Property="BorderBrush" Value="{x:Null}" />
3939
<Setter Property="BorderThickness" Value="0,0,0,0" />
4040
<Style.Triggers>
4141
<!--<Trigger Property="IsMouseOver" Value="True">
4242
<Setter Property="Background" Value="{StaticResource DataGridRowMouseOver}"/>
4343
</Trigger>-->
4444
<Trigger Property="IsSelected" Value="True">
45-
<Setter Property="Background" Value="{StaticResource DataGridRowSelectedBackground}" />
45+
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}" />
4646
</Trigger>
4747
</Style.Triggers>
4848
</Style>
@@ -73,17 +73,17 @@
7373
<Setter.Value>
7474
<ControlTemplate TargetType="{x:Type RepeatButton}">
7575
<!-- button background -->
76-
<Border Name="Border" Margin="1" CornerRadius="0" BorderThickness="0" Background="{DynamicResource ButtonBackground}" BorderBrush="{x:Null}">
76+
<Border Name="Border" Margin="1" CornerRadius="0" BorderThickness="0" Background="{DynamicResource ThemeButtonBackground}" BorderBrush="{x:Null}">
7777
<!-- arrow sign -->
78-
<Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource ScrollArrowForeground}" Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" />
78+
<Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource ThemeScrollArrowForeground}" Data="{Binding Path=Content,RelativeSource={RelativeSource TemplatedParent}}" />
7979
</Border>
8080
<ControlTemplate.Triggers>
8181
<!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten -->
8282
<Trigger Property="IsMouseOver" Value="true">
83-
<Setter TargetName="Border" Property="Background" Value="{StaticResource TextBoxBackground}" />
83+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeTextBoxBackground}" />
8484
</Trigger>
8585
<Trigger Property="IsPressed" Value="true">
86-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ScrollArrowPressed}" />
86+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollArrowPressed}" />
8787
</Trigger>
8888
<Trigger Property="IsEnabled" Value="false">
8989
<Setter Property="Foreground" Value="Black"/>
@@ -120,7 +120,7 @@
120120
<Border Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
121121
<ControlTemplate.Triggers>
122122
<Trigger Property="IsMouseOver" Value="true">
123-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ScrollBarThumbFill}" />
123+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollBarThumbFill}" />
124124
</Trigger>
125125
</ControlTemplate.Triggers>
126126
</ControlTemplate>
@@ -173,23 +173,23 @@
173173

174174
</Window.Resources>
175175
<Grid>
176-
<Label x:Name="lblCurrentVersion" Content="Project Current Version" HorizontalAlignment="Left" Margin="9,11,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ButtonForeground}" Width="139"/>
177-
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" x:Name="txtCurrentVersion" Background="{DynamicResource DarkMenuBar}" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="173,16,37,0" UndoLimit="64" Text="Version" IsReadOnly="True" VerticalAlignment="Top" />
176+
<Label x:Name="lblCurrentVersion" Content="Project Current Version" HorizontalAlignment="Left" Margin="9,11,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ThemeButtonForeground}" Width="139"/>
177+
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" x:Name="txtCurrentVersion" Background="{DynamicResource ThemeDarkMenuBar}" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="173,16,37,0" UndoLimit="64" Text="Version" IsReadOnly="True" VerticalAlignment="Top" />
178178

179-
<Label x:Name="lblAvailableVersions" Content="Available Unity Versions" HorizontalAlignment="Left" Margin="9,94,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ButtonForeground}"/>
180-
<Button Style="{StaticResource CustomButton}" x:Name="btnDownload" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="0,47,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="35" Click="BtnDownload_Click" >
181-
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Download in Browser"/>
179+
<Label x:Name="lblAvailableVersions" Content="Available Unity Versions" HorizontalAlignment="Left" Margin="9,94,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ThemeButtonForeground}"/>
180+
<Button Style="{StaticResource CustomButton}" x:Name="btnDownload" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="0,47,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="35" Click="BtnDownload_Click" >
181+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Download in Browser"/>
182182
</Button>
183-
<Button Style="{StaticResource CustomButton}" x:Name="btnOpenReleasePage" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="9,47,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Click="BtnOpenReleasePage_Click" >
184-
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Open Release Page"/>
183+
<Button Style="{StaticResource CustomButton}" x:Name="btnOpenReleasePage" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="9,47,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Click="BtnOpenReleasePage_Click" >
184+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Open Release Page"/>
185185
</Button>
186-
<Button Style="{StaticResource CustomButton}" x:Name="btnCancelUpgrade" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="9,434,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" Width="111" VerticalAlignment="Top" Height="51" Click="BtnCancelUpgrade_Click" >
187-
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Cancel"/>
186+
<Button Style="{StaticResource CustomButton}" x:Name="btnCancelUpgrade" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="9,434,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" Width="111" VerticalAlignment="Top" Height="51" Click="BtnCancelUpgrade_Click" >
187+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Cancel"/>
188188
</Button>
189-
<Button Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="0,434,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" Width="159" VerticalAlignment="Top" Height="51" Click="BtnUpgradeProject_Click" >
190-
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Upgrade Project"/>
189+
<Button Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="0,434,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" Width="159" VerticalAlignment="Top" Height="51" Click="BtnUpgradeProject_Click" >
190+
<Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Upgrade Project"/>
191191
</Button>
192-
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded" PreviewMouseDoubleClick="GridAvailableVersions_PreviewMouseDoubleClick">
192+
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded" PreviewMouseDoubleClick="GridAvailableVersions_PreviewMouseDoubleClick">
193193
<DataGrid.Columns>
194194
<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" />
195195
<DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" />

0 commit comments

Comments
 (0)