[FancyZones Editor] New UX for the FZ editor.

.github/actions/spell-check/expect.txt

@@ -2374,6 +2374,7 @@ Whichdoes
 whitespaces
 WIC
 Wifi
+wifstream
 wih
 wiki
 wikipedia

installer/PowerToysSetup/Product.wxs

@@ -374,8 +374,9 @@
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\FancyZonesEditor.runtimeconfig.json" />
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\FancyZonesEditor.exe" />
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ControlzEx.dll" />
-        <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\MahApps.Metro.dll" />
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\Microsoft.Xaml.Behaviors.dll" />
+        <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ModernWpf.dll" />
+        <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ModernWpf.Controls.dll" />
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\System.Text.Json.dll" />
         <File Id="FancyZones_ManagedCommon" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ManagedCommon.dll" />
         <File Id="FancyZones_Telemetry.dll" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ManagedTelemetry.dll" />

src/modules/fancyzones/editor/FancyZonesEditor/App.xaml

@@ -2,20 +2,29 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:FancyZonesEditor"
+             xmlns:ui="http://schemas.modernwpf.com/2019"
              Startup="OnStartup">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-                <!-- Accent and AppTheme setting -->
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
+                <ui:ThemeResources />
+                <ui:XamlControlsResources />
+                <ResourceDictionary Source="pack://application:,,,/Styles/ButtonStyles.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Styles/LayoutPreviewStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
-            <SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BF333333"/>
-            <SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#FF1a1a1a"/>
-
+            <Style x:Key="UWPFocusVisualStyle">
+                <Setter Property="Control.Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Border Margin="-2"
+                                    CornerRadius="4"
+                                    BorderThickness="2"
+                                    BorderBrush="{DynamicResource PrimaryForegroundBrush}" />
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

src/modules/fancyzones/editor/FancyZonesEditor/App.xaml.cs

@@ -9,6 +9,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using FancyZonesEditor.Utils;
 using ManagedCommon;
@@ -41,6 +43,9 @@ public partial class App : Application
         private const string CrashReportDynamicAssemblyTag = "dynamic assembly doesn't have location";
         private const string CrashReportLocationNullTag = "location is null or empty";
 
+        private const string ParsingErrorReportTag = "Settings parsing error";
+        private const string ParsingErrorDataTag = "Data: ";
+
         public MainWindowSettingsModel MainWindowSettings { get; }
 
         public static FancyZonesEditorIO FancyZonesEditorIO { get; private set; }
@@ -49,6 +54,8 @@ public partial class App : Application
 
         public static int PowerToysPID { get; set; }
 
+        private ThemeManager _themeManager;
+
         public static bool DebugMode
         {
             get
@@ -67,7 +74,7 @@ private void DebugModeCheck()
 
         public App()
         {
-            DebugModeCheck();
+            // DebugModeCheck();
             FancyZonesEditorIO = new FancyZonesEditorIO();
             Overlay = new Overlay();
             MainWindowSettings = new MainWindowSettingsModel();
@@ -82,8 +89,61 @@ private void OnStartup(object sender, StartupEventArgs e)
                 Environment.Exit(0);
             });
 
-            FancyZonesEditorIO.ParseCommandLineArguments();
-            FancyZonesEditorIO.ParseDeviceInfoData();
+            _themeManager = new ThemeManager(this);
+
+            if (!FancyZonesEditorIO.ParseParams().Result)
+            {
+                FancyZonesEditorIO.ParseCommandLineArguments();
+            }
+
+            var parseResult = FancyZonesEditorIO.ParseZoneSettings();
+
+            // 10ms retry loop with 1 second timeout
+            if (!parseResult.Result)
+            {
+                CancellationTokenSource ts = new CancellationTokenSource();
+                Task t = Task.Run(() =>
+                {
+                    while (!parseResult.Result && !ts.IsCancellationRequested)
+                    {
+                        Task.Delay(10).Wait();
+                        parseResult = FancyZonesEditorIO.ParseZoneSettings();
+                    }
+                });
+
+                try
+                {
+                    bool result = t.Wait(1000, ts.Token);
+                    ts.Cancel();
+                }
+                catch (OperationCanceledException)
+                {
+                    ts.Dispose();
+                }
+            }
+
+            // Error message if parsing failed
+            if (!parseResult.Result)
+            {
+                var sb = new StringBuilder();
+                sb.AppendLine();
+                sb.AppendLine("## " + ParsingErrorReportTag);
+                sb.AppendLine();
+                sb.AppendLine(parseResult.Message);
+                sb.AppendLine();
+                sb.AppendLine(ParsingErrorDataTag);
+                sb.AppendLine(parseResult.MalformedData);
+
+                string message = parseResult.Message + Environment.NewLine + Environment.NewLine + FancyZonesEditor.Properties.Resources.Error_Parsing_Zones_Settings_User_Choice;
+                if (MessageBox.Show(message, FancyZonesEditor.Properties.Resources.Error_Parsing_Zones_Settings_Title, MessageBoxButton.YesNo) == MessageBoxResult.No)
+                {
+                    // TODO: log error
+                    ShowExceptionReportMessageBox(sb.ToString());
+                    Environment.Exit(0);
+                }
+
+                ShowExceptionReportMessageBox(sb.ToString());
+            }
 
             MainWindowSettingsModel settings = ((App)Current).MainWindowSettings;
             settings.UpdateSelectedLayoutModel();