customdatetime: add red outline for invalid values, add new theme colors, theme editor: sort by key, disable column rearrange and sort click, set first row autoselected, set datagrid header visible and styled, add new theme colors to checkboxes and radiobuttons set sliders to Int ticks, start initial cleanup

unitycoder · unitycoder · commit 09a6d2233994 · 2022-02-24T23:18:00.000+02:00
diff --git a/UnityLauncherPro/GetUnityInstallations.cs b/UnityLauncherPro/GetUnityInstallations.cs
@@ -82,6 +82,7 @@ public static UnityInstallation[] Scan()
                 } // got folders
             } // all root folders
 
+            // sort by version
             results.Sort((s1, s2) => Tools.VersionAsInt(s2.Version).CompareTo(Tools.VersionAsInt(s1.Version)));
 
             return results.ToArray();
diff --git a/UnityLauncherPro/MainWindow.xaml b/UnityLauncherPro/MainWindow.xaml
@@ -407,7 +407,7 @@
                     <ControlTemplate TargetType="{x:Type CheckBox}">
                         <BulletDecorator Background="Transparent">
                             <BulletDecorator.Bullet>
-                                <Border x:Name="Border" Margin="0 1 0 0" Width="14" Height="13" CornerRadius="0" Background="#ffffff" BorderThickness="1" BorderBrush="#404040">
+                                <Border x:Name="Border" Margin="0 1 0 0" Width="14" Height="13" CornerRadius="0" Background="{DynamicResource ThemeRadioCheckBoxBackground}" BorderThickness="1" BorderBrush="#404040">
                                     <Path Width="8" Height="8" x:Name="CheckMark" SnapsToDevicePixels="False" Stroke="#000000" StrokeThickness="1.75" Data="M 0 3 L 3 6 L 7 0" Margin="1,1,0,0" />
                                 </Border>
                             </BulletDecorator.Bullet>
@@ -442,10 +442,10 @@
                     <ControlTemplate TargetType="{x:Type RadioButton}">
                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Background="Transparent">
                             <Grid>
-                                <Ellipse x:Name="TargetEllipse" Width="12" Height="12" Fill="{DynamicResource ThemeButtonForeground}" Stroke="Transparent" />
+                                <Ellipse x:Name="TargetEllipse" Width="12" Height="12" Fill="{DynamicResource ThemeRadioCheckBoxBackground}" Stroke="Transparent" />
                                 <Ellipse x:Name="CheckedEllipse" Width="6" Height="6" Fill="{DynamicResource ThemeRadioButtonSelected}" Visibility="Collapsed"/>
                             </Grid>
-                            <Label Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}"/>
+                            <Label Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}"/>
                         </StackPanel>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
@@ -1000,19 +1000,19 @@
                             <CheckBox  x:Name="chkShowPlatform" Content="Show current target platform (if exists in .csproj)"  ToolTip="Shows target platform column" Checked="ChkShowPlatform_Checked" Unchecked="ChkShowPlatform_Checked" HorizontalAlignment="Left"/>
                             <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4">
                                 <CheckBox  x:Name="chkUseCustomTheme" Content="Load custom theme" ToolTip="Loads theme.ini from application folder" Checked="ChkUseCustomTheme_Checked" Unchecked="ChkUseCustomTheme_Checked" HorizontalAlignment="Left"/>
-                                <TextBox x:Name="txtCustomThemeFile" MinWidth="128" ToolTip="Default is theme.ini" Padding="0,3,0,0" Margin="5,0,0,0" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}"  Text="theme.ini" LostFocus="TxtCustomThemeFile_LostFocus" PreviewKeyDown="TxtCustomThemeFile_PreviewKeyDown" />
+                                <TextBox x:Name="txtCustomThemeFile" BorderBrush="Transparent" MinWidth="128" ToolTip="Default is theme.ini" Padding="0,3,0,0" Margin="5,0,0,0" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}"  Text="theme.ini" LostFocus="TxtCustomThemeFile_LostFocus" PreviewKeyDown="TxtCustomThemeFile_PreviewKeyDown" />
                                 <Button Style="{StaticResource CustomButton}" ToolTip="Reload theme" x:Name="btnReloadTheme" Content="⟳" Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="BtnReloadTheme_Click" Margin="5,0,0,0"/>
                                 <Button Style="{StaticResource CustomButton}" ToolTip="Explore Themes folder" x:Name="btnExploreFolder" Content="..." Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="BtnExploreFolder_Click" Margin="5,0,0,0"/>
                                 <Button Style="{StaticResource CustomButton}" ToolTip="Open theme editor" x:Name="btnThemeEditor" Content="✎" Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="BtnThemeEditor_Click" Margin="5,0,0,0"/>
                             </StackPanel>
 
                             <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4">
-                                <TextBox x:Name="txtRootFolderForNewProjects" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="300" ToolTip="Root folder for quick New Projects (so that you dont have to pick project folder every time)" Padding="0,3,0,0" TextChanged="TxtRootFolderForNewProjects_TextChanged" />
+                                <TextBox x:Name="txtRootFolderForNewProjects" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="300" ToolTip="Root folder for quick New Projects (so that you dont have to pick project folder every time)" Padding="0,3,0,0" TextChanged="TxtRootFolderForNewProjects_TextChanged" />
                                 <Button Style="{StaticResource CustomButton}" x:Name="btnBrowseProjectRootFolder" Content="..." Margin="6,0,0,0" MinWidth="22" Click="BtnBrowseProjectRootFolder_Click" MinHeight="22" FontSize="16" ToolTip="Browse for new projects root folder.." />
                                 <Label Content="Root Folder for New Projects" Foreground="{DynamicResource ThemeButtonForeground}" />
                             </StackPanel>
                             <StackPanel Grid.Row="3" Orientation="Horizontal">
-                                <TextBox x:Name="txtWebglRelativePath" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}"  MinWidth="200" ToolTip="Inside Builds/ folder you might have separate folder for webgl builds, like webgl/. Used for starting WebGL server there" Padding="0,3,0,0" TextChanged="TxtWebglRelativePath_TextChanged" />
+                                <TextBox x:Name="txtWebglRelativePath" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}"  MinWidth="200" ToolTip="Inside Builds/ folder you might have separate folder for webgl builds, like webgl/. Used for starting WebGL server there" Padding="0,3,0,0" TextChanged="TxtWebglRelativePath_TextChanged" />
                                 <Label Content="Webgl Relative Build Path (inside Builds/)" Foreground="{DynamicResource ThemeButtonForeground}" />
                             </StackPanel>
                         </StackPanel>
@@ -1025,13 +1025,13 @@
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
                                 <CheckBox  x:Name="chkUseCustomLastModified" Content="Date format" ToolTip="Last modified date format" HorizontalAlignment="Left" Checked="ChkUseCustomLastModified_Checked" Unchecked="ChkUseCustomLastModified_Checked"/>
-                                <TextBox x:Name="txtCustomDateTimeFormat" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="150" ToolTip="Default is dd/MM/yyyy HH:mm:ss" Padding="0,3,0,0" Margin="5,0,0,0" Text="dd/MM/yyyy HH:mm:ss" LostFocus="TxtCustomDateTimeFormat_LostFocus" TextChanged="TxtCustomDateTimeFormat_TextChanged" />
-
+                                <TextBox x:Name="txtCustomDateTimeFormat" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="150" ToolTip="Default is dd/MM/yyyy HH:mm:ss" Padding="0,3,0,0" Margin="5,0,0,0" Text="dd/MM/yyyy HH:mm:ss" LostFocus="TxtCustomDateTimeFormat_LostFocus" TextChanged="TxtCustomDateTimeFormat_TextChanged">
+                                </TextBox>
                             </StackPanel>
                             <CheckBox  x:Name="chkHumanFriendlyDateTime" Content="Use human friendly last modified"  ToolTip="Last modified date format" HorizontalAlignment="Left" Checked="ChkHumanFriendlyDateTime_Checked" Unchecked="ChkHumanFriendlyDateTime_Checked"/>
-                            <Label Foreground="{DynamicResource ThemeButtonForeground}">Project name:</Label>
+                            <Label Foreground="{DynamicResource ThemeButtonForeground}" Padding="0,5,5,0">Project name:</Label>
                             <StackPanel Orientation="Horizontal">
-                                <RadioButton x:Name="radioProjNameFolder" Content="ProjectName.txt or Folder"  Margin="4,0,0,0" GroupName="toggleGroupProjectName" IsChecked="True" Checked="RadioProjNameFolder_Checked" ToolTip="Take project name from project folder name OR ProjectName.txt if file exists in ProjectSettings/ folder"/>
+                                <RadioButton x:Name="radioProjNameFolder" Content="ProjectName.txt or Folder"  Margin="3,0,0,0" GroupName="toggleGroupProjectName" IsChecked="True" Checked="RadioProjNameFolder_Checked" ToolTip="Take project name from project folder name OR ProjectName.txt if file exists in ProjectSettings/ folder"/>
                                 <RadioButton x:Name="radioProjNameProductName" Content="Settings ProductName"  Margin="5,0,0,0" GroupName="toggleGroupProjectName" Checked="RadioProjNameProductName_Checked" ToolTip="Take project name from player settings ProductName field"/>
                             </StackPanel>
                         </StackPanel>
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -2177,11 +2177,12 @@ void ValidateCustomDateFormat(string format)
                 currentDateFormat = format;
                 Properties.Settings.Default.customDateFormat = currentDateFormat;
                 Properties.Settings.Default.Save();
-                txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Black;
+                txtCustomDateTimeFormat.BorderBrush = System.Windows.Media.Brushes.Transparent;
             }
             else // invalid format
             {
-                txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Red;
+                //txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Red;
+                txtCustomDateTimeFormat.BorderBrush = System.Windows.Media.Brushes.Red;
                 currentDateFormat = defaultDateFormat;
             }
         }
diff --git a/UnityLauncherPro/Resources/Colors.xaml b/UnityLauncherPro/Resources/Colors.xaml
@@ -1,23 +1,34 @@
 ﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:UnityLauncherPro">
-    
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--window-->
+    <SolidColorBrush x:Key="ThemeMainTitle" Color="#FFB8B8B8"/>
     <SolidColorBrush x:Key="ThemeDarkestBackground" Color="#FF121212"/>
     <SolidColorBrush x:Key="ThemeDarkMenuBar" Color="#FF0C0C0C"/>
     <SolidColorBrush x:Key="ThemeMainBackgroundColor" Color="#FF262626"/>
-    <SolidColorBrush x:Key="ThemeTextBoxBackground" Color="#FF333337"/>
     <SolidColorBrush x:Key="ThemeDeactiveTabForeground" Color="#FFC1C1C1"/>
     <SolidColorBrush x:Key="ThemeDeactiveTabBackground" Color="#FF1D1D1D"/>
+    <SolidColorBrush x:Key="ThemeWindowMinClose" Color="#FFC3C3C3"/>
+
+    <!--datagrid-->
     <SolidColorBrush x:Key="ThemeDatagridHeaderBackground" Color="#4C3F3F46"/>
     <SolidColorBrush x:Key="ThemeDatagridHeaderForeground" Color="#FFB6B6B6"/>
     <SolidColorBrush x:Key="ThemeDatagridHeaderBorder" Color="#4C000000"/>
     <SolidColorBrush x:Key="ThemeDataGridRowMouseOver" Color="#7F007ACC"/>
     <SolidColorBrush x:Key="ThemeDataGridRowSelectedBackground" Color="#FF007ACC"/>
+    <SolidColorBrush x:Key="ThemeGridForeground" Color="#FFD8D8D8"/>
+    <SolidColorBrush x:Key="ThemeGridHorizontalGridLines" Color="#4C000000"/>
+    <SolidColorBrush x:Key="ThemeGridVerticalGridLines" Color="#19000000"/>
+    <SolidColorBrush x:Key="ThemeGridGreenText" Color="#FF00C500"/>
+    <SolidColorBrush x:Key="ThemeGridRedText" Color="#FFF54F4F"/>
+
+    <!--scrollbar-->
     <SolidColorBrush x:Key="ThemeScrollArrowPressed" Color="#FF838383"/>
     <SolidColorBrush x:Key="ThemeScrollArrowForeground" Color="#FF5E5E64"/>
     <SolidColorBrush x:Key="ThemeScrollBarThumbFill" Color="#FF6A6969"/>
     <SolidColorBrush x:Key="ThemeScrollBarBackground" Color="#FF151515"/>
     <SolidColorBrush x:Key="ThemeScrollBarFill" Color="#FF47474B"/>
+    <SolidColorBrush x:Key="ThemeScrollBarEnabledForeground" Color="#FF000000"/>
 
     <!--buttons-->
     <SolidColorBrush x:Key="ThemeButtonForegroundDisabled" Color="#FF707070"/>
@@ -27,9 +38,8 @@
     <SolidColorBrush x:Key="ThemeButtonBackground" Color="#FF3F3F46"/>
     <SolidColorBrush x:Key="ThemeButtonForeground" Color="#FFC1C1C1"/>
 
-    <!--custom components-->
-    <SolidColorBrush x:Key="ThemeMainTitle" Color="#FFB8B8B8"/>
-    <SolidColorBrush x:Key="ThemeScrollBarEnabledForeground" Color="#FF000000"/>
+    <!--textbox-->
+    <SolidColorBrush x:Key="ThemeTextBoxBackground" Color="#FF333337"/>
 
     <!--search-->
     <SolidColorBrush x:Key="ThemeSearchPlaceholder" Color="#7F919191"/>
@@ -38,28 +48,20 @@
     <SolidColorBrush x:Key="ThemeSearchForeground" Color="#FFC7C7C7"/>
     <SolidColorBrush x:Key="ThemeSearchSelection" Color="#FF003966"/>
 
-    <!--window-->
-    <SolidColorBrush x:Key="ThemeWindowMinClose" Color="#FFC3C3C3"/>
-
-    <!--datagrids-->
-    <SolidColorBrush x:Key="ThemeGridForeground" Color="#FFD8D8D8"/>
-    <SolidColorBrush x:Key="ThemeGridHorizontalGridLines" Color="#4C000000"/>
-    <SolidColorBrush x:Key="ThemeGridVerticalGridLines" Color="#19000000"/>
-    <SolidColorBrush x:Key="ThemeGridGreenText" Color="#FF00C500"/>
-    <SolidColorBrush x:Key="ThemeGridRedText" Color="#FFF54F4F"/>
-
     <!--statusbar-->
     <SolidColorBrush x:Key="ThemeStatusText" Color="#FF595959"/>
 
-    <!--platform selection combobox-->
+    <!--combobox-->
     <SolidColorBrush x:Key="ThemeDropDownBorderBorderBrush" Color="#FF171717"/>
     <SolidColorBrush x:Key="ThemeDropDownBorderBackground" Color="#FF2E2E34"/>
 
-    <SolidColorBrush x:Key="ThemeButtonFocusOutline" Color="#FF003D61"/>
-    <SolidColorBrush x:Key="ThemeSystemHighlight" Color="#FF0078D7"/>
+    <!--radio and checkboxes-->
     <SolidColorBrush x:Key="ThemeRadioButtonSelected" Color="#FF1E1E1E"/>
     <SolidColorBrush x:Key="ThemeRadioButtonOutline" Color="#FF1E1E1E"/>
-    <SolidColorBrush x:Key="ThemeRadioButtonBackground" Color="#FFFFFFFF"/>
-    
+    <SolidColorBrush x:Key="ThemeRadioCheckBoxBackground" Color="#FFFFFFFF"/>
+
+    <!--common-->
+    <SolidColorBrush x:Key="ThemeButtonFocusOutline" Color="#FF003D61"/>
+    <SolidColorBrush x:Key="ThemeSystemHighlight" Color="#FF0078D7"/>
 
 </ResourceDictionary>
diff --git a/UnityLauncherPro/ThemeEditor.xaml b/UnityLauncherPro/ThemeEditor.xaml
diff --git a/UnityLauncherPro/ThemeEditor.xaml.cs b/UnityLauncherPro/ThemeEditor.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -2177,11 +2177,12 @@ void ValidateCustomDateFormat(string format)`
`2177`	`2177`	`currentDateFormat = format;`
`2178`	`2178`	`Properties.Settings.Default.customDateFormat = currentDateFormat;`
`2179`	`2179`	`Properties.Settings.Default.Save();`
`2180`		`- txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Black;`
	`2180`	`+ txtCustomDateTimeFormat.BorderBrush = System.Windows.Media.Brushes.Transparent;`
`2181`	`2181`	`}`
`2182`	`2182`	`else // invalid format`
`2183`	`2183`	`{`
`2184`		`- txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Red;`
	`2184`	`+ //txtCustomDateTimeFormat.Foreground = System.Windows.Media.Brushes.Red;`
	`2185`	`+ txtCustomDateTimeFormat.BorderBrush = System.Windows.Media.Brushes.Red;`
`2185`	`2186`	`currentDateFormat = defaultDateFormat;`
`2186`	`2187`	`}`
`2187`	`2188`	`}`