Skip to content

Commit

Permalink
Refactring continues
Browse files Browse the repository at this point in the history
  • Loading branch information
farag2 committed Dec 10, 2024
1 parent 4477061 commit 6809e22
Show file tree
Hide file tree
Showing 116 changed files with 1,529 additions and 1,930 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ Or use an old-style format without the TAB functions autocomplete (the quotation

## Key features

* All archives are being built via GitHub Actions [automatically](https://github.com/farag2/Sophia-Script-for-Windows/actions);
* Set up Privacy & Telemetry;
* Enable DNS-over-HTTPS for IPv4;
* Turn off diagnostics tracking scheduled tasks with pop-up form written in [WPF](#screenshots);
Expand Down
20 changes: 2 additions & 18 deletions Wrapper/Config/config_Windows_10.json
Original file line number Diff line number Diff line change
Expand Up @@ -1568,10 +1568,10 @@
"Function": "InstallDotNetRuntimes -Runtimes",
"Arg": {
"Zero": {
"Tag": "NET6x64"
"Tag": "NET8x64"
},
"One": {
"Tag": "NET8x64"
"Tag": "NET9x64"
}
},
"Preset": "",
Expand Down Expand Up @@ -1609,22 +1609,6 @@
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "System",
"Control": "cmb",
"Required": "false",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable"
},
"One": {
"Tag": "Default"
}
},
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "System",
"Control": "cmb",
Expand Down
50 changes: 23 additions & 27 deletions Wrapper/Config/config_Windows_10_LTSC.json
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,9 @@
}
},
"Preset": "Zero",
"WindowsDefault": "Zero"
"WindowsDefault": "Zero",
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "UI & Personalization",
Expand Down Expand Up @@ -845,7 +847,9 @@
}
},
"Preset": "One",
"WindowsDefault": "Zero"
"WindowsDefault": "Zero",
"LTSC2019": "false",
"LTSC2021": "true"
},
{
"Region": "UI & Personalization",
Expand All @@ -861,7 +865,9 @@
}
},
"Preset": "Zero",
"WindowsDefault": "One"
"WindowsDefault": "One",
"LTSC2019": "false",
"LTSC2021": "true"
},
{
"Region": "UI & Personalization",
Expand All @@ -877,7 +883,9 @@
}
},
"Preset": "Zero",
"WindowsDefault": "Zero"
"WindowsDefault": "Zero",
"LTSC2019": "false",
"LTSC2021": "true"
},
{
"Region": "System",
Expand Down Expand Up @@ -1433,7 +1441,9 @@
}
},
"Preset": "",
"WindowsDefault": ""
"WindowsDefault": "",
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "System",
Expand Down Expand Up @@ -1487,14 +1497,16 @@
"Function": "InstallDotNetRuntimes -Runtimes",
"Arg": {
"Zero": {
"Tag": "NET6x64"
"Tag": "NET8x64"
},
"One": {
"Tag": "NET8x64"
"Tag": "NET9x64"
}
},
"Preset": "",
"WindowsDefault": ""
"WindowsDefault": "",
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "System",
Expand Down Expand Up @@ -1532,24 +1544,6 @@
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "System",
"Control": "cmb",
"Required": "false",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable"
},
"One": {
"Tag": "Default"
}
},
"Preset": "Zero",
"WindowsDefault": "",
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "System",
"Control": "cmb",
Expand All @@ -1564,7 +1558,9 @@
}
},
"Preset": "Zero",
"WindowsDefault": "One"
"WindowsDefault": "One",
"LTSC2019": "true",
"LTSC2021": "true"
},
{
"Region": "WSL",
Expand Down
36 changes: 2 additions & 34 deletions Wrapper/Config/config_Windows_11.json
Original file line number Diff line number Diff line change
Expand Up @@ -1475,10 +1475,10 @@
"Function": "InstallDotNetRuntimes -Runtimes",
"Arg": {
"Zero": {
"Tag": "NET6x64"
"Tag": "NET8x64"
},
"One": {
"Tag": "NET8x64"
"Tag": "NET9x64"
}
},
"Preset": "",
Expand Down Expand Up @@ -1516,22 +1516,6 @@
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "System",
"Control": "cmb",
"Required": "false",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable"
},
"One": {
"Tag": "Default"
}
},
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "System",
"Control": "cmb",
Expand Down Expand Up @@ -1622,22 +1606,6 @@
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "UWP apps",
"Control": "cmb",
"Required": "false",
"Function": "TeamsAutostart",
"Arg": {
"Zero": {
"Tag": "Disable"
},
"One": {
"Tag": "Enable"
}
},
"Preset": "Zero",
"WindowsDefault": "One"
},
{
"Region": "Gaming",
"Control": "cmb",
Expand Down
21 changes: 2 additions & 19 deletions Wrapper/Config/config_Windows_11_LTSC.json
Original file line number Diff line number Diff line change
Expand Up @@ -1502,10 +1502,10 @@
"Function": "InstallDotNetRuntimes -Runtimes",
"Arg": {
"Zero": {
"Tag": "NET6x64"
"Tag": "NET8x64"
},
"One": {
"Tag": "NET8x64"
"Tag": "NET9x64"
}
},
"Preset": "",
Expand Down Expand Up @@ -1546,23 +1546,6 @@
"WindowsDefault": "One",
"LTSC2024": "true"
},
{
"Region": "System",
"Control": "cmb",
"Required": "false",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable"
},
"One": {
"Tag": "Default"
}
},
"Preset": "Zero",
"WindowsDefault": "One",
"LTSC2024": "true"
},
{
"Region": "System",
"Control": "cmb",
Expand Down
24 changes: 5 additions & 19 deletions Wrapper/Localizations/de-DE/tooltip_Windows_10.json
Original file line number Diff line number Diff line change
Expand Up @@ -1379,15 +1379,15 @@
{
"Region": "System",
"Function": "InstallDotNetRuntimes -Runtimes",
"ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 6, 8 x64.",
"ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 8, 9 x64.",
"Arg": {
"Zero": {
"Tag": "NET6x64",
"ToolTip": ".NET Desktop Runtime 6 x64."
},
"One": {
"Tag": "NET8x64",
"ToolTip": ".NET Desktop Runtime 8 x64."
},
"One": {
"Tag": "NET9x64",
"ToolTip": ".NET Desktop Runtime 9 x64."
}
}
},
Expand Down Expand Up @@ -1419,20 +1419,6 @@
}
}
},
{
"Region": "System",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable",
"ToolTip": "Verhindern, dass alle internen SATA-Laufwerke im Infobereich der Taskleiste als Wechselmedien angezeigt werden."
},
"One": {
"Tag": "Default",
"ToolTip": "Anzeige aller internen SATA-Laufwerke als entfernbare Medien im Infobereich der Taskleiste (Standardeinstellung)."
}
}
},
{
"Region": "System",
"Function": "RegistryBackup",
Expand Down
38 changes: 5 additions & 33 deletions Wrapper/Localizations/de-DE/tooltip_Windows_11.json
Original file line number Diff line number Diff line change
Expand Up @@ -1313,15 +1313,15 @@
{
"Region": "System",
"Function": "InstallDotNetRuntimes -Runtimes",
"ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 6, 8 x64.",
"ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 8, 9 x64.",
"Arg": {
"Zero": {
"Tag": "NET6x64",
"ToolTip": ".NET Desktop Runtime 6 x64."
},
"One": {
"Tag": "NET8x64",
"ToolTip": ".NET Desktop Runtime 8 x64."
},
"One": {
"Tag": "NET9x64",
"ToolTip": ".NET Desktop Runtime 9 x64."
}
}
},
Expand Down Expand Up @@ -1353,20 +1353,6 @@
}
}
},
{
"Region": "System",
"Function": "SATADrivesRemovableMedia",
"Arg": {
"Zero": {
"Tag": "Disable",
"ToolTip": "Verhindern, dass alle internen SATA-Laufwerke im Infobereich der Taskleiste als Wechselmedien angezeigt werden."
},
"One": {
"Tag": "Default",
"ToolTip": "Anzeige aller internen SATA-Laufwerke als entfernbare Medien im Infobereich der Taskleiste (Standardeinstellung)."
}
}
},
{
"Region": "System",
"Function": "RegistryBackup",
Expand Down Expand Up @@ -1443,20 +1429,6 @@
}
}
},
{
"Region": "UWP apps",
"Function": "TeamsAutostart",
"Arg": {
"Zero": {
"Tag": "Disable",
"ToolTip": "Microsoft Teams-Autostart deaktivieren."
},
"One": {
"Tag": "Enable",
"ToolTip": "Microsoft Teams-Autostart aktivieren (Standardeinstellung)."
}
}
},
{
"Region": "Gaming",
"Function": "XboxGameBar",
Expand Down
1 change: 1 addition & 0 deletions Wrapper/Localizations/de-DE/ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"Options": {
"messageBoxNewWrapperFound": "Eine neue Version von 'Wrapper' wurde entdeckt.\nGitHub-Seite öffnen?",
"messageBoxNewSophiaFound": "Eine neue Version von 'Sophia Script' wurde entdeckt.\nGitHub-Seite öffnen?",
"messageBoxPS1FileHasToBeInFolder": "Die Voreinstellungsdatei Sophia.ps1 muss sich im Ordner Sophia Script befinden.",
"messageBoxDoesNotExist": "existiert nicht.",
"messageBoxPresetNotComp": "Voreinstellung ist nicht kompatibel!",
"messageBoxFilesMissingClose": "Die erforderlichen Sophia Script Wrapper-Dateien fehlen. Das Programm wird geschlossen.",
Expand Down
Loading

0 comments on commit 6809e22

Please sign in to comment.