xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2024-11-14 22:55:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup & remove nav from search effects

Browse Source
This commit is contained in:
MyDrift 2024-09-28 13:40:38 +02:00
parent e8de029483
commit 5b0ea0b373
3 changed files with 59 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
config/appnavigation.json Normal file
View File

@ -0,0 +1,54 @@
{
"WingetRadioButton": {
"Content": "Winget",
"Category": "__Package Manager",
"Type": "RadioButton",
"GroupName": "PackageManagerGroup",
"Checked": true,
"Order": "1",
"Description": "Use Winget for package management"
},
"ChocoRadioButton": {
"Content": "Chocolatey",
"Category": "__Package Manager",
"Type": "RadioButton",
"GroupName": "PackageManagerGroup",
"Checked": false,
"Order": "2",
"Description": "Use Chocolatey for package management"
},
"autofallback": {
"Content": "Auto Fallback",
"Category": "__Package Manager",
"Checked": true,
"Order": "3",
"Description": "If the selected package manager fails, automatically switch to the other one"
},
"DefaultScope": {
"Content": "Default",
"Category": "_Installation Scope",
"Type": "RadioButton",
"GroupName": "InstallationScopeGroup",
"Checked": true,
"Order": "1",
"Description": "Use the default scope of the application"
},
"UserScope": {
"Content": "User",
"Category": "_Installation Scope",
"Type": "RadioButton",
"GroupName": "InstallationScopeGroup",
"Checked": false,
"Order": "2",
"Description": "If possible, install the application only for the current user"
},
"GlobalMachineScope": {
"Content": "Global (Machine)",
"Category": "_Installation Scope",
"Type": "RadioButton",
"GroupName": "InstallationScopeGroup",
"Checked": false,
"Order": "3",
"Description": "If possible, install the application globally for all users"
}
}

3
functions/public/Invoke-WPFUIElements.ps1
View File

@ -172,7 +172,6 @@ function Invoke-WPFUIElements {
$image.Height = 40 $image.Height = 40
$image.Margin = New-Object Windows.Thickness(0, 0, 10, 0) $image.Margin = New-Object Windows.Thickness(0, 0, 10, 0)
$image.Source = $noimage $image.Source = $noimage
# TODO: use UniGetUI's image db as a fallback
if (-not [string]::IsNullOrEmpty($kaka)) { # replace kaka with $entryInfo.choco to get images, takes a lot longer but works for many packages if (-not [string]::IsNullOrEmpty($kaka)) { # replace kaka with $entryInfo.choco to get images, takes a lot longer but works for many packages
try { try {
$packageinfo = (choco info $entryInfo.choco --limit-output).Split(' ')[0] $packageinfo = (choco info $entryInfo.choco --limit-output).Split(' ')[0]
@ -183,7 +182,7 @@ function Invoke-WPFUIElements {
if ($webimage.StatusCode -eq 200) { if ($webimage.StatusCode -eq 200) {
$image.Source = [Windows.Media.Imaging.BitmapImage]::new([Uri]::new($finishediconlink)) $image.Source = [Windows.Media.Imaging.BitmapImage]::new([Uri]::new($finishediconlink))
} else { } else {
$finishediconlink = $iconlink + ".svg" # TODO: use UniGetUI's image db as a fallback
$image.Source = $noimage $image.Source = $noimage
} }
} catch { } catch {

86
scripts/main.ps1
View File

@ -115,8 +115,6 @@ Invoke-WinutilThemeChange -init $true
$noimage = "https://images.emojiterra.com/google/noto-emoji/unicode-15/color/512px/1f4e6.png" $noimage = "https://images.emojiterra.com/google/noto-emoji/unicode-15/color/512px/1f4e6.png"
$noimage = [Windows.Media.Imaging.BitmapImage]::new([Uri]::new($noimage)) $noimage = [Windows.Media.Imaging.BitmapImage]::new([Uri]::new($noimage))
Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 1
# Extract unique categories from the applications configuration # Extract unique categories from the applications configuration
$uniqueCategories = $sync.configs.applications.PSObject.Properties.Value | $uniqueCategories = $sync.configs.applications.PSObject.Properties.Value |
Where-Object { $_.Category } | Where-Object { $_.Category } |
@ -131,91 +129,15 @@ foreach ($category in $uniqueCategories) {
$categoryConfig[$sanitizedCategoryName] = [PSCustomObject]@{ $categoryConfig[$sanitizedCategoryName] = [PSCustomObject]@{
Category = "Categories" Category = "Categories"
Content = $category # Keep original category name for display Content = $category
} }
} $sync.configs.appnavigation | Add-Member -MemberType NoteProperty -Name $sanitizedCategoryName -Value $categoryConfig[$sanitizedCategoryName] -Force
# Adding dynamically two radiobuttons for "Package Manager" category with GroupName
$packageManagerConfig = @{
"WPFWingetRadioButton" = [PSCustomObject]@{
Name = "WingetRadioButton"
Content = "Winget"
Category = "__Package Manager"
Type = "RadioButton"
GroupName = "PackageManagerGroup"
Checked = $true
Order = "1"
Description = "Use Winget for package management"
}
"WPFChocoRadioButton" = [PSCustomObject]@{
Name = "ChocoRadioButton"
Content = "Chocolatey"
Category = "__Package Manager"
Type = "RadioButton"
GroupName = "PackageManagerGroup"
Checked = $false
Order = "2"
Description = "Use Chocolatey for package management"
}
"WPFautofallback" = [PSCustomObject]@{
Name = "AutoRadioButton"
Content = "Auto Fallback"
Category = "__Package Manager"
Checked = $true
Order = "3"
Description = "If the selected package manager fails, automatically switch to the other one"
}
"WPFDefaultScope" = [PSCustomObject]@{
Name = "DefaultScope"
Content = "Default"
Category = "_Installation Scope"
Type = "RadioButton"
GroupName = "InstallationScopeGroup"
Checked = $true
Order = "1"
Description = "Use the default scope of the application"
}
"WPFUserScope" = [PSCustomObject]@{
Name = "UserScope"
Content = "User"
Category = "_Installation Scope"
Type = "RadioButton"
GroupName = "InstallationScopeGroup"
Checked = $false
Order = "2"
Description = "If possible, install the application only for the current user"
}
"WPFGlobalMachineScope" = [PSCustomObject]@{
Name = "GlobalMachineScope"
Content = "Global (Machine)"
Category = "_Installation Scope"
Type = "RadioButton"
GroupName = "InstallationScopeGroup"
Checked = $false
Order = "3"
Description = "If possible, install the application globally for all users"
}
}
# Merge the packageManagerConfig with the existing category config
$finalConfig = @{}
$categoryConfig.Keys | ForEach-Object {
$finalConfig[$_] = $categoryConfig[$_]
}
$packageManagerConfig.Keys | ForEach-Object {
$finalConfig[$_] = $packageManagerConfig[$_]
}
# Convert to PSCustomObject for function input
$finalConfigObject = [PSCustomObject]@{}
$finalConfig.Keys | ForEach-Object {
Add-Member -InputObject $finalConfigObject -MemberType NoteProperty -Name $_ -Value $finalConfig[$_]
} }
# Now call the function with the final merged config # Now call the function with the final merged config
Invoke-WPFUIElements -configVariable $finalConfigObject -targetGridName "appscategory" -columncount 1 Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1
Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 1
Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2 Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2 Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2