v1.04 — Config layout, button contrast, Skype default, Win11 for 2019
- Arch + Language side by side on config page - Removed redundant hint text under app checkboxes - Primary button: white text on blue (TextElement.Foreground fix) - Skype for Business unchecked by default - Office 2019: added Windows 11 support, end-of-support note - Version display synced to v1.04 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -9,9 +9,9 @@
|
|||||||
<Company>InstaSoft Zrt.</Company>
|
<Company>InstaSoft Zrt.</Company>
|
||||||
<Product>InstaSoft Office Tool</Product>
|
<Product>InstaSoft Office Tool</Product>
|
||||||
<Copyright>Copyright (c) InstaSoft Zrt. 2026</Copyright>
|
<Copyright>Copyright (c) InstaSoft Zrt. 2026</Copyright>
|
||||||
<Version>1.0.2</Version>
|
<Version>1.0.4</Version>
|
||||||
<AssemblyVersion>1.0.2.0</AssemblyVersion>
|
<AssemblyVersion>1.0.4.0</AssemblyVersion>
|
||||||
<FileVersion>1.0.2.0</FileVersion>
|
<FileVersion>1.0.4.0</FileVersion>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
Foreground="{StaticResource TextSecondaryBrush}" Margin="0,-2,0,0"/>
|
Foreground="{StaticResource TextSecondaryBrush}" Margin="0,-2,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBlock Text="v1.02" HorizontalAlignment="Right" VerticalAlignment="Center"
|
<TextBlock Text="v1.04" HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}"/>
|
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -68,14 +68,15 @@ namespace InstaSoftOfficeTool.Models
|
|||||||
|
|
||||||
public static class ExcludableApps
|
public static class ExcludableApps
|
||||||
{
|
{
|
||||||
public static readonly (string Id, string DisplayName)[] Apps = new[]
|
// Id, DisplayName, DefaultChecked (true = telep\u00edt, false = kiz\u00e1r)
|
||||||
|
public static readonly (string Id, string DisplayName, bool DefaultChecked)[] Apps = new[]
|
||||||
{
|
{
|
||||||
("Access", "Access"),
|
("Access", "Access", true),
|
||||||
("Teams", "Teams"),
|
("Teams", "Teams", true),
|
||||||
("OneNote", "OneNote"),
|
("OneNote", "OneNote", true),
|
||||||
("Publisher", "Publisher"),
|
("Publisher", "Publisher", true),
|
||||||
("Outlook", "Outlook"),
|
("Outlook", "Outlook", true),
|
||||||
("Lync", "Skype for Business"),
|
("Lync", "Skype for Business", false),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,25 +7,35 @@
|
|||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="Beállítások" FontSize="24" FontWeight="Light" Margin="0,0,0,20"/>
|
<TextBlock Text="Beállítások" FontSize="24" FontWeight="Light" Margin="0,0,0,20"/>
|
||||||
|
|
||||||
|
<!-- Arch + Language side by side -->
|
||||||
|
<Grid Margin="0,0,0,20">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<StackPanel Grid.Column="0" Margin="0,0,16,0">
|
||||||
<TextBlock Text="Architektúra" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8"/>
|
<TextBlock Text="Architektúra" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8"/>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,20">
|
<StackPanel Orientation="Horizontal">
|
||||||
<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="140">
|
||||||
<TextBlock Text="64-bit (ajánlott)" FontSize="15" Margin="8,0"/>
|
<TextBlock Text="64-bit (ajánlott)" FontSize="14" Margin="6,0"/>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
<RadioButton x:Name="Rb32" GroupName="Arch"
|
<RadioButton x:Name="Rb32" GroupName="Arch"
|
||||||
Style="{StaticResource CardRadioButton}" MinWidth="160">
|
Style="{StaticResource CardRadioButton}" MinWidth="100">
|
||||||
<TextBlock Text="32-bit" FontSize="15" Margin="8,0"/>
|
<TextBlock Text="32-bit" FontSize="14" Margin="6,0"/>
|
||||||
</RadioButton>
|
</RadioButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<StackPanel Grid.Column="1">
|
||||||
<TextBlock Text="Telepítési nyelv" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8"/>
|
<TextBlock Text="Telepítési nyelv" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,8"/>
|
||||||
<ComboBox x:Name="CbLanguage" Style="{StaticResource FluentComboBox}"
|
<ComboBox x:Name="CbLanguage" Style="{StaticResource FluentComboBox}"
|
||||||
Width="300" HorizontalAlignment="Left" Margin="0,0,0,20"/>
|
HorizontalAlignment="Stretch"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
<TextBlock Text="Telepítendő alkalmazások" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,4"/>
|
<TextBlock Text="Telepítendő alkalmazások" FontSize="15" FontWeight="SemiBold" Margin="0,0,0,10"/>
|
||||||
<TextBlock Text="Törölje a jelölést azon alkalmazásoknál, amelyeket nem szeretne telepíteni."
|
|
||||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,0,0,10"/>
|
|
||||||
|
|
||||||
<WrapPanel x:Name="AppCheckBoxes" Orientation="Horizontal"/>
|
<WrapPanel x:Name="AppCheckBoxes" Orientation="Horizontal"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -48,10 +48,15 @@ namespace InstaSoftOfficeTool.Pages
|
|||||||
// Populate app checkboxes
|
// Populate app checkboxes
|
||||||
foreach (var app in ExcludableApps.Apps)
|
foreach (var app in ExcludableApps.Apps)
|
||||||
{
|
{
|
||||||
|
// Ha m\u00e1r van ment\u00e9s a configban, azt haszn\u00e1ljuk; k\u00fcl\u00f6nben a default\u00f6t
|
||||||
|
bool isChecked = _config.ExcludedApps.Count > 0
|
||||||
|
? !_config.ExcludedApps.Contains(app.Id)
|
||||||
|
: app.DefaultChecked;
|
||||||
|
|
||||||
var cb = new CheckBox
|
var cb = new CheckBox
|
||||||
{
|
{
|
||||||
Content = app.DisplayName,
|
Content = app.DisplayName,
|
||||||
IsChecked = !_config.ExcludedApps.Contains(app.Id),
|
IsChecked = isChecked,
|
||||||
Tag = app.Id,
|
Tag = app.Id,
|
||||||
Style = (Style)FindResource("FluentCheckBox"),
|
Style = (Style)FindResource("FluentCheckBox"),
|
||||||
Margin = new Thickness(0, 4, 24, 4),
|
Margin = new Thickness(0, 4, 24, 4),
|
||||||
|
|||||||
@@ -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="2019. szeptemberi kiadás · Windows 7 / 8.1 / 10"
|
<TextBlock Text="2019. szeptemberi kiadás · Windows 7 / 8.1 / 10 / 11 · Támogatás lejárt: 2025.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>
|
||||||
|
|||||||
@@ -18,7 +18,8 @@
|
|||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
SnapsToDevicePixels="True">
|
SnapsToDevicePixels="True"
|
||||||
|
TextElement.Foreground="{StaticResource TextOnAccentBrush}">
|
||||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
|
|||||||
Reference in New Issue
Block a user