Merge pull request #666 from dremin/settings-json

Add new configuration backend
dremin · Aug 30, 2023 · 3ecff6b · 3ecff6b
2 parents b8c006b + 265060c
commit 3ecff6b
Show file tree

Hide file tree

Showing 20 changed files with 280 additions and 770 deletions.
diff --git a/RetroBar/App.config b/RetroBar/App.config
diff --git a/RetroBar/Controls/NotifyBalloon.xaml.cs b/RetroBar/Controls/NotifyBalloon.xaml.cs
@@ -47,7 +47,7 @@ public CustomPopupPlacement[] PlacePopup(Size popupSize, Size targetSize, Point
 
             DpiScale dpiScale = VisualTreeHelper.GetDpi(this);
 
-            switch ((AppBarEdge)Settings.Instance.Edge)
+            switch (Settings.Instance.Edge)
             {
                 case AppBarEdge.Top:
                     if (FlowDirection == FlowDirection.LeftToRight)

diff --git a/RetroBar/Controls/NotifyIcon.xaml.cs b/RetroBar/Controls/NotifyIcon.xaml.cs
@@ -33,7 +33,7 @@ public NotifyIcon()
 
         private void applyEffects()
         {
-            if ((!EnvironmentHelper.IsWindows10OrBetter && Settings.Instance.InvertIconsMode == 0) || TrayIcon == null || Settings.Instance.InvertIconsMode == 2)
+            if ((!EnvironmentHelper.IsWindows10OrBetter && Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.WhenNeededByTheme) || TrayIcon == null || Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.Never)
             {
                 return;
             }
@@ -53,7 +53,7 @@ private void applyEffects()
             }
 
             bool invertByTheme = Application.Current.FindResource("InvertSystemNotifyIcons") as bool? ?? false;
-            bool performInvert = invertByTheme || Settings.Instance.InvertIconsMode == 1;
+            bool performInvert = invertByTheme || Settings.Instance.InvertIconsMode == Settings.InvertIconsOption.Always;
 
             if (NotifyIconImage.Effect == null != performInvert)
             {

diff --git a/RetroBar/Controls/TaskList.xaml.cs b/RetroBar/Controls/TaskList.xaml.cs
@@ -56,7 +56,7 @@ private void SetStyles()
             MinButtonWidth = Application.Current.FindResource("TaskButtonMinWidth") as double? ?? 0;
             Thickness buttonMargin;
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 buttonMargin = Application.Current.FindResource("TaskButtonVerticalMargin") as Thickness? ?? new Thickness();
             }
@@ -98,7 +98,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             }
             else if (e.PropertyName == "ShowMultiMon")
             {
-                if (Settings.Instance.MultiMonMode != 0)
+                if (Settings.Instance.MultiMonMode != Settings.MultiMonOption.AllTaskbars)
                 {
                     taskbarItems?.Refresh();
                 }
@@ -114,12 +114,12 @@ private bool Tasks_Filter(object obj)
                     return false;
                 }
 
-                if (!Settings.Instance.ShowMultiMon || Settings.Instance.MultiMonMode == 0)
+                if (!Settings.Instance.ShowMultiMon || Settings.Instance.MultiMonMode == Settings.MultiMonOption.AllTaskbars)
                 {
                     return true;
                 }
 
-                if (Settings.Instance.MultiMonMode == 2 && Host.Screen.Primary)
+                if (Settings.Instance.MultiMonMode == Settings.MultiMonOption.SameAsWindowAndPrimary && Host.Screen.Primary)
                 {
                     return true;
                 }
@@ -159,7 +159,7 @@ private void TaskList_OnSizeChanged(object sender, SizeChangedEventArgs e)
 
         private void SetTaskButtonWidth()
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 ButtonWidth = ActualWidth;
                 SetScrollable(true); // while technically not always scrollable, we don't run into DPI-specific issues with it enabled while vertical

diff --git a/RetroBar/Converters/DockOrientationConverter.cs b/RetroBar/Converters/DockOrientationConverter.cs
@@ -11,7 +11,7 @@ public class DockOrientationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            bool vertical = Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right;
+            bool vertical = Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right;
 
             // parameter is a string "leading" or "trailing"
 

diff --git a/RetroBar/Converters/EdgeOrientationConverter.cs b/RetroBar/Converters/EdgeOrientationConverter.cs
@@ -11,7 +11,7 @@ public class EdgeOrientationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return Orientation.Vertical;
             }

diff --git a/RetroBar/Converters/EnumConverter.cs b/RetroBar/Converters/EnumConverter.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace RetroBar.Converters
+{
+    public class EnumConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (int)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Enum.ToObject(targetType, value);
+        }
+    }
+}
diff --git a/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs b/RetroBar/Converters/ToolTipHorizontalOffsetConverter.cs
@@ -18,7 +18,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return double.NaN;
             }
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return (double)0;
             }

diff --git a/RetroBar/Converters/ToolTipPlacementConverter.cs b/RetroBar/Converters/ToolTipPlacementConverter.cs
@@ -11,15 +11,15 @@ public class ToolTipPlacementConverter : IMultiValueConverter
     {
         public object Convert(object[] value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left)
+            if (Settings.Instance.Edge == AppBarEdge.Left)
             {
                 return PlacementMode.Right;
             }
-            else if (Settings.Instance.Edge == (int)AppBarEdge.Right)
+            else if (Settings.Instance.Edge == AppBarEdge.Right)
             {
                 return PlacementMode.Left;
             }
-            else if (Settings.Instance.Edge == (int)AppBarEdge.Top)
+            else if (Settings.Instance.Edge == AppBarEdge.Top)
             {
                 return PlacementMode.Bottom;
             }

diff --git a/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs b/RetroBar/Converters/ToolTipVerticalOffsetConverter.cs
@@ -18,7 +18,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return double.NaN;
             }
 
-            if (Settings.Instance.Edge == (int)AppBarEdge.Left || Settings.Instance.Edge == (int)AppBarEdge.Right)
+            if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 double placementTargetHeight = (double)values[0];
                 double toolTipHeight = (double)values[1];