Skip to content

Commit 5a1d062

Browse files
committed
add default unity hub editors installation folder, fixes #112
1 parent 1c85a01 commit 5a1d062

File tree

4 files changed

+38
-31
lines changed

4 files changed

+38
-31
lines changed

UnityLauncherPro/MainWindow.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,8 @@
709709
<Label x:Name="lblFoundXInstallations" Grid.Row="0" Content="Found .. Installations" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
710710
<!-- locations list -->
711711
<ListBox x:Name="lstRootFolders" Grid.Row="1" Background="{DynamicResource ThemeButtonBackground}" Margin="4,0,2,0" Foreground="{DynamicResource ThemeButtonForeground}" VerticalAlignment="Top" MinHeight="65" >
712-
<System:String>c:\Program Files</System:String>
712+
<System:String>C:\Program Files\Unity\Hub\Editor</System:String>
713+
<System:String>C:\Program Files</System:String>
713714
</ListBox>
714715
<!-- locations add/remove -->
715716
<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0" VerticalAlignment="Top" >

UnityLauncherPro/MainWindow.xaml.cs

+29-26
Original file line numberDiff line numberDiff line change
@@ -426,39 +426,42 @@ private bool BuildReportFilter(object item)
426426

427427
void LoadSettings()
428428
{
429+
// debug, print filename
430+
//Console.WriteLine(ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath);
431+
429432
// catch corrupted config file
430433
try
431434
{
432435
Settings.Default.Reload();
433436
// form size
434-
this.Width = Properties.Settings.Default.windowWidth;
435-
this.Height = Properties.Settings.Default.windowHeight;
437+
this.Width = Settings.Default.windowWidth;
438+
this.Height = Settings.Default.windowHeight;
436439

437-
chkMinimizeToTaskbar.IsChecked = Properties.Settings.Default.minimizeToTaskbar;
438-
chkRegisterExplorerMenu.IsChecked = Properties.Settings.Default.registerExplorerMenu;
440+
chkMinimizeToTaskbar.IsChecked = Settings.Default.minimizeToTaskbar;
441+
chkRegisterExplorerMenu.IsChecked = Settings.Default.registerExplorerMenu;
439442

440443
// update settings window
441-
chkQuitAfterCommandline.IsChecked = Properties.Settings.Default.closeAfterExplorer;
442-
chkQuitAfterOpen.IsChecked = Properties.Settings.Default.closeAfterProject;
443-
chkShowLauncherArgumentsColumn.IsChecked = Properties.Settings.Default.showArgumentsColumn;
444-
chkShowGitBranchColumn.IsChecked = Properties.Settings.Default.showGitBranchColumn;
445-
chkGetGitBranchRecursively.IsChecked = Properties.Settings.Default.searchGitFolderRecursivly;
446-
chkCheckPlasticBranch.IsChecked = Properties.Settings.Default.checkPlasticBranch;
447-
chkShowMissingFolderProjects.IsChecked = Properties.Settings.Default.showProjectsMissingFolder;
448-
chkAllowSingleInstanceOnly.IsChecked = Properties.Settings.Default.AllowSingleInstanceOnly;
449-
chkAskNameForQuickProject.IsChecked = Properties.Settings.Default.askNameForQuickProject;
450-
chkEnableProjectRename.IsChecked = Properties.Settings.Default.enableProjectRename;
451-
chkStreamerMode.IsChecked = Properties.Settings.Default.streamerMode;
452-
chkShowPlatform.IsChecked = Properties.Settings.Default.showTargetPlatform;
453-
chkUseCustomTheme.IsChecked = Properties.Settings.Default.useCustomTheme;
454-
txtRootFolderForNewProjects.Text = Properties.Settings.Default.newProjectsRoot;
455-
txtWebglRelativePath.Text = Properties.Settings.Default.webglBuildPath;
456-
txtCustomThemeFile.Text = Properties.Settings.Default.themeFile;
457-
useAlphaReleaseNotesSite.IsChecked = Properties.Settings.Default.useAlphaReleaseNotes;
458-
459-
chkEnablePlatformSelection.IsChecked = Properties.Settings.Default.enablePlatformSelection;
460-
chkRunAutomatically.IsChecked = Properties.Settings.Default.runAutomatically;
461-
chkRunAutomaticallyMinimized.IsChecked = Properties.Settings.Default.runAutomaticallyMinimized;
444+
chkQuitAfterCommandline.IsChecked = Settings.Default.closeAfterExplorer;
445+
chkQuitAfterOpen.IsChecked = Settings.Default.closeAfterProject;
446+
chkShowLauncherArgumentsColumn.IsChecked = Settings.Default.showArgumentsColumn;
447+
chkShowGitBranchColumn.IsChecked = Settings.Default.showGitBranchColumn;
448+
chkGetGitBranchRecursively.IsChecked = Settings.Default.searchGitFolderRecursivly; // FIXME typo
449+
chkCheckPlasticBranch.IsChecked = Settings.Default.checkPlasticBranch;
450+
chkShowMissingFolderProjects.IsChecked = Settings.Default.showProjectsMissingFolder;
451+
chkAllowSingleInstanceOnly.IsChecked = Settings.Default.AllowSingleInstanceOnly;
452+
chkAskNameForQuickProject.IsChecked = Settings.Default.askNameForQuickProject;
453+
chkEnableProjectRename.IsChecked = Settings.Default.enableProjectRename;
454+
chkStreamerMode.IsChecked = Settings.Default.streamerMode;
455+
chkShowPlatform.IsChecked = Settings.Default.showTargetPlatform;
456+
chkUseCustomTheme.IsChecked = Settings.Default.useCustomTheme;
457+
txtRootFolderForNewProjects.Text = Settings.Default.newProjectsRoot;
458+
txtWebglRelativePath.Text = Settings.Default.webglBuildPath;
459+
txtCustomThemeFile.Text = Settings.Default.themeFile;
460+
useAlphaReleaseNotesSite.IsChecked = Settings.Default.useAlphaReleaseNotes;
461+
462+
chkEnablePlatformSelection.IsChecked = Settings.Default.enablePlatformSelection;
463+
chkRunAutomatically.IsChecked = Settings.Default.runAutomatically;
464+
chkRunAutomaticallyMinimized.IsChecked = Settings.Default.runAutomaticallyMinimized;
462465

463466
// update optional grid columns, hidden or visible
464467
gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
@@ -469,7 +472,7 @@ void LoadSettings()
469472
lstRootFolders.Items.Clear();
470473

471474
// check if no installation root folders are added, then add default folder(s), this usually happens only on first run (or if user has not added any folders)
472-
if (Properties.Settings.Default.rootFolders.Count == 0)
475+
if (Settings.Default.rootFolders.Count == 0)
473476
{
474477
// default hub installation folder
475478
string baseFolder = "\\Program Files\\Unity\\Hub\\Editor";

UnityLauncherPro/Properties/Settings.Designer.cs

+6-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityLauncherPro/Properties/Settings.settings

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
<Setting Name="rootFolders" Type="System.Collections.Specialized.StringCollection" Scope="User">
111111
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
112112
&lt;ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
113+
&lt;string&gt;C:\Program Files\Unity\Hub\Editor\&lt;/string&gt;
113114
&lt;string&gt;C:\Program Files\&lt;/string&gt;
114115
&lt;/ArrayOfString&gt;</Value>
115116
</Setting>

0 commit comments

Comments
 (0)