Skip to content

Commit 1f78425

Browse files
committed
Licensing Changes + Twitter to X
1 parent 565922b commit 1f78425

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

.github/Licensing/main.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

33
root_dir = r"./Licensing"
4-
output_file = os.path.join(r"./", "NOTICE")
4+
output_file = os.path.join(root_dir, "NOTICE")
55

66
license_filenames = {
77
"LICENSE", "LICENSE.txt", "LICENSE.md",
@@ -14,8 +14,12 @@
1414
with open(output_file, "w", encoding="utf-8") as outfile:
1515
for foldername, _, filenames in os.walk(root_dir):
1616
for filename in filenames:
17+
file_path = os.path.join(foldername, filename)
18+
19+
if file_path == r"./Licensing\NOTICE":
20+
continue
21+
1722
if filename in license_filenames:
18-
file_path = os.path.join(foldername, filename)
1923
relative_path = os.path.relpath(file_path, root_dir)
2024

2125
outfile.write("\n" + "=" * 40 + "\n")

Licensing/NOTICE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@ This project includes third-party libraries that are licensed under their respec
715715
- FluentAvaloniaUI
716716
- DiscordRichPresence
717717

718-
The Discord logo is a trademark of Discord Inc. and is used in accordance with [Discord’s branding guidelines](https://discord.com/branding).
718+
The Discord logo is a trademark of Discord Inc. and is used in accordance with [Discord's branding guidelines](https://discord.com/branding).
719+
The X logo is a trademark of X Corp. and is used in accordance with [X's Brand Guidelines](https://about.x.com/en/who-we-are/brand-toolkit).
719720

720721
========================================
721722
File: Avalonia\licence.md

Licensing/THIRD_PARTY_NOTICES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ This project includes third-party libraries that are licensed under their respec
3030
- FluentAvaloniaUI
3131
- DiscordRichPresence
3232

33-
The Discord logo is a trademark of Discord Inc. and is used in accordance with [Discord’s branding guidelines](https://discord.com/branding).
33+
The Discord logo is a trademark of Discord Inc. and is used in accordance with [Discord's branding guidelines](https://discord.com/branding).
34+
The X logo is a trademark of X Corp. and is used in accordance with [X's Brand Guidelines](https://about.x.com/en/who-we-are/brand-toolkit).
-120 KB
Binary file not shown.
3.93 KB
Loading

Source/vj0/Views/HomeView.axaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@
129129
</StackPanel>
130130
</Button>
131131

132-
<!-- Twitter button -->
133-
<Button Click="OpenTwitterAccount" Cursor="Hand" ToolTip.Tip="Twitter"
132+
<!-- X (Twitter) button -->
133+
<Button Click="OpenXAccount" Cursor="Hand" ToolTip.Tip="X"
134134
HorizontalAlignment="Stretch" Height="40" Width="40"
135135
HorizontalContentAlignment="Center"
136136
VerticalContentAlignment="Center">
137137
<StackPanel Orientation="Horizontal" Spacing="8">
138-
<avalonia:MaterialIcon Width="20" Kind="Twitter"
139-
HorizontalAlignment="Center" VerticalAlignment="Center" />
138+
<Image Source="/Assets/Brands/Scaled/X.25px.png"
139+
Width="20" IsHitTestVisible="False"/>
140140
</StackPanel>
141141
</Button>
142142
</StackPanel>

Source/vj0/Views/HomeView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void OpenGitHub(object? sender, RoutedEventArgs e)
104104
AppService.OpenLink(Globals.GITHUB_LINK);
105105
}
106106

107-
private void OpenTwitterAccount(object? sender, RoutedEventArgs e)
107+
private void OpenXAccount(object? sender, RoutedEventArgs e)
108108
{
109109
AppService.OpenLink(Globals.X_LINK);
110110
}

0 commit comments

Comments
 (0)