diff --git a/config/themes.json b/config/themes.json index ce1e98889e..27f3a45e13 100644 --- a/config/themes.json +++ b/config/themes.json @@ -1,169 +1,169 @@ { - "_default": { - "CustomDialogFontSize": "12", - "CustomDialogFontSizeHeader": "14", - "CustomDialogIconSize": "25", - "CustomDialogWidth": "400", - "CustomDialogHeight": "200", - - "FontSize": "12", - "FontFamily": "Arial", - "FontSizeHeading": "16", - "HeaderFontFamily": "Consolas, Monaco", - - "CheckBoxBulletDecoratorSize": "14", - "CheckBoxMargin": "15,0,0,2", - - "TabContentMargin": "5", - "TabButtonFontSize": "14", - "TabButtonWidth": "100", - "TabButtonHeight": "25", - "TabRowHeightInPixels": "50", - "IconFontSize": "14", - "IconButtonSize": "35", - "SettingsIconFontSize": "18", - "CloseIconFontSize": "18", - - "MicroWinLogoSize": "10", - "MicrowinCheckBoxMargin": "-10,5,0,0", - - "ProgressBarForegroundColor": "#2e77ff", - "ProgressBarBackgroundColor": "Transparent", - "ProgressBarTextColor": "#232629", - - "ComboBoxBackgroundColor": "#F7F7F7", - "LabelboxForegroundColor": "#232629", - "MainForegroundColor": "#232629", - "MainBackgroundColor": "#F7F7F7", - "LabelBackgroundColor": "#F7F7F7", - "LinkForegroundColor": "#232629", - "LinkHoverForegroundColor": "#232629", - "GroupBorderBackgroundColor": "#232629", - "ComboBoxForegroundColor": "#232629", - - "ButtonFontSize": "12", - "ButtonFontFamily": "Arial", - "ButtonWidth": "200", - "ButtonHeight": "25", - "ConfigTabButtonFontSize": "16", - - "SearchBarWidth": "200", - "SearchBarHeight": "25", - "SearchBarTextBoxFontSize": "12", - "SearchBarClearButtonFontSize": "14", - - "ButtonInstallBackgroundColor": "#F7F7F7", - "ButtonTweaksBackgroundColor": "#F7F7F7", - "ButtonConfigBackgroundColor": "#F7F7F7", - "ButtonUpdatesBackgroundColor": "#F7F7F7", - "ButtonInstallForegroundColor": "#232629", - "ButtonTweaksForegroundColor": "#232629", - "ButtonConfigForegroundColor": "#232629", - "ButtonUpdatesForegroundColor": "#232629", - "ButtonBackgroundColor": "#F5F5F5", - "ButtonBackgroundPressedColor": "#1A1A1A", - "CheckboxMouseOverColor": "#999999", - "ButtonBackgroundMouseoverColor": "#C2C2C2", - "ButtonBackgroundSelectedColor": "#F0F0F0", - "ButtonForegroundColor": "#232629", - "ToggleButtonOnColor": "#2e77ff", - - "ButtonBorderThickness": "1", - "ButtonMargin": "1", - "ButtonCornerRadius": "2", - "BorderColor": "#232629", - "BorderOpacity": "0.2", - "ShadowPulse": "Forever" - }, - "Classic": { - "ComboBoxBackgroundColor": "#F7F7F7", - "LabelboxForegroundColor": "#232629", - "MainForegroundColor": "#232629", - "MainBackgroundColor": "#F7F7F7", - "LabelBackgroundColor": "#F7F7F7", - "LinkForegroundColor": "#232629", - "LinkHoverForegroundColor": "#232629", - "GroupBorderBackgroundColor": "#232629", - "ComboBoxForegroundColor": "#232629", - - "ButtonInstallBackgroundColor": "#F7F7F7", - "ButtonTweaksBackgroundColor": "#F7F7F7", - "ButtonConfigBackgroundColor": "#F7F7F7", - "ButtonUpdatesBackgroundColor": "#F7F7F7", - "ButtonInstallForegroundColor": "#232629", - "ButtonTweaksForegroundColor": "#232629", - "ButtonConfigForegroundColor": "#232629", - "ButtonUpdatesForegroundColor": "#232629", - "ButtonBackgroundColor": "#F5F5F5", - "ButtonBackgroundPressedColor": "#1A1A1A", - "CheckboxMouseOverColor": "#999999", - "ButtonBackgroundMouseoverColor": "#C2C2C2", - "ButtonBackgroundSelectedColor": "#F0F0F0", - "ButtonForegroundColor": "#232629", - "ToggleButtonOnColor": "#2e77ff" - }, - "Matrix": { - "ComboBoxBackgroundColor": "#232629", - "LabelboxForegroundColor": "#81a1c1", - "MainForegroundColor": "#F7F7F7", - "MainBackgroundColor": "#232629", - "LabelBackgroundColor": "#232629", - "LinkForegroundColor": "#add8e6", - "LinkHoverForegroundColor": "#F7F7F7", - "ComboBoxForegroundColor": "#81a1c1", - - "ProgressBarForegroundColor": "#222222", - "ProgressBarBackgroundColor": "Transparent", - "ProgressBarTextColor": "#cccccc", - - "ButtonInstallBackgroundColor": "#222222", - "ButtonTweaksBackgroundColor": "#333333", - "ButtonConfigBackgroundColor": "#444444", - "ButtonUpdatesBackgroundColor": "#555555", - "ButtonInstallForegroundColor": "#F7F7F7", - "ButtonTweaksForegroundColor": "#F7F7F7", - "ButtonConfigForegroundColor": "#F7F7F7", - "ButtonUpdatesForegroundColor": "#F7F7F7", - "ButtonBackgroundColor": "#1E3747", - "ButtonBackgroundPressedColor": "#F7F7F7", - "ButtonBackgroundMouseoverColor": "#3B4252", - "ButtonBackgroundSelectedColor": "#5E81AC", - "ButtonForegroundColor": "#F7F7F7", - "ToggleButtonOnColor": "#2e77ff", - - "BorderColor": "#0060CC", - "BorderOpacity": "0.2", - "ShadowPulse": "0:0:3" - }, - "Dark": { - "ComboBoxBackgroundColor": "#232629", - "LabelboxForegroundColor": "#81a1c1", - "MainForegroundColor": "#F7F7F7", - "MainBackgroundColor": "#232629", - "LabelBackgroundColor": "#232629", - "LinkForegroundColor": "#add8e6", - "LinkHoverForegroundColor": "#F7F7F7", - "ComboBoxForegroundColor": "#81a1c1", - - "ProgressBarForegroundColor": "#222222", - "ProgressBarBackgroundColor": "Transparent", - "ProgressBarTextColor": "#cccccc", - - "ButtonInstallBackgroundColor": "#222222", - "ButtonTweaksBackgroundColor": "#333333", - "ButtonConfigBackgroundColor": "#444444", - "ButtonUpdatesBackgroundColor": "#555555", - "ButtonInstallForegroundColor": "#F7F7F7", - "ButtonTweaksForegroundColor": "#F7F7F7", - "ButtonConfigForegroundColor": "#F7F7F7", - "ButtonUpdatesForegroundColor": "#F7F7F7", - "ButtonBackgroundColor": "#1E3747", - "ButtonBackgroundPressedColor": "#00CFFF", - "ButtonBackgroundMouseoverColor": "#5E81AC", - "ButtonBackgroundSelectedColor": "#5E81AC", - "ButtonForegroundColor": "#F7F7F7", - "ToggleButtonOnColor": "#2e77ff", - - "BorderColor": "#0b1215" - } + "_default": { + "CustomDialogFontSize": "12", + "CustomDialogFontSizeHeader": "14", + "CustomDialogIconSize": "25", + "CustomDialogWidth": "400", + "CustomDialogHeight": "200", + + "FontSize": "12", + "FontFamily": "Arial", + "FontSizeHeading": "16", + "HeaderFontFamily": "Consolas, Monaco", + + "CheckBoxBulletDecoratorSize": "14", + "CheckBoxMargin": "15,0,0,2", + + "TabContentMargin": "5", + "TabButtonFontSize": "14", + "TabButtonWidth": "100", + "TabButtonHeight": "25", + "TabRowHeightInPixels": "50", + "IconFontSize": "14", + "IconButtonSize": "35", + "SettingsIconFontSize": "18", + "CloseIconFontSize": "18", + + "MicroWinLogoSize": "10", + "MicrowinCheckBoxMargin": "-10,5,0,0", + + "ProgressBarForegroundColor": "#2e77ff", + "ProgressBarBackgroundColor": "Transparent", + "ProgressBarTextColor": "#232629", + + "ComboBoxBackgroundColor": "#F7F7F7", + "LabelboxForegroundColor": "#232629", + "MainForegroundColor": "#232629", + "MainBackgroundColor": "#F7F7F7", + "LabelBackgroundColor": "#F7F7F7", + "LinkForegroundColor": "#232629", + "LinkHoverForegroundColor": "#232629", + "GroupBorderBackgroundColor": "#232629", + "ComboBoxForegroundColor": "#232629", + + "ButtonFontSize": "12", + "ButtonFontFamily": "Arial", + "ButtonWidth": "200", + "ButtonHeight": "25", + "ConfigTabButtonFontSize": "16", + + "SearchBarWidth": "200", + "SearchBarHeight": "25", + "SearchBarTextBoxFontSize": "12", + "SearchBarClearButtonFontSize": "14", + + "ButtonInstallBackgroundColor": "#F7F7F7", + "ButtonTweaksBackgroundColor": "#F7F7F7", + "ButtonConfigBackgroundColor": "#F7F7F7", + "ButtonUpdatesBackgroundColor": "#F7F7F7", + "ButtonInstallForegroundColor": "#232629", + "ButtonTweaksForegroundColor": "#232629", + "ButtonConfigForegroundColor": "#232629", + "ButtonUpdatesForegroundColor": "#232629", + "ButtonBackgroundColor": "#F5F5F5", + "ButtonBackgroundPressedColor": "#1A1A1A", + "CheckboxMouseOverColor": "#999999", + "ButtonBackgroundMouseoverColor": "#C2C2C2", + "ButtonBackgroundSelectedColor": "#F0F0F0", + "ButtonForegroundColor": "#232629", + "ToggleButtonOnColor": "#2e77ff", + + "ButtonBorderThickness": "1", + "ButtonMargin": "1", + "ButtonCornerRadius": "2", + "BorderColor": "#232629", + "BorderOpacity": "0.2", + "ShadowPulse": "Forever" + }, + "Classic": { + "ComboBoxBackgroundColor": "#F7F7F7", + "LabelboxForegroundColor": "#232629", + "MainForegroundColor": "#232629", + "MainBackgroundColor": "#F7F7F7", + "LabelBackgroundColor": "#F7F7F7", + "LinkForegroundColor": "#232629", + "LinkHoverForegroundColor": "#232629", + "GroupBorderBackgroundColor": "#232629", + "ComboBoxForegroundColor": "#232629", + + "ButtonInstallBackgroundColor": "#F7F7F7", + "ButtonTweaksBackgroundColor": "#F7F7F7", + "ButtonConfigBackgroundColor": "#F7F7F7", + "ButtonUpdatesBackgroundColor": "#F7F7F7", + "ButtonInstallForegroundColor": "#232629", + "ButtonTweaksForegroundColor": "#232629", + "ButtonConfigForegroundColor": "#232629", + "ButtonUpdatesForegroundColor": "#232629", + "ButtonBackgroundColor": "#F5F5F5", + "ButtonBackgroundPressedColor": "#1A1A1A", + "CheckboxMouseOverColor": "#999999", + "ButtonBackgroundMouseoverColor": "#C2C2C2", + "ButtonBackgroundSelectedColor": "#F0F0F0", + "ButtonForegroundColor": "#232629", + "ToggleButtonOnColor": "#2e77ff" + }, + "Matrix": { + "ComboBoxBackgroundColor": "#232629", + "LabelboxForegroundColor": "#f7f7f7", + "MainForegroundColor": "#F7F7F7", + "MainBackgroundColor": "#232629", + "LabelBackgroundColor": "#232629", + "LinkForegroundColor": "#add8e6", + "LinkHoverForegroundColor": "#F7F7F7", + "ComboBoxForegroundColor": "#81a1c1", + + "ProgressBarForegroundColor": "#222222", + "ProgressBarBackgroundColor": "Transparent", + "ProgressBarTextColor": "#cccccc", + + "ButtonInstallBackgroundColor": "#222222", + "ButtonTweaksBackgroundColor": "#333333", + "ButtonConfigBackgroundColor": "#444444", + "ButtonUpdatesBackgroundColor": "#555555", + "ButtonInstallForegroundColor": "#F7F7F7", + "ButtonTweaksForegroundColor": "#F7F7F7", + "ButtonConfigForegroundColor": "#F7F7F7", + "ButtonUpdatesForegroundColor": "#F7F7F7", + "ButtonBackgroundColor": "#1E3747", + "ButtonBackgroundPressedColor": "#F7F7F7", + "ButtonBackgroundMouseoverColor": "#3B4252", + "ButtonBackgroundSelectedColor": "#5E81AC", + "ButtonForegroundColor": "#F7F7F7", + "ToggleButtonOnColor": "#2e77ff", + + "BorderColor": "#0060CC", + "BorderOpacity": "0.2", + "ShadowPulse": "0:0:3" + }, + "Dark": { + "ComboBoxBackgroundColor": "#1e3747", + "LabelboxForegroundColor": "#0567ff", + "MainForegroundColor": "#F7F7F7", + "MainBackgroundColor": "#121212", + "LabelBackgroundColor": "#121212", + "LinkForegroundColor": "#add8e6", + "LinkHoverForegroundColor": "#F7F7F7", + "ComboBoxForegroundColor": "#f7f7f7", + + "ProgressBarForegroundColor": "#222222", + "ProgressBarBackgroundColor": "Transparent", + "ProgressBarTextColor": "#cccccc", + + "ButtonInstallBackgroundColor": "#222222", + "ButtonTweaksBackgroundColor": "#333333", + "ButtonConfigBackgroundColor": "#444444", + "ButtonUpdatesBackgroundColor": "#555555", + "ButtonInstallForegroundColor": "#F7F7F7", + "ButtonTweaksForegroundColor": "#F7F7F7", + "ButtonConfigForegroundColor": "#F7F7F7", + "ButtonUpdatesForegroundColor": "#F7F7F7", + "ButtonBackgroundColor": "#1E3747", + "ButtonBackgroundPressedColor": "#00CFFF", + "ButtonBackgroundMouseoverColor": "#5E81AC", + "ButtonBackgroundSelectedColor": "#5E81AC", + "ButtonForegroundColor": "#F7F7F7", + "ToggleButtonOnColor": "#2e77ff", + + "BorderColor": "#2F373D" + } } diff --git a/xaml/inputXML.xaml b/xaml/inputXML.xaml index fec2e11fe8..cf4b2010d1 100644 --- a/xaml/inputXML.xaml +++ b/xaml/inputXML.xaml @@ -911,19 +911,19 @@ <Border Grid.Row="0" Grid.Column="0" Style="{StaticResource BorderStyle}"> <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True"> <Button Name="WPFUpdatesdefault" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Default (Out of Box) Settings" Margin="20,4,20,10" Padding="10"/> - <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock> + <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is the default settings that come with Windows. <LineBreak/><LineBreak/> No modifications are made and will remove any custom windows update settings.<LineBreak/><LineBreak/>Note: If you still encounter update errors, reset all updates in the config tab. That will restore ALL Microsoft Update Services from their servers and reinstall them to default settings.</TextBlock> </StackPanel> </Border> <Border Grid.Row="0" Grid.Column="1" Style="{StaticResource BorderStyle}"> <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True"> <Button Name="WPFUpdatessecurity" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Security (Recommended) Settings" Margin="20,4,20,10" Padding="10"/> - <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock> + <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This is my recommended setting I use on all computers.<LineBreak/><LineBreak/> It will delay feature updates by 2 years and will install security updates 4 days after release.<LineBreak/><LineBreak/>Feature Updates: Adds features and often bugs to systems when they are released. You want to delay these as long as possible.<LineBreak/><LineBreak/>Security Updates: Typically these are pressing security flaws that need to be patched quickly. You only want to delay these a couple of days just to see if they are safe and don't break other systems. You don't want to go without these for ANY extended periods of time.</TextBlock> </StackPanel> </Border> <Border Grid.Row="0" Grid.Column="2" Style="{StaticResource BorderStyle}"> <StackPanel Background="{MainBackgroundColor}" SnapsToDevicePixels="True"> <Button Name="WPFUpdatesdisable" FontSize="{ConfigTabButtonFontSize}" Height="Auto" Width="Auto" Content="Disable ALL Updates (NOT RECOMMENDED!)" Margin="20,4,20,10" Padding="10,10,10,10"/> - <TextBlock Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock> + <TextBlock Foreground="{ComboBoxForegroundColor}" Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300">This completely disables ALL Windows Updates and is NOT RECOMMENDED.<LineBreak/><LineBreak/> However, it can be suitable if you use your system for a select purpose and do not actively browse the internet. <LineBreak/><LineBreak/>Note: Your system will be easier to hack and infect without security updates.</TextBlock> <TextBlock Text=" " Margin="20,0,20,0" Padding="10" TextWrapping="WrapWithOverflow" MaxWidth="300"/> </StackPanel> </Border>