Skip to content

Commit d1ca498

Browse files
LongerWarriorLongerWarrior
committed
CommitControl update
1 parent 07d26f7 commit d1ca498

File tree

5 files changed

+74
-60
lines changed

5 files changed

+74
-60
lines changed

‎CUE4Parse‎

‎FModel/Settings/DirectorySettings.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ public override int GetHashCode()
113113
return HashCode.Combine(GameDirectory, (int) UeVersion);
114114
}
115115

116+
public override string ToString()
117+
{
118+
return GameName;
119+
}
120+
116121
public object Clone()
117122
{
118123
return this.MemberwiseClone();

‎FModel/Views/DirectorySelector.xaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,17 @@
5252
</Grid.ColumnDefinitions>
5353

5454
<TextBlock Grid.Row="0" Grid.Column="0" Text="Detected Game" VerticalAlignment="Center" Margin="0 0 0 5" />
55-
<ComboBox Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" ItemsSource="{Binding DetectedDirectories}" Margin="0 0 0 5"
56-
VerticalAlignment="Center" SelectedItem="{Binding SelectedDirectory, Mode=TwoWay}">
55+
<controls:FilterableComboBox Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3"
56+
ItemsSource="{Binding DetectedDirectories}" Margin="0 0 0 5"
57+
Style="{StaticResource UComboBox}"
58+
adonisExtensions:WatermarkExtension.Watermark="Search for a game..."
59+
VerticalAlignment="Center" SelectedItem="{Binding SelectedDirectory, Mode=TwoWay}">
5760
<ComboBox.ItemTemplate>
5861
<DataTemplate>
5962
<TextBlock Text="{Binding GameName, Converter={x:Static converters:StringToGameConverter.Instance}}" />
6063
</DataTemplate>
6164
</ComboBox.ItemTemplate>
62-
</ComboBox>
65+
</controls:FilterableComboBox>
6366

6467
<TextBlock Grid.Row="1" Grid.Column="0" Text="UE Versions" VerticalAlignment="Center" Margin="0 0 0 5" />
6568
<controls:FilterableComboBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Margin="0 0 0 5"

‎FModel/Views/Resources/Controls/CommitControl.xaml‎

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,66 @@
6565
</Grid>
6666
</Grid>
6767

68-
<controls:CommitDownloaderControl Grid.Column="1" Commit="{Binding}">
69-
<controls:CommitDownloaderControl.Style>
70-
<Style TargetType="controls:CommitDownloaderControl">
71-
<Setter Property="Visibility" Value="Collapsed" />
72-
<Style.Triggers>
73-
<DataTrigger Binding="{Binding IsDownloadable}" Value="True">
74-
<Setter Property="Visibility" Value="Visible"/>
75-
</DataTrigger>
76-
</Style.Triggers>
77-
</Style>
78-
</controls:CommitDownloaderControl.Style>
79-
</controls:CommitDownloaderControl>
68+
<Grid Grid.Column="1">
69+
<Grid.ColumnDefinitions>
70+
<ColumnDefinition Width="Auto" />
71+
<ColumnDefinition Width="15" />
72+
<ColumnDefinition Width="Auto" />
73+
</Grid.ColumnDefinitions>
74+
75+
<Border Grid.Column="0"
76+
BorderThickness="1"
77+
CornerRadius="2.5"
78+
Padding="5,2"
79+
HorizontalAlignment="Center"
80+
VerticalAlignment="Center">
81+
<TextBlock FontSize="9" Foreground="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=Border}}">
82+
<TextBlock.Style>
83+
<Style TargetType="TextBlock">
84+
<Style.Triggers>
85+
<DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
86+
<Setter Property="Text" Value="Latest" />
87+
</DataTrigger>
88+
<DataTrigger Binding="{Binding IsCurrent}" Value="True">
89+
<Setter Property="Text" Value="Current" />
90+
</DataTrigger>
91+
</Style.Triggers>
92+
</Style>
93+
</TextBlock.Style>
94+
</TextBlock>
95+
96+
<Border.Style>
97+
<Style TargetType="Border">
98+
<Setter Property="Visibility" Value="Collapsed" />
99+
<Style.Triggers>
100+
<DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
101+
<Setter Property="Visibility" Value="Visible" />
102+
<Setter Property="BorderBrush" Value="#3fb950" />
103+
<Setter Property="Background" Value="#0f3fb950" />
104+
</DataTrigger>
105+
<DataTrigger Binding="{Binding IsCurrent}" Value="True">
106+
<Setter Property="Visibility" Value="Visible" />
107+
<Setter Property="BorderBrush" Value="#3f92b9" />
108+
<Setter Property="Background" Value="#0f3f92b9" />
109+
</DataTrigger>
110+
</Style.Triggers>
111+
</Style>
112+
</Border.Style>
113+
</Border>
114+
115+
<controls:CommitDownloaderControl Grid.Column="2" Commit="{Binding}">
116+
<controls:CommitDownloaderControl.Style>
117+
<Style TargetType="controls:CommitDownloaderControl">
118+
<Setter Property="Visibility" Value="Collapsed" />
119+
<Style.Triggers>
120+
<DataTrigger Binding="{Binding IsDownloadable}" Value="True">
121+
<Setter Property="Visibility" Value="Visible"/>
122+
</DataTrigger>
123+
</Style.Triggers>
124+
</Style>
125+
</controls:CommitDownloaderControl.Style>
126+
</controls:CommitDownloaderControl>
127+
</Grid>
80128
</Grid>
81129
</Border>
82130
</UserControl>

‎FModel/Views/Resources/Controls/CommitDownloaderControl.xaml‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,51 +15,9 @@
1515
<ColumnDefinition Width="Auto" />
1616
<ColumnDefinition Width="15" />
1717
<ColumnDefinition Width="Auto" />
18-
<ColumnDefinition Width="15" />
19-
<ColumnDefinition Width="Auto" />
2018
</Grid.ColumnDefinitions>
2119

22-
<Border Grid.Column="0"
23-
BorderThickness="1"
24-
CornerRadius="2.5"
25-
Padding="5,2"
26-
HorizontalAlignment="Center"
27-
VerticalAlignment="Center">
28-
<TextBlock FontSize="9" Foreground="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=Border}}">
29-
<TextBlock.Style>
30-
<Style TargetType="TextBlock">
31-
<Style.Triggers>
32-
<DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
33-
<Setter Property="Text" Value="Latest" />
34-
</DataTrigger>
35-
<DataTrigger Binding="{Binding IsCurrent}" Value="True">
36-
<Setter Property="Text" Value="Current" />
37-
</DataTrigger>
38-
</Style.Triggers>
39-
</Style>
40-
</TextBlock.Style>
41-
</TextBlock>
42-
43-
<Border.Style>
44-
<Style TargetType="Border">
45-
<Setter Property="Visibility" Value="Collapsed" />
46-
<Style.Triggers>
47-
<DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
48-
<Setter Property="Visibility" Value="Visible" />
49-
<Setter Property="BorderBrush" Value="#3fb950" />
50-
<Setter Property="Background" Value="#0f3fb950" />
51-
</DataTrigger>
52-
<DataTrigger Binding="{Binding IsCurrent}" Value="True">
53-
<Setter Property="Visibility" Value="Visible" />
54-
<Setter Property="BorderBrush" Value="#3f92b9" />
55-
<Setter Property="Background" Value="#0f3f92b9" />
56-
</DataTrigger>
57-
</Style.Triggers>
58-
</Style>
59-
</Border.Style>
60-
</Border>
61-
62-
<Grid Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center">
20+
<Grid Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
6321
<Grid.ColumnDefinitions>
6422
<ColumnDefinition Width="Auto" />
6523
<ColumnDefinition Width="5" />
@@ -78,7 +36,7 @@
7836
</StackPanel>
7937
</Grid>
8038

81-
<Button Grid.Column="4" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}" ToolTip="Download"
39+
<Button Grid.Column="2" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}" ToolTip="Download"
8240
Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=Grid}}"
8341
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
8442
IsEnabled="{Binding IsCurrent, Converter={x:Static converters:InvertBooleanConverter.Instance}}"

0 commit comments

Comments
 (0)