xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2024-12-25 07:21:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes to the Get-Installed function and formatting stuff

Browse Source
This commit is contained in:
Marterich 2024-10-14 20:02:36 +02:00
parent dcf752fdeb
commit 8d34e2fa30
5 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
functions/public/Invoke-WPFGetInstalled.ps1
View File

@ -9,46 +9,45 @@ function Invoke-WPFGetInstalled {
#> #>
param($checkbox) param($checkbox)
if ($sync.ProcessRunning) {
if($sync.ProcessRunning) {
$msg = "[Invoke-WPFGetInstalled] Install process is currently running." $msg = "[Invoke-WPFGetInstalled] Install process is currently running."
[System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning) [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
return return
} }
if(($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") { if (($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
return return
} }
$preferChoco = $sync.ChocoRadioButton.IsChecked $preferChoco = $sync.ChocoRadioButton.IsChecked
$sync.ItemsControl.Dispatcher.Invoke([action]{ $sync.ItemsControl.Dispatcher.Invoke([action] {
$sync.ItemsControl.Items | ForEach-Object { $_.Visibility = [Windows.Visibility]::Collapsed} $sync.ItemsControl.Items | ForEach-Object { $_.Visibility = [Windows.Visibility]::Collapsed }
$null = $sync.itemsControl.Items.Add($sync.LoadingLabel) $null = $sync.itemsControl.Items.Add($sync.LoadingLabel)
}) })
Invoke-WPFRunspace -ArgumentList $checkbox, $preferChoco -ParameterList @(,("ShowOnlyCheckedApps",${function:Show-OnlyCheckedApps})) -DebugPreference $DebugPreference -ScriptBlock { Invoke-WPFRunspace -ParameterList @(("preferChoco", $preferChoco),("checkbox", $checkbox),("ShowOnlyCheckedApps", ${function:Show-OnlyCheckedApps})) -DebugPreference $DebugPreference -ScriptBlock {
param($checkbox, $preferChoco, $ShowOnlyCheckedApps,$DebugPreference) param (
[string]$checkbox,
[boolean]$preferChoco,
[scriptblock]$ShowOnlyCheckedApps
)
$sync.ProcessRunning = $true $sync.ProcessRunning = $true
$sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" }) $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "Indeterminate" })
if($checkbox -eq "winget") { if ($checkbox -eq "winget") {
Write-Host "Getting Installed Programs..." Write-Host "Getting Installed Programs..."
if ($preferChoco) { $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco" }
else { $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox }
} }
if($checkbox -eq "tweaks") { elseif ($checkbox -eq "tweaks") {
Write-Host "Getting Installed Tweaks..." Write-Host "Getting Installed Tweaks..."
}
if ($preferChoco -and $checkbox -eq "winget") {
$Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco"
}
else{
$Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox
} }
$sync.form.Dispatcher.invoke({ $sync.form.Dispatcher.invoke({
foreach($checkbox in $Checkboxes) { foreach ($checkbox in $Checkboxes) {
$sync.$checkbox.ischecked = $True $sync.$checkbox.ischecked = $True
} }
}) })
$sync.ItemsControl.Dispatcher.Invoke([action]{ $sync.ItemsControl.Dispatcher.Invoke([action] {
$ShowOnlyCheckedApps.Invoke($sync.SelectedApps, $sync.ItemsControl) $ShowOnlyCheckedApps.Invoke($sync.SelectedApps, $sync.ItemsControl)
$sync.ItemsControl.Items.Remove($sync.LoadingLabel) $sync.ItemsControl.Items.Remove($sync.LoadingLabel)
}) })

10
functions/public/Invoke-WPFUIApps.ps1
View File

@ -7,7 +7,7 @@ function Toggle-CategoryVisibility {
) )
$appsInCategory = $ItemsControl.Items | Where-Object { $appsInCategory = $ItemsControl.Items | Where-Object {
if ($null -ne $_.Tag){ if ($null -ne $_.Tag) {
$sync.configs.applicationsHashtable.$($_.Tag).Category -eq $Category $sync.configs.applicationsHashtable.$($_.Tag).Category -eq $Category
} }
} }
@ -55,8 +55,12 @@ function Show-OnlyCheckedApps {
[Parameter(Mandatory=$true)] [Parameter(Mandatory=$true)]
[System.Windows.Controls.ItemsControl]$ItemsControl [System.Windows.Controls.ItemsControl]$ItemsControl
) )
$sync.ShowOnlySelected = -not $sync.ShowOnlySelected # If no apps are selected, do not allow switching to show only selected
if ($sync.ShowOnlySelected) { if (($false -eq $sync.ShowOnlySelected) -and ($appKeys.Count -eq 0)) {
return
}
$sync.ShowOnlySelected = -not $sync.ShowOnlySelected
if ($sync.ShowOnlySelected) {
$sync.Buttons.ShowSelectedAppsButton.Content = "Show All" $sync.Buttons.ShowSelectedAppsButton.Content = "Show All"
foreach ($item in $ItemsControl.Items) { foreach ($item in $ItemsControl.Items) {
if ($appKeys -contains $item.Tag) { if ($appKeys -contains $item.Tag) {

1
scripts/main.ps1
View File

@ -124,7 +124,6 @@ $sync.configs.applications.PSObject.Properties | ForEach-Object {
Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1 Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1
Invoke-WPFUIApps -Apps $sync.configs.applicationsHashtable -targetGridName "appspanel" Invoke-WPFUIApps -Apps $sync.configs.applicationsHashtable -targetGridName "appspanel"
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

1
scripts/start.ps1
View File

@ -42,6 +42,7 @@ $sync.ProcessRunning = $false
$sync.selectedApps = [System.Collections.Generic.List[string]]::new() $sync.selectedApps = [System.Collections.Generic.List[string]]::new()
$sync.ShowOnlySeleced = $false $sync.ShowOnlySeleced = $false
$sync.currentTab = "Install" $sync.currentTab = "Install"
$sync.ShowOnlySelected = $false
if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) { if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {