Skip to content

Commit 06c9bd9

Browse files
unitycoderunitycoder
committed
add updates, tools & settings-tab content, remove tabstop from minimize and close, remove packages-tab
1 parent 5d7d618 commit 06c9bd9

File tree

2 files changed

+143
-24
lines changed

2 files changed

+143
-24
lines changed

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 141 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
mc:Ignorable="d"
88
Title="UnityLauncherPro" Height="600" Width="500" WindowStartupLocation="CenterScreen" Background="{DynamicResource DarkestBackground}" MinWidth="500" MinHeight="300" AllowsTransparency="True" WindowStyle="None" Margin="0" >
99

10-
<Window.Resources>
10+
<Window.Resources>
1111
<!-- tabs -->
1212
<Style x:Key="TabItemStyle1" TargetType="{x:Type TabItem}">
1313
<Setter Property="Template">
@@ -217,7 +217,7 @@
217217

218218
</Window.Resources>
219219

220-
220+
221221
<!-- UI -->
222222

223223
<Grid Margin="0">
@@ -233,18 +233,18 @@
233233
<Image Source="Images/icon.png" RenderOptions.BitmapScalingMode="NearestNeighbor" HorizontalAlignment="Left" Width="16" Height="16" Margin="4,0,0,0" SnapsToDevicePixels="True" UseLayoutRounding="True" />
234234
<Label Content="UnityLauncherPro" IsHitTestVisible="False" Margin="19,0,0,-5" Foreground="#FFB8B8B8" FontSize="12" HorizontalAlignment="Left" />
235235
<!-- minimize -->
236-
<Button Name="btnMinimize" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnMinimize_Click" Margin="0,0,27,0" Padding="2,0,2,8">
236+
<Button Name="btnMinimize" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnMinimize_Click" Margin="0,0,27,0" Padding="2,0,2,8" IsTabStop="False">
237237
<TextBlock Text="–" FontSize="15" Foreground="#FFC3C3C3" Padding="0" Height="23" HorizontalAlignment="Center"/>
238238
</Button>
239239
<!-- close -->
240-
<Button Name="btnClose" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnClose_Click" Padding="0,2">
240+
<Button Name="btnClose" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="23" Width="23" Background="Transparent" Click="BtnClose_Click" Padding="0,2" IsTabStop="False">
241241
<TextBlock Text="❌" FontSize="10" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center" />
242242
</Button>
243243
</Grid>
244244

245245
<!-- main content : Tabs -->
246246
<TabControl Grid.Row="1" x:Name="tabControl" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{x:Null}" Padding="0" Margin="0">
247-
247+
248248
<!-- Tab: Projects-->
249249
<TabItem Header="Projects" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}">
250250
<Grid>
@@ -253,7 +253,7 @@
253253
<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="#7F919191" Visibility="{Binding ElementName=txtSearchBox, Path=Text.IsEmpty, Converter={StaticResource MyBoolToVisibilityConverter}}" Height="24" />
254254
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" Name="txtSearchBox" Background="Transparent" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="2,2,0,0" UndoLimit="64" />
255255
<Button Name="btnClearSearch" 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}">
256-
<TextBlock Text="❌" FontSize="8" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center">
256+
<TextBlock Text="❌" FontSize="8" Foreground="{DynamicResource ButtonForeground}" Padding="5,3,4,4" HorizontalAlignment="Center">
257257
<TextBlock.Style>
258258
<Style TargetType="TextBlock">
259259
<Style.Triggers>
@@ -354,18 +354,18 @@
354354
<RowDefinition Height="32" />
355355
</Grid.RowDefinitions>
356356
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="5,0,0,0" BorderBrush="{x:Null}">
357-
<Label Foreground="#FFC1C1C1">_Upgrade</Label>
357+
<Label Foreground="{DynamicResource ButtonForeground}">_Upgrade</Label>
358358
</Button>
359359
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnLaunchUnity" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
360-
<Label Foreground="#FFC1C1C1">_Run Unity</Label>
360+
<Label Foreground="{DynamicResource ButtonForeground}">_Run Unity</Label>
361361
</Button>
362362

363363
<Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnLaunchProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
364-
<Label Foreground="#FFC1C1C1">_Open Project</Label>
364+
<Label Foreground="{DynamicResource ButtonForeground}">_Open Project</Label>
365365
</Button>
366366

367367
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExplore" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" >
368-
<Label Foreground="#FFC1C1C1">_Explore</Label>
368+
<Label Foreground="{DynamicResource ButtonForeground}">_Explore</Label>
369369
</Button>
370370

371371
</Grid>
@@ -406,7 +406,6 @@
406406
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="123"/>
407407
<DataGridTextColumn Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True"/>
408408
<DataGridTextColumn Binding="{Binding Installed}" ClipboardContentBinding="{x:Null}" Header="Installed" IsReadOnly="True"/>
409-
<DataGridTextColumn Binding="{Binding Platforms}" ClipboardContentBinding="{x:Null}" Header="Platforms" IsReadOnly="True"/>
410409
</DataGrid.Columns>
411410

412411
<!-- right click context menu -->
@@ -417,7 +416,7 @@
417416
</DataGrid.ContextMenu>
418417

419418
<!-- sample data for testing -->
420-
<local:UnityInstallations Version="3000.1.2f1" Path="c:/proggies/unity3000" Installed="12.12.2020" Platforms="" />
419+
<local:UnityInstallations Version="3000.1.2f1" Path="c:/proggies/unity3000" Installed="12.12.2020" />
421420
</DataGrid>
422421

423422
<!-- bottom buttoms row -->
@@ -430,27 +429,146 @@
430429
<Grid.RowDefinitions>
431430
<RowDefinition Height="32" />
432431
</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>
432+
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnRunUnity" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}">
433+
<Label Foreground="{DynamicResource ButtonForeground}">_Upgrade</Label>
435434
</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>
435+
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnReleaseNotes" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="8,0,0,0" BorderBrush="{x:Null}" >
436+
<Label Foreground="{DynamicResource ButtonForeground}">_Run Unity</Label>
438437
</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>
438+
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExploreUnity" Background="{DynamicResource ButtonBackground}" Margin="8,0,0,0" BorderBrush="{x:Null}" Foreground="{DynamicResource ButtonForeground}" >
439+
<Label Foreground="{DynamicResource ButtonForeground}">_Explore</Label>
441440
</Button>
442441

443442
</Grid>
444443
</Grid>
445444
</TabItem>
446-
<!-- Tab: Packages -->
447-
<TabItem Header="Packages" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
445+
448446
<!-- Tab: Updates -->
449-
<TabItem Header="Updates" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
447+
<TabItem Header="Updates" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" >
448+
<Grid>
449+
<!-- search box -->
450+
<Grid Background="{DynamicResource TextBoxBackground}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="222" Margin="6,5,0,0" Height="20" >
451+
<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="#7F919191" Visibility="{Binding ElementName=txtSearchBoxUpdates, Path=Text.IsEmpty, Converter={StaticResource MyBoolToVisibilityConverter}}" Height="24" />
452+
<TextBox MinWidth="100" CaretBrush="#FFE2E2E2" Name="txtSearchBoxUpdates" Background="Transparent" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" Margin="2,2,0,0" UndoLimit="64" />
453+
<Button Name="btnClearUpdatesSearch" 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}">
454+
<TextBlock Text="❌" FontSize="8" Foreground="#FFC3C3C3" Padding="5,3,4,4" HorizontalAlignment="Center">
455+
<TextBlock.Style>
456+
<Style TargetType="TextBlock">
457+
<Style.Triggers>
458+
<DataTrigger Binding="{Binding ElementName=txtSearchBoxUpdates, Path=Text}" Value="">
459+
<Setter Property="Visibility" Value="Hidden"/>
460+
461+
</DataTrigger>
462+
<DataTrigger Binding="{Binding ElementName=txtSearchBoxUpdates, Path=Text}" Value="{x:Null}">
463+
<Setter Property="Visibility" Value="Hidden"/>
464+
</DataTrigger>
465+
</Style.Triggers>
466+
</Style>
467+
</TextBlock.Style>
468+
</TextBlock>
469+
</Button>
470+
</Grid>
471+
472+
<Button Style="{StaticResource CustomButton}" ToolTip="Refresh installations (F5)" x:Name="btnRefreshUpdatesList" 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}"/>
473+
474+
<DataGrid x:Name="dataGridUpdates" 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">
475+
476+
<DataGrid.Columns>
477+
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="123"/>
478+
<DataGridTextColumn Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True"/>
479+
<DataGridTextColumn Binding="{Binding Installed}" ClipboardContentBinding="{x:Null}" Header="Installed" IsReadOnly="True"/>
480+
</DataGrid.Columns>
481+
482+
<!-- right click context menu -->
483+
<DataGrid.ContextMenu>
484+
<ContextMenu>
485+
<MenuItem Header="Copy Unity Version" />
486+
</ContextMenu>
487+
</DataGrid.ContextMenu>
488+
489+
<!-- sample data for testing -->
490+
<local:UnityInstallations Version="3000.1.2f1" Path="c:/proggies/unity3000" Installed="12.12.2020" />
491+
</DataGrid>
492+
493+
<!-- bottom buttoms row -->
494+
<Grid VerticalAlignment="Bottom" Margin="4,0,8,5">
495+
<Grid.ColumnDefinitions>
496+
<ColumnDefinition Width="20*" />
497+
<ColumnDefinition Width="45*" />
498+
</Grid.ColumnDefinitions>
499+
<Grid.RowDefinitions>
500+
<RowDefinition Height="32" />
501+
</Grid.RowDefinitions>
502+
<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnDonwloadInBrowser" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}">
503+
<Label Foreground="{DynamicResource ButtonForeground}">_Download in browser</Label>
504+
</Button>
505+
<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="8,0,0,0" BorderBrush="{x:Null}" >
506+
<Label Foreground="{DynamicResource ButtonForeground}">_Release Notes</Label>
507+
</Button>
508+
</Grid>
509+
</Grid>
510+
511+
</TabItem>
512+
450513
<!-- Tab: Tools -->
451-
<TabItem Header="Tools" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
514+
<TabItem Header="Tools" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black">
515+
<Grid>
516+
<Grid.RowDefinitions>
517+
<RowDefinition Height="50*" />
518+
<RowDefinition Height="50*" />
519+
</Grid.RowDefinitions>
520+
<!-- 1st part -->
521+
522+
<!-- 2nd part -->
523+
<Grid Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left">
524+
<Border>
525+
<StackPanel Orientation="Horizontal" Margin="10">
526+
<Button Style="{StaticResource CustomButton}" x:Name="btnTemp1" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top">
527+
<Label Foreground="{DynamicResource ButtonForeground}">_Editor Logs</Label>
528+
</Button>
529+
<Button Style="{StaticResource CustomButton}" x:Name="btnTemp2" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top">
530+
<Label Foreground="{DynamicResource ButtonForeground}">_Player Logs</Label>
531+
</Button>
532+
<Button Style="{StaticResource CustomButton}" x:Name="btnTemp3" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top">
533+
<Label Foreground="{DynamicResource ButtonForeground}">_ADB logcat (cmd)</Label>
534+
</Button>
535+
</StackPanel>
536+
</Border>
537+
</Grid>
538+
</Grid>
539+
540+
</TabItem>
541+
452542
<!-- Tab: Settings -->
453-
<TabItem Header="Settings" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black" />
543+
<TabItem Header="Settings" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}" Background="Black">
544+
<Grid>
545+
<Grid.RowDefinitions>
546+
<!-- top labels-->
547+
<RowDefinition Height="28" />
548+
<!-- install locations list box -->
549+
<RowDefinition Height="30*" />
550+
<!-- list buttons -->
551+
<RowDefinition Height="33" />
552+
<!-- settings -->
553+
<RowDefinition Height="70*" />
554+
<!-- links -->
555+
<RowDefinition Height="33" />
556+
</Grid.RowDefinitions>
557+
558+
<!-- top labels -->
559+
<Label Grid.Row="0" Content="Unity Installation Parent Folders" Foreground="{DynamicResource ButtonForeground}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></Label>
560+
<Label Grid.Row="0" Content=".. Installations" Foreground="{DynamicResource ButtonForeground}" HorizontalAlignment="Right" VerticalAlignment="Bottom"></Label>
561+
<!-- locations list -->
562+
<ListBox Grid.Row="1" Background="#FF3C3C3C" Margin="4,0,2,0" />
563+
<!-- locations add/remove -->
564+
<Button Grid.Row="2" Style="{StaticResource CustomButton}" x:Name="btnASASDFasdf" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Center">
565+
<Label Foreground="{DynamicResource ButtonForeground}">_asdf</Label>
566+
</Button>
567+
<!-- settings-->
568+
<!-- links-->
569+
570+
</Grid>
571+
</TabItem>
454572
</TabControl>
455573

456574
<Grid Grid.Row="2" UseLayoutRounding="False">

‎UnityLauncherPro/Resources/Colors.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<SolidColorBrush x:Key="MainBackgroundColor" Color="#FF262626"/>
77
<SolidColorBrush x:Key="TextBoxBackground" Color="#FF333337"/>
88
<SolidColorBrush x:Key="ButtonBackground" Color="#FF3F3F46"/>
9-
<SolidColorBrush x:Key="DeactiveTabForeground" Color="#FFC1C1C1"/>
9+
<SolidColorBrush x:Key="ButtonForeground" Color="#FFC1C1C1"/>
10+
<SolidColorBrush x:Key="DeactiveTabForeground" Color="#FFC1C1C1"/>
1011
<SolidColorBrush x:Key="DeactiveTabBackground" Color="#FF1D1D1D"/>
1112
<SolidColorBrush x:Key="DatagridHeaderBackground" Color="#4C3F3F46"/>
1213
<SolidColorBrush x:Key="DatagridHeaderForeground" Color="#FFB6B6B6"/>

0 commit comments

Comments
 (0)