Skip to content

Commit

Permalink
Merge branch 'test-2023-11-15' of https://github.com/ChrisTitusTech/w…
Browse files Browse the repository at this point in the history
…inutil into test-2023-11-15
  • Loading branch information
ChrisTitusTech committed Nov 28, 2023
2 parents ee2cd3d + c9c989c commit e82601f
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 10 deletions.
44 changes: 40 additions & 4 deletions config/applications.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
"winget": "AnyDeskSoftwareGmbH.AnyDesk",
"choco": "anydesk"
},
"WPFInstallanki": {
"winget": "Anki.Anki",
"choco": "anki"
},
"WPFInstallaimp": {
"winget": "AIMP.AIMP",
"choco": "aimp"
Expand All @@ -45,7 +49,7 @@
},
"WPFInstallbluestacks": {
"winget": "BlueStack.BlueStacks",
"choco": "na"
"choco": "bluestacks"
},
"WPFInstallbrave": {
"winget": "Brave.Brave",
Expand All @@ -63,6 +67,10 @@
"winget": "Google.Chrome",
"choco": "googlechrome"
},
"WPFInstallcopyq": {
"winget": "copyq",
"choco": "copyq"
},
"WPFInstallchromium": {
"winget": "eloston.ungoogled-chromium",
"choco": "chromium"
Expand All @@ -71,6 +79,14 @@
"winget": "CiderCollective.Cider",
"choco": "cider"
},
"WPFInstallclink": {
"winget": "chrisant996.Clink",
"choco": "clink"
},
"WPFInstallclipgrab": {
"winget": "na",
"choco": "clipgrab"
},
"WPFInstallcpuz": {
"winget": "CPUID.CPU-Z",
"choco": "cpu-z"
Expand All @@ -83,6 +99,10 @@
"winget": "DelugeTeam.Deluge",
"choco": "deluge"
},
"WPFInstalldevtoys": {
"winget": "devtoys",
"choco": "devToys"
},
"WPFInstalldiscord": {
"winget": "Discord.Discord",
"choco": "discord"
Expand Down Expand Up @@ -149,7 +169,7 @@
},
"WPFInstallflameshot": {
"winget": "Flameshot.Flameshot",
"choco": "na"
"choco": "flameshot"
},
"WPFInstallflux": {
"winget": "flux.flux",
Expand Down Expand Up @@ -335,6 +355,10 @@
"winget": "Malwarebytes.Malwarebytes",
"choco": "malwarebytes"
},
"WPFInstallmasscode": {
"winget": "antonreshetov.massCode",
"choco": "na"
},
"WPFInstallmatrix": {
"winget": "Element.Element",
"choco": "element-desktop"
Expand Down Expand Up @@ -479,13 +503,21 @@
"winget": "Microsoft.PowerShell",
"choco": "powershell-core"
},
"WPFInstallposh": {
"winget": "JanDeDobbeleer.OhMyPosh",
"choco": "oh-my-posh"
},
"WPFInstallpowertoys": {
"winget": "Microsoft.PowerToys",
"choco": "powertoys"
},
"WPFInstallportmaster": {
"winget": "portmaster",
"choco": "portmaster"
},
"WPFInstallprismlauncher": {
"winget": "PrismLauncher.PrismLauncher",
"choco": "na"
"choco": "prismlauncher"
},
"WPFInstallprocesslasso": {
"winget": "BitSum.ProcessLasso",
Expand Down Expand Up @@ -541,7 +573,7 @@
},
"WPFInstallshell": {
"winget": "Nilesoft.Shell",
"choco": "na"
"choco": "nilesoft-shell"
},
"WPFInstallsignal": {
"winget": "OpenWhisperSystems.Signal",
Expand All @@ -567,6 +599,10 @@
"winget": "Valve.Steam",
"choco": "steam-client"
},
"WPFInstallstarship": {
"winget": "starship",
"choco": "starship"
},
"WPFInstallstrawberry": {
"winget": "StrawberryMusicPlayer.Strawberry",
"choco": "strawberrymusicplayer"
Expand Down
55 changes: 50 additions & 5 deletions winutil.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4102,6 +4102,7 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="1" Grid.Column="1" Margin="10">
<Label Content="Development" FontSize="16" Margin="5,0"/>
<CheckBox Name="WPFInstalljava20" Content="Azul Zulu JDK 20" Margin="5,0"/>
<CheckBox Name="WPFInstallclink" Content="Clink" Margin="5,0"/>
<CheckBox Name="WPFInstalldockerdesktop" Content="Docker Desktop" Margin="5,0"/>
<CheckBox Name="WPFInstallgit" Content="Git" Margin="5,0"/>
<CheckBox Name="WPFInstallgitextensions" Content="Git Extensions" Margin="5,0"/>
Expand All @@ -4116,9 +4117,11 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<CheckBox Name="WPFInstalljava8" Content="OpenJDK Java 8" Margin="5,0"/>
<CheckBox Name="WPFInstalljava16" Content="OpenJDK Java 16" Margin="5,0"/>
<CheckBox Name="WPFInstalljava18" Content="Oracle Java 18" Margin="5,0"/>
<CheckBox Name="WPFInstallposh" Content="Oh My Posh (Prompt)" Margin="5,0"/>
<CheckBox Name="WPFInstallpython3" Content="Python3" Margin="5,0"/>
<CheckBox Name="WPFInstallpostman" Content="Postman" Margin="5,0"/>
<CheckBox Name="WPFInstallrustlang" Content="Rust" Margin="5,0"/>
<CheckBox Name="WPFInstallstarship" Content="Starship (Shell Prompt)" Margin="5,0"/>
<CheckBox Name="WPFInstallsublimemerge" Content="Sublime Merge" Margin="5,0"/>
<CheckBox Name="WPFInstallsublimetext" Content="Sublime Text" Margin="5,0"/>
<CheckBox Name="WPFInstallunity" Content="Unity Game Engine" Margin="5,0"/>
Expand All @@ -4127,12 +4130,14 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<CheckBox Name="WPFInstallvscodium" Content="VS Codium" Margin="5,0"/>
<Label Content="Document" FontSize="16" Margin="5,0"/>
<CheckBox Name="WPFInstallanki" Content="Anki" Margin="5,0"/>
<CheckBox Name="WPFInstalladobe" Content="Adobe Reader DC" Margin="5,0"/>
<CheckBox Name="WPFInstallopenoffice" Content="Apache OpenOffice" Margin="5,0"/>
<CheckBox Name="WPFInstallcalibre" Content="Calibre" Margin="5,0"/>
<CheckBox Name="WPFInstallfoxpdf" Content="Foxit PDF" Margin="5,0"/>
<CheckBox Name="WPFInstalljoplin" Content="Joplin (FOSS Notes)" Margin="5,0"/>
<CheckBox Name="WPFInstalllibreoffice" Content="LibreOffice" Margin="5,0"/>
<CheckBox Name="WPFInstallmasscode" Content="massCode (Snippet Manager)" Margin="5,0"/>
<CheckBox Name="WPFInstallnaps2" Content="NAPS2 (Document Scanner)" Margin="5,0"/>
<CheckBox Name="WPFInstallnotepadplus" Content="Notepad++" Margin="5,0"/>
<CheckBox Name="WPFInstallobsidian" Content="Obsidian" Margin="5,0"/>
Expand Down Expand Up @@ -4175,6 +4180,8 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<CheckBox Name="WPFInstallaudacity" Content="Audacity" Margin="5,0"/>
<CheckBox Name="WPFInstallblender" Content="Blender (3D Graphics)" Margin="5,0"/>
<CheckBox Name="WPFInstallcider" Content="Cider (FOSS Music Player)" Margin="5,0"/>
<CheckBox Name="WPFInstallclipgrab" Content="Clipgrab" Margin="5,0"/>
<CheckBox Name="WPFInstallcopyq" Content="Copyq (Clipboard Manager)" Margin="5,0"/>
<CheckBox Name="WPFInstalleartrumpet" Content="Eartrumpet (Audio)" Margin="5,0"/>
<CheckBox Name="WPFInstallflameshot" Content="Flameshot (Screenshots)" Margin="5,0"/>
<CheckBox Name="WPFInstallfoobar" Content="Foobar2000 (Music Player)" Margin="5,0"/>
Expand Down Expand Up @@ -4208,7 +4215,8 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<CheckBox Name="WPFInstallheidisql" Content="HeidiSQL" Margin="5,0" />
<CheckBox Name="WPFInstallmremoteng" Content="mRemoteNG" Margin="5,0"/>
<CheckBox Name="WPFInstallOpenVPN" Content="OpenVPN Connect" Margin="5,0"/>
<CheckBox Name="WPFInstallputty" Content="Putty" Margin="5,0"/>
<CheckBox Name="WPFInstallportmaster" Content="Portmaster" Margin="5,0"/>
<CheckBox Name="WPFInstallputty" Content="Putty" Margin="5,0"/>
<CheckBox Name="WPFInstallrustdesk" Content="Rust Remote Desktop (FOSS)" Margin="5,0"/>
<CheckBox Name="WPFInstallsimplewall" Content="SimpleWall" Margin="5,0"/>
<CheckBox Name="WPFInstallventoy" Content="Ventoy" Margin="5,0"/>
Expand All @@ -4228,6 +4236,7 @@ $inputXML = '<Window x:Class="WinUtility.MainWindow"
<CheckBox Name="WPFInstalldeluge" Content="Deluge" Margin="5,0"/>
<CheckBox Name="WPFInstalldolphin" Content="Dolphin File manager" Margin="5,0"/>
<CheckBox Name="WPFInstallduplicati" Content="Duplicati 2" Margin="5,0"/>
<CheckBox Name="WPFInstalldevtoys" Content="Devtoys" Margin="5,0"/>
<CheckBox Name="WPFInstalletcher" Content="Etcher USB Creator" Margin="5,0"/>
<CheckBox Name="WPFInstallesearch" Content="Everything Search" Margin="5,0"/>
<CheckBox Name="WPFInstallflux" Content="f.lux Redshift" Margin="5,0"/>
Expand Down Expand Up @@ -4624,6 +4633,10 @@ $sync.configs.applications = '{
"winget": "AnyDeskSoftwareGmbH.AnyDesk",
"choco": "anydesk"
},
"WPFInstallanki": {
"winget": "Anki.Anki",
"choco": "anki"
},
"WPFInstallaimp": {
"winget": "AIMP.AIMP",
"choco": "aimp"
Expand All @@ -4646,7 +4659,7 @@ $sync.configs.applications = '{
},
"WPFInstallbluestacks": {
"winget": "BlueStack.BlueStacks",
"choco": "na"
"choco": "bluestacks"
},
"WPFInstallbrave": {
"winget": "Brave.Brave",
Expand All @@ -4664,6 +4677,10 @@ $sync.configs.applications = '{
"winget": "Google.Chrome",
"choco": "googlechrome"
},
"WPFInstallcopyq": {
"winget": "copyq",
"choco": "copyq"
},
"WPFInstallchromium": {
"winget": "eloston.ungoogled-chromium",
"choco": "chromium"
Expand All @@ -4672,6 +4689,14 @@ $sync.configs.applications = '{
"winget": "CiderCollective.Cider",
"choco": "cider"
},
"WPFInstallclink": {
"winget": "chrisant996.Clink",
"choco": "clink"
},
"WPFInstallclipgrab": {
"winget": "na",
"choco": "clipgrab"
},
"WPFInstallcpuz": {
"winget": "CPUID.CPU-Z",
"choco": "cpu-z"
Expand All @@ -4684,6 +4709,10 @@ $sync.configs.applications = '{
"winget": "DelugeTeam.Deluge",
"choco": "deluge"
},
"WPFInstalldevtoys": {
"winget": "devtoys",
"choco": "devToys"
},
"WPFInstalldiscord": {
"winget": "Discord.Discord",
"choco": "discord"
Expand Down Expand Up @@ -4750,7 +4779,7 @@ $sync.configs.applications = '{
},
"WPFInstallflameshot": {
"winget": "Flameshot.Flameshot",
"choco": "na"
"choco": "flameshot"
},
"WPFInstallflux": {
"winget": "flux.flux",
Expand Down Expand Up @@ -4936,6 +4965,10 @@ $sync.configs.applications = '{
"winget": "Malwarebytes.Malwarebytes",
"choco": "malwarebytes"
},
"WPFInstallmasscode": {
"winget": "antonreshetov.massCode",
"choco": "na"
},
"WPFInstallmatrix": {
"winget": "Element.Element",
"choco": "element-desktop"
Expand Down Expand Up @@ -5080,13 +5113,21 @@ $sync.configs.applications = '{
"winget": "Microsoft.PowerShell",
"choco": "powershell-core"
},
"WPFInstallposh": {
"winget": "JanDeDobbeleer.OhMyPosh",
"choco": "oh-my-posh"
},
"WPFInstallpowertoys": {
"winget": "Microsoft.PowerToys",
"choco": "powertoys"
},
"WPFInstallportmaster": {
"winget": "portmaster",
"choco": "portmaster"
},
"WPFInstallprismlauncher": {
"winget": "PrismLauncher.PrismLauncher",
"choco": "na"
"choco": "prismlauncher"
},
"WPFInstallprocesslasso": {
"winget": "BitSum.ProcessLasso",
Expand Down Expand Up @@ -5142,7 +5183,7 @@ $sync.configs.applications = '{
},
"WPFInstallshell": {
"winget": "Nilesoft.Shell",
"choco": "na"
"choco": "nilesoft-shell"
},
"WPFInstallsignal": {
"winget": "OpenWhisperSystems.Signal",
Expand All @@ -5168,6 +5209,10 @@ $sync.configs.applications = '{
"winget": "Valve.Steam",
"choco": "steam-client"
},
"WPFInstallstarship": {
"winget": "starship",
"choco": "starship"
},
"WPFInstallstrawberry": {
"winget": "StrawberryMusicPlayer.Strawberry",
"choco": "strawberrymusicplayer"
Expand Down
11 changes: 10 additions & 1 deletion xaml/inputXML.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@
<StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="1" Grid.Column="1" Margin="10">
<Label Content="Development" FontSize="16" Margin="5,0"/>
<CheckBox Name="WPFInstalljava20" Content="Azul Zulu JDK 20" Margin="5,0"/>
<CheckBox Name="WPFInstallclink" Content="Clink" Margin="5,0"/>
<CheckBox Name="WPFInstalldockerdesktop" Content="Docker Desktop" Margin="5,0"/>
<CheckBox Name="WPFInstallgit" Content="Git" Margin="5,0"/>
<CheckBox Name="WPFInstallgitextensions" Content="Git Extensions" Margin="5,0"/>
Expand All @@ -571,9 +572,11 @@
<CheckBox Name="WPFInstalljava8" Content="OpenJDK Java 8" Margin="5,0"/>
<CheckBox Name="WPFInstalljava16" Content="OpenJDK Java 16" Margin="5,0"/>
<CheckBox Name="WPFInstalljava18" Content="Oracle Java 18" Margin="5,0"/>
<CheckBox Name="WPFInstallposh" Content="Oh My Posh (Prompt)" Margin="5,0"/>
<CheckBox Name="WPFInstallpython3" Content="Python3" Margin="5,0"/>
<CheckBox Name="WPFInstallpostman" Content="Postman" Margin="5,0"/>
<CheckBox Name="WPFInstallrustlang" Content="Rust" Margin="5,0"/>
<CheckBox Name="WPFInstallstarship" Content="Starship (Shell Prompt)" Margin="5,0"/>
<CheckBox Name="WPFInstallsublimemerge" Content="Sublime Merge" Margin="5,0"/>
<CheckBox Name="WPFInstallsublimetext" Content="Sublime Text" Margin="5,0"/>
<CheckBox Name="WPFInstallunity" Content="Unity Game Engine" Margin="5,0"/>
Expand All @@ -582,12 +585,14 @@
<CheckBox Name="WPFInstallvscodium" Content="VS Codium" Margin="5,0"/>

<Label Content="Document" FontSize="16" Margin="5,0"/>
<CheckBox Name="WPFInstallanki" Content="Anki" Margin="5,0"/>
<CheckBox Name="WPFInstalladobe" Content="Adobe Reader DC" Margin="5,0"/>
<CheckBox Name="WPFInstallopenoffice" Content="Apache OpenOffice" Margin="5,0"/>
<CheckBox Name="WPFInstallcalibre" Content="Calibre" Margin="5,0"/>
<CheckBox Name="WPFInstallfoxpdf" Content="Foxit PDF" Margin="5,0"/>
<CheckBox Name="WPFInstalljoplin" Content="Joplin (FOSS Notes)" Margin="5,0"/>
<CheckBox Name="WPFInstalllibreoffice" Content="LibreOffice" Margin="5,0"/>
<CheckBox Name="WPFInstallmasscode" Content="massCode (Snippet Manager)" Margin="5,0"/>
<CheckBox Name="WPFInstallnaps2" Content="NAPS2 (Document Scanner)" Margin="5,0"/>
<CheckBox Name="WPFInstallnotepadplus" Content="Notepad++" Margin="5,0"/>
<CheckBox Name="WPFInstallobsidian" Content="Obsidian" Margin="5,0"/>
Expand Down Expand Up @@ -630,6 +635,8 @@
<CheckBox Name="WPFInstallaudacity" Content="Audacity" Margin="5,0"/>
<CheckBox Name="WPFInstallblender" Content="Blender (3D Graphics)" Margin="5,0"/>
<CheckBox Name="WPFInstallcider" Content="Cider (FOSS Music Player)" Margin="5,0"/>
<CheckBox Name="WPFInstallclipgrab" Content="Clipgrab" Margin="5,0"/>
<CheckBox Name="WPFInstallcopyq" Content="Copyq (Clipboard Manager)" Margin="5,0"/>
<CheckBox Name="WPFInstalleartrumpet" Content="Eartrumpet (Audio)" Margin="5,0"/>
<CheckBox Name="WPFInstallflameshot" Content="Flameshot (Screenshots)" Margin="5,0"/>
<CheckBox Name="WPFInstallfoobar" Content="Foobar2000 (Music Player)" Margin="5,0"/>
Expand Down Expand Up @@ -663,7 +670,8 @@
<CheckBox Name="WPFInstallheidisql" Content="HeidiSQL" Margin="5,0" />
<CheckBox Name="WPFInstallmremoteng" Content="mRemoteNG" Margin="5,0"/>
<CheckBox Name="WPFInstallOpenVPN" Content="OpenVPN Connect" Margin="5,0"/>
<CheckBox Name="WPFInstallputty" Content="Putty" Margin="5,0"/>
<CheckBox Name="WPFInstallportmaster" Content="Portmaster" Margin="5,0"/>
<CheckBox Name="WPFInstallputty" Content="Putty" Margin="5,0"/>
<CheckBox Name="WPFInstallrustdesk" Content="Rust Remote Desktop (FOSS)" Margin="5,0"/>
<CheckBox Name="WPFInstallsimplewall" Content="SimpleWall" Margin="5,0"/>
<CheckBox Name="WPFInstallventoy" Content="Ventoy" Margin="5,0"/>
Expand All @@ -683,6 +691,7 @@
<CheckBox Name="WPFInstalldeluge" Content="Deluge" Margin="5,0"/>
<CheckBox Name="WPFInstalldolphin" Content="Dolphin File manager" Margin="5,0"/>
<CheckBox Name="WPFInstallduplicati" Content="Duplicati 2" Margin="5,0"/>
<CheckBox Name="WPFInstalldevtoys" Content="Devtoys" Margin="5,0"/>
<CheckBox Name="WPFInstalletcher" Content="Etcher USB Creator" Margin="5,0"/>
<CheckBox Name="WPFInstallesearch" Content="Everything Search" Margin="5,0"/>
<CheckBox Name="WPFInstallflux" Content="f.lux Redshift" Margin="5,0"/>
Expand Down

0 comments on commit e82601f

Please sign in to comment.