Skip to content

Commit d152e9c

Browse files
committed
clear search after add project manually (otherwise cannot see it, unless it matches search), adding template folder option for new projects
1 parent 21062b5 commit d152e9c

File tree

5 files changed

+44
-3
lines changed

5 files changed

+44
-3
lines changed

UnityLauncherPro/App.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999
<setting name="projectName" serializeAs="String">
100100
<value>0</value>
101101
</setting>
102+
<setting name="templatePackagesFolder" serializeAs="String">
103+
<value />
104+
</setting>
102105
</UnityLauncherPro.Properties.Settings>
103106
</userSettings>
104107
</configuration>

UnityLauncherPro/MainWindow.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,11 @@
10341034
<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"/>
10351035
<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"/>
10361036
</StackPanel>
1037+
<!--<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
1038+
<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" />
1039+
<Button Style="{StaticResource CustomButton}" x:Name="btnBrowseTemplateUnityPackagesFolder" Content="..." Margin="6,0,0,0" MinWidth="22" MinHeight="22" FontSize="16" ToolTip="Browse for new projects root folder.." Click="BtnBrowseTemplateUnityPackagesFolder_Click" />
1040+
<Label Content="UnityPackage Templates Folder" Foreground="{DynamicResource ThemeButtonForeground}" />
1041+
</StackPanel>-->
10371042
</StackPanel>
10381043
</StackPanel>
10391044

UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,8 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
638638
{
639639
var proj = GetNewProjectData(folder);
640640
AddNewProjectToList(proj);
641+
// clear search, so can see added project
642+
txtSearchBox.Text = "";
641643
}
642644
}
643645

@@ -719,7 +721,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
719721
{
720722
// its already clear
721723
}
722-
else // we have text in searchbox
724+
else // we have text in searchbox, clear it
723725
{
724726
txtSearchBox.Text = "";
725727
}
@@ -1579,7 +1581,6 @@ private void BtnBrowseProjectRootFolder_Click(object sender, RoutedEventArgs e)
15791581
Properties.Settings.Default.newProjectsRoot = folder;
15801582
Properties.Settings.Default.Save();
15811583
}
1582-
// save to prefs when? onchange
15831584
}
15841585

15851586
private void TxtRootFolderForNewProjects_TextChanged(object sender, TextChangedEventArgs e)
@@ -2407,8 +2408,25 @@ private void MenuItemDownloadWebGLModule_Click(object sender, RoutedEventArgs e)
24072408
private void Window_Loaded(object sender, RoutedEventArgs e)
24082409
{
24092410
Start();
2410-
24112411
}
2412+
2413+
//private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
2414+
//{
2415+
// var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");
2416+
// if (string.IsNullOrEmpty(folder) == false)
2417+
// {
2418+
// txtTemplatePackagesFolder.Text = folder;
2419+
// Properties.Settings.Default.templatePackagesFolder = folder;
2420+
// Properties.Settings.Default.Save();
2421+
// }
2422+
//}
2423+
2424+
//private void TxtTemplatePackagesFolder_TextChanged(object sender, TextChangedEventArgs e)
2425+
//{
2426+
// Properties.Settings.Default.templatePackagesFolder = txtTemplatePackagesFolder.Text;
2427+
// Properties.Settings.Default.Save();
2428+
//}
2429+
24122430
} // class
24132431
} //namespace
24142432

UnityLauncherPro/Properties/Settings.Designer.cs

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityLauncherPro/Properties/Settings.settings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,8 @@
9898
<Setting Name="projectName" Type="System.Int32" Scope="User">
9999
<Value Profile="(Default)">0</Value>
100100
</Setting>
101+
<Setting Name="templatePackagesFolder" Type="System.String" Scope="User">
102+
<Value Profile="(Default)" />
103+
</Setting>
101104
</Settings>
102105
</SettingsFile>

0 commit comments

Comments
 (0)