load themes from application/Themes/ folder, remove themefile global var, move Start() method into OnWindowLoaded (to get nicer error messages), make highlight and inactive highlight colors for recent datagrid transparent (to see custom selected row colors), theme editor: clear orig colors list on enter window

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -7,7 +7,7 @@
 		xmlns:System="clr-namespace:System;assembly=mscorlib"
         xmlns:converters="clr-namespace:UnityLauncherPro.Converters" x:Class="UnityLauncherPro.MainWindow"
 		mc:Ignorable="d"
-        Title="UnityLauncherPro" Height="650" Width="880" WindowStartupLocation="CenterScreen" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" Activated="Window_Activated">
+        Title="UnityLauncherPro" Height="650" Width="880" WindowStartupLocation="CenterScreen" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" Activated="Window_Activated" Loaded="Window_Loaded">
     <Window.Resources>
 
         <converters:LastModifiedConverter x:Key="lastModifiedConverter"/>
@@ -220,7 +220,17 @@
                 </Trigger>
             </Style.Triggers>
             <Style.Resources>
-                <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{DynamicResource {x:Static SystemColors.HighlightColorKey}}"/>
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{DynamicResource {x:Static SystemColors.HighlightColorKey}}"/>-->
+
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="{DynamicResource ThemeGridRowHighlight}"/>-->
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{DynamicResource ThemeGridRowHighlight}"/>-->
+
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{DynamicResource ThemeGridRowHighlight.Color}"/>-->
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{Binding DynamicResource ThemeGridRowHighlight, Converter={StaticResource solidColorBrushToColorConverter}, ElementName=SolidColorBrush}"/>-->
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{DynamicResource Color1}"/>-->
+                <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}">Transparent</SolidColorBrush>
+                <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}">Transparent</SolidColorBrush>
+                <!--<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}">Red</SolidColorBrush>-->
             </Style.Resources>
         </Style>
 
@@ -923,7 +933,7 @@
                                 <CheckBox x:Name="chkUseCustomTheme" Content="Load custom theme" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,4" 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" 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 (application root)" 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="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>
 

UnityLauncherPro/MainWindow.xaml.cs

@@ -51,7 +51,7 @@ public partial class MainWindow : Window
         string adbLogCatArgs = defaultAdbLogCatArgs;
 
         Dictionary<string, SolidColorBrush> origResourceColors = new Dictionary<string, SolidColorBrush>();
-        string themefile = "theme.ini";
+
         string latestBuildReportProjectPath = null;
 
         [DllImport("user32", CharSet = CharSet.Unicode)]
@@ -66,13 +66,11 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-            Start();
+            Init();
         }
 
-        void Start()
+        void Init()
         {
-            LoadSettings();
-
             // disable accesskeys without alt
             CoreCompatibilityPreferences.IsAltKeyRequiredInAccessKeyDefaultScope = true;
 
@@ -81,6 +79,11 @@ void Start()
             Resizable_BorderLess_Chrome.CornerRadius = new CornerRadius(0);
             Resizable_BorderLess_Chrome.CaptionHeight = 1.0;
             WindowChrome.SetWindowChrome(this, Resizable_BorderLess_Chrome);
+        }
+
+        void Start()
+        {
+            LoadSettings();
 
             // get unity installations
             dataGridUnitys.Items.Clear();
@@ -122,7 +125,7 @@ void Start()
                 origResourceColors[item.Key.ToString()] = (SolidColorBrush)item.Value;
             }
 
-            ApplyTheme();
+            ApplyTheme(txtCustomThemeFile.Text);
 
             // for autostart with minimized
             if (Properties.Settings.Default.runAutomatically == true && Properties.Settings.Default.runAutomaticallyMinimized == true)
@@ -311,8 +314,7 @@ void LoadSettings()
             chkUseCustomTheme.IsChecked = Properties.Settings.Default.useCustomTheme;
             txtRootFolderForNewProjects.Text = Properties.Settings.Default.newProjectsRoot;
             txtWebglRelativePath.Text = Properties.Settings.Default.webglBuildPath;
-            themefile = Properties.Settings.Default.themeFile;
-            txtCustomThemeFile.Text = themefile;
+            txtCustomThemeFile.Text = Properties.Settings.Default.themeFile;
 
             chkEnablePlatformSelection.IsChecked = Properties.Settings.Default.enablePlatformSelection;
             chkRunAutomatically.IsChecked = Properties.Settings.Default.runAutomatically;
@@ -1997,15 +1999,17 @@ private void MenuItemBrowsePersistentDataPath_Click(object sender, RoutedEventAr
             }
         }
 
-        void ApplyTheme()
+        void ApplyTheme(string themeFile)
         {
             if (chkUseCustomTheme.IsChecked == false) return;
 
             //Console.WriteLine("Load theme: " + themefile);
 
-            if (File.Exists(themefile) == true)
+            themeFile = "Themes/" + themeFile;
+
+            if (File.Exists(themeFile) == true)
             {
-                var colors = File.ReadAllLines(themefile);
+                var colors = File.ReadAllLines(themeFile);
 
                 // parse lines
                 for (int i = 0, length = colors.Length; i < length; i++)
@@ -2034,7 +2038,7 @@ void ApplyTheme()
             }
             else
             {
-                Console.WriteLine("Theme file not found: " + themefile);
+                Console.WriteLine("Theme file not found: " + themeFile);
             }
         }
 
@@ -2059,7 +2063,7 @@ private void ChkUseCustomTheme_Checked(object sender, RoutedEventArgs e)
             // reset colors now
             if (isChecked == true)
             {
-                ApplyTheme();
+                ApplyTheme(txtCustomThemeFile.Text);
             }
             else
             {
@@ -2069,14 +2073,13 @@ private void ChkUseCustomTheme_Checked(object sender, RoutedEventArgs e)
 
         private void BtnReloadTheme_Click(object sender, RoutedEventArgs e)
         {
-            ApplyTheme();
+            ApplyTheme(txtCustomThemeFile.Text);
         }
 
         private void TxtCustomThemeFile_LostFocus(object sender, RoutedEventArgs e)
         {
             var s = (TextBox)sender;
-            themefile = s.Text;
-            Properties.Settings.Default.themeFile = themefile;
+            Properties.Settings.Default.themeFile = s.Text;
             Properties.Settings.Default.Save();
         }
 
@@ -2085,8 +2088,7 @@ private void TxtCustomThemeFile_PreviewKeyDown(object sender, KeyEventArgs e)
             switch (e.Key)
             {
                 case Key.Return: // pressed enter in theme file text box
-                    themefile = txtCustomThemeFile.Text;
-                    Properties.Settings.Default.themeFile = themefile;
+                    Properties.Settings.Default.themeFile = txtCustomThemeFile.Text;
                     Properties.Settings.Default.Save();
                     btnReloadTheme.Focus();
                     break;
@@ -2095,7 +2097,7 @@ private void TxtCustomThemeFile_PreviewKeyDown(object sender, KeyEventArgs e)
 
         private void BtnExploreFolder_Click(object sender, RoutedEventArgs e)
         {
-            Tools.LaunchExplorer(System.AppDomain.CurrentDomain.BaseDirectory);
+            Tools.LaunchExplorer(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Themes"));
         }
 
         private void ChkEnablePlatformSelection_Checked(object sender, RoutedEventArgs e)
@@ -2394,6 +2396,12 @@ private void MenuItemDownloadWebGLModule_Click(object sender, RoutedEventArgs e)
             if (unity == null) return;
             Tools.DownloadAdditionalModules(unity.Path, unity.Version, "WebGL");
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            Start();
+
+        }
     } // class
 } //namespace
 

UnityLauncherPro/Resources/Colors.xaml

@@ -27,7 +27,7 @@
     <SolidColorBrush x:Key="ThemeButtonBackgroundPressed" Color="#FF0F0F0F"/>
     <SolidColorBrush x:Key="ThemeMainTitle" Color="#FFB8B8B8"/>
     <SolidColorBrush x:Key="ThemeScrollBarEnabledForeground" Color="#FF000000"/>
-    
+
     <!--search-->
     <SolidColorBrush x:Key="ThemeSearchPlaceholder" Color="#7F919191"/>
     <SolidColorBrush x:Key="ThemeSearchClose" Color="#A3C1C1C1"/>
@@ -38,7 +38,7 @@
     <!--window-->
     <SolidColorBrush x:Key="ThemeWindowMinClose" Color="#FFC3C3C3"/>
 
-    <!--grids-->
+    <!--datagrids-->
     <SolidColorBrush x:Key="ThemeGridForeground" Color="#FFD8D8D8"/>
     <SolidColorBrush x:Key="ThemeGridHorizontalGridLines" Color="#4C000000"/>
     <SolidColorBrush x:Key="ThemeGridVerticalGridLines" Color="#19000000"/>
@@ -51,9 +51,8 @@
     <!--platform selection combobox-->
     <SolidColorBrush x:Key="ThemeDropDownBorderBorderBrush" Color="#FF171717"/>
     <SolidColorBrush x:Key="ThemeDropDownBorderBackground" Color="#FF2E2E34"/>
-    
+
     <!--focused button outline-->
     <SolidColorBrush x:Key="ThemeButtonFocusOutline" Color="#FF003D61"/>
 
-
 </ResourceDictionary>

UnityLauncherPro/ThemeEditor.xaml.cs

@@ -28,6 +28,7 @@ public ThemeEditor()
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             themeColors.Clear();
+            themeColorsOrig.Clear();
 
             //foreach (KeyValuePair<string, SolidColorBrush> item in origResourceColors)
             //{
@@ -36,14 +37,13 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
 
             // get original colors to collection
             foreach (DictionaryEntry item in Application.Current.Resources.MergedDictionaries[0])
-            //foreach (DictionaryEntry item in Application.Current.Resources[themeColors[i].Key])
             {
                 // take currently used colors
                 var currentColor = Application.Current.Resources[item.Key];
 
                 var themeColorPair = new ThemeColor();
                 themeColorPair.Key = item.Key.ToString();
-                themeColorPair.Brush = (SolidColorBrush)currentColor;// (SolidColorBrush)item.Value;
+                themeColorPair.Brush = (SolidColorBrush)currentColor;
                 themeColors.Add(themeColorPair);
 
                 // take backup copy
@@ -166,7 +166,7 @@ private void SliderAlpha_ValueChanged(object sender, RoutedPropertyChangedEventA
 
         private void BtnSaveTheme_Click(object sender, RoutedEventArgs e)
         {
-            var themeFolder = Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "Themes");
+            var themeFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Themes");
 
             if (Directory.Exists(themeFolder) == false) Directory.CreateDirectory(themeFolder);
 
@@ -196,10 +196,11 @@ private void BtnSaveTheme_Click(object sender, RoutedEventArgs e)
 
         private void BtnResetTheme_Click(object sender, RoutedEventArgs e)
         {
+            Console.WriteLine(themeColorsOrig.Count);
+            Console.WriteLine(themeColors.Count);
             for (int i = 0; i < themeColorsOrig.Count; i++)
             {
                 // reset collection colors
-                // FIXME fails if exit theme editor, then come back to reset
                 themeColors[i].Brush = themeColorsOrig[i].Brush;
 
                 // reset application colors