Skip to content

Commit 3b7b64b

Browse files
fgsfdsfgsfds
committed
switched to font awesome
1 parent 084f03e commit 3b7b64b

16 files changed

+123
-94
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
2828
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
2929
<PackageVersion Include="Moq" Version="4.20.72" />
30-
<PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
30+
<PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
3131
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
3232
<PackageVersion Include="SharpCompress" Version="0.39.0" />
3333
<PackageVersion Include="coverlet.collector" Version="6.0.4" />

‎src/Avalonia.Desktop/Assets/discord.png

-12.5 KB
Binary file not shown.

‎src/Avalonia.Desktop/Assets/github.png

-8.44 KB
Binary file not shown.

‎src/Avalonia.Desktop/Assets/issues.png

-37 KB
Binary file not shown.

‎src/Avalonia.Desktop/Avalonia.Desktop.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414

1515
<ItemGroup>
1616
<AvaloniaResource Include="Assets\blood.png" />
17-
<AvaloniaResource Include="Assets\discord.png" />
1817
<AvaloniaResource Include="Assets\duke3d.png" />
1918
<AvaloniaResource Include="Assets\fury.png" />
20-
<AvaloniaResource Include="Assets\github.png" />
2119
<AvaloniaResource Include="Assets\icon.ico" />
22-
<AvaloniaResource Include="Assets\issues.png" />
2320
<AvaloniaResource Include="Assets\logo.png" />
2421
<AvaloniaResource Include="Assets\nam.png" />
2522
<AvaloniaResource Include="Assets\overlay.png" />
@@ -47,7 +44,7 @@
4744
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4845
</PackageReference>
4946
<PackageReference Include="Markdown.Avalonia" />
50-
<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
47+
<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" />
5148
<PackageReference Include="Roslynator.Analyzers" PrivateAssets="all" />
5249
<PackageReference Include="System.Private.Uri" />
5350
</ItemGroup>

‎src/Avalonia.Desktop/Controls/CampaignsControl.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
Command="{Binding ClearSearchBoxCommand}"
2727
ToolTip.Tip="Clear search"
2828
Height="{Binding Bounds.Height, ElementName=SearchBox}">
29-
<i:Icon Value="mdi-close"/>
29+
<i:Icon Value="fa-xmark"/>
3030
</Button>
3131

3232
</Grid>

‎src/Avalonia.Desktop/Controls/DownloadsControl.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
Command="{Binding ClearSearchBoxCommand}"
3535
ToolTip.Tip="Clear search"
3636
Height="{Binding Bounds.Height, ElementName=SearchBox}">
37-
<i:Icon Value="mdi-close" />
37+
<i:Icon Value="fa-xmark" />
3838
</Button>
3939

4040
</Grid>
@@ -127,15 +127,15 @@
127127
Padding="8"
128128
Margin="10,0,0,0"
129129
Command="{Binding UpdateCommand}">
130-
<i:Icon Value="mdi-refresh" />
130+
<i:Icon Value="fa-rotate" />
131131
</Button>
132132

133133
<Button Grid.Column="2"
134134
IsVisible="{Binding IsInProgress}"
135135
HorizontalAlignment="Right"
136136
Padding="8"
137137
Margin="10,0,0,0">
138-
<i:Icon Value="mdi-refresh" Animation="Spin" />
138+
<i:Icon Value="fa-rotate" Animation="Spin" />
139139
</Button>
140140

141141
</Grid>

‎src/Avalonia.Desktop/Controls/MapsControl.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Command="{Binding ClearSearchBoxCommand}"
2626
ToolTip.Tip="Clear search"
2727
Height="{Binding Bounds.Height, ElementName=SearchBox}">
28-
<i:Icon Value="mdi-close" />
28+
<i:Icon Value="fa-xmark" />
2929
</Button>
3030

3131
</Grid>

‎src/Avalonia.Desktop/Controls/PortControl.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
HorizontalContentAlignment="Center"
5959
IsEnabled="{Binding IsInstalled}"
6060
ToolTip.Tip="Open port folder...">
61-
<i:Icon Value="mdi-folder-open" />
61+
<i:Icon Value="fa-folder-open" />
6262
</Button>
6363

6464
<Button Height="{Binding #InstallButton.Bounds.Height}"
@@ -70,7 +70,7 @@
7070
IsEnabled="{Binding IsInstalled}"
7171
Background="Crimson"
7272
ToolTip.Tip="Uninstall">
73-
<i:Icon Value="mdi-delete" />
73+
<i:Icon Value="fa-trash" />
7474
</Button>
7575

7676
</Grid>

‎src/Avalonia.Desktop/Controls/PortsButtonsControl.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
Margin="10,0"
2727
Command="{Binding RefreshListCommand}"
2828
IsEnabled="{Binding !IsInProgress}">
29-
<i:Icon Value="mdi-refresh" />
29+
<i:Icon Value="fa-rotate" />
3030
</Button>
3131

3232
<Button Grid.Column="2"
3333
HorizontalAlignment="Right"
3434
ToolTip.Tip="Open folder..."
3535
Padding="8"
3636
Command="{Binding OpenFolderCommand}">
37-
<i:Icon Value="mdi-folder-open" />
37+
<i:Icon Value="fa-folder-open" />
3838
</Button>
3939

4040
</Grid>

‎src/Avalonia.Desktop/MainWindow.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
<TabItem.Header>
195195
<StackPanel Orientation="Horizontal">
196196
<TextBlock Text="Ports"/>
197-
<i:Icon Foreground="Crimson" ToolTip.Tip="Updates available" DataContext="{Binding PortsPageViewModel}" IsVisible="{Binding HasUpdates}" Margin="5,0,0,0" Value="mdi-alert-decagram" />
197+
<i:Icon Foreground="Crimson" ToolTip.Tip="Updates available" DataContext="{Binding PortsPageViewModel}" IsVisible="{Binding HasUpdates}" Margin="5,0,0,0" Value="fa-circle-exclamation" />
198198
</StackPanel>
199199
</TabItem.Header>
200200

@@ -219,7 +219,7 @@
219219
<TabItem.Header>
220220
<StackPanel Orientation="Horizontal">
221221
<TextBlock Text="About"/>
222-
<i:Icon Foreground="Crimson" ToolTip.Tip="App update available" DataContext="{Binding AboutPageViewModel}" IsVisible="{Binding IsUpdateAvailable}" Margin="5,0,0,0" Value="mdi-alert-decagram" />
222+
<i:Icon Foreground="Crimson" ToolTip.Tip="App update available" DataContext="{Binding AboutPageViewModel}" IsVisible="{Binding IsUpdateAvailable}" Margin="5,0,0,0" Value="fa-circle-exclamation" />
223223
</StackPanel>
224224
</TabItem.Header>
225225

‎src/Avalonia.Desktop/Pages/AboutPage.axaml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:i="https://github.com/projektanker/icons.avalonia"
56
mc:Ignorable="d"
67
d:DesignWidth="800"
78
d:DesignHeight="450"
@@ -37,13 +38,31 @@
3738
</Grid>
3839
</Border>
3940

41+
<!--Patreon-->
42+
<Button Padding="10"
43+
Margin="10"
44+
HorizontalAlignment="Stretch"
45+
Click="PatreonClick">
46+
<StackPanel Orientation="Horizontal">
47+
48+
<i:Icon Value="fa-patreon" FontSize="48" />
49+
50+
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
51+
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="18">Patreon</TextBlock>
52+
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="14">Support me on Patreon</TextBlock>
53+
</StackPanel>
54+
</StackPanel>
55+
</Button>
56+
4057
<!--Discord-->
4158
<Button Padding="10"
4259
Margin="10"
4360
HorizontalAlignment="Stretch"
4461
Click="DiscordClick">
4562
<StackPanel Orientation="Horizontal">
46-
<Image Source="/Assets/discord.png" Width="48" />
63+
64+
<i:Icon Value="fa-discord" FontSize="48" />
65+
4766
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
4867
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="18">Discord server</TextBlock>
4968
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="14">Join discussion on Discord</TextBlock>
@@ -57,7 +76,9 @@
5776
HorizontalAlignment="Stretch"
5877
Click="GitHubClick">
5978
<StackPanel Orientation="Horizontal">
60-
<Image Source="/Assets/github.png" Width="48" />
79+
80+
<i:Icon Value="fa-github" FontSize="48" />
81+
6182
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
6283
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="18">GitHub repository</TextBlock>
6384
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="14">BuildLauncher is free and open source</TextBlock>
@@ -72,7 +93,9 @@
7293
Click="GitHubIssuesClick">
7394

7495
<StackPanel Orientation="Horizontal">
75-
<Image Source="/Assets/issues.png" Width="48" />
96+
97+
<i:Icon Value="fa-bug" FontSize="48" />
98+
7699
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
77100
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="18">Report a problem</TextBlock>
78101
<TextBlock VerticalAlignment="Center" Margin="10,0" FontSize="14">Create issue on GitHub</TextBlock>

‎src/Avalonia.Desktop/Pages/AboutPage.axaml.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ public AboutPage()
1111
InitializeComponent();
1212
}
1313

14+
private void PatreonClick(object sender, RoutedEventArgs e)
15+
{
16+
using var process = Process.Start(new ProcessStartInfo
17+
{
18+
FileName = "https://www.patreon.com/fgsfds",
19+
UseShellExecute = true
20+
});
21+
}
22+
1423
private void DiscordClick(object sender, RoutedEventArgs e)
1524
{
1625
using var process = Process.Start(new ProcessStartInfo

‎src/Avalonia.Desktop/Pages/GamePage.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<TabItem.Header>
3030
<StackPanel Orientation="Horizontal">
3131
<TextBlock Text="Downloads"/>
32-
<i:Icon Foreground="Crimson" ToolTip.Tip="Updates available" IsVisible="{Binding ElementName=DownControl, Path=((vm:DownloadsViewModel)DataContext).HasUpdates, FallbackValue=False}" Margin="5,0,0,0" Value="mdi-alert-decagram" />
32+
<i:Icon Foreground="Crimson" ToolTip.Tip="Updates available" IsVisible="{Binding ElementName=DownControl, Path=((vm:DownloadsViewModel)DataContext).HasUpdates, FallbackValue=False}" Margin="5,0,0,0" Value="fa-circle-exclamation" />
3333
</StackPanel>
3434
</TabItem.Header>
3535

‎src/Avalonia.Desktop/Pages/SettingsPage.axaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
Command="{Binding AutodetectCommand}"
7878
CommandParameter="Duke3D"
7979
ToolTip.Tip="Autodetect">
80-
<i:Icon Value="mdi-refresh" />
80+
<i:Icon Value="fa-rotate" />
8181
</Button>
8282

8383

@@ -106,7 +106,7 @@
106106
Command="{Binding AutodetectCommand}"
107107
CommandParameter="Duke3D_WT"
108108
ToolTip.Tip="Autodetect">
109-
<i:Icon Value="mdi-refresh" />
109+
<i:Icon Value="fa-rotate" />
110110
</Button>
111111

112112

@@ -154,7 +154,7 @@
154154
Command="{Binding AutodetectCommand}"
155155
CommandParameter="Blood"
156156
ToolTip.Tip="Autodetect">
157-
<i:Icon Value="mdi-refresh" />
157+
<i:Icon Value="fa-rotate" />
158158
</Button>
159159

160160

@@ -183,7 +183,7 @@
183183
Command="{Binding AutodetectCommand}"
184184
CommandParameter="ShadowWarrior"
185185
ToolTip.Tip="Autodetect">
186-
<i:Icon Value="mdi-refresh" />
186+
<i:Icon Value="fa-rotate" />
187187
</Button>
188188

189189

@@ -212,7 +212,7 @@
212212
Command="{Binding AutodetectCommand}"
213213
CommandParameter="Fury"
214214
ToolTip.Tip="Autodetect">
215-
<i:Icon Value="mdi-refresh" />
215+
<i:Icon Value="fa-rotate" />
216216
</Button>
217217

218218

@@ -241,7 +241,7 @@
241241
Command="{Binding AutodetectCommand}"
242242
CommandParameter="Redneck"
243243
ToolTip.Tip="Autodetect">
244-
<i:Icon Value="mdi-refresh" />
244+
<i:Icon Value="fa-rotate" />
245245
</Button>
246246

247247

@@ -270,7 +270,7 @@
270270
Command="{Binding AutodetectCommand}"
271271
CommandParameter="RidesAgain"
272272
ToolTip.Tip="Autodetect">
273-
<i:Icon Value="mdi-refresh" />
273+
<i:Icon Value="fa-rotate" />
274274
</Button>
275275

276276

@@ -299,7 +299,7 @@
299299
Command="{Binding AutodetectCommand}"
300300
CommandParameter="Exhumed"
301301
ToolTip.Tip="Autodetect">
302-
<i:Icon Value="mdi-refresh" />
302+
<i:Icon Value="fa-rotate" />
303303
</Button>
304304

305305

@@ -328,7 +328,7 @@
328328
Command="{Binding AutodetectCommand}"
329329
CommandParameter="NAM"
330330
ToolTip.Tip="Autodetect">
331-
<i:Icon Value="mdi-refresh" />
331+
<i:Icon Value="fa-rotate" />
332332
</Button>
333333

334334

@@ -357,7 +357,7 @@
357357
Command="{Binding AutodetectCommand}"
358358
CommandParameter="WW2GI"
359359
ToolTip.Tip="Autodetect">
360-
<i:Icon Value="mdi-refresh" />
360+
<i:Icon Value="fa-rotate" />
361361
</Button>
362362

363363

@@ -386,7 +386,7 @@
386386
Command="{Binding AutodetectCommand}"
387387
CommandParameter="Witchaven"
388388
ToolTip.Tip="Autodetect">
389-
<i:Icon Value="mdi-refresh" />
389+
<i:Icon Value="fa-rotate" />
390390
</Button>
391391

392392

@@ -416,7 +416,7 @@
416416
Command="{Binding AutodetectCommand}"
417417
CommandParameter="Witchaven2"
418418
ToolTip.Tip="Autodetect">
419-
<i:Icon Value="mdi-refresh" />
419+
<i:Icon Value="fa-rotate" />
420420
</Button>
421421

422422

0 commit comments

Comments
 (0)