Skip to content

Commit

Permalink
Merge pull request #49 from XanatosX/feature/39_add-missing-about-page
Browse files Browse the repository at this point in the history
Feature/39 add missing about page
  • Loading branch information
XanatosX authored Jan 31, 2023
2 parents 59d784a + b730cbf commit 66e9345
Show file tree
Hide file tree
Showing 27 changed files with 711 additions and 17 deletions.
3 changes: 2 additions & 1 deletion src/ModularToolManager/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

<Application.Styles>
<FluentTheme Mode="Dark"/>
<StyleInclude Source="avares://ModularToolManager/Icons.axaml"/>
<StyleInclude Source="avares://ModularToolManager/Resources/Icons.axaml"/>
<StyleInclude Source="avares://ModularToolManager/Resources/LinkButtonStyle.axaml"/>
</Application.Styles>

<Application.Resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public static IServiceCollection AddViewModels(this IServiceCollection collectio
.AddTransient<BoolPluginSettingViewModel>()
.AddTransient<StringPluginSettingViewModel>()
.AddTransient<IntPluginSettingViewModel>()
.AddTransient<FloatPluginSettingView>();
.AddTransient<FloatPluginSettingView>()
.AddTransient<AboutViewModel>();
}

/// <summary>
Expand Down Expand Up @@ -95,6 +96,8 @@ public static IServiceCollection AddServices(this IServiceCollection collection)
.AddSingleton<ISettingsService, SerializedSettingsService>()
.AddTransient<ViewLocator>()
.AddSingleton<PluginSettingViewModelService>()
.AddTransient<IImageService, ImageService>();
.AddTransient<IImageService, ImageService>()
.AddTransient<ResourceReaderService>()
.AddTransient<GetApplicationInformationService>();
}
}
27 changes: 27 additions & 0 deletions src/ModularToolManager/Models/DependencyModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
namespace ModularToolManager.Models;

/// <summary>
/// Model for a single dependency
/// </summary>
internal class DependencyModel
{
/// <summary>
/// The name of the dependency
/// </summary>
public string? Name { get; init; }

/// <summary>
/// The version of the dependency
/// </summary>
public string? Version { get; init; }

/// <summary>
/// The path to the license of the dependency
/// </summary>
public string? LicenseUrl { get; init; }

/// <summary>
/// The path to the project url of the dependency
/// </summary>
public string? ProjectUrl { get; init; }
}
6 changes: 6 additions & 0 deletions src/ModularToolManager/ModularToolManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
<None Remove=".gitignore" />
<None Remove="Resources\dependencies.json" />
<None Remove="Resources\LICENSE" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\dependencies.json" />
<EmbeddedResource Include="Resources\LICENSE" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.18" />
Expand Down
22 changes: 20 additions & 2 deletions src/ModularToolManager/Properties/Properties.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/ModularToolManager/Properties/Properties.resx
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,15 @@
<data name="FunctionsFile" xml:space="preserve">
<value>functions.dat</value>
</data>
<data name="GithubUrl" xml:space="preserve">
<data name="GithubIssueUrl" xml:space="preserve">
<value>https://github.com/XanatosX/ModularToolManager/issues</value>
</data>
<data name="GitHubUrl" xml:space="preserve">
<value>https://github.com/XanatosX/ModularToolManager/</value>
</data>
<data name="Icon_About" xml:space="preserve">
<value>question_circle_regular</value>
</data>
<data name="Icon_edit_function" xml:space="preserve">
<value>edit_regular</value>
</data>
Expand Down
63 changes: 63 additions & 0 deletions src/ModularToolManager/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/ModularToolManager/Properties/Resources.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="About_Dependency" xml:space="preserve">
<value>Abhängigkeiten</value>
</data>
<data name="About_License" xml:space="preserve">
<value>Lizenz</value>
</data>
<data name="About_Repository_Colon" xml:space="preserve">
<value>Repository:</value>
</data>
<data name="About_Version_Colon" xml:space="preserve">
<value>Version:</value>
</data>
<data name="AddFunction_FunctionPathWatermark" xml:space="preserve">
<value>Pfad zur Funktion</value>
</data>
Expand Down Expand Up @@ -177,6 +189,9 @@
<data name="Plugin_Url_Colon" xml:space="preserve">
<value>Projekt Link:</value>
</data>
<data name="RunningWith" xml:space="preserve">
<value>Läuft mit Avalonia UI</value>
</data>
<data name="Settings_KeepOnTop" xml:space="preserve">
<value>Immer über anderen Fenstern</value>
</data>
Expand Down
21 changes: 21 additions & 0 deletions src/ModularToolManager/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="About_Dependency" xml:space="preserve">
<value>Dependencies</value>
</data>
<data name="About_License" xml:space="preserve">
<value>License</value>
</data>
<data name="About_Repository_Colon" xml:space="preserve">
<value>Repository:</value>
</data>
<data name="About_Version_Colon" xml:space="preserve">
<value>Version:</value>
</data>
<data name="AddFunction_FunctionPathWatermark" xml:space="preserve">
<value>Path to function</value>
</data>
Expand Down Expand Up @@ -150,6 +162,12 @@
<data name="Default_Edit" xml:space="preserve">
<value>Edit</value>
</data>
<data name="Dependency_License" xml:space="preserve">
<value>License</value>
</data>
<data name="Dependency_Project" xml:space="preserve">
<value>Project</value>
</data>
<data name="FunctionSelection_SearchForFunction" xml:space="preserve">
<value>Search for function</value>
</data>
Expand Down Expand Up @@ -183,6 +201,9 @@
<data name="Plugin_Url_Colon" xml:space="preserve">
<value>Project url:</value>
</data>
<data name="RunningWith" xml:space="preserve">
<value>Running with Avalonia UI</value>
</data>
<data name="Settings_KeepOnTop" xml:space="preserve">
<value>Keep on Top</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<!-- Add Styles Here -->
<Style>
<!-- Icons from http://avaloniaui.github.io/icons.html-->
<Style.Resources>
<StreamGeometry x:Key="eye_hide_regular">M2.21967 2.21967C1.9534 2.48594 1.9292 2.9026 2.14705 3.19621L2.21967 3.28033L6.25424 7.3149C4.33225 8.66437 2.89577 10.6799 2.29888 13.0644C2.1983 13.4662 2.4425 13.8735 2.84431 13.9741C3.24613 14.0746 3.6534 13.8305 3.75399 13.4286C4.28346 11.3135 5.59112 9.53947 7.33416 8.39452L9.14379 10.2043C8.43628 10.9258 8 11.9143 8 13.0046C8 15.2138 9.79086 17.0046 12 17.0046C13.0904 17.0046 14.0788 16.5683 14.8004 15.8608L20.7197 21.7803C21.0126 22.0732 21.4874 22.0732 21.7803 21.7803C22.0466 21.5141 22.0708 21.0974 21.8529 20.8038L21.7803 20.7197L15.6668 14.6055L15.668 14.604L14.4679 13.4061L11.598 10.5368L11.6 10.536L8.71877 7.65782L8.72 7.656L7.58672 6.52549L3.28033 2.21967C2.98744 1.92678 2.51256 1.92678 2.21967 2.21967ZM10.2041 11.2655L13.7392 14.8006C13.2892 15.2364 12.6759 15.5046 12 15.5046C10.6193 15.5046 9.5 14.3853 9.5 13.0046C9.5 12.3287 9.76824 11.7154 10.2041 11.2655ZM12 5.5C10.9997 5.5 10.0291 5.64807 9.11109 5.925L10.3481 7.16119C10.8839 7.05532 11.4364 7 12 7C15.9231 7 19.3099 9.68026 20.2471 13.4332C20.3475 13.835 20.7546 14.0794 21.1565 13.9791C21.5584 13.8787 21.8028 13.4716 21.7024 13.0697C20.5994 8.65272 16.6155 5.5 12 5.5ZM12.1947 9.00928L15.996 12.81C15.8942 10.7531 14.2472 9.10764 12.1947 9.00928Z</StreamGeometry>
<StreamGeometry x:Key="dismiss_regular">M3.52499419,3.71761187 L3.61611652,3.61611652 C4.0717282,3.16050485 4.79154862,3.13013074 5.28238813,3.52499419 L5.38388348,3.61611652 L14,12.233 L22.6161165,3.61611652 C23.1042719,3.12796116 23.8957281,3.12796116 24.3838835,3.61611652 C24.8720388,4.10427189 24.8720388,4.89572811 24.3838835,5.38388348 L15.767,14 L24.3838835,22.6161165 C24.8394952,23.0717282 24.8698693,23.7915486 24.4750058,24.2823881 L24.3838835,24.3838835 C23.9282718,24.8394952 23.2084514,24.8698693 22.7176119,24.4750058 L22.6161165,24.3838835 L14,15.767 L5.38388348,24.3838835 C4.89572811,24.8720388 4.10427189,24.8720388 3.61611652,24.3838835 C3.12796116,23.8957281 3.12796116,23.1042719 3.61611652,22.6161165 L12.233,14 L3.61611652,5.38388348 C3.16050485,4.9282718 3.13013074,4.20845138 3.52499419,3.71761187 L3.61611652,3.61611652 L3.52499419,3.71761187 Z</StreamGeometry>
Expand All @@ -16,6 +17,7 @@
<StreamGeometry x:Key="add_circle_regular">M14,2 C20.627417,2 26,7.372583 26,14 C26,20.627417 20.627417,26 14,26 C7.372583,26 2,20.627417 2,14 C2,7.372583 7.372583,2 14,2 Z M14,3.5 C8.20101013,3.5 3.5,8.20101013 3.5,14 C3.5,19.7989899 8.20101013,24.5 14,24.5 C19.7989899,24.5 24.5,19.7989899 24.5,14 C24.5,8.20101013 19.7989899,3.5 14,3.5 Z M14,8 C14.4142136,8 14.75,8.33578644 14.75,8.75 L14.75,13.25 L19.25,13.25 C19.6642136,13.25 20,13.5857864 20,14 C20,14.4142136 19.6642136,14.75 19.25,14.75 L14.75,14.75 L14.75,19.25 C14.75,19.6642136 14.4142136,20 14,20 C13.5857864,20 13.25,19.6642136 13.25,19.25 L13.25,14.75 L8.75,14.75 C8.33578644,14.75 8,14.4142136 8,14 C8,13.5857864 8.33578644,13.25 8.75,13.25 L13.25,13.25 L13.25,8.75 C13.25,8.33578644 13.5857864,8 14,8 Z</StreamGeometry>
<StreamGeometry x:Key="edit_regular">M27.3138 4.68622C28.8759 6.24832 28.8759 8.78098 27.3138 10.3431L12.5409 25.116C11.9001 25.7568 11.0972 26.2114 10.218 26.4312L5.63602 27.5767C4.90364 27.7598 4.24025 27.0964 4.42335 26.364L5.56885 21.782C5.78864 20.9028 6.24323 20.0999 6.88402 19.4591L21.6569 4.68622C23.219 3.12412 25.7517 3.12412 27.3138 4.68622ZM20.2426 8.92865L8.29824 20.8734C7.91376 21.2578 7.641 21.7396 7.50913 22.2671L6.76786 25.2322L9.73295 24.4909C10.2604 24.359 10.7422 24.0863 11.1267 23.7018L23.0706 11.7566L20.2426 8.92865ZM23.0712 6.10043L21.6566 7.51465L24.4846 10.3426L25.8996 8.92886C26.6806 8.14781 26.6806 6.88148 25.8996 6.10043C25.1185 5.31939 23.8522 5.31939 23.0712 6.10043Z</StreamGeometry>
<StreamGeometry x:Key="delete_regular">M24,7.25 C27.1017853,7.25 29.629937,9.70601719 29.7458479,12.7794443 L29.75,13 L37,13 C37.6903559,13 38.25,13.5596441 38.25,14.25 C38.25,14.8972087 37.7581253,15.4295339 37.1278052,15.4935464 L37,15.5 L35.909,15.5 L34.2058308,38.0698451 C34.0385226,40.2866784 32.1910211,42 29.9678833,42 L18.0321167,42 C15.8089789,42 13.9614774,40.2866784 13.7941692,38.0698451 L12.09,15.5 L11,15.5 C10.3527913,15.5 9.8204661,15.0081253 9.75645361,14.3778052 L9.75,14.25 C9.75,13.6027913 10.2418747,13.0704661 10.8721948,13.0064536 L11,13 L18.25,13 C18.25,9.82436269 20.8243627,7.25 24,7.25 Z M33.4021054,15.5 L14.5978946,15.5 L16.2870795,37.8817009 C16.3559711,38.7945146 17.116707,39.5 18.0321167,39.5 L29.9678833,39.5 C30.883293,39.5 31.6440289,38.7945146 31.7129205,37.8817009 L33.4021054,15.5 Z M27.25,20.75 C27.8972087,20.75 28.4295339,21.2418747 28.4935464,21.8721948 L28.5,22 L28.5,33 C28.5,33.6903559 27.9403559,34.25 27.25,34.25 C26.6027913,34.25 26.0704661,33.7581253 26.0064536,33.1278052 L26,33 L26,22 C26,21.3096441 26.5596441,20.75 27.25,20.75 Z M20.75,20.75 C21.3972087,20.75 21.9295339,21.2418747 21.9935464,21.8721948 L22,22 L22,33 C22,33.6903559 21.4403559,34.25 20.75,34.25 C20.1027913,34.25 19.5704661,33.7581253 19.5064536,33.1278052 L19.5,33 L19.5,22 C19.5,21.3096441 20.0596441,20.75 20.75,20.75 Z M24,9.75 C22.2669685,9.75 20.8507541,11.1064548 20.7551448,12.8155761 L20.75,13 L27.25,13 C27.25,11.2050746 25.7949254,9.75 24,9.75 Z</StreamGeometry>
<StreamGeometry x:Key="question_circle_regular">M24 4C35.0457 4 44 12.9543 44 24C44 35.0457 35.0457 44 24 44C12.9543 44 4 35.0457 4 24C4 12.9543 12.9543 4 24 4ZM24 6.5C14.335 6.5 6.5 14.335 6.5 24C6.5 33.665 14.335 41.5 24 41.5C33.665 41.5 41.5 33.665 41.5 24C41.5 14.335 33.665 6.5 24 6.5ZM24.25 32C25.0784 32 25.75 32.6716 25.75 33.5C25.75 34.3284 25.0784 35 24.25 35C23.4216 35 22.75 34.3284 22.75 33.5C22.75 32.6716 23.4216 32 24.25 32ZM24.25 13C27.6147 13 30.5 15.8821 30.5 19.2488C30.502 21.3691 29.7314 22.7192 27.8216 24.7772L26.8066 25.8638C25.7842 27.0028 25.3794 27.7252 25.3409 28.5793L25.3379 28.7411L25.3323 28.8689L25.3143 28.9932C25.2018 29.5636 24.7009 29.9957 24.0968 30.0001C23.4065 30.0049 22.8428 29.4493 22.8379 28.7589C22.8251 26.9703 23.5147 25.7467 25.1461 23.9739L26.1734 22.8762C27.5312 21.3837 28.0012 20.503 28 19.25C28 17.2634 26.2346 15.5 24.25 15.5C22.3307 15.5 20.6142 17.1536 20.5055 19.0587L20.4935 19.3778C20.4295 20.0081 19.8972 20.5 19.25 20.5C18.5596 20.5 18 19.9404 18 19.25C18 15.8846 20.8864 13 24.25 13Z</StreamGeometry>
</Style.Resources>
</Style>
</Styles>
21 changes: 21 additions & 0 deletions src/ModularToolManager/Resources/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 XanatosX

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
29 changes: 29 additions & 0 deletions src/ModularToolManager/Resources/LinkButtonStyle.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.PreviewWith>
<Border Padding="20">
<Button Classes="link" Content="http://This.is.a/awesome/link"/>
</Border>
</Design.PreviewWith>

<Style Selector="Button.link">
<Setter Property="Foreground" Value="LightBlue"/>
<Setter Property="Padding" Value="0" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Template">
<ControlTemplate>
<ContentPresenter Content="{TemplateBinding Content}">
<ContentPresenter.Styles>
<Style Selector="TextBlock">
<Setter Property="Foreground" Value="{TemplateBinding Foreground}"/>
<Setter Property="FontSize" Value="{TemplateBinding FontSize}"/>
<Setter Property="TextDecorations" Value="Underline"/>
</Style>
</ContentPresenter.Styles>
</ContentPresenter>
</ControlTemplate>
</Setter>
</Style>
</Styles>
50 changes: 50 additions & 0 deletions src/ModularToolManager/Resources/dependencies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"Name": "Avalonia",
"Version": "0.10.18",
"ProjectUrl": "https://avaloniaui.net/",
"LicenseUrl": "https://licenses.nuget.org/MIT"
},
{
"Name": "Avalonia.Desktop",
"Version": "0.10.18",
"ProjectUrl": "https://avaloniaui.net/",
"LicenseUrl": "https://licenses.nuget.org/MIT"
},
{
"Name": "Avalonia.Diagnostics",
"Version": "0.10.18",
"ProjectUrl": "https://avaloniaui.net/",
"LicenseUrl": "https://licenses.nuget.org/MIT"
},
{
"Name": "CommunityToolkit.Mvvm",
"Version": "8.0.0",
"ProjectUrl": "https://github.com/CommunityToolkit/dotnet",
"LicenseUrl": "https://licenses.nuget.org/MIT"
},
{
"Name": "Microsoft.Extensions.DependencyInjection",
"Version": "7.0.0",
"ProjectUrl": "https://dot.net",
"LicenseUrl": "https://licenses.nuget.org/MIT"
},
{
"Name": "Serilog",
"Version": "2.12.0",
"ProjectUrl": "https://serilog.net/",
"LicenseUrl": "https://licenses.nuget.org/Apache-2.0"
},
{
"Name": "Serilog.Extensions.Logging",
"Version": "3.1.0",
"ProjectUrl": "https://serilog.net/",
"LicenseUrl": "https://licenses.nuget.org/Apache-2.0"
},
{
"Name": "Serilog.Sinks.File",
"Version": "5.0.0",
"ProjectUrl": "https://serilog.net/",
"LicenseUrl": "https://licenses.nuget.org/Apache-2.0"
}
]
Loading

0 comments on commit 66e9345

Please sign in to comment.