From 486589f9bcc2a1be510dc2007550e16085b06024 Mon Sep 17 00:00:00 2001 From: hariel1985 Date: Thu, 2 Apr 2026 07:07:27 +0200 Subject: [PATCH] =?UTF-8?q?v1.16=20=E2=80=94=20Remove=20PowerShell=20editi?= =?UTF-8?q?on,=20restore=20flat=20project=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PowerShell version removed — will use OV code signing certificate instead. Files moved back from src/ to project root. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/App.xaml => App.xaml | 0 src/App.xaml.cs => App.xaml.cs | 0 ...eTool.csproj => InstaSoftOfficeTool.csproj | 0 src/MainWindow.xaml => MainWindow.xaml | 0 src/MainWindow.xaml.cs => MainWindow.xaml.cs | 0 {src/Models => Models}/InstallConfig.cs | 0 {src/Models => Models}/InstalledOffice.cs | 0 {src/Models => Models}/OfficeEdition.cs | 0 {src/Models => Models}/OfficeVersion.cs | 0 {src/Pages => Pages}/ConfigPage.xaml | 0 {src/Pages => Pages}/ConfigPage.xaml.cs | 0 {src/Pages => Pages}/ConfirmDialog.xaml | 0 {src/Pages => Pages}/ConfirmDialog.xaml.cs | 0 {src/Pages => Pages}/EditionPage.xaml | 0 {src/Pages => Pages}/EditionPage.xaml.cs | 0 {src/Pages => Pages}/PreInstallCheckPage.xaml | 0 .../PreInstallCheckPage.xaml.cs | 0 {src/Pages => Pages}/ProductKeyDialog.xaml | 0 {src/Pages => Pages}/ProductKeyDialog.xaml.cs | 0 {src/Pages => Pages}/ProductKeyPage.xaml | 0 {src/Pages => Pages}/ProductKeyPage.xaml.cs | 0 {src/Pages => Pages}/ProgressPage.xaml | 0 {src/Pages => Pages}/ProgressPage.xaml.cs | 0 {src/Pages => Pages}/RemovePage.xaml | 0 {src/Pages => Pages}/RemovePage.xaml.cs | 0 {src/Pages => Pages}/SummaryPage.xaml | 0 {src/Pages => Pages}/SummaryPage.xaml.cs | 0 {src/Pages => Pages}/TroubleshootPage.xaml | 0 {src/Pages => Pages}/TroubleshootPage.xaml.cs | 0 {src/Pages => Pages}/VersionPage.xaml | 0 {src/Pages => Pages}/VersionPage.xaml.cs | 0 {src/Pages => Pages}/WelcomePage.xaml | 0 {src/Pages => Pages}/WelcomePage.xaml.cs | 0 {src/Resources => Resources}/app.ico | Bin {src/Services => Services}/LicenseManager.cs | 0 {src/Services => Services}/OdtDownloader.cs | 0 {src/Services => Services}/OdtXmlGenerator.cs | 0 {src/Services => Services}/OfficeDetector.cs | 0 {src/Services => Services}/ProcessRunner.cs | 0 {src/Styles => Styles}/ButtonStyles.xaml | 0 {src/Styles => Styles}/ControlStyles.xaml | 0 {src/Styles => Styles}/FluentTheme.xaml | 0 src/app.manifest => app.manifest | 0 powershell/InstaSoftOfficeTool.ps1 | 1155 ----------------- 44 files changed, 1155 deletions(-) rename src/App.xaml => App.xaml (100%) rename src/App.xaml.cs => App.xaml.cs (100%) rename src/InstaSoftOfficeTool.csproj => InstaSoftOfficeTool.csproj (100%) rename src/MainWindow.xaml => MainWindow.xaml (100%) rename src/MainWindow.xaml.cs => MainWindow.xaml.cs (100%) rename {src/Models => Models}/InstallConfig.cs (100%) rename {src/Models => Models}/InstalledOffice.cs (100%) rename {src/Models => Models}/OfficeEdition.cs (100%) rename {src/Models => Models}/OfficeVersion.cs (100%) rename {src/Pages => Pages}/ConfigPage.xaml (100%) rename {src/Pages => Pages}/ConfigPage.xaml.cs (100%) rename {src/Pages => Pages}/ConfirmDialog.xaml (100%) rename {src/Pages => Pages}/ConfirmDialog.xaml.cs (100%) rename {src/Pages => Pages}/EditionPage.xaml (100%) rename {src/Pages => Pages}/EditionPage.xaml.cs (100%) rename {src/Pages => Pages}/PreInstallCheckPage.xaml (100%) rename {src/Pages => Pages}/PreInstallCheckPage.xaml.cs (100%) rename {src/Pages => Pages}/ProductKeyDialog.xaml (100%) rename {src/Pages => Pages}/ProductKeyDialog.xaml.cs (100%) rename {src/Pages => Pages}/ProductKeyPage.xaml (100%) rename {src/Pages => Pages}/ProductKeyPage.xaml.cs (100%) rename {src/Pages => Pages}/ProgressPage.xaml (100%) rename {src/Pages => Pages}/ProgressPage.xaml.cs (100%) rename {src/Pages => Pages}/RemovePage.xaml (100%) rename {src/Pages => Pages}/RemovePage.xaml.cs (100%) rename {src/Pages => Pages}/SummaryPage.xaml (100%) rename {src/Pages => Pages}/SummaryPage.xaml.cs (100%) rename {src/Pages => Pages}/TroubleshootPage.xaml (100%) rename {src/Pages => Pages}/TroubleshootPage.xaml.cs (100%) rename {src/Pages => Pages}/VersionPage.xaml (100%) rename {src/Pages => Pages}/VersionPage.xaml.cs (100%) rename {src/Pages => Pages}/WelcomePage.xaml (100%) rename {src/Pages => Pages}/WelcomePage.xaml.cs (100%) rename {src/Resources => Resources}/app.ico (100%) rename {src/Services => Services}/LicenseManager.cs (100%) rename {src/Services => Services}/OdtDownloader.cs (100%) rename {src/Services => Services}/OdtXmlGenerator.cs (100%) rename {src/Services => Services}/OfficeDetector.cs (100%) rename {src/Services => Services}/ProcessRunner.cs (100%) rename {src/Styles => Styles}/ButtonStyles.xaml (100%) rename {src/Styles => Styles}/ControlStyles.xaml (100%) rename {src/Styles => Styles}/FluentTheme.xaml (100%) rename src/app.manifest => app.manifest (100%) delete mode 100644 powershell/InstaSoftOfficeTool.ps1 diff --git a/src/App.xaml b/App.xaml similarity index 100% rename from src/App.xaml rename to App.xaml diff --git a/src/App.xaml.cs b/App.xaml.cs similarity index 100% rename from src/App.xaml.cs rename to App.xaml.cs diff --git a/src/InstaSoftOfficeTool.csproj b/InstaSoftOfficeTool.csproj similarity index 100% rename from src/InstaSoftOfficeTool.csproj rename to InstaSoftOfficeTool.csproj diff --git a/src/MainWindow.xaml b/MainWindow.xaml similarity index 100% rename from src/MainWindow.xaml rename to MainWindow.xaml diff --git a/src/MainWindow.xaml.cs b/MainWindow.xaml.cs similarity index 100% rename from src/MainWindow.xaml.cs rename to MainWindow.xaml.cs diff --git a/src/Models/InstallConfig.cs b/Models/InstallConfig.cs similarity index 100% rename from src/Models/InstallConfig.cs rename to Models/InstallConfig.cs diff --git a/src/Models/InstalledOffice.cs b/Models/InstalledOffice.cs similarity index 100% rename from src/Models/InstalledOffice.cs rename to Models/InstalledOffice.cs diff --git a/src/Models/OfficeEdition.cs b/Models/OfficeEdition.cs similarity index 100% rename from src/Models/OfficeEdition.cs rename to Models/OfficeEdition.cs diff --git a/src/Models/OfficeVersion.cs b/Models/OfficeVersion.cs similarity index 100% rename from src/Models/OfficeVersion.cs rename to Models/OfficeVersion.cs diff --git a/src/Pages/ConfigPage.xaml b/Pages/ConfigPage.xaml similarity index 100% rename from src/Pages/ConfigPage.xaml rename to Pages/ConfigPage.xaml diff --git a/src/Pages/ConfigPage.xaml.cs b/Pages/ConfigPage.xaml.cs similarity index 100% rename from src/Pages/ConfigPage.xaml.cs rename to Pages/ConfigPage.xaml.cs diff --git a/src/Pages/ConfirmDialog.xaml b/Pages/ConfirmDialog.xaml similarity index 100% rename from src/Pages/ConfirmDialog.xaml rename to Pages/ConfirmDialog.xaml diff --git a/src/Pages/ConfirmDialog.xaml.cs b/Pages/ConfirmDialog.xaml.cs similarity index 100% rename from src/Pages/ConfirmDialog.xaml.cs rename to Pages/ConfirmDialog.xaml.cs diff --git a/src/Pages/EditionPage.xaml b/Pages/EditionPage.xaml similarity index 100% rename from src/Pages/EditionPage.xaml rename to Pages/EditionPage.xaml diff --git a/src/Pages/EditionPage.xaml.cs b/Pages/EditionPage.xaml.cs similarity index 100% rename from src/Pages/EditionPage.xaml.cs rename to Pages/EditionPage.xaml.cs diff --git a/src/Pages/PreInstallCheckPage.xaml b/Pages/PreInstallCheckPage.xaml similarity index 100% rename from src/Pages/PreInstallCheckPage.xaml rename to Pages/PreInstallCheckPage.xaml diff --git a/src/Pages/PreInstallCheckPage.xaml.cs b/Pages/PreInstallCheckPage.xaml.cs similarity index 100% rename from src/Pages/PreInstallCheckPage.xaml.cs rename to Pages/PreInstallCheckPage.xaml.cs diff --git a/src/Pages/ProductKeyDialog.xaml b/Pages/ProductKeyDialog.xaml similarity index 100% rename from src/Pages/ProductKeyDialog.xaml rename to Pages/ProductKeyDialog.xaml diff --git a/src/Pages/ProductKeyDialog.xaml.cs b/Pages/ProductKeyDialog.xaml.cs similarity index 100% rename from src/Pages/ProductKeyDialog.xaml.cs rename to Pages/ProductKeyDialog.xaml.cs diff --git a/src/Pages/ProductKeyPage.xaml b/Pages/ProductKeyPage.xaml similarity index 100% rename from src/Pages/ProductKeyPage.xaml rename to Pages/ProductKeyPage.xaml diff --git a/src/Pages/ProductKeyPage.xaml.cs b/Pages/ProductKeyPage.xaml.cs similarity index 100% rename from src/Pages/ProductKeyPage.xaml.cs rename to Pages/ProductKeyPage.xaml.cs diff --git a/src/Pages/ProgressPage.xaml b/Pages/ProgressPage.xaml similarity index 100% rename from src/Pages/ProgressPage.xaml rename to Pages/ProgressPage.xaml diff --git a/src/Pages/ProgressPage.xaml.cs b/Pages/ProgressPage.xaml.cs similarity index 100% rename from src/Pages/ProgressPage.xaml.cs rename to Pages/ProgressPage.xaml.cs diff --git a/src/Pages/RemovePage.xaml b/Pages/RemovePage.xaml similarity index 100% rename from src/Pages/RemovePage.xaml rename to Pages/RemovePage.xaml diff --git a/src/Pages/RemovePage.xaml.cs b/Pages/RemovePage.xaml.cs similarity index 100% rename from src/Pages/RemovePage.xaml.cs rename to Pages/RemovePage.xaml.cs diff --git a/src/Pages/SummaryPage.xaml b/Pages/SummaryPage.xaml similarity index 100% rename from src/Pages/SummaryPage.xaml rename to Pages/SummaryPage.xaml diff --git a/src/Pages/SummaryPage.xaml.cs b/Pages/SummaryPage.xaml.cs similarity index 100% rename from src/Pages/SummaryPage.xaml.cs rename to Pages/SummaryPage.xaml.cs diff --git a/src/Pages/TroubleshootPage.xaml b/Pages/TroubleshootPage.xaml similarity index 100% rename from src/Pages/TroubleshootPage.xaml rename to Pages/TroubleshootPage.xaml diff --git a/src/Pages/TroubleshootPage.xaml.cs b/Pages/TroubleshootPage.xaml.cs similarity index 100% rename from src/Pages/TroubleshootPage.xaml.cs rename to Pages/TroubleshootPage.xaml.cs diff --git a/src/Pages/VersionPage.xaml b/Pages/VersionPage.xaml similarity index 100% rename from src/Pages/VersionPage.xaml rename to Pages/VersionPage.xaml diff --git a/src/Pages/VersionPage.xaml.cs b/Pages/VersionPage.xaml.cs similarity index 100% rename from src/Pages/VersionPage.xaml.cs rename to Pages/VersionPage.xaml.cs diff --git a/src/Pages/WelcomePage.xaml b/Pages/WelcomePage.xaml similarity index 100% rename from src/Pages/WelcomePage.xaml rename to Pages/WelcomePage.xaml diff --git a/src/Pages/WelcomePage.xaml.cs b/Pages/WelcomePage.xaml.cs similarity index 100% rename from src/Pages/WelcomePage.xaml.cs rename to Pages/WelcomePage.xaml.cs diff --git a/src/Resources/app.ico b/Resources/app.ico similarity index 100% rename from src/Resources/app.ico rename to Resources/app.ico diff --git a/src/Services/LicenseManager.cs b/Services/LicenseManager.cs similarity index 100% rename from src/Services/LicenseManager.cs rename to Services/LicenseManager.cs diff --git a/src/Services/OdtDownloader.cs b/Services/OdtDownloader.cs similarity index 100% rename from src/Services/OdtDownloader.cs rename to Services/OdtDownloader.cs diff --git a/src/Services/OdtXmlGenerator.cs b/Services/OdtXmlGenerator.cs similarity index 100% rename from src/Services/OdtXmlGenerator.cs rename to Services/OdtXmlGenerator.cs diff --git a/src/Services/OfficeDetector.cs b/Services/OfficeDetector.cs similarity index 100% rename from src/Services/OfficeDetector.cs rename to Services/OfficeDetector.cs diff --git a/src/Services/ProcessRunner.cs b/Services/ProcessRunner.cs similarity index 100% rename from src/Services/ProcessRunner.cs rename to Services/ProcessRunner.cs diff --git a/src/Styles/ButtonStyles.xaml b/Styles/ButtonStyles.xaml similarity index 100% rename from src/Styles/ButtonStyles.xaml rename to Styles/ButtonStyles.xaml diff --git a/src/Styles/ControlStyles.xaml b/Styles/ControlStyles.xaml similarity index 100% rename from src/Styles/ControlStyles.xaml rename to Styles/ControlStyles.xaml diff --git a/src/Styles/FluentTheme.xaml b/Styles/FluentTheme.xaml similarity index 100% rename from src/Styles/FluentTheme.xaml rename to Styles/FluentTheme.xaml diff --git a/src/app.manifest b/app.manifest similarity index 100% rename from src/app.manifest rename to app.manifest diff --git a/powershell/InstaSoftOfficeTool.ps1 b/powershell/InstaSoftOfficeTool.ps1 deleted file mode 100644 index a40dc42..0000000 --- a/powershell/InstaSoftOfficeTool.ps1 +++ /dev/null @@ -1,1155 +0,0 @@ -#Requires -Version 5.1 -# InstaSoft Office Tool v1.14 — PowerShell Edition -# Copyright (c) InstaSoft Informatikai Zrt. 2026 -# Office deployment wizard: install, remove, license management - -# --- Request admin elevation --- -if (-not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) { - Start-Process powershell.exe -ArgumentList "-ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs - exit -} - -Add-Type -AssemblyName PresentationFramework -Add-Type -AssemblyName PresentationCore -Add-Type -AssemblyName WindowsBase -Add-Type -AssemblyName System.Net.Http - -# ============================================================ -# DATA -# ============================================================ -$script:Config = @{ - Version = 'Office2024' - Edition = $null - Architecture = '64' - Language = 'hu-hu' - ProductKey = '' - ExcludedApps = @() -} - -$script:Editions = @{ - Office2024 = @( - @{ DisplayName='Standard'; Description='Alapveto irodai alkalmazasok: Word, Excel, PowerPoint, Outlook, OneNote'; ProductId='Standard2024Volume'; Channel='PerpetualVL2024'; IsVolume=$true }, - @{ DisplayName='Professional Plus'; Description='Teljes csomag: Word, Excel, PowerPoint, Outlook, Access, Publisher, OneNote'; ProductId='ProPlus2024Volume'; Channel='PerpetualVL2024'; IsVolume=$true }, - @{ DisplayName="Otthoni `u{00e9}s kisv`u{00e1}llalati verzi`u{00f3}"; Description="Word, Excel, PowerPoint, Outlook, OneNote `u{2014} v`u{00e1}llalkoz`u{00e1}sokban is haszn`u{00e1}lhat`u{00f3}"; ProductId='HomeBusiness2024Retail'; Channel='Current'; IsVolume=$false } - ) - Office2021 = @( - @{ DisplayName='Standard'; Description='Alapveto irodai alkalmazasok: Word, Excel, PowerPoint, Outlook, OneNote'; ProductId='Standard2021Volume'; Channel='PerpetualVL2021'; IsVolume=$true }, - @{ DisplayName='Professional Plus'; Description='Teljes csomag: Word, Excel, PowerPoint, Outlook, Access, Publisher, OneNote'; ProductId='ProPlus2021Volume'; Channel='PerpetualVL2021'; IsVolume=$true }, - @{ DisplayName="Otthoni `u{00e9}s kisv`u{00e1}llalati verzi`u{00f3}"; Description="Word, Excel, PowerPoint, Outlook, OneNote `u{2014} v`u{00e1}llalkoz`u{00e1}sokban is haszn`u{00e1}lhat`u{00f3}"; ProductId='HomeBusiness2021Retail'; Channel='Current'; IsVolume=$false } - ) - Office2019 = @( - @{ DisplayName='Standard'; Description='Alapveto irodai alkalmazasok: Word, Excel, PowerPoint, Outlook, OneNote'; ProductId='Standard2019Volume'; Channel='PerpetualVL2019'; IsVolume=$true }, - @{ DisplayName='Professional Plus'; Description='Teljes csomag: Word, Excel, PowerPoint, Outlook, Access, Publisher, OneNote, Skype for Business'; ProductId='ProPlus2019Volume'; Channel='PerpetualVL2019'; IsVolume=$true }, - @{ DisplayName="Otthoni `u{00e9}s kisv`u{00e1}llalati verzi`u{00f3}"; Description="Word, Excel, PowerPoint, Outlook, OneNote `u{2014} v`u{00e1}llalkoz`u{00e1}sokban is haszn`u{00e1}lhat`u{00f3}"; ProductId='HomeBusiness2019Retail'; Channel='Current'; IsVolume=$false } - ) -} - -$script:Languages = @( - @('hu-hu','Magyar'), @('en-us','English (US)'), @('de-de','Deutsch'), - @('fr-fr','Fran\u00e7ais'), @('it-it','Italiano'), @('es-es','Espa\u00f1ol'), - @('pt-pt','Portugu\u00eas'), @('nl-nl','Nederlands'), @('pl-pl','Polski'), - @('cs-cz','\u010ce\u0161tina'), @('sk-sk','Sloven\u010dina'), @('ro-ro','Rom\u00e2n\u0103'), - @('hr-hr','Hrvatski'), @('sl-si','Sloven\u0161\u010dina'), @('sr-latn-rs','Srpski'), - @('bg-bg','Bulgarian'), @('uk-ua','Ukrainian'), @('ru-ru','Russian'), - @('tr-tr','T\u00fcrk\u00e7e'), @('ja-jp','Japanese'), @('zh-cn','Chinese'), @('ko-kr','Korean') -) - -$script:ExcludableApps = @( - @{Id='Word'; Name='Word'; Default=$true; Min='all'}, - @{Id='Excel'; Name='Excel'; Default=$true; Min='all'}, - @{Id='PowerPoint'; Name='PowerPoint'; Default=$true; Min='all'}, - @{Id='Outlook'; Name='Outlook'; Default=$true; Min='all'}, - @{Id='OneNote'; Name='OneNote'; Default=$true; Min='all'}, - @{Id='Access'; Name='Access'; Default=$true; Min='proplus'}, - @{Id='Publisher'; Name='Publisher'; Default=$true; Min='standard+'}, - @{Id='Teams'; Name='Teams'; Default=$false; Min='all'}, - @{Id='Lync'; Name='Skype for Business'; Default=$false; Min='all'} -) - -# ============================================================ -# XAML — Full UI in one window with panels -# ============================================================ -[xml]$xaml = @' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -