Skip to content

Commit 9018eae

Browse files
ThomasBousquetThomasBousquet
committed
button mockup
1 parent 196595e commit 9018eae

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

Diff for: ‎UnityLauncherPro/MainWindow.xaml

+17-7
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@
4848
<!-- Tab: Projects-->
4949
<TabItem Header="Projects" Style="{DynamicResource TabItemStyle1}" Padding="0,0,0,0" Margin="-1,1,1,-1" BorderBrush="{x:Null}">
5050
<Grid>
51+
<Grid.ColumnDefinitions>
52+
<ColumnDefinition Width="185*"/>
53+
<ColumnDefinition Width="693*"/>
54+
</Grid.ColumnDefinitions>
5155
<!-- search box -->
52-
<Grid Background="{DynamicResource ThemeTextBoxBackground}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="222" Margin="6,5,0,0" Height="20" >
56+
<Grid Background="{DynamicResource ThemeTextBoxBackground}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="222" Margin="6,5,0,0" Height="20" Grid.ColumnSpan="2" >
5357
<!--<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="{DynamicResource ThemeSearchPlaceholder}" Visibility="{Binding Text.IsEmpty, Converter={StaticResource MyBoolToVisibilityConverter}, ElementName=txtSearchBox}" Height="24" />-->
5458
<TextBlock Margin="3,2" MinWidth="100" Text="Search" Foreground="{DynamicResource ThemeSearchPlaceholder}" Height="24">
5559
<TextBlock.Style>
@@ -84,10 +88,10 @@
8488
</Button>
8589
</Grid>
8690

87-
<Button Style="{StaticResource CustomButton}" ToolTip="Browse and add existing project to list" x:Name="btnAddProjectFolder" Content="Add Project.." Height="22" Width="78" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,38,0" Click="BtnAddProjectFolder_Click" BorderBrush="{x:Null}" TabIndex="10" />
88-
<Button Style="{StaticResource CustomButton}" ToolTip="Refresh list (F5)" x:Name="btnRefreshProjectList" Content="⟳" Height="22" Width="26" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="BtnRefreshProjectList_Click" TabIndex="11"/>
91+
<Button Style="{StaticResource CustomButton}" ToolTip="Browse and add existing project to list" x:Name="btnAddProjectFolder" Content="Add Project.." Height="22" Width="78" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,38,0" Click="BtnAddProjectFolder_Click" BorderBrush="{x:Null}" TabIndex="10" Grid.Column="1" />
92+
<Button Style="{StaticResource CustomButton}" ToolTip="Refresh list (F5)" x:Name="btnRefreshProjectList" Content="⟳" Height="22" Width="26" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="BtnRefreshProjectList_Click" TabIndex="11" Grid.Column="1"/>
8993

90-
<DataGrid x:Name="gridRecent" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" SelectionMode="Single" Margin="4,30,2,42" CanUserAddRows="False" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" PreviewKeyDown="GridRecent_PreviewKeyDown" Loaded="GridRecent_Loaded" TabIndex="2" CellEditEnding="GridRecent_CellEditEnding" PreviewMouseDoubleClick="GridRecent_PreviewMouseDoubleClick" ContextMenuOpening="GridRecent_ContextMenuOpening" BeginningEdit="GridRecent_BeginningEdit" RowHeight="21" ColumnReordered="GridRecent_ColumnReordered" Sorting="gridRecent_Sorting" >
94+
<DataGrid x:Name="gridRecent" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" SelectionMode="Single" Margin="4,30,2,42" CanUserAddRows="False" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" PreviewKeyDown="GridRecent_PreviewKeyDown" Loaded="GridRecent_Loaded" TabIndex="2" CellEditEnding="GridRecent_CellEditEnding" PreviewMouseDoubleClick="GridRecent_PreviewMouseDoubleClick" ContextMenuOpening="GridRecent_ContextMenuOpening" BeginningEdit="GridRecent_BeginningEdit" RowHeight="21" ColumnReordered="GridRecent_ColumnReordered" Sorting="gridRecent_Sorting" Grid.ColumnSpan="2" >
9195

9296
<DataGrid.CommandBindings>
9397
<CommandBinding Command="ApplicationCommands.Copy" Executed="CopyRowFolderToClipBoard" CanExecute="CanExecute_Copy"/>
@@ -241,7 +245,7 @@
241245
</DataGrid>
242246

243247
<!-- bottom buttoms row -->
244-
<Grid VerticalAlignment="Bottom" Margin="4,0,8,5">
248+
<Grid VerticalAlignment="Bottom" Margin="4,0,8,5" Grid.ColumnSpan="2">
245249
<Grid.ColumnDefinitions>
246250
<ColumnDefinition Width="14*" />
247251
<ColumnDefinition Width="17*" />
@@ -492,7 +496,8 @@
492496
<ColumnDefinition Width="20*" />
493497
<ColumnDefinition Width="18*" />
494498
<ColumnDefinition Width="28*" />
495-
<ColumnDefinition Width="26*" />
499+
<ColumnDefinition Width="14*" />
500+
<ColumnDefinition Width="18*" />
496501
</Grid.ColumnDefinitions>
497502
<Grid.RowDefinitions>
498503
<RowDefinition Height="32" />
@@ -507,7 +512,12 @@
507512
<Label Content="Download &amp; Install" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
508513
</Button>
509514
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite" Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnOpenWebsite_Click" >
510-
<Label Content="Release _Notes" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
515+
</Button>
516+
<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite_Copy" Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnOpenWebsite_Click" >
517+
<Label Content="Release Notes" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Control}, Mode=FindAncestor}}" />
518+
</Button>
519+
<Button Grid.Column="4" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite_Copy2" Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnOpenWebsite_Click" ToolTip="Show All Release notes between this version on the older, closest one installed.&lt;br&gt;Only works for final versions." >
520+
<Label Content="Cumulated Release Notes" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Control}, Mode=FindAncestor}}" />
511521
</Button>
512522
</Grid>
513523
</Grid>

Diff for: ‎UnityLauncherPro/MainWindow.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public partial class MainWindow : Window
4646
System.Windows.Forms.NotifyIcon notifyIcon;
4747

4848
Updates[] updatesSource;
49-
public static List<string> updatesAsStrings;
49+
public static List<string> updatesAsStrings = new List<string>();
5050

5151
string _filterString = null;
5252
bool multiWordSearch = false;

Diff for: ‎UnityLauncherPro/Tools.cs

+3
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,9 @@ private static string FetchUnityVersionNumberFromHTML(string url)
10141014

10151015
public static string FindNearestVersion(string currentVersion, List<string> allAvailable, bool checkBelow = false)
10161016
{
1017+
if (allAvailable == null)
1018+
return null;
1019+
10171020
string result = null;
10181021

10191022
// add current version to list, to sort it with others

0 commit comments

Comments
 (0)