Wizard improvements: version info, 64-bit label, paste fix
- Version cards show technical info (Version 16.0 · LTSC · OS support) - 64-bit option labeled as "(ajánlott)" - Full product key paste distributes across all 5 input fields Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,20">
|
<StackPanel Orientation="Horizontal" Margin="0,0,0,20">
|
||||||
<RadioButton x:Name="Rb64" GroupName="Arch" IsChecked="True"
|
<RadioButton x:Name="Rb64" GroupName="Arch" IsChecked="True"
|
||||||
Style="{StaticResource CardRadioButton}" Margin="0,0,10,0" MinWidth="160">
|
Style="{StaticResource CardRadioButton}" Margin="0,0,10,0" MinWidth="160">
|
||||||
<TextBlock Text="64-bit" FontSize="15" Margin="8,0"/>
|
<TextBlock Text="64-bit (ajánlott)" FontSize="15" Margin="8,0"/>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
<RadioButton x:Name="Rb32" GroupName="Arch"
|
<RadioButton x:Name="Rb32" GroupName="Arch"
|
||||||
Style="{StaticResource CardRadioButton}" MinWidth="160">
|
Style="{StaticResource CardRadioButton}" MinWidth="160">
|
||||||
|
|||||||
@@ -34,9 +34,33 @@ namespace InstaSoftOfficeTool.Pages
|
|||||||
if (_suppressAutoTab) return;
|
if (_suppressAutoTab) return;
|
||||||
|
|
||||||
var tb = (TextBox)sender;
|
var tb = (TextBox)sender;
|
||||||
|
var raw = tb.Text;
|
||||||
|
|
||||||
var cleaned = Regex.Replace(tb.Text, "[^A-Za-z0-9]", "");
|
// Detect full key paste (contains dash or longer than 5 chars with alphanumerics)
|
||||||
if (cleaned != tb.Text)
|
var allAlphaNum = Regex.Replace(raw, "[^A-Za-z0-9]", "");
|
||||||
|
if (allAlphaNum.Length > 5 && tb == _keyBoxes[0])
|
||||||
|
{
|
||||||
|
// Full key pasted — distribute across all boxes
|
||||||
|
_suppressAutoTab = true;
|
||||||
|
for (int i = 0; i < 5; i++)
|
||||||
|
{
|
||||||
|
int start = i * 5;
|
||||||
|
if (start < allAlphaNum.Length)
|
||||||
|
{
|
||||||
|
int len = System.Math.Min(5, allAlphaNum.Length - start);
|
||||||
|
_keyBoxes[i].Text = allAlphaNum.Substring(start, len).ToUpper();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_suppressAutoTab = false;
|
||||||
|
_keyBoxes[4].Focus();
|
||||||
|
_keyBoxes[4].CaretIndex = _keyBoxes[4].Text.Length;
|
||||||
|
ValidationMessage.Visibility = Visibility.Collapsed;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean non-alphanumeric chars
|
||||||
|
var cleaned = Regex.Replace(raw, "[^A-Za-z0-9]", "");
|
||||||
|
if (cleaned != raw)
|
||||||
{
|
{
|
||||||
_suppressAutoTab = true;
|
_suppressAutoTab = true;
|
||||||
tb.Text = cleaned;
|
tb.Text = cleaned;
|
||||||
@@ -44,6 +68,7 @@ namespace InstaSoftOfficeTool.Pages
|
|||||||
_suppressAutoTab = false;
|
_suppressAutoTab = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Auto-tab to next box when 5 chars entered
|
||||||
if (tb.Text.Length == 5)
|
if (tb.Text.Length == 5)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < _keyBoxes.Length - 1; i++)
|
for (int i = 0; i < _keyBoxes.Length - 1; i++)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
GroupName="Version" IsChecked="True" Margin="0,0,0,10">
|
GroupName="Version" IsChecked="True" Margin="0,0,0,10">
|
||||||
<StackPanel Margin="8,2">
|
<StackPanel Margin="8,2">
|
||||||
<TextBlock Text="Office 2024" FontSize="18" FontWeight="SemiBold"/>
|
<TextBlock Text="Office 2024" FontSize="18" FontWeight="SemiBold"/>
|
||||||
<TextBlock Text="Legújabb változat — Word, Excel, PowerPoint, Outlook és más alkalmazások"
|
<TextBlock Text="Version 16.0 · LTSC 2024 · Windows 10 / 11"
|
||||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
GroupName="Version" Margin="0,0,0,10">
|
GroupName="Version" Margin="0,0,0,10">
|
||||||
<StackPanel Margin="8,2">
|
<StackPanel Margin="8,2">
|
||||||
<TextBlock Text="Office 2021" FontSize="18" FontWeight="SemiBold"/>
|
<TextBlock Text="Office 2021" FontSize="18" FontWeight="SemiBold"/>
|
||||||
<TextBlock Text="Stabil, bevált változat — széleskörű kompatibilitás"
|
<TextBlock Text="Version 16.0 · LTSC 2021 · Windows 10 / 11"
|
||||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
GroupName="Version" Margin="0,0,0,10">
|
GroupName="Version" Margin="0,0,0,10">
|
||||||
<StackPanel Margin="8,2">
|
<StackPanel Margin="8,2">
|
||||||
<TextBlock Text="Office 2019" FontSize="18" FontWeight="SemiBold"/>
|
<TextBlock Text="Office 2019" FontSize="18" FontWeight="SemiBold"/>
|
||||||
<TextBlock Text="Régebbi változat — Windows 7, 8.1 és 10 támogatás"
|
<TextBlock Text="Version 16.0 · LTSC 2019 · Windows 7 / 8.1 / 10"
|
||||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
|
|||||||
Reference in New Issue
Block a user