From 128b5b2a63f502b6607d08cb8c93f626e66b0da5 Mon Sep 17 00:00:00 2001 From: XanatosX <10531466+XanatosX@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:34:21 +0100 Subject: [PATCH 1/4] Add new avalonia logo for about page Adjust gitattributes --- .gitattributes | 1 + src/ModularToolManager/Assets/built-with-avalonia.png | 3 +++ src/ModularToolManager/ModularToolManager.csproj | 2 ++ src/ModularToolManager/Views/AboutView.axaml | 5 ++--- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 src/ModularToolManager/Assets/built-with-avalonia.png diff --git a/.gitattributes b/.gitattributes index 361484f1..91a10970 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.ico filter=lfs diff=lfs merge=lfs -text +**/Assets/*.png filter=lfs diff=lfs merge=lfs -text diff --git a/src/ModularToolManager/Assets/built-with-avalonia.png b/src/ModularToolManager/Assets/built-with-avalonia.png new file mode 100644 index 00000000..b6d62854 --- /dev/null +++ b/src/ModularToolManager/Assets/built-with-avalonia.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acd3ef1d9a149a2838e2fc5cd50a54043a0749c950b5b5c74dff849f62547db0 +size 49140 diff --git a/src/ModularToolManager/ModularToolManager.csproj b/src/ModularToolManager/ModularToolManager.csproj index 29030eb6..f7c62b81 100644 --- a/src/ModularToolManager/ModularToolManager.csproj +++ b/src/ModularToolManager/ModularToolManager.csproj @@ -9,6 +9,7 @@ + @@ -16,6 +17,7 @@ + diff --git a/src/ModularToolManager/Views/AboutView.axaml b/src/ModularToolManager/Views/AboutView.axaml index 641d314c..8c4fd331 100644 --- a/src/ModularToolManager/Views/AboutView.axaml +++ b/src/ModularToolManager/Views/AboutView.axaml @@ -20,9 +20,8 @@ - - - + + + + + + + + + + + + diff --git a/src/ModularToolManager/Resources/LinkButtonStyle.axaml b/src/ModularToolManager/Resources/LinkButtonStyle.axaml index c124d74c..cbf9d009 100644 --- a/src/ModularToolManager/Resources/LinkButtonStyle.axaml +++ b/src/ModularToolManager/Resources/LinkButtonStyle.axaml @@ -27,4 +27,8 @@ + + diff --git a/src/ModularToolManager/Services/IO/GetApplicationInformationService.cs b/src/ModularToolManager/Services/IO/GetApplicationInformationService.cs index 51af6acd..a08ac3b2 100644 --- a/src/ModularToolManager/Services/IO/GetApplicationInformationService.cs +++ b/src/ModularToolManager/Services/IO/GetApplicationInformationService.cs @@ -149,4 +149,11 @@ public IEnumerable GetHotkeys() return returnHotkeys; } + + /// + /// Get the url for the avalonia UI project + /// + /// The avalonia ui project url + public string GetAvaloniaProjectUrl() => Properties.Properties.AvaloniaProjectUrl; + } diff --git a/src/ModularToolManager/ViewModels/AboutViewModel.cs b/src/ModularToolManager/ViewModels/AboutViewModel.cs index 7b8368d7..3b4bf931 100644 --- a/src/ModularToolManager/ViewModels/AboutViewModel.cs +++ b/src/ModularToolManager/ViewModels/AboutViewModel.cs @@ -46,6 +46,12 @@ internal partial class AboutViewModel : ObservableObject [ObservableProperty] private string? gitHubUserManualUrl; + /// + /// The url to open for the avalonia project + /// + [ObservableProperty] + private string? avaloniaProjectUrl; + /// /// Service used to open url /// @@ -66,6 +72,7 @@ public AboutViewModel(GetApplicationInformationService applicationInformationSer Version = applicationInformationService.GetVersion()?.ToString(); GitHubUrl = applicationInformationService.GetGithubUrl(); GitHubUserManualUrl = applicationInformationService.GetGithubUserManualUrl(); + AvaloniaProjectUrl = applicationInformationService.GetAvaloniaProjectUrl(); Dependencies = applicationInformationService.GetDependencies() .OrderBy(d => d.Name) .Select(dep => dependencyResolverService.GetDependency(provider => diff --git a/src/ModularToolManager/Views/AboutView.axaml b/src/ModularToolManager/Views/AboutView.axaml index 8c4fd331..3cbc64b9 100644 --- a/src/ModularToolManager/Views/AboutView.axaml +++ b/src/ModularToolManager/Views/AboutView.axaml @@ -21,7 +21,9 @@ - +