Skip to content

Commit 407163e

Browse files
unitycoderunitycoder
committed
add datagrid context menu, add Unitys-tab items, add UnityInstallations class
1 parent a38f8bd commit 407163e

File tree

3 files changed

+92
-1
lines changed

3 files changed

+92
-1
lines changed

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244

245245
<!-- main content : Tabs -->
246246
<TabControl Grid.Row="1" x:Name="tabControl" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{x:Null}" Padding="0" Margin="0">
247+
247248
<!-- Tab: Projects-->
248249
<TabItem Header="Projects" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}">
249250
<Grid>
@@ -297,6 +298,14 @@
297298
<DataGridTextColumn Binding="{Binding GITBranch}" ClipboardContentBinding="{x:Null}" Header="GITBranch" IsReadOnly="True"/>
298299
</DataGrid.Columns>
299300

301+
<!-- right click context menu -->
302+
<DataGrid.ContextMenu>
303+
<ContextMenu>
304+
<MenuItem Header="Copy Unity Version" />
305+
<Separator />
306+
<MenuItem Header="Menu item asdf" />
307+
</ContextMenu>
308+
</DataGrid.ContextMenu>
300309

301310
<!-- sample data for testing -->
302311
<local:Project GITBranch="" Modified="" Title="M dfgh dfghMO" Path="A:/temp" Version="2099.1.2.3"/>
@@ -364,7 +373,76 @@
364373
</TabItem>
365374

366375
<!-- Tab: Unitys -->
367-
<TabItem Header="Unitys" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black"/>
376+
<TabItem Header="Unitys" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black">
377+
<Grid>
378+
<!-- search box -->
379+
<Grid Background="{DynamicResource TextBoxBackground}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="222" Margin="6,5,0,0" Height="20" >
380+
<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="#7F919191" Visibility="{Binding ElementName=txtSearchBoxUnity, Path=Text.IsEmpty, Converter={StaticResource MyBoolToVisibilityConverter}}" Height="24" />
381+
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" Name="txtSearchBoxUnity" Background="Transparent" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="2,2,0,0" UndoLimit="64" />
382+
<Button Name="btnClearUnitySearch" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" BorderThickness="0" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Padding="0,2" Visibility="Visible" BorderBrush="{x:Null}">
383+
<TextBlock Text="❌" FontSize="8" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center">
384+
<TextBlock.Style>
385+
<Style TargetType="TextBlock">
386+
<Style.Triggers>
387+
<DataTrigger Binding="{Binding ElementName=txtSearchBoxUnity, Path=Text}" Value="">
388+
<Setter Property="Visibility" Value="Hidden"/>
389+
390+
</DataTrigger>
391+
<DataTrigger Binding="{Binding ElementName=txtSearchBoxUnity, Path=Text}" Value="{x:Null}">
392+
<Setter Property="Visibility" Value="Hidden"/>
393+
</DataTrigger>
394+
</Style.Triggers>
395+
</Style>
396+
</TextBlock.Style>
397+
</TextBlock>
398+
</Button>
399+
</Grid>
400+
401+
<Button Style="{StaticResource CustomButton}" ToolTip="Refresh installations (F5)" x:Name="btnRefreshUnityList" Content="⟳" Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}"/>
402+
403+
<DataGrid x:Name="dataGridUnitys" SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="#FFD8D8D8" HorizontalGridLinesBrush="#4C000000" VerticalGridLinesBrush="#19000000">
404+
405+
<DataGrid.Columns>
406+
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="123"/>
407+
<DataGridTextColumn Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True"/>
408+
<DataGridTextColumn Binding="{Binding Installed}" ClipboardContentBinding="{x:Null}" Header="Installed" IsReadOnly="True"/>
409+
<DataGridTextColumn Binding="{Binding Platforms}" ClipboardContentBinding="{x:Null}" Header="Platforms" IsReadOnly="True"/>
410+
</DataGrid.Columns>
411+
412+
<!-- right click context menu -->
413+
<DataGrid.ContextMenu>
414+
<ContextMenu>
415+
<MenuItem Header="Copy Unity Version" />
416+
</ContextMenu>
417+
</DataGrid.ContextMenu>
418+
419+
<!-- sample data for testing -->
420+
<local:UnityInstallations Version="3000.1.2f1" Path="c:/proggies/unity3000" Installed="12.12.2020" Platforms="" />
421+
</DataGrid>
422+
423+
<!-- bottom buttoms row -->
424+
<Grid VerticalAlignment="Bottom" Margin="4,0,8,5">
425+
<Grid.ColumnDefinitions>
426+
<ColumnDefinition Width="20*" />
427+
<ColumnDefinition Width="45*" />
428+
<ColumnDefinition Width="15*" />
429+
</Grid.ColumnDefinitions>
430+
<Grid.RowDefinitions>
431+
<RowDefinition Height="32" />
432+
</Grid.RowDefinitions>
433+
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnRunUnity" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="5,0,0,0" BorderBrush="{x:Null}">
434+
<Label Foreground="#FFC1C1C1">_Upgrade</Label>
435+
</Button>
436+
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnReleaseNotes" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
437+
<Label Foreground="#FFC1C1C1">_Run Unity</Label>
438+
</Button>
439+
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExploreUnity" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
440+
<Label Foreground="#FFC1C1C1">_Explore</Label>
441+
</Button>
442+
443+
</Grid>
444+
</Grid>
445+
</TabItem>
368446
<!-- Tab: Packages -->
369447
<TabItem Header="Packages" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
370448
<!-- Tab: Updates -->

‎UnityLauncherPro/UnityInstallations.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
3+
namespace UnityLauncherPro
4+
{
5+
public class UnityInstallations
6+
{
7+
public string Version { set; get; }
8+
public string Path { set; get; }
9+
public DateTime Installed { set; get; }
10+
public string Platforms { set; get; }
11+
}
12+
}

‎UnityLauncherPro/UnityLauncherPro.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<Generator>MSBuild:Compile</Generator>
7676
<SubType>Designer</SubType>
7777
</ApplicationDefinition>
78+
<Compile Include="UnityInstallations.cs" />
7879
<Page Include="Resources\Colors.xaml">
7980
<SubType>Designer</SubType>
8081
<Generator>MSBuild:Compile</Generator>

0 commit comments

Comments
 (0)