Skip to content

Commit e11c09a

Browse files
unitycoderunitycoder
committed
upgrade project: display platform, display unity release type & platforms in available unitys list
1 parent 7f5bc69 commit e11c09a

File tree

3 files changed

+27
-19
lines changed

3 files changed

+27
-19
lines changed

‎UnityLauncherPro/NewProject.xaml

+1-1
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">
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">
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" />

‎UnityLauncherPro/UpgradeWindow.xaml

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:UnityLauncherPro"
77
mc:Ignorable="d"
8-
Title="Upgrade Project Version" Height="533.165" Width="419" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
8+
Title="Upgrade Project Version" Height="533.165" Width="455" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="319" MinHeight="555" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" PreviewKeyDown="Window_PreviewKeyDown" ShowInTaskbar="False">
99

1010
<Grid>
1111
<StackPanel Orientation="Horizontal">
1212
<Label x:Name="lblCurrentVersion" Content="Project version:" HorizontalAlignment="Left" Margin="9,11,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ThemeButtonForeground}"/>
1313
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" x:Name="txtCurrentVersion" Background="{DynamicResource ThemeDarkMenuBar}" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="0,16,0,0" UndoLimit="64" Text="Version" IsReadOnly="True" VerticalAlignment="Top" />
14+
<Label x:Name="lblCurrentPlatform" Content="Platform:" HorizontalAlignment="Left" Margin="9,11,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ThemeButtonForeground}"/>
15+
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" x:Name="txtCurrentPlatform" Background="{DynamicResource ThemeDarkMenuBar}" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="0,16,0,0" UndoLimit="64" Text="Platform" IsReadOnly="True" VerticalAlignment="Top" />
1416
</StackPanel>
1517
<Label x:Name="lblAvailableVersions" Content="Available Unity Versions" HorizontalAlignment="Left" Margin="9,94,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ThemeButtonForeground}"/>
1618

@@ -41,10 +43,13 @@
4143
</DataGrid.Columns>
4244
</DataGrid>-->
4345

44-
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" Height="304" Margin="10,121,10,0" VerticalAlignment="Top" Width="383" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded" PreviewMouseDoubleClick="GridAvailableVersions_PreviewMouseDoubleClick" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible">
46+
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" Height="304" Margin="10,121,10,0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded" PreviewMouseDoubleClick="GridAvailableVersions_PreviewMouseDoubleClick" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" CanUserAddRows="False" CanUserDeleteRows="False" CanUserResizeRows="False" CanUserSortColumns="False" CanUserResizeColumns="False" CanUserReorderColumns="False">
4547
<DataGrid.Columns>
46-
<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
47-
<DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" CanUserResize="False" />
48+
<!--<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
49+
<DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" CanUserResize="False" />-->
50+
<DataGridTextColumn Header="Version" Binding="{Binding Version}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
51+
<DataGridTextColumn Header="Platforms" Binding="{Binding PlatformsCombined}" IsReadOnly="True" CanUserResize="False" MinWidth="270" />
52+
<DataGridTextColumn Header="Release" Binding="{Binding ReleaseType}" IsReadOnly="True" CanUserResize="False" MinWidth="70" />
4853
</DataGrid.Columns>
4954
</DataGrid>
5055

‎UnityLauncherPro/UpgradeWindow.xaml.cs

+17-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
1919
{
2020
InitializeComponent();
2121
txtCurrentVersion.Text = currentVersion;
22-
gridAvailableVersions.ItemsSource = MainWindow.unityInstalledVersions;
22+
txtCurrentPlatform.Text = Tools.GetTargetPlatform(projectPath);
23+
24+
if (gridAvailableVersions.ItemsSource == null)
25+
{
26+
gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;
27+
}
28+
2329
gridAvailableVersions.SelectedItem = null;
2430

2531
// we have current version info in project
@@ -40,17 +46,15 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
4046
string nearestVersion = Tools.FindNearestVersion(currentVersion, MainWindow.unityInstalledVersions.Keys.ToList());
4147
if (nearestVersion != null)
4248
{
43-
// get correct row for nearest version
44-
var obj = Tools.GetEntry(MainWindow.unityInstalledVersions, nearestVersion);
45-
int index = gridAvailableVersions.Items.IndexOf(obj);
46-
if (index > -1)
49+
// select nearest version
50+
for (int i = 0; i < MainWindow.unityInstallationsSource.Count; i++)
4751
{
48-
gridAvailableVersions.SelectedIndex = index;
49-
}
50-
else
51-
{
52-
// just select first item then
53-
gridAvailableVersions.SelectedIndex = 0;
52+
if (MainWindow.unityInstallationsSource[i].Version == nearestVersion)
53+
{
54+
gridAvailableVersions.SelectedIndex = i;
55+
gridAvailableVersions.ScrollIntoView(gridAvailableVersions.SelectedItem);
56+
break;
57+
}
5458
}
5559
}
5660
}
@@ -83,7 +87,6 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
8387
}
8488

8589
}
86-
8790
gridAvailableVersions.Focus();
8891
}
8992

@@ -183,8 +186,8 @@ private void GridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseB
183186

184187
void Upgrade()
185188
{
186-
var k = (gridAvailableVersions.SelectedItem) as KeyValuePair<string, string>?;
187-
upgradeVersion = k.Value.Key;
189+
var k = (UnityInstallation)gridAvailableVersions.SelectedItem;
190+
upgradeVersion = k.Version;
188191
DialogResult = true;
189192
}
190193

0 commit comments

Comments
 (0)