CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-10-02 01:57:23 +13:00
Code Issues Projects Releases Wiki Activity

Remove color support for SliderArrowsAndTrackHover

Browse source 
Feature was dropped with 2.0.0.0
Settings kept for compatibility reasons, as application is still supporting v1 settings
This commit is contained in:
Peter Kirmeier 2023-08-20 14:39:20 +02:00
parent 4ac3d1eb3a
commit 2e268ec030
7 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Config/AppColors.cs
View file

@ -54,8 +54,6 @@ namespace SystemTrayMenu
public static SolidColorBrush ArrowClickBackground { get; internal set; } = new(Color.FromRgb(96, 96, 96));
public static SolidColorBrush SliderArrowsAndTrackHover { get; internal set; } = new(Color.FromRgb(192, 192, 192));
public static SolidColorBrush Slider { get; internal set; } = new(Color.FromRgb(205, 205, 205));
public static SolidColorBrush SliderHover { get; internal set; } = new(Color.FromRgb(166, 166, 166));
@ -74,8 +72,6 @@ namespace SystemTrayMenu
public static SolidColorBrush ArrowClickBackgroundDarkMode { get; internal set; } = new(Color.FromRgb(166, 166, 166));
public static SolidColorBrush SliderArrowsAndTrackHoverDarkMode { get; internal set; } = new(Color.FromRgb(77, 77, 77));
public static SolidColorBrush SliderDarkMode { get; internal set; } = new(Color.FromRgb(77, 77, 77));
public static SolidColorBrush SliderHoverDarkMode { get; internal set; } = new(Color.FromRgb(122, 122, 122));

12
Config/Config.cs
View file

@ -328,12 +328,6 @@ namespace SystemTrayMenu
Settings.Default.ColorArrowClickBackground = colorAndCode.HtmlColorCode;
AppColors.ArrowClickBackground = new SolidColorBrush(colorAndCode.Color);
colorAndCode.HtmlColorCode = Settings.Default.ColorSliderArrowsAndTrackHover;
colorAndCode.Color = AppColors.SliderArrowsAndTrackHover.Color;
ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
Settings.Default.ColorSliderArrowsAndTrackHover = colorAndCode.HtmlColorCode;
AppColors.SliderArrowsAndTrackHover = new SolidColorBrush(colorAndCode.Color);
colorAndCode.HtmlColorCode = Settings.Default.ColorSlider;
colorAndCode.Color = AppColors.Slider.Color;
ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
@ -388,12 +382,6 @@ namespace SystemTrayMenu
Settings.Default.ColorArrowClickBackgroundDarkMode = colorAndCode.HtmlColorCode;
AppColors.ArrowClickBackgroundDarkMode = new SolidColorBrush(colorAndCode.Color);
colorAndCode.HtmlColorCode = Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode;
colorAndCode.Color = AppColors.SliderArrowsAndTrackHoverDarkMode.Color;
ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);
Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode = colorAndCode.HtmlColorCode;
AppColors.SliderArrowsAndTrackHoverDarkMode = new SolidColorBrush(colorAndCode.Color);
colorAndCode.HtmlColorCode = Settings.Default.ColorSliderDarkMode;
colorAndCode.Color = AppColors.SliderDarkMode.Color;
ProcessColorAndCode(converter, ref colorAndCode, ref resetDefaults);

3
Config/MenuDefines.cs
View file

@ -57,9 +57,6 @@ namespace SystemTrayMenu
public static SolidColorBrush ColorArrowClickBackground =>
Config.IsDarkMode() ? AppColors.ArrowClickBackgroundDarkMode : AppColors.ArrowClickBackground;
public static SolidColorBrush ColorSliderArrowsAndTrackHover =>
Config.IsDarkMode() ? AppColors.SliderArrowsAndTrackHoverDarkMode : AppColors.SliderArrowsAndTrackHover;
public static SolidColorBrush ColorSlider =>
Config.IsDarkMode() ? AppColors.SliderDarkMode : AppColors.Slider;

4
Properties/Settings.Designer.cs generated
View file

@ -8,6 +8,8 @@
// </auto-generated>
//------------------------------------------------------------------------------
using Windows.Foundation.Metadata;
namespace SystemTrayMenu.Properties
{
@ -1340,6 +1342,7 @@ namespace SystemTrayMenu.Properties
}
}
[Deprecated("Used in 1.x, Deprecated since 2.0.0.0", DeprecationType.Deprecate, 1)]
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -1500,6 +1503,7 @@ namespace SystemTrayMenu.Properties
}
}
[Deprecated("Used in 1.x, Deprecated since 2.0.0.0", DeprecationType.Deprecate, 1)]
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

1
Resources/ScrollBarStyles.xaml
View file

@ -10,7 +10,6 @@
<!-- TODO: Check and adjust horizontal scrollbars -->
<!-- TODO: Take care of disabled scrollbars -->
<!-- TODO: Implement ColorSliderArrowsAndTrackHover -->
<Color x:Key="DisabledForegroundColor">Transparent</Color>

4
UserInterface/SettingsWindow.xaml
View file

@ -295,7 +295,7 @@
<local:ColorSelector x:Name="textBoxColorSlider" Description="{u:Translate 'Slider'}" />
<local:ColorSelector x:Name="textBoxColorSliderDragging" Description="{u:Translate 'Slider while dragging'}" />
<local:ColorSelector x:Name="textBoxColorSliderHover" Description="{u:Translate 'Slider while mouse hovers over it 1'}" />
<local:ColorSelector x:Name="textBoxColorSliderArrowsAndTrackHover" Description="{u:Translate 'Slider while mouse hovers over it 2'}" />
<!-- Deprecated since 2.0.0.0: textBoxColorSliderArrowsAndTrackHover, obsolete translation: 'Slider while mouse hovers over it 2' -->
<local:ColorSelector x:Name="textBoxColorArrow" Description="{u:Translate 'Arrow'}" />
<local:ColorSelector x:Name="textBoxColorArrowClick" Description="{u:Translate 'Arrow when clicking'}" />
<local:ColorSelector x:Name="textBoxColorArrowClickBackground" Description="{u:Translate 'Background of arrow when clicking'}" />
@ -320,7 +320,7 @@
<local:ColorSelector x:Name="textBoxColorSliderDarkMode" Description="{u:Translate 'Slider'}" />
<local:ColorSelector x:Name="textBoxColorSliderDraggingDarkMode" Description="{u:Translate 'Slider while dragging'}" />
<local:ColorSelector x:Name="textBoxColorSliderHoverDarkMode" Description="{u:Translate 'Slider while mouse hovers over it 1'}" />
<local:ColorSelector x:Name="textBoxColorSliderArrowsAndTrackHoverDarkMode" Description="{u:Translate 'Slider while mouse hovers over it 2'}" />
<!-- Deprecated since 2.0.0.0: textBoxColorSliderArrowsAndTrackHoverDarkMode, obsolete translation: 'Slider while mouse hovers over it 2' -->
<local:ColorSelector x:Name="textBoxColorArrowDarkMode" Description="{u:Translate 'Arrow'}" />
<local:ColorSelector x:Name="textBoxColorArrowClickDarkMode" Description="{u:Translate 'Arrow when clicking'}" />
<local:ColorSelector x:Name="textBoxColorArrowClickBackgroundDarkMode" Description="{u:Translate 'Background of arrow when clicking'}" />

6
UserInterface/SettingsWindow.xaml.cs
View file

@ -321,7 +321,6 @@ namespace SystemTrayMenu.UserInterface
textBoxColorSlider.Text = Settings.Default.ColorSlider;
textBoxColorSliderDragging.Text = Settings.Default.ColorSliderDragging;
textBoxColorSliderHover.Text = Settings.Default.ColorSliderHover;
textBoxColorSliderArrowsAndTrackHover.Text = Settings.Default.ColorSliderArrowsAndTrackHover;
textBoxColorArrow.Text = Settings.Default.ColorArrow;
textBoxColorArrowClick.Text = Settings.Default.ColorArrowClick;
textBoxColorArrowClickBackground.Text = Settings.Default.ColorArrowClickBackground;
@ -331,7 +330,6 @@ namespace SystemTrayMenu.UserInterface
textBoxColorSliderDarkMode.Text = Settings.Default.ColorSliderDarkMode;
textBoxColorSliderDraggingDarkMode.Text = Settings.Default.ColorSliderDraggingDarkMode;
textBoxColorSliderHoverDarkMode.Text = Settings.Default.ColorSliderHoverDarkMode;
textBoxColorSliderArrowsAndTrackHoverDarkMode.Text = Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode;
textBoxColorArrowDarkMode.Text = Settings.Default.ColorArrowDarkMode;
textBoxColorArrowClickDarkMode.Text = Settings.Default.ColorArrowClickDarkMode;
textBoxColorArrowClickBackgroundDarkMode.Text = Settings.Default.ColorArrowClickBackgroundDarkMode;
@ -908,7 +906,6 @@ namespace SystemTrayMenu.UserInterface
Settings.Default.ColorSlider = textBoxColorSlider.Text;
Settings.Default.ColorSliderDragging = textBoxColorSliderDragging.Text;
Settings.Default.ColorSliderHover = textBoxColorSliderHover.Text;
Settings.Default.ColorSliderArrowsAndTrackHover = textBoxColorSliderArrowsAndTrackHover.Text;
Settings.Default.ColorArrow = textBoxColorArrow.Text;
Settings.Default.ColorArrowClick = textBoxColorArrowClick.Text;
Settings.Default.ColorArrowClickBackground = textBoxColorArrowClickBackground.Text;
@ -918,7 +915,6 @@ namespace SystemTrayMenu.UserInterface
Settings.Default.ColorSliderDarkMode = textBoxColorSliderDarkMode.Text;
Settings.Default.ColorSliderDraggingDarkMode = textBoxColorSliderDraggingDarkMode.Text;
Settings.Default.ColorSliderHoverDarkMode = textBoxColorSliderHoverDarkMode.Text;
Settings.Default.ColorSliderArrowsAndTrackHoverDarkMode = textBoxColorSliderArrowsAndTrackHoverDarkMode.Text;
Settings.Default.ColorArrowDarkMode = textBoxColorArrowDarkMode.Text;
Settings.Default.ColorArrowClickDarkMode = textBoxColorArrowClickDarkMode.Text;
Settings.Default.ColorArrowClickBackgroundDarkMode = textBoxColorArrowClickBackgroundDarkMode.Text;
@ -977,7 +973,6 @@ namespace SystemTrayMenu.UserInterface
textBoxColorArrowHover.Text = "#000000";
textBoxColorArrowClick.Text = "#ffffff";
textBoxColorArrowClickBackground.Text = "#606060";
textBoxColorSliderArrowsAndTrackHover.Text = "#c0c0c0";
textBoxColorSlider.Text = "#cdcdcd";
textBoxColorSliderHover.Text = "#a6a6a6";
textBoxColorSliderDragging.Text = "#606060";
@ -999,7 +994,6 @@ namespace SystemTrayMenu.UserInterface
textBoxColorArrowHoverDarkMode.Text = "#676767";
textBoxColorArrowClickDarkMode.Text = "#171717";
textBoxColorArrowClickBackgroundDarkMode.Text = "#a6a6a6";
textBoxColorSliderArrowsAndTrackHoverDarkMode.Text = "#4d4d4d";
textBoxColorSliderDarkMode.Text = "#4d4d4d";
textBoxColorSliderHoverDarkMode.Text = "#7a7a7a";
textBoxColorSliderDraggingDarkMode.Text = "#a6a6a6";