Merge pull request #2309 from marticliment/better-keyboard-navigation

Update licenses, disclaimer on the about page
marticliment · Jun 13, 2024 · 74109e5 · 74109e5
2 parents 16eb3d0 + ca71788
commit 74109e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/UniGetUI.Core.Data/Licenses.cs b/src/UniGetUI.Core.Data/Licenses.cs
@@ -17,13 +17,13 @@ public static class LicenseData
             // Package managers and related
             {"Winget",                  "MIT"},
             {"Scoop",                   "MIT"},
-            {"Scoop Search",            "MIT"},
+            {"scoop-search",            "MIT"},
             {"Chocolatey",              "Apache v2"},
             {"Npm",                     "Artistic License 2.0"},
             {"Pip",                     "MIT"},
-            {"Parse Pip Search",        "MIT"},
+            {"parse_pip_search",        "MIT"},
             {"PowerShell Gallery",      "Unknown"},
-            {"Dotnet Tool",             "Free (Proprietary license)"},
+            {".NET Sdk",                "MIT"},
             {"dotnet-tools-outdated",   "MIT"},
 
             // Other
@@ -46,12 +46,12 @@ public static class LicenseData
             // Package managers and related
             {"Winget",                  new Uri("https://github.com/microsoft/winget-cli/blob/master/LICENSE")},
             {"Scoop",                   new Uri("https://github.com/ScoopInstaller/Scoop/blob/master/LICENSE")},
-            {"Scoop Search",            new Uri("https://github.com/shilangyu/scoop-search/blob/master/LICENSE")},
+            {"scoop-search",            new Uri("https://github.com/shilangyu/scoop-search/blob/master/LICENSE")},
             {"Chocolatey",              new Uri("https://github.com/chocolatey/choco/blob/develop/LICENSE")},
             {"Npm",                     new Uri("https://github.com/npm/cli/blob/latest/LICENSE")},
             {"Pip",                     new Uri("https://github.com/pypa/pip/blob/main/LICENSE.txt")},
-            {"Parse Pip Search",        new Uri("https://github.com/marticliment/parseable_pip_search/blob/master/LICENSE.md")},
-            {"Dotnet Tool",             new Uri("https://dotnet.microsoft.com/en-us/platform/free")},
+            {"parse_pip_search",        new Uri("https://github.com/marticliment/parseable_pip_search/blob/master/LICENSE.md")},
+            {".NET Sdk",                new Uri("https://github.com/dotnet/sdk/blob/main/LICENSE.TXT")},
             {"dotnet-tools-outdated",   new Uri("https://github.com/rychlym/dotnet-tools-outdated/blob/master/LICENSE")},
             {"PowerShell Gallery",      new Uri("https://www.powershellgallery.com/")},
 
@@ -75,12 +75,12 @@ public static class LicenseData
             // Package managers and related
             {"Winget",                  new Uri("https://github.com/microsoft/winget-cli/")},
             {"Scoop",                   new Uri("https://github.com/ScoopInstaller/Scoop/")},
-            {"Scoop Search",            new Uri("https://github.com/shilangyu/scoop-search/")},
+            {"scoop-search",            new Uri("https://github.com/shilangyu/scoop-search/")},
             {"Chocolatey",              new Uri("https://github.com/chocolatey/choco/")},
             {"Npm",                     new Uri("https://github.com/npm/cli/")},
             {"Pip",                     new Uri("https://github.com/pypa/pip/")},
-            {"Parse Pip Search",        new Uri("https://github.com/marticliment/parseable_pip_search/")},
-            {"Dotnet Tool",             new Uri("https://github.com/dotnet/sdk/")},
+            {"parse_pip_search",        new Uri("https://github.com/marticliment/parseable_pip_search/")},
+            {".NET Sdk",                new Uri("https://dotnet.microsoft.com/")},
             {"dotnet-tools-outdated",   new Uri("https://github.com/rychlym/dotnet-tools-outdated/")},
             {"PowerShell Gallery",      new Uri("https://www.powershellgallery.com/")},
 

diff --git a/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml b/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml
@@ -16,7 +16,7 @@
             <widgets:TranslatedTextBlock x:Name="AboutHeader" Text="About WingetUI" FontSize="24" FontFamily="Segoe UI Variable Display" FontWeight="Bold"/>
             <widgets:TranslatedTextBlock Text="WingetUI is an application that makes managing your software easier, by providing an all-in-one graphical interface for your command-line package managers."/>
             <TextBlock Margin="0,10,0,10" x:Name="VersionText" Text="" FontWeight="SemiBold" FontSize="15"/>
-            <InfoBar Margin="0,10,0,10" Severity="Warning" Name="DisclaimerBanner" IsOpen="True" IsClosable="False" Title="Disclaimer" Message="WingetUI is not affiliated or related with Winget, Microsoft, nor any other package manager."/>
+            <InfoBar Margin="0,10,0,10" Severity="Warning" Name="DisclaimerBanner" IsOpen="True" IsClosable="False"/>
 
             <widgets:TranslatedTextBlock Text="Useful links" FontSize="24" FontFamily="Segoe UI Variable Display" FontWeight="Bold"/>
             <HyperlinkButton NavigateUri="https://www.marticliment.com/unigetui" HorizontalAlignment="Stretch">

diff --git a/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs b/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs
@@ -17,7 +17,8 @@ public AboutUniGetUI()
         {
             InitializeComponent();
             VersionText.Text = CoreTools.Translate("You have installed WingetUI Version {0}", CoreData.VersionName);
-
+            DisclaimerBanner.Title = CoreTools.Translate("Disclaimer");
+            DisclaimerBanner.Message = CoreTools.Translate("UniGetUI is not related to any of the compatible package managers. UniGetUI is an independent project.");
         }
     }
 }