Add CreateShortcut context menu for projects (creates shortcut to desktop for launching project directly), streamermode: hide batch folder text (as it defaults to user folder), hide quick project folder text (as it might contain private folders), settings: add shortcut .bat folder location (defaults to appdata), fix settings stackpanel widths (bigger than window), add initialdirectory optional arg for BrowseForOutputFolder()

unitycoder · unitycoder · commit d0d72ee951d7 · 2022-07-23T00:40:36.000+03:00
diff --git a/UnityLauncherPro/App.config b/UnityLauncherPro/App.config
@@ -111,6 +111,9 @@
             <setting name="checkPlasticBranch" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="shortcutBatchFileFolder" serializeAs="String">
+                <value />
+            </setting>
         </UnityLauncherPro.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/UnityLauncherPro/MainWindow.xaml b/UnityLauncherPro/MainWindow.xaml
@@ -592,6 +592,7 @@
                                 </MenuItem>
                                 <!--<Separator/>
                                 <MenuItem x:Name="menuRemoveProject" Header="Remove from recent list" Click="MenuRemoveProject_Click" />-->
+                                <MenuItem x:Name="menuCreateDesktopShortCut" Header="Create Shortcut on Desktop" Click="MenuCreateDesktopShortCut_Click" />
                             </ContextMenu>
                         </DataGrid.ContextMenu>
 
@@ -1035,21 +1036,20 @@
 
                         <StackPanel Grid.Row="3" Orientation="Vertical" Margin="5,10,3,3" >
                             <CheckBox  x:Name="chkEnablePlatformSelection" Content="Enable Platform Selection (Experimental!)"  Checked="ChkEnablePlatformSelection_Checked" Unchecked="ChkEnablePlatformSelection_Checked" ToolTip="Select target platform" HorizontalAlignment="Left"/>
-                            <StackPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                 <CheckBox   x:Name="chkRunAutomatically" Content="Run automatically on startup"  ToolTip="Run automatically using startup registry key" HorizontalAlignment="Left" Checked="ChkRunAutomatically_Checked" Unchecked="ChkRunAutomatically_Checked"/>
                                 <CheckBox   x:Name="chkRunAutomaticallyMinimized" Content="as minimized"  ToolTip="Minimize to tray when started automatically" HorizontalAlignment="Left" Checked="ChkRunAutomaticallyMinimized_Checked" Unchecked="ChkRunAutomaticallyMinimized_Checked" Margin="5,0,0,3"/>
                             </StackPanel>
-                            <StackPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                 <CheckBox  x:Name="chkUseCustomLastModified" Content="Date format" ToolTip="Last modified date format" HorizontalAlignment="Left" Checked="ChkUseCustomLastModified_Checked" Unchecked="ChkUseCustomLastModified_Checked"/>
-                                <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>
+                                <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"/>
                             </StackPanel>
                             <CheckBox  x:Name="chkHumanFriendlyDateTime" Content="Use human friendly last modified"  ToolTip="Last modified date format" HorizontalAlignment="Left" Checked="ChkHumanFriendlyDateTime_Checked" Unchecked="ChkHumanFriendlyDateTime_Checked"/>
                             <CheckBox  x:Name="chkSearchProjectPath" Content="Search project path also"  ToolTip="Searches from project folder path and project name" HorizontalAlignment="Left" Checked="ChkSearchProjectPath_Checked" Unchecked="ChkSearchProjectPath_Checked"/>
-                            <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="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"/>
+                            <Label Foreground="{DynamicResource ThemeButtonForeground}" Padding="0,5,5,0" HorizontalAlignment="Left">Project name:</Label>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <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" HorizontalAlignment="Left"/>
+                                <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" HorizontalAlignment="Left"/>
                             </StackPanel>
                             <!--<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                 <TextBox x:Name="txtTemplatePackagesFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" ToolTip="Folder for your custom unitypackage templates (for new project)" Padding="0,3,0,0" Width="110" TextChanged="TxtTemplatePackagesFolder_TextChanged" />
@@ -1058,12 +1058,20 @@
                             </StackPanel>-->
 
                             <Label Content="ADB args:" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" VerticalAlignment="Top" VerticalContentAlignment="Center" Margin="0,1,0,-4" />
-                            <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4">
+                            <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4" HorizontalAlignment="Left">
                                 <TextBox x:Name="txtLogCatArgs" BorderBrush="Transparent" Text="-s Unity ActivityManager PackageManager dalvikvm DEBUG -v color" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="312" ToolTip="ADB commandline arguments" Padding="0,3,0,0" TextChanged="TxtLogCatArgs_TextChanged" Width="312" />
                                 <Button Style="{StaticResource CustomButton}" x:Name="btnResetLogCatArgs" Margin="10,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Reset to default logcat args" Click="BtnResetLogCatArgs_Click">
                                     <Label Content="Reset" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                                 </Button>
                             </StackPanel>
+                            
+                            <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4" HorizontalAlignment="Left">
+                                <TextBox x:Name="txtShortcutBatchFileFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" MinWidth="150" ToolTip="Save generated .bat files here (they are run from Desktop Shortcut)" Padding="0,3,0,0" HorizontalAlignment="Left" MaxWidth="200" LostFocus="TxtShortcutBatchFileFolder_LostFocus" TextChanged="TxtShortcutBatchFileFolder_TextChanged" />
+                                <Button Style="{StaticResource CustomButton}" x:Name="btnBrowseBatchFileFolder" Content="..." Margin="6,0,0,0" MinWidth="22" Click="BtnBrowseBatchFileFolder_Click" MinHeight="22" FontSize="16" ToolTip="Browse for .bat folder (default location is inside AppData/UnityLauncherPro/ and works fine, so this is optional)" HorizontalAlignment="Left" />
+                                <Label Content="Shortcut .bat files folder" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" />
+                            </StackPanel>
+
+
 
                         </StackPanel>
                     </StackPanel>
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -424,6 +424,13 @@ void LoadSettings()
                     break;
             }
 
+            // set default .bat folder location to appdata/.., if nothing is set, or current one is invalid
+            if (string.IsNullOrEmpty(txtShortcutBatchFileFolder.Text) || Directory.Exists(txtShortcutBatchFileFolder.Text) == false)
+            {
+                Properties.Settings.Default.shortcutBatchFileFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), appName);
+                txtShortcutBatchFileFolder.Text = Properties.Settings.Default.shortcutBatchFileFolder;
+            }
+
         } // LoadSettings()
 
 
@@ -1669,19 +1676,24 @@ private void ChkAskNameForQuickProject_Checked(object sender, RoutedEventArgs e)
         bool isInitializing = true; // used to avoid doing things while still starting up
         private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
         {
-            // TODO add "(streamer mode)" text in statusbar
+            // TODO could add "(streamer mode)" text in statusbar?
 
             var isChecked = (bool)((CheckBox)sender).IsChecked;
 
             Properties.Settings.Default.streamerMode = isChecked;
             Properties.Settings.Default.Save();
 
-            // Create cellstyle and assign if enabled
+            // Create cellstyle and assign if streamermode is enabled
             Style cellStyle = new Style(typeof(DataGridCell));
             cellStyle.Setters.Add(new Setter(FontSizeProperty, 1.0));
             txtColumnTitle.CellStyle = isChecked ? cellStyle : null;
             txtColumnName.CellStyle = isChecked ? cellStyle : null;
 
+            Style txtBoxStyle = new Style(typeof(TextBox));
+            txtBoxStyle.Setters.Add(new Setter(FontSizeProperty, 1.0));
+            txtShortcutBatchFileFolder.Style = isChecked ? txtBoxStyle : null;
+            txtRootFolderForNewProjects.Style = isChecked ? txtBoxStyle : null;
+
             // need to reload list if user changed setting
             if (isInitializing == false)
             {
@@ -2165,6 +2177,23 @@ void ValidateCustomDateFormat(string format)
             }
         }
 
+        void ValidateFolderFromTextbox(TextBox textBox)
+        {
+            Console.WriteLine(textBox.Text);
+            if (Directory.Exists(textBox.Text) == true)
+            {
+                Properties.Settings.Default.shortcutBatchFileFolder = textBox.Text;
+                Properties.Settings.Default.Save();
+                textBox.BorderBrush = System.Windows.Media.Brushes.Transparent;
+            }
+            else // invalid format
+            {
+                textBox.BorderBrush = System.Windows.Media.Brushes.Red;
+                //Properties.Settings.Default.shortcutBatchFileFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), appName);
+                //Properties.Settings.Default.Save();
+            }
+        }
+
         private void ChkHumanFriendlyDateTime_Checked(object sender, RoutedEventArgs e)
         {
             if (this.IsActive == false) return; // dont run code on window init
@@ -2433,6 +2462,43 @@ private void ChkCheckPlasticBranch_Checked(object sender, RoutedEventArgs e)
             Properties.Settings.Default.Save();
         }
 
+        private void MenuCreateDesktopShortCut_Click(object sender, RoutedEventArgs e)
+        {
+            var proj = GetSelectedProject();
+            var res = Tools.CreateDesktopShortCut(proj, txtShortcutBatchFileFolder.Text);
+            if (res == false)
+            {
+                Console.WriteLine("Failed to create shortcut, maybe batch folder location is invalid..");
+            }
+        }
+
+        private void TxtShortcutBatchFileFolder_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var folder = ((TextBox)sender).Text;
+            if (Directory.Exists(folder))
+            {
+                Properties.Settings.Default.shortcutBatchFileFolder = folder;
+                Properties.Settings.Default.Save();
+            }
+        }
+
+        private void TxtShortcutBatchFileFolder_LostFocus(object sender, RoutedEventArgs e)
+        {
+            ValidateFolderFromTextbox((TextBox)sender);
+        }
+
+        private void BtnBrowseBatchFileFolder_Click(object sender, RoutedEventArgs e)
+        {
+            // TODO change directory browsing window title (now its Project folder)
+            var folder = Tools.BrowseForOutputFolder("Select folder for .bat shortcut files", Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), appName));
+            if (string.IsNullOrEmpty(folder) == false)
+            {
+                txtShortcutBatchFileFolder.Text = folder;
+                Properties.Settings.Default.shortcutBatchFileFolder = folder;
+                Properties.Settings.Default.Save();
+            }
+        }
+
         //private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
         //{
         //    var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");
diff --git a/UnityLauncherPro/Properties/Settings.Designer.cs b/UnityLauncherPro/Properties/Settings.Designer.cs
diff --git a/UnityLauncherPro/Properties/Settings.settings b/UnityLauncherPro/Properties/Settings.settings
@@ -110,5 +110,8 @@
     <Setting Name="checkPlasticBranch" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="shortcutBatchFileFolder" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/UnityLauncherPro/Tools.cs b/UnityLauncherPro/Tools.cs
@@ -1017,12 +1017,12 @@ public static void SetFocusToGrid(DataGrid targetGrid, int index = -1)
             Keyboard.Focus(row);
         }
 
-        public static string BrowseForOutputFolder(string title)
+        public static string BrowseForOutputFolder(string title, string initialDirectory = null)
         {
             // https://stackoverflow.com/a/50261723/5452781
             // Create a "Save As" dialog for selecting a directory (HACK)
             var dialog = new Microsoft.Win32.SaveFileDialog();
-            //dialog.InitialDirectory = "c:"; // Use current value for initial dir
+            if (initialDirectory != null) dialog.InitialDirectory = initialDirectory;
             dialog.Title = title;
             dialog.Filter = "Project Folder|*.Folder"; // Prevents displaying files
             dialog.FileName = "Project"; // Filename will then be "select.this.directory"
@@ -1592,6 +1592,43 @@ public static void LaunchWebGL(Project proj, string relativeFolder)
             }
         } // LaunchWebGL()
 
+        // creates .bat file to launch UnityLauncherPro and then .url link file on desktop, into that .bat file
+        public static bool CreateDesktopShortCut(Project proj, string batchFolder)
+        {
+            string lnkFileName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop));
+
+            if (string.IsNullOrEmpty(batchFolder)) return false;
+
+            //string batchFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "UnityLauncherPro");
+            if (Directory.Exists(batchFolder) == false) Directory.CreateDirectory(batchFolder);
+            string batFileName = Path.Combine(batchFolder, proj.Title + ".bat");
+            string launcherExe = Process.GetCurrentProcess().MainModule.FileName;
+            string args = "-projectPath " + "\"" + proj.Path + "\" " + proj.Arguments;
+            string description = "Unity Project: " + proj.Title;
+
+            // create .bat file
+            var batLauncherData = "start \"\" \"" + launcherExe + "\"" + " " + args;
+            File.WriteAllText(batFileName, batLauncherData);
+
+            // create desktop link file
+            using (StreamWriter writer = new StreamWriter(lnkFileName + "\\" + proj.Title + ".url"))
+            {
+                writer.WriteLine("[InternetShortcut]");
+                writer.WriteLine("URL=file:///" + batFileName);
+                //writer.WriteLine("ShowCommand=7"); // doesnt work for minimized
+                writer.WriteLine("IconIndex=0");
+                writer.WriteLine("Arguments=-projectPath " + proj.Path);
+                // TODO maybe could take icon from project (but then need to convert into .ico)
+                string iconExe = GetUnityExePath(proj.Version);
+                if (iconExe == null) iconExe = launcherExe;
+                string icon = iconExe.Replace('\\', '/');
+                writer.WriteLine("IconFile=" + icon);
+            }
+
+            // TODO check for streamwriter and file write success
+
+            return true;
+        }
     } // class
 
 } // namespace
