Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e5d4efc

Browse files
new project: adding editable project folder field and browse for folder #201 
1 parent 0febfad commit e5d4efc

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

‎UnityLauncherPro/NewProject.xaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Grid>
1111
<StackPanel Margin="10,3">
1212
<Label Content="Unity Version" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
13-
<DataGrid x:Name="gridAvailableVersions" KeyboardNavigation.TabNavigation = "None" SelectionMode="Single" Height="270" Margin="0"VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" PreviewMouseDoubleClick="gridAvailableVersions_PreviewMouseDoubleClick" CanUserAddRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserDeleteRows="False">
13+
<DataGrid x:Name="gridAvailableVersions" KeyboardNavigation.TabNavigation = "None" SelectionMode="Single" Height="230" Margin="0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" PreviewMouseDoubleClick="gridAvailableVersions_PreviewMouseDoubleClick" CanUserAddRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserDeleteRows="False">
1414
<DataGrid.Columns>
1515
<DataGridTextColumn Header="Version" Binding="{Binding Version}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
1616
<DataGridTextColumn Header="Platforms" Binding="{Binding PlatformsCombined}" IsReadOnly="True" CanUserResize="False" MinWidth="270" />
@@ -44,10 +44,20 @@
4444
<CheckBox Grid.Column="3" x:Name="chkForceDX11" Content="DX11" ToolTip="Use DX11 instead of DX12" Margin="6,0,0,0" IsChecked="True" Checked="chkForceDX11_Checked" Unchecked="chkForceDX11_Checked"/>
4545
</Grid>
4646

47-
<Label x:Name="lblNewProjectFolder"Content="(folder)" Foreground="{DynamicResource ThemeButtonForegroundDisabled}" Margin="0" FontSize="10"Padding="5,0,5,3" />
48-
<Grid HorizontalAlignment="Stretch" Margin="0,8,0,0">
47+
<Label x:Name="lblNewProjectFolderLabel" Grid.Column="0"Content="Project Folder:" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0" Padding="0,5,5,0" />
48+
<Grid HorizontalAlignment="Stretch" Margin="0,3,0,0">
4949
<Grid.ColumnDefinitions>
50+
<ColumnDefinition Width="18*"/>
5051
<ColumnDefinition Width="*"/>
52+
</Grid.ColumnDefinitions>
53+
<TextBox Grid.Column="0" x:Name="txtNewProjectFolder" VerticalAlignment="Center" IsUndoEnabled="True" TextChanged="TxtNewProjectName_TextChanged" PreviewKeyDown="TxtNewProjectName_PreviewKeyDown" TabIndex="0" Margin="0,2,6,2" />
54+
<Button Grid.Column="1" x:Name="btnBrowseForProjectFolder" Style="{StaticResource CustomButton}" ToolTip="Browse for New Project folder" Content="..." Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="btnBrowseForProjectFolder_Click"/>
55+
</Grid>
56+
57+
<!--<Label x:Name="lblNewProjectFolder" Content="(folder)" Foreground="{DynamicResource ThemeButtonForegroundDisabled}" Margin="0" FontSize="10" Padding="5,0,5,3" />-->
58+
<Grid HorizontalAlignment="Stretch" Margin="0,24,0,0">
59+
<Grid.ColumnDefinitions>
60+
<ColumnDefinition Width="0.7*"/>
5161
<ColumnDefinition Width="*"/>
5262
</Grid.ColumnDefinitions>
5363
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Margin="0,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" TabIndex="4" >

‎UnityLauncherPro/NewProject.xaml.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public NewProject(string unityVersion, string suggestedName, string targetFolder
3838
txtNewProjectName.IsEnabled = !nameIsLocked;
3939

4040
txtNewProjectName.Text = newName;
41-
lblNewProjectFolder.Content = targetFolder;
41+
txtNewProjectFolder.Text = targetFolder;
4242

4343
// fill available versions
4444
if (gridAvailableVersions.ItemsSource == null)
@@ -272,7 +272,7 @@ private void TxtNewProjectName_PreviewKeyDown(object sender, KeyEventArgs e)
272272

273273
void GenerateNewName()
274274
{
275-
var newProj = Tools.GetSuggestedProjectName(newVersion, lblNewProjectFolder.Content.ToString());
275+
var newProj = Tools.GetSuggestedProjectName(newVersion, txtNewProjectFolder.Text.ToString());
276276
txtNewProjectName.Text = newProj;
277277
}
278278

@@ -332,5 +332,15 @@ private void chkForceDX11_Checked(object sender, RoutedEventArgs e)
332332
{
333333
forceDX11 = chkForceDX11.IsChecked == true;
334334
}
335+
336+
private void btnBrowseForProjectFolder_Click(object sender, RoutedEventArgs e)
337+
{
338+
var folder = Tools.BrowseForOutputFolder("Select New Project folder");
339+
if (string.IsNullOrEmpty(folder) == false)
340+
{
341+
txtNewProjectFolder.Text = folder;
342+
}
343+
344+
}
335345
}
336346
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /