diff --git a/InstaSoftOfficeTool.csproj b/InstaSoftOfficeTool.csproj index 8d245c1..ab8776a 100644 --- a/InstaSoftOfficeTool.csproj +++ b/InstaSoftOfficeTool.csproj @@ -9,9 +9,9 @@ InstaSoft Zrt. InstaSoft Office Tool Copyright (c) InstaSoft Zrt. 2026 - 1.0.2 - 1.0.2.0 - 1.0.2.0 + 1.0.4 + 1.0.4.0 + 1.0.4.0 app.manifest latest diff --git a/MainWindow.xaml b/MainWindow.xaml index f11e27a..8d8a982 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -41,7 +41,7 @@ Foreground="{StaticResource TextSecondaryBrush}" Margin="0,-2,0,0"/> - diff --git a/Models/InstallConfig.cs b/Models/InstallConfig.cs index 91d8c77..1760657 100644 --- a/Models/InstallConfig.cs +++ b/Models/InstallConfig.cs @@ -68,14 +68,15 @@ namespace InstaSoftOfficeTool.Models 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"), - ("Teams", "Teams"), - ("OneNote", "OneNote"), - ("Publisher", "Publisher"), - ("Outlook", "Outlook"), - ("Lync", "Skype for Business"), + ("Access", "Access", true), + ("Teams", "Teams", true), + ("OneNote", "OneNote", true), + ("Publisher", "Publisher", true), + ("Outlook", "Outlook", true), + ("Lync", "Skype for Business", false), }; } } diff --git a/Pages/ConfigPage.xaml b/Pages/ConfigPage.xaml index 14e6fbc..88ff480 100644 --- a/Pages/ConfigPage.xaml +++ b/Pages/ConfigPage.xaml @@ -7,25 +7,35 @@ - - - - - - - - - + + + + + + - - + + + + + + + + + + + - - + + + + + + + diff --git a/Pages/ConfigPage.xaml.cs b/Pages/ConfigPage.xaml.cs index 898d6a7..df814c4 100644 --- a/Pages/ConfigPage.xaml.cs +++ b/Pages/ConfigPage.xaml.cs @@ -48,10 +48,15 @@ namespace InstaSoftOfficeTool.Pages // Populate app checkboxes 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 { Content = app.DisplayName, - IsChecked = !_config.ExcludedApps.Contains(app.Id), + IsChecked = isChecked, Tag = app.Id, Style = (Style)FindResource("FluentCheckBox"), Margin = new Thickness(0, 4, 24, 4), diff --git a/Pages/VersionPage.xaml b/Pages/VersionPage.xaml index 1e92c9d..c469264 100644 --- a/Pages/VersionPage.xaml +++ b/Pages/VersionPage.xaml @@ -38,7 +38,7 @@ GroupName="Version" Margin="0,0,0,10"> - diff --git a/Styles/ButtonStyles.xaml b/Styles/ButtonStyles.xaml index 6f10a1d..a48f372 100644 --- a/Styles/ButtonStyles.xaml +++ b/Styles/ButtonStyles.xaml @@ -18,7 +18,8 @@ Background="{TemplateBinding Background}" CornerRadius="4" Padding="{TemplateBinding Padding}" - SnapsToDevicePixels="True"> + SnapsToDevicePixels="True" + TextElement.Foreground="{StaticResource TextOnAccentBrush}">