v1.07 — Pre-install Office check before installation
- New PreInstallCheckPage between Summary and Progress - Detects existing Office installs, offers removal before new install - License cleanup option included - Skip button to proceed without removal - Auto-proceeds to install after removal completes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hariel1985
67
Pages/PreInstallCheckPage.xaml
Normal file
67
Pages/PreInstallCheckPage.xaml
Normal file
@@ -0,0 +1,67 @@
|
||||
<Page x:Class="InstaSoftOfficeTool.Pages.PreInstallCheckPage"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Background="Transparent">
|
||||
|
||||
<Grid Margin="40,30">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<StackPanel Grid.Row="0" Margin="0,0,0,16">
|
||||
<TextBlock Text="Meglévő Office ellenőrzése" FontSize="24" FontWeight="Light"/>
|
||||
<TextBlock x:Name="SubtitleText" FontSize="14"
|
||||
Foreground="{StaticResource TextSecondaryBrush}" Margin="0,4,0,0"/>
|
||||
</StackPanel>
|
||||
|
||||
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel>
|
||||
<StackPanel x:Name="OfficeListPanel"/>
|
||||
|
||||
<!-- No office found card -->
|
||||
<Border x:Name="NoOfficeCard" Visibility="Collapsed"
|
||||
Background="{StaticResource CardBrush}" CornerRadius="8"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
Padding="16,14">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="" FontFamily="Segoe MDL2 Assets" FontSize="18"
|
||||
Foreground="{StaticResource SuccessBrush}" VerticalAlignment="Center"
|
||||
Margin="0,0,12,0"/>
|
||||
<TextBlock Text="Nem található telepített Office. A telepítés indítható."
|
||||
FontSize="14" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- License cleanup -->
|
||||
<Border x:Name="LicenseCleanupPanel" Margin="0,12,0,0" Visibility="Collapsed"
|
||||
Background="{StaticResource CardBrush}" CornerRadius="8"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
Padding="16,12">
|
||||
<CheckBox x:Name="CbCleanLicense" Style="{StaticResource FluentCheckBox}"
|
||||
Content="Licenc-adatbázis tisztítása is (ajánlott)"
|
||||
IsChecked="True"/>
|
||||
</Border>
|
||||
|
||||
<!-- Log -->
|
||||
<Border x:Name="LogPanel" Margin="0,12,0,0" Background="#F8F8F8"
|
||||
CornerRadius="6" Padding="12" Visibility="Collapsed"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1">
|
||||
<TextBox x:Name="LogText" FontFamily="Consolas" FontSize="11"
|
||||
TextWrapping="Wrap" Foreground="{StaticResource TextSecondaryBrush}"
|
||||
IsReadOnly="True" Background="Transparent" BorderThickness="0"
|
||||
VerticalScrollBarVisibility="Auto" AcceptsReturn="True" MaxHeight="150"/>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
|
||||
<!-- Buttons -->
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
|
||||
<Button x:Name="BtnSkip" Content="Kihagyás, telepítés folytatása"
|
||||
Style="{StaticResource SecondaryButton}" Click="BtnSkip_Click" Margin="0,0,8,0"/>
|
||||
<Button x:Name="BtnRemove" Content="Eltávolítás, majd telepítés"
|
||||
Style="{StaticResource PrimaryButton}" Click="BtnRemove_Click" Visibility="Collapsed"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Page>
|
||||
139
Pages/PreInstallCheckPage.xaml.cs
Normal file
139
Pages/PreInstallCheckPage.xaml.cs
Normal file
@@ -0,0 +1,139 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using InstaSoftOfficeTool.Models;
|
||||
using InstaSoftOfficeTool.Services;
|
||||
|
||||
namespace InstaSoftOfficeTool.Pages
|
||||
{
|
||||
public partial class PreInstallCheckPage : Page
|
||||
{
|
||||
private readonly MainWindow _main;
|
||||
private List<InstalledOffice> _detected;
|
||||
|
||||
public PreInstallCheckPage(MainWindow main)
|
||||
{
|
||||
InitializeComponent();
|
||||
_main = main;
|
||||
Loaded += (s, e) => DetectOffice();
|
||||
}
|
||||
|
||||
private void DetectOffice()
|
||||
{
|
||||
_detected = OfficeDetector.Detect();
|
||||
OfficeListPanel.Children.Clear();
|
||||
|
||||
if (_detected.Count == 0)
|
||||
{
|
||||
SubtitleText.Text = "Nincs kor\u00e1bbi Office telep\u00edt\u00e9s a g\u00e9pen.";
|
||||
NoOfficeCard.Visibility = Visibility.Visible;
|
||||
BtnRemove.Visibility = Visibility.Collapsed;
|
||||
LicenseCleanupPanel.Visibility = Visibility.Collapsed;
|
||||
BtnSkip.Content = "Tov\u00e1bb a telep\u00edt\u00e9shez \u2192";
|
||||
return;
|
||||
}
|
||||
|
||||
SubtitleText.Text = "A sz\u00e1m\u00edt\u00f3g\u00e9pen tal\u00e1lt Office telep\u00edt\u00e9sek. Az \u00faj Office telep\u00edt\u00e9se el\u0151tt aj\u00e1nlott elt\u00e1vol\u00edtani.";
|
||||
BtnRemove.Visibility = Visibility.Visible;
|
||||
LicenseCleanupPanel.Visibility = Visibility.Visible;
|
||||
|
||||
foreach (var office in _detected)
|
||||
{
|
||||
var cb = new CheckBox
|
||||
{
|
||||
Content = office.DisplayName +
|
||||
(string.IsNullOrEmpty(office.Version) ? "" : " (" + office.Version + ")"),
|
||||
IsChecked = true,
|
||||
Style = (Style)FindResource("FluentCheckBox"),
|
||||
Tag = office,
|
||||
Margin = new Thickness(0, 4, 0, 4),
|
||||
FontSize = 14
|
||||
};
|
||||
OfficeListPanel.Children.Add(cb);
|
||||
}
|
||||
}
|
||||
|
||||
private void BtnSkip_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
_main.ProceedToInstall();
|
||||
}
|
||||
|
||||
private async void BtnRemove_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
BtnRemove.IsEnabled = false;
|
||||
BtnSkip.IsEnabled = false;
|
||||
LogPanel.Visibility = Visibility.Visible;
|
||||
|
||||
bool hasC2R = false;
|
||||
foreach (UIElement child in OfficeListPanel.Children)
|
||||
{
|
||||
if (child is CheckBox cb && cb.IsChecked == true)
|
||||
{
|
||||
var office = (InstalledOffice)cb.Tag;
|
||||
if (office.IsClickToRun)
|
||||
{
|
||||
hasC2R = true;
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(office.ProductCode))
|
||||
{
|
||||
AppendLog("MSI elt\u00e1vol\u00edt\u00e1s: " + office.DisplayName);
|
||||
var runner = new ProcessRunner();
|
||||
runner.OutputReceived += msg => Dispatcher.Invoke(() => AppendLog(msg));
|
||||
await runner.RunAsync("msiexec", "/x " + office.ProductCode + " /qb");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (hasC2R)
|
||||
{
|
||||
AppendLog("Click-to-Run Office elt\u00e1vol\u00edt\u00e1sa...");
|
||||
var downloader = new OdtDownloader();
|
||||
downloader.StatusChanged += msg => Dispatcher.Invoke(() => AppendLog(msg));
|
||||
|
||||
bool ok = await downloader.DownloadAndExtractAsync();
|
||||
if (ok)
|
||||
{
|
||||
string removeXml = OdtXmlGenerator.GenerateRemoveAll();
|
||||
string xmlPath = Path.Combine(downloader.OdtFolder, "remove.xml");
|
||||
File.WriteAllText(xmlPath, removeXml);
|
||||
|
||||
int exitCode = await downloader.RunRemoveAsync(xmlPath,
|
||||
msg => Dispatcher.Invoke(() => AppendLog(msg)));
|
||||
|
||||
AppendLog(exitCode == 0
|
||||
? "Office sikeresen elt\u00e1vol\u00edtva."
|
||||
: "Elt\u00e1vol\u00edt\u00e1s befejez\u0151d\u00f6tt (k\u00f3d: " + exitCode + ")");
|
||||
}
|
||||
}
|
||||
|
||||
if (CbCleanLicense.IsChecked == true)
|
||||
{
|
||||
AppendLog("Licenc-adatb\u00e1zis tiszt\u00edt\u00e1sa...");
|
||||
var lm = new LicenseManager();
|
||||
if (lm.FindOspp())
|
||||
{
|
||||
var cleanResult = await lm.RemoveAllKeysAsync();
|
||||
AppendLog(cleanResult);
|
||||
}
|
||||
else
|
||||
{
|
||||
AppendLog("Az ospp.vbs nem tal\u00e1lhat\u00f3 \u2014 licenc-tiszt\u00edt\u00e1s kihagyva.");
|
||||
}
|
||||
}
|
||||
|
||||
AppendLog("K\u00e9sz. Tov\u00e1bbl\u00e9p\u00e9s az \u00faj Office telep\u00edt\u00e9s\u00e9hez...");
|
||||
|
||||
// Auto-proceed to install after short delay
|
||||
await System.Threading.Tasks.Task.Delay(1500);
|
||||
_main.ProceedToInstall();
|
||||
}
|
||||
|
||||
private void AppendLog(string text)
|
||||
{
|
||||
LogText.Text += DateTime.Now.ToString("HH:mm:ss") + " " + text + "\n";
|
||||
LogText.ScrollToEnd();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user