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 @@
-
-
-
+
+
From 7cde1330b2d463f492ed1ec61e353ad4d12e4a49 Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Thu, 4 Jan 2024 20:04:05 +0100
Subject: [PATCH 2/4] Add missing doc blocks Add style for image button Fix
issue with link style
---
src/ModularToolManager/App.axaml | 1 +
.../Properties/Properties.Designer.cs | 9 ++++++
.../Properties/Properties.resx | 3 ++
.../Resources/ImageButtonStyle.axaml | 30 +++++++++++++++++++
.../Resources/LinkButtonStyle.axaml | 4 +++
.../IO/GetApplicationInformationService.cs | 7 +++++
.../ViewModels/AboutViewModel.cs | 7 +++++
src/ModularToolManager/Views/AboutView.axaml | 4 ++-
8 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 src/ModularToolManager/Resources/ImageButtonStyle.axaml
diff --git a/src/ModularToolManager/App.axaml b/src/ModularToolManager/App.axaml
index 4da76b88..da51b512 100644
--- a/src/ModularToolManager/App.axaml
+++ b/src/ModularToolManager/App.axaml
@@ -9,6 +9,7 @@
+
diff --git a/src/ModularToolManager/Properties/Properties.Designer.cs b/src/ModularToolManager/Properties/Properties.Designer.cs
index c082c481..3b465487 100644
--- a/src/ModularToolManager/Properties/Properties.Designer.cs
+++ b/src/ModularToolManager/Properties/Properties.Designer.cs
@@ -69,6 +69,15 @@ internal static string ApplicationName {
}
}
+ ///
+ /// Looks up a localized string similar to https://avaloniaui.net/.
+ ///
+ internal static string AvaloniaProjectUrl {
+ get {
+ return ResourceManager.GetString("AvaloniaProjectUrl", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to eng.
///
diff --git a/src/ModularToolManager/Properties/Properties.resx b/src/ModularToolManager/Properties/Properties.resx
index caae8829..9ff37f96 100644
--- a/src/ModularToolManager/Properties/Properties.resx
+++ b/src/ModularToolManager/Properties/Properties.resx
@@ -120,6 +120,9 @@
Modular Tool Manager
+
+ https://avaloniaui.net/
+
eng
diff --git a/src/ModularToolManager/Resources/ImageButtonStyle.axaml b/src/ModularToolManager/Resources/ImageButtonStyle.axaml
new file mode 100644
index 00000000..c73a750a
--- /dev/null
+++ b/src/ModularToolManager/Resources/ImageButtonStyle.axaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
From 7c9b84f2c90145adea2c5f3456cf68e0ac260c53 Mon Sep 17 00:00:00 2001
From: Xanatos <10531466+XanatosX@users.noreply.github.com>
Date: Fri, 5 Jan 2024 10:35:10 +0100
Subject: [PATCH 3/4] Hide button on plugin setting page
---
src/ModularToolManager/Views/PluginSettingsView.axaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ModularToolManager/Views/PluginSettingsView.axaml b/src/ModularToolManager/Views/PluginSettingsView.axaml
index 2fc0d26c..19f57661 100644
--- a/src/ModularToolManager/Views/PluginSettingsView.axaml
+++ b/src/ModularToolManager/Views/PluginSettingsView.axaml
@@ -8,7 +8,7 @@
-
+
From 334f8db8c706d2bb5479df4c2f5bfa3f534e73e8 Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Sun, 7 Jan 2024 22:06:07 +0100
Subject: [PATCH 4/4] Hide hotkey button
---
src/ModularToolManager/Views/HotkeysView.axaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ModularToolManager/Views/HotkeysView.axaml b/src/ModularToolManager/Views/HotkeysView.axaml
index b3509387..7c792c1f 100644
--- a/src/ModularToolManager/Views/HotkeysView.axaml
+++ b/src/ModularToolManager/Views/HotkeysView.axaml
@@ -6,6 +6,6 @@
x:Class="ModularToolManager.Views.HotkeysView">
-
+