Merge branch 'main' into compiler-simple-improvements-and-remove-app-prefix-from-app-list

This commit is contained in:
Mr.k 2024-06-26 04:37:58 +03:00 committed by GitHub
commit c51e1970f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 397 additions and 1769 deletions

View File

@ -5,6 +5,7 @@ on:
branches: branches:
- main - main
- test* - test*
workflow_dispatch: # Manual trigger added
jobs: jobs:
build-runspace: build-runspace:

View File

@ -5,6 +5,7 @@ on:
workflows: ["Compile"] #Ensure Compile winget.ps1 is done workflows: ["Compile"] #Ensure Compile winget.ps1 is done
types: types:
- completed - completed
workflow_dispatch: # Manual trigger added
jobs: jobs:
build-runspace: build-runspace:

View File

@ -1,5 +1,6 @@
param ( param (
[switch]$Debug [switch]$Debug,
[switch]$Run
) )
$OFS = "`r`n" $OFS = "`r`n"
$scriptname = "winutil.ps1" $scriptname = "winutil.ps1"
@ -95,13 +96,6 @@ Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-
$sync.configs.$($psitem.BaseName) = $json | convertfrom-json $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
$script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" )) $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
} }
Update-Progress "Adding: Config *.cfg" 45
Get-ChildItem .\config | Where-Object {$PSItem.Extension -eq ".cfg"} | ForEach-Object {
$script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$(Get-Content $PSItem.FullName)'"))
}
Get-ChildItem .\config | Where-Object {$PSItem.Extension -eq ".cfg"} | ForEach-Object {
$script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$(Get-Content $PSItem.FullName)'"))
}
$xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''") $xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''")
@ -138,4 +132,14 @@ else {
} }
Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii
Update-Progress "Finished" 100 Write-Progress -Activity "Compiling" -Completed
if ($run){
try {
Start-Process -FilePath "pwsh" -ArgumentList ".\$scriptname"
}
catch {
Start-Process -FilePath "powershell" -ArgumentList ".\$scriptname"
}
}

View File

@ -407,7 +407,7 @@
"link": "https://discord.com/", "link": "https://discord.com/",
"winget": "Discord.Discord" "winget": "Discord.Discord"
}, },
"ditto": { "ditto": {
"category": "Utilities", "category": "Utilities",
"choco": "ditto", "choco": "ditto",
"content": "Ditto", "content": "Ditto",
@ -591,7 +591,7 @@
"link": "https://file-converter.io/", "link": "https://file-converter.io/",
"winget": "AdrienAllard.FileConverter" "winget": "AdrienAllard.FileConverter"
}, },
"files": { "files": {
"category": "Utilities", "category": "Utilities",
"choco": "files", "choco": "files",
"content": "Files", "content": "Files",
@ -975,14 +975,6 @@
"link": "https://www.oracle.com/java/", "link": "https://www.oracle.com/java/",
"winget": "EclipseAdoptium.Temurin.18.JRE" "winget": "EclipseAdoptium.Temurin.18.JRE"
}, },
"java20": {
"category": "Development",
"choco": "na",
"content": "Azul Zulu JDK 20",
"description": "Azul Zulu JDK 20 is a distribution of the OpenJDK with long-term support, performance enhancements, and security updates.",
"link": "https://www.azul.com/downloads/zulu-community/",
"winget": "Azul.Zulu.20.JDK"
},
"java21": { "java21": {
"category": "Development", "category": "Development",
"choco": "na", "choco": "na",
@ -1303,14 +1295,6 @@
"link": "https://sourceforge.net/projects/equalizerapo", "link": "https://sourceforge.net/projects/equalizerapo",
"winget": "na" "winget": "na"
}, },
"FreeFileSync": {
"category": "Utilities",
"choco": "freefilesync",
"content": "FreeFileSync",
"description": "Synchronize Files and Folders",
"link": "https://freefilesync.org",
"winget": "na"
},
"CompactGUI": { "CompactGUI": {
"category": "Utilities", "category": "Utilities",
"choco": "compactgui", "choco": "compactgui",
@ -1663,6 +1647,14 @@
"link": "https://www.plex.tv/your-media/", "link": "https://www.plex.tv/your-media/",
"winget": "Plex.PlexMediaServer" "winget": "Plex.PlexMediaServer"
}, },
"plexdesktop": {
"category": "Multimedia Tools",
"choco": "plex",
"content": "Plex Desktop",
"description": "Plex Desktop for Windows is the front end for Plex Media Server.",
"link": "https://www.plex.tv",
"winget": "Plex.Plex"
},
"Portmaster": { "Portmaster": {
"category": "Pro Tools", "category": "Pro Tools",
"choco": "portmaster", "choco": "portmaster",
@ -1831,6 +1823,14 @@
"link": "https://www.revouninstaller.com/", "link": "https://www.revouninstaller.com/",
"winget": "RevoUninstaller.RevoUninstaller" "winget": "RevoUninstaller.RevoUninstaller"
}, },
"WPFInstallWiseProgramUninstaller": {
"category": "Utilities",
"choco": "na",
"content": "Wise Program Uninstaller (WiseCleaner)",
"description": "Wise Program Uninstaller is the perfect solution for uninstalling Windows programs, allowing you to uninstall applications quickly and completely using its simple and user-friendly interface.",
"link": "https://www.wisecleaner.com/wise-program-uninstaller.html",
"winget": "WiseCleaner.WiseProgramUninstaller"
},
"revolt": { "revolt": {
"category": "Communications", "category": "Communications",
"choco": "na", "choco": "na",
@ -1871,7 +1871,7 @@
"link": "https://www.rust-lang.org/", "link": "https://www.rust-lang.org/",
"winget": "Rustlang.Rust.MSVC" "winget": "Rustlang.Rust.MSVC"
}, },
"sagethumbs": { "sagethumbs": {
"category": "Utilities", "category": "Utilities",
"choco": "sagethumbs", "choco": "sagethumbs",
"content": "SageThumbs", "content": "SageThumbs",
@ -1999,7 +1999,7 @@
"link": "http://www.uderzo.it/main_products/space_sniffer/", "link": "http://www.uderzo.it/main_products/space_sniffer/",
"winget": "UderzoSoftware.SpaceSniffer" "winget": "UderzoSoftware.SpaceSniffer"
}, },
"spotube": { "spotube": {
"category": "Multimedia Tools", "category": "Multimedia Tools",
"choco": "spotube", "choco": "spotube",
"content": "Spotube", "content": "Spotube",
@ -2503,6 +2503,14 @@
"link": "https://toys.wisecleaner.com/", "link": "https://toys.wisecleaner.com/",
"winget": "WiseCleaner.WiseToys" "winget": "WiseCleaner.WiseToys"
}, },
"WPFInstallTeraCopy": {
"category": "Utilities",
"choco": "TeraCopy",
"content": "TeraCopy",
"description": "Copy your files faster and more securely",
"link": "https://codesector.com/teracopy",
"winget": "CodeSector.TeraCopy"
},
"wizfile": { "wizfile": {
"category": "Utilities", "category": "Utilities",
"choco": "na", "choco": "na",
@ -2727,6 +2735,14 @@
"link": "https://github.com/AutoDarkMode/Windows-Auto-Night-Mode", "link": "https://github.com/AutoDarkMode/Windows-Auto-Night-Mode",
"winget": "Armin2208.WindowsAutoNightMode" "winget": "Armin2208.WindowsAutoNightMode"
}, },
"WPFInstallAmbieWhiteNoise": {
"category": "Utilities",
"choco": "na",
"content": "Ambie White Noise",
"description": "Ambie is the ultimate app to help you focus, study, or relax. We use white noise and nature sounds combined with an innovative focus timer to keep you concentrated on doing your best work.",
"link": "https://ambieapp.com/",
"winget": "9P07XNM5CHP0"
},
"magicwormhole": { "magicwormhole": {
"category": "Utilities", "category": "Utilities",
"choco": "magic-wormhole", "choco": "magic-wormhole",
@ -2735,6 +2751,14 @@
"link": "https://github.com/magic-wormhole/magic-wormhole", "link": "https://github.com/magic-wormhole/magic-wormhole",
"winget": "magic-wormhole.magic-wormhole" "winget": "magic-wormhole.magic-wormhole"
}, },
"WPFInstallcroc": {
"category": "Utilities",
"choco": "croc",
"content": "croc",
"description": "Easily and securely send things from one computer to another.",
"link": "https://github.com/schollz/croc",
"winget": "schollz.croc"
},
"qgis": { "qgis": {
"category": "Multimedia Tools", "category": "Multimedia Tools",
"choco": "qgis", "choco": "qgis",
@ -2786,11 +2810,19 @@
"ForceAutoHDR": { "ForceAutoHDR": {
"category": "Utilities", "category": "Utilities",
"choco": "na", "choco": "na",
"content": "GUI That Forces Auto HDR In Unsupported Games", "content": "ForceAutoHDR",
"description": "ForceAutoHDR simplifies the process of adding games to the AutoHDR list in the Windows Registry", "description": "ForceAutoHDR simplifies the process of adding games to the AutoHDR list in the Windows Registry",
"link": "https://github.com/7gxycn08/ForceAutoHDR", "link": "https://github.com/7gxycn08/ForceAutoHDR",
"winget": "ForceAutoHDR.7gxycn08" "winget": "ForceAutoHDR.7gxycn08"
}, },
"WPFInstallJoyToKey": {
"category": "Utilities",
"choco": "joytokey",
"content": "JoyToKey",
"description": "enables PC game controllers to emulate the keyboard and mouse input",
"link": "https://joytokey.net/en/",
"winget": "JTKsoftware.JoyToKey"
},
"nditools": { "nditools": {
"category": "Multimedia Tools", "category": "Multimedia Tools",
"choco": "na", "choco": "na",
@ -2798,5 +2830,13 @@
"description":"NDI, or Network Device Interface, is a video connectivity standard that enables multimedia systems to identify and communicate with one another over IP and to encode, transmit, and receive high-quality, low latency, frame-accurate video and audio, and exchange metadata in real-time.", "description":"NDI, or Network Device Interface, is a video connectivity standard that enables multimedia systems to identify and communicate with one another over IP and to encode, transmit, and receive high-quality, low latency, frame-accurate video and audio, and exchange metadata in real-time.",
"link": "https://ndi.video/", "link": "https://ndi.video/",
"winget": "NDI.NDITools" "winget": "NDI.NDITools"
},
"WPFInstallkicad": {
"category": "Pro Tools",
"choco": "na",
"content": "Kicad",
"description":"Kicad is an open-source EDA tool. It's a good starting point for those who want to do electrical design and is even used by professionals in the industry.",
"link": "https://www.kicad.org/",
"winget": "KiCad.KiCad"
} }
} }

View File

@ -1,227 +0,0 @@
############################################################################
# This file was created with O&O ShutUp10++ V1.9.1436
# and can be imported onto another computer.
#
# Download the application at https://www.oo-software.com/shutup10
# You can then import the file from within the program.
#
# Alternatively you can import it automatically over a command line.
# Simply use the following parameter:
# OOSU10.exe <path to file>
#
# Selecting the Option /quiet ends the app right after the import and the
# user does not get any feedback about the import.
#
# We are always happy to answer any questions you may have!
# © 2015-2023 O&O Software GmbH, Berlin. All rights reserved.
# https://www.oo-software.com/
############################################################################
P001 -
P002 -
P003 -
P004 -
P005 -
P006 -
P008 -
P026 -
P027 -
P028 -
P064 -
P065 -
P066 -
P067 -
P070 -
P069 -
P009 -
P010 -
P015 -
P068 -
P016 -
A001 -
A002 -
A003 -
A004 -
A006 -
A005 -
P007 -
P036 -
P025 -
P033 -
P023 -
P056 -
P057 -
P012 -
P034 -
P013 -
P035 -
P062 -
P063 -
P081 -
P047 -
P019 -
P048 -
P049 -
P020 -
P037 -
P011 -
P038 -
P050 -
P051 -
P018 -
P039 -
P021 -
P040 -
P022 -
P041 -
P014 -
P042 -
P052 -
P053 -
P054 -
P055 -
P029 -
P043 -
P030 -
P044 -
P031 -
P045 -
P032 -
P046 -
P058 -
P059 -
P060 -
P061 -
P071 -
P072 -
P073 -
P074 -
P075 -
P076 -
P077 -
P078 -
P079 -
P080 -
P024 -
S001 -
S002 -
S003 -
S008 -
E101 -
E201 -
E115 -
E215 -
E118 -
E218 -
E107 -
E207 -
E111 -
E211 -
E112 -
E212 -
E109 -
E209 -
E121 -
E221 -
E103 -
E203 -
E123 -
E223 -
E124 -
E224 -
E128 -
E228 -
E119 -
E219 -
E120 -
E220 -
E122 -
E222 -
E125 -
E225 -
E126 -
E226 -
E106 -
E206 -
E127 -
E227 -
E001 -
E002 -
E003 -
E008 -
E007 -
E010 -
E011 +
E012 +
E009 -
E004 -
E005 -
E013 -
E014 -
E006 -
Y001 -
Y002 -
Y003 -
Y004 -
Y005 -
Y006 -
Y007 -
C012 -
C002 -
C013 -
C007 -
C008 -
C009 -
C010 -
C011 -
C014 -
C015 -
C101 -
C201 -
C102 -
L001 -
L003 -
L004 -
L005 -
U001 -
U004 -
U005 -
U006 -
U007 -
W001 -
W011 -
W004 -
W005 -
W010 -
W009 -
P017 -
W006 -
W008 -
M006 -
M011 -
M010 -
O003 -
O001 -
S012 -
S013 -
S014 -
K001 -
K002 -
K005 -
M003 -
M015 -
M016 -
M017 -
M018 -
M019 -
M020 -
M021 -
M022 -
M001 -
M004 -
M005 -
M024 -
M012 -
M013 -
M014 -
N001 -

View File

@ -1,231 +0,0 @@
############################################################################
# This file was created with O&O ShutUp10++ V1.9.1438
# and can be imported onto another computer.
#
# Download the application at https://www.oo-software.com/shutup10
# You can then import the file from within the program.
#
# Alternatively you can import it automatically over a command line.
# Simply use the following parameter:
# OOSU10.exe <path to file>
#
# Selecting the Option /quiet ends the app right after the import and the
# user does not get any feedback about the import.
#
# We are always happy to answer any questions you may have!
# © 2015-2024 O&O Software GmbH, Berlin. All rights reserved.
# https://www.oo-software.com/
############################################################################
P001 +
P002 +
P003 +
P004 +
P005 +
P006 +
P008 +
P026 +
P027 +
P028 +
P064 +
P065 +
P066 +
P067 +
P070 +
P069 +
P009 -
P010 +
P015 +
P068 -
P016 -
A001 +
A002 +
A003 +
A004 +
A006 +
A005 +
P007 +
P036 +
P025 +
P033 +
P023 +
P056 +
P057 -
P012 -
P034 -
P013 -
P035 -
P062 -
P063 -
P081 -
P047 -
P019 -
P048 -
P049 -
P020 -
P037 -
P011 -
P038 -
P050 -
P051 -
P018 -
P039 -
P021 -
P040 -
P022 -
P041 -
P014 -
P042 -
P052 -
P053 -
P054 -
P055 -
P029 -
P043 -
P030 -
P044 -
P031 -
P045 -
P032 -
P046 -
P058 -
P059 -
P060 -
P061 -
P071 -
P072 -
P073 -
P074 -
P075 -
P076 -
P077 -
P078 -
P079 -
P080 -
P024 +
S001 +
S002 +
S003 +
S008 -
E101 +
E201 +
E115 +
E215 +
E118 +
E218 +
E107 +
E207 +
E111 +
E211 +
E112 +
E212 +
E109 +
E209 +
E121 +
E221 +
E103 +
E203 +
E123 +
E223 +
E124 +
E224 +
E128 +
E228 +
E119 -
E219 -
E120 -
E220 -
E122 -
E222 -
E125 -
E225 -
E126 -
E226 -
E106 -
E206 -
E127 -
E227 -
E001 +
E002 +
E003 +
E008 +
E007 +
E010 +
E011 +
E012 +
E009 -
E004 -
E005 -
E013 -
E014 -
E006 -
Y001 +
Y002 +
Y003 +
Y004 +
Y005 +
Y006 +
Y007 +
C012 +
C002 +
C013 +
C007 +
C008 +
C009 +
C010 +
C011 +
C014 +
C015 +
C101 +
C201 +
C102 +
C103 +
C203 +
L001 +
L003 +
L004 -
L005 -
U001 +
U004 +
U005 +
U006 +
U007 +
W001 +
W011 +
W004 -
W005 -
W010 -
W009 -
P017 +
W006 -
W008 -
M006 +
M011 -
M010 +
O003 -
O001 -
S012 -
S013 -
S014 -
K001 +
K002 +
K005 +
M003 +
M015 +
M016 +
M017 -
M018 +
M019 -
M020 +
M021 +
M022 +
M001 +
M004 +
M005 +
M024 +
M026 +
M027 +
M012 -
M013 -
M014 -
N001 -

View File

@ -5,7 +5,6 @@
"WPFTweaksHiber", "WPFTweaksHiber",
"WPFTweaksHome", "WPFTweaksHome",
"WPFTweaksLoc", "WPFTweaksLoc",
"WPFTweaksOO",
"WPFTweaksServices", "WPFTweaksServices",
"WPFTweaksStorage", "WPFTweaksStorage",
"WPFTweaksTele", "WPFTweaksTele",
@ -18,7 +17,6 @@
], ],
"Minimal": [ "Minimal": [
"WPFTweaksHome", "WPFTweaksHome",
"WPFTweaksOO",
"WPFTweaksServices", "WPFTweaksServices",
"WPFTweaksTele" "WPFTweaksTele"
] ]

View File

@ -1223,11 +1223,6 @@
"StartupType": "Automatic", "StartupType": "Automatic",
"OriginalType": "Automatic" "OriginalType": "Automatic"
}, },
{
"Name": "WwanSvc",
"StartupType": "Manual",
"OriginalType": "Manual"
},
{ {
"Name": "XblAuthManager", "Name": "XblAuthManager",
"StartupType": "Manual", "StartupType": "Manual",
@ -2313,20 +2308,6 @@
"Invoke-WPFTweakPS7 -action \"PS5\"" "Invoke-WPFTweakPS7 -action \"PS5\""
] ]
}, },
"WPFTweaksOO": {
"Content": "Run OO Shutup",
"Description": "Runs OO Shutup and applies the recommended Tweaks. https://www.oo-software.com/en/shutup10",
"category": "Essential Tweaks",
"panel": "1",
"Order": "a009_",
"ToolTip": "Runs OO Shutup and applies the recommended Tweaks https://www.oo-software.com/en/shutup10",
"InvokeScript": [
"Invoke-WPFOOSU -action \"recommended\""
],
"UndoScript": [
"Invoke-WPFOOSU -action \"undo\""
]
},
"WPFTweaksStorage": { "WPFTweaksStorage": {
"Content": "Disable Storage Sense", "Content": "Disable Storage Sense",
"Description": "Storage Sense deletes temp files automatically.", "Description": "Storage Sense deletes temp files automatically.",
@ -2342,17 +2323,15 @@
}, },
"WPFTweaksRemoveEdge": { "WPFTweaksRemoveEdge": {
"Content": "Remove Microsoft Edge - NOT RECOMMENDED", "Content": "Remove Microsoft Edge - NOT RECOMMENDED",
"Description": "Removes MS Edge when it gets reinstalled by updates.", "Description": "Removes MS Edge when it gets reinstalled by updates. Credit: AveYo",
"category": "z__Advanced Tweaks - CAUTION", "category": "z__Advanced Tweaks - CAUTION",
"panel": "1", "panel": "1",
"Order": "a029_", "Order": "a029_",
"InvokeScript": [ "InvokeScript": [
" "
#:: Standalone script by AveYo Source: https://raw.githubusercontent.com/AveYo/fox/main/Edge_Removal.bat #:: Standalone script by AveYo Source: https://raw.githubusercontent.com/AveYo/fox/main/Edge_Removal.bat
Invoke-WebRequest -Uri \"https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/edgeremoval.bat\" -OutFile \"$ENV:TEMP\\edgeremoval.bat\"
curl.exe -s \"https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/edgeremoval.bat\" -o $ENV:temp\\edgeremoval.bat
Start-Process $ENV:temp\\edgeremoval.bat Start-Process $ENV:temp\\edgeremoval.bat
" "
], ],
"UndoScript": [ "UndoScript": [
@ -2408,12 +2387,12 @@
"WPFTweaksDisableLMS1": { "WPFTweaksDisableLMS1": {
"Content": "Disable Intel MM (vPro LMS)", "Content": "Disable Intel MM (vPro LMS)",
"Description": "Intel LMS service is always listening on all ports and could be a huge security risk. There is no need to run LMS on home machines and even in the Enterprise there are better solutions.", "Description": "Intel LMS service is always listening on all ports and could be a huge security risk. There is no need to run LMS on home machines and even in the Enterprise there are better solutions.",
"category": "Essential Tweaks", "category": "z__Advanced Tweaks - CAUTION",
"panel": "1", "panel": "1",
"Order": "a0015_", "Order": "a026_",
"InvokeScript": [ "InvokeScript": [
" "
Write-Host \"Kill OneDrive process\" Write-Host \"Kill LMS\"
$serviceName = \"LMS\" $serviceName = \"LMS\"
Write-Host \"Stopping and disabling service: $serviceName\" Write-Host \"Stopping and disabling service: $serviceName\"
Stop-Service -Name $serviceName -Force -ErrorAction SilentlyContinue; Stop-Service -Name $serviceName -Force -ErrorAction SilentlyContinue;
@ -2457,8 +2436,7 @@
], ],
"UndoScript": [ "UndoScript": [
" "
Write-Host \"Install Microsoft Edge\" Write-Host \"LMS vPro needs to be redownloaded from intel.com\"
taskkill.exe /F /IM \"OneDrive.exe\"
" "
] ]
@ -3085,7 +3063,7 @@
"Type": "Toggle" "Type": "Toggle"
}, },
"WPFOOSUbutton": { "WPFOOSUbutton": {
"Content": "Customize OO Shutup Tweaks", "Content": "Run OO Shutup 10",
"category": "z__Advanced Tweaks - CAUTION", "category": "z__Advanced Tweaks - CAUTION",
"panel": "1", "panel": "1",
"Order": "a039_", "Order": "a039_",

View File

@ -31,57 +31,3 @@ function Get-LocalizedYesNo {
# Return the array of characters # Return the array of characters
return $charactersArray return $charactersArray
} }
function Get-LocalizedYesNoTakeown {
<#
.SYNOPSIS
This function runs takeown.exe and captures its output to extract yes no in a localized Windows
.DESCRIPTION
The function retrieves lines from the output of takeown.exe until there are at least 2 characters
captured in a specific format, such as "Yes=<first character>, No=<second character>".
.EXAMPLE
$yesNoArray = Get-LocalizedYesNo
Write-Host "Yes=$($yesNoArray[0]), No=$($yesNoArray[1])"
#>
# Run takeown.exe and capture its output
$takeownOutput = & takeown.exe /? | Out-String
# Parse the output and retrieve lines until there are at least 2 characters in the array
$found = $false
$charactersArray = @()
foreach ($line in $takeownOutput -split "`r`n")
{
# skip everything before /D flag help
if ($found)
{
# now that /D is found start looking for a single character in double quotes
# in help text there is another string in double quotes but it is not a single character
$regexPattern = '"([a-zA-Z])"'
$charactersArray = [regex]::Matches($line, $regexPattern) | ForEach-Object { $_.Groups[1].Value }
# if ($charactersArray.Count -gt 0) {
# Write-Output "Extracted symbols: $($matches -join ', ')"
# } else {
# Write-Output "No matches found."
# }
if ($charactersArray.Count -ge 2)
{
break
}
}
elseif ($line -match "/D ")
{
$found = $true
}
}
Write-Debug "According to takeown.exe local Yes is $charactersArray[0]"
# Return the array of characters
return $charactersArray
}

View File

@ -1,19 +1,3 @@
function Invoke-MicroWin-Helper {
<#
.SYNOPSIS
checking unit tests
.PARAMETER Name
no parameters
.EXAMPLE
placeholder
#>
}
function Test-CompatibleImage() { function Test-CompatibleImage() {
<# <#

View File

@ -178,17 +178,67 @@ $cttLogoPath = @"
$winutilTextBlock.Foreground = $foregroundColor $winutilTextBlock.Foreground = $foregroundColor
$winutilTextBlock.Margin = New-Object Windows.Thickness(10, 5, 10, 5) # Add margins around the text block $winutilTextBlock.Margin = New-Object Windows.Thickness(10, 5, 10, 5) # Add margins around the text block
$stackPanel.Children.Add($winutilTextBlock) $stackPanel.Children.Add($winutilTextBlock)
# Add TextBlock for information with text wrapping and margins # Add TextBlock for information with text wrapping and margins
$messageTextBlock = New-Object Windows.Controls.TextBlock $messageTextBlock = New-Object Windows.Controls.TextBlock
$messageTextBlock.Text = $Message
$messageTextBlock.TextWrapping = [Windows.TextWrapping]::Wrap # Enable text wrapping $messageTextBlock.TextWrapping = [Windows.TextWrapping]::Wrap # Enable text wrapping
$messageTextBlock.HorizontalAlignment = [Windows.HorizontalAlignment]::Left $messageTextBlock.HorizontalAlignment = [Windows.HorizontalAlignment]::Left
$messageTextBlock.VerticalAlignment = [Windows.VerticalAlignment]::Top $messageTextBlock.VerticalAlignment = [Windows.VerticalAlignment]::Top
$messageTextBlock.Margin = New-Object Windows.Thickness(10) # Add margins around the text block $messageTextBlock.Margin = New-Object Windows.Thickness(10) # Add margins around the text block
# Define the Regex to find hyperlinks formatted as HTML <a> tags
$regex = [regex]::new('<a href="([^"]+)">([^<]+)</a>')
$lastPos = 0
# Iterate through each match and add regular text and hyperlinks
foreach ($match in $regex.Matches($Message)) {
# Add the text before the hyperlink, if any
$textBefore = $Message.Substring($lastPos, $match.Index - $lastPos)
if ($textBefore.Length -gt 0) {
$messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($textBefore)))
}
# Create and add the hyperlink
$hyperlink = New-Object Windows.Documents.Hyperlink
$hyperlink.NavigateUri = New-Object System.Uri($match.Groups[1].Value)
$hyperlink.Inlines.Add($match.Groups[2].Value)
$hyperlink.TextDecorations = [Windows.TextDecorations]::None # Remove underline
$hyperlink.Foreground = $foregroundColor
$hyperlink.Add_Click({
param($sender, $args)
Start-Process $sender.NavigateUri.AbsoluteUri
})
$hyperlink.Add_MouseEnter({
param($sender, $args)
$sender.Foreground = [Windows.Media.Brushes]::LightGray
})
$hyperlink.Add_MouseLeave({
param($sender, $args)
$sender.Foreground = $foregroundColor
})
$messageTextBlock.Inlines.Add($hyperlink)
# Update the last position
$lastPos = $match.Index + $match.Length
}
# Add any remaining text after the last hyperlink
if ($lastPos -lt $Message.Length) {
$textAfter = $Message.Substring($lastPos)
$messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($textAfter)))
}
# If no matches, add the entire message as a run
if ($regex.Matches($Message).Count -eq 0) {
$messageTextBlock.Inlines.Add((New-Object Windows.Documents.Run($Message)))
}
# Add the TextBlock to the Grid
$grid.Children.Add($messageTextBlock) $grid.Children.Add($messageTextBlock)
[Windows.Controls.Grid]::SetRow($messageTextBlock, 1) # Set the row to the second row (0-based index) [Windows.Controls.Grid]::SetRow($messageTextBlock, 1) # Set the row to the second row (0-based index)
# Add OK button # Add OK button
$okButton = New-Object Windows.Controls.Button $okButton = New-Object Windows.Controls.Button
$okButton.Content = "OK" $okButton.Content = "OK"

View File

@ -26,7 +26,7 @@ function Invoke-WPFButton {
"WPFclear" {Invoke-WPFPresets -preset $null -imported $true} "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
"WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"} "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
"WPFtweaksbutton" {Invoke-WPFtweaksbutton} "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
"WPFOOSUbutton" {Invoke-WPFOOSU -action "customize"} "WPFOOSUbutton" {Invoke-WPFOOSU}
"WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enabled"} "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enabled"}
"WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disabled"} "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disabled"}
"WPFundoall" {Invoke-WPFundoall} "WPFundoall" {Invoke-WPFundoall}

View File

@ -1,43 +1,20 @@
function Invoke-WPFOOSU { function Invoke-WPFOOSU {
<# <#
.SYNOPSIS .SYNOPSIS
Downloads and runs OO Shutup 10 with or without config files Downloads and runs OO Shutup 10
.PARAMETER action
Specifies how OOSU should be started
customize: Opens the OOSU GUI
recommended: Loads and applies the recommended OOSU policies silently
undo: Resets all policies to factory silently
#> #>
try {
param ( $OOSU_filepath = "$ENV:temp\OOSU10.exe"
[ValidateSet("customize", "recommended", "undo")] $Initial_ProgressPreference = $ProgressPreference
[string]$action $ProgressPreference = "SilentlyContinue" # Disables the Progress Bar to drasticly speed up Invoke-WebRequest
) Invoke-WebRequest -Uri "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" -OutFile $OOSU_filepath
Write-Host "Starting OO Shutup 10 ..."
$OOSU_filepath = "$ENV:temp\OOSU10.exe" Start-Process $OOSU_filepath
}
$Initial_ProgressPreference = $ProgressPreference catch {
$ProgressPreference = "SilentlyContinue" # Disables the Progress Bar to drasticly speed up Invoke-WebRequest Write-Host "Error Downloading and Running OO Shutup 10" -ForegroundColor Red
Invoke-WebRequest -Uri "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" -OutFile $OOSU_filepath }
finally {
switch ($action) $ProgressPreference = $Initial_ProgressPreference
{
"customize"{
Write-Host "Starting OO Shutup 10 ..."
Start-Process $OOSU_filepath
}
"recommended"{
$oosu_config = "$ENV:temp\ooshutup10_recommended.cfg"
$sync.configs.ooshutup10_recommended | Out-File -FilePath $oosu_config -Force
Write-Host "Applying recommended OO Shutup 10 Policies"
Start-Process $OOSU_filepath -ArgumentList "$oosu_config /quiet" -Wait
}
"undo"{
$oosu_config = "$ENV:temp\ooshutup10_factory.cfg"
$sync.configs.ooshutup10_factory | Out-File -FilePath $oosu_config -Force
Write-Host "Resetting all OO Shutup 10 Policies"
Start-Process $OOSU_filepath -ArgumentList "$oosu_config /quiet" -Wait
}
} }
$ProgressPreference = $Initial_ProgressPreference
} }

View File

View File

@ -133,9 +133,17 @@ $sync.keys | ForEach-Object {
# Load computer information in the background # Load computer information in the background
Invoke-WPFRunspace -ScriptBlock { Invoke-WPFRunspace -ScriptBlock {
$sync.ConfigLoaded = $False try{
$sync.ComputerInfo = Get-ComputerInfo $oldProgressPreference = $ProgressPreference
$sync.ConfigLoaded = $True $ProgressPreference = "SilentlyContinue"
$sync.ConfigLoaded = $False
$sync.ComputerInfo = Get-ComputerInfo
$sync.ConfigLoaded = $True
}
finally{
$ProgressPreference = "Continue"
}
} | Out-Null } | Out-Null
#=========================================================================== #===========================================================================
@ -145,9 +153,6 @@ Invoke-WPFRunspace -ScriptBlock {
# Print the logo # Print the logo
Invoke-WPFFormVariables Invoke-WPFFormVariables
# Install Winget if not already present
Install-WinUtilWinget
# Set the titlebar # Set the titlebar
$sync["Form"].title = $sync["Form"].title + " " + $sync.version $sync["Form"].title = $sync["Form"].title + " " + $sync.version
# Set the commands that will run when the form is closed # Set the commands that will run when the form is closed
@ -467,14 +472,13 @@ $sync["AboutMenuItem"].Add_Click({
# Handle Export menu item click # Handle Export menu item click
Write-Debug "About clicked" Write-Debug "About clicked"
$sync["SettingsPopup"].IsOpen = $false $sync["SettingsPopup"].IsOpen = $false
# Example usage
$authorInfo = @" $authorInfo = @"
Author : @christitustech Author : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
Runspace : @DeveloperDurp Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>
GUI : @KonTy GUI : <a href="https://github.com/KonTy">@KonTy</a>
MicroWin : @KonTy MicroWin : <a href="https://github.com/KonTy">@KonTy</a>
GitHub : https://github.com/ChrisTitusTech/winutil GitHub : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/winutil</a>
Version : $($sync.version) Version : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
"@ "@
Show-CustomDialog -Message $authorInfo -Width 400 Show-CustomDialog -Message $authorInfo -Width 400
}) })

File diff suppressed because it is too large Load Diff

View File

@ -571,6 +571,18 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="ScrollVisibilityRectangle" TargetType="Rectangle">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=ComputedHorizontalScrollBarVisibility, ElementName=scrollViewer}" Value="Visible"/>
<Condition Binding="{Binding Path=ComputedVerticalScrollBarVisibility, ElementName=scrollViewer}" Value="Visible"/>
</MultiDataTrigger.Conditions>
<Setter Property="Visibility" Value="Visible"/>
</MultiDataTrigger>
</Style.Triggers>
</Style>
</Window.Resources> </Window.Resources>
<Grid Background="{MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch"> <Grid Background="{MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -706,13 +718,15 @@
<Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/> <Button Name="WPFclearWinget" Content=" Clear Selection" Margin="2"/>
</StackPanel> </StackPanel>
<ScrollViewer Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Padding="-1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
{{InstallPanel_applications}} {{InstallPanel_applications}}
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
<Rectangle Grid.Row="1" Grid.Column="0" Width="18" Height="18" Fill="{MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2"> <TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">