[FancyZones Editor] New UX for the FZ editor. (#9325)

* Removed MetroWindow, added theming support and modernWPF

* Rmoved MahApps refs

* Removed MahApps

* Updated canvas zones

* Updated GridEditor

* Fixes

* UI updates

* New layout type selection dialog

* New editor UI

* Updates

* Fix

* UI enhancements

* Updated UI

* Added styles to layoutpreview

* Accesibility improvements

* Accesibility and styling improvements

* Fix

* Cleaned up brushes

* Updated UX

* Updated UI

* Added no layouts description

* Fix

* UI fixes

* [FZ Editor] Serialize/deserialize settings (#8615)

* conflicts fix

* [FZ Editor] Parse json file instead of command line args (#8649)

* [FZ Editor] Serialize/deserialize settings fix (#8707)

* [FZ Editor] Hide unsupported settings in custom layouts flyouts (#8716)

* [FZ Editor] Duplicate custom layouts (#8718)

* [FZ Editor] Duplicate layout behavior (#8720)

* New UX proposal

* Updated spacing

* Switching to toggleswitches

* Revert toggleswitch

* Updated colorbrush

* Updated string for saving label

* Updated UI

* Dark theme color fixes

* Removed space

* [FZ Editor] Bind dialog properties (#9199)

* Resize editor window to fit the content in single-monitor mode (#9203)

* Editor opening fix (#9207)

* Disable "Create" button if the Name textbox is empty (#9212)

* [FZ Editor] Changed edit dialog for template layouts. (#9233)

* [FZ Editor] Small fixes and refactoring. (#9236)

* new layout creation refactoring
* "Save and apply" applies the layout
* number of zones header hide

* [FZ Editor] Empty layout template. (#9237)

* [FZ Editor] Move "Duplicate" and "Delete" buttons to the Edit dialog. (#9272)

* [FZ Editor] Preview the applied layout after editing another layout. (#9278)

* Fixed "Save and apply" button behavior (#9286)

* [FZ Editor] Save template layouts in the settings. (#9283)

* Added default custom layout name (#9291)

* close dialog before opening zones editor (#9302)

* Pressing Esc closes dialogs (#9301)

* [FZ Editor] Reset applied layout to "No layout" if it was deleted. (#9315)

* [FZ Editor] Dark theme colors (#9317)

* "Number of zones" buttons colors. (#9321)

* rebase fix

* added ModernWpf.dll

* address PR comments: updated colors

* added comments, replaced magic numbers

* refactoring

* merge zones crash fix

* removed redundant using directive

Co-authored-by: Niels Laute <niels9001@hotmail.com>
Co-authored-by: Niels Laute <niels.laute@live.nl>

src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs

@@ -78,6 +78,33 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Apply layout.
+        /// </summary>
+        public static string Apply_Layout {
+            get {
+                return ResourceManager.GetString("Apply_Layout", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure?.
+        /// </summary>
+        public static string Are_You_Sure {
+            get {
+                return ResourceManager.GetString("Are_You_Sure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure you want to delete this layout?.
+        /// </summary>
+        public static string Are_You_Sure_Description {
+            get {
+                return ResourceManager.GetString("Are_You_Sure_Description", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -97,7 +124,7 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Choose your layout for this desktop.
+        ///   Looks up a localized string similar to Choose the layout for this desktop.
         /// </summary>
         public static string Choose_Layout {
             get {
@@ -105,6 +132,15 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Choose layout type.
+        /// </summary>
+        public static string Choose_layout_type {
+            get {
+                return ResourceManager.GetString("Choose_layout_type", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Close.
         /// </summary>
@@ -132,6 +168,33 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        public static string Create {
+            get {
+                return ResourceManager.GetString("Create", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Create custom layout.
+        /// </summary>
+        public static string Create_Custom_From_Template {
+            get {
+                return ResourceManager.GetString("Create_Custom_From_Template", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Create new layout.
+        /// </summary>
+        public static string Create_new_layout {
+            get {
+                return ResourceManager.GetString("Create_new_layout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Custom.
         /// </summary>
@@ -142,7 +205,7 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Create new custom.
+        ///   Looks up a localized string similar to Custom layout.
         /// </summary>
         public static string Custom_Layout_Create_New {
             get {
@@ -160,20 +223,29 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delete custom layout.
+        ///   Looks up a localized string similar to Custom layout.
         /// </summary>
-        public static string Custom_Layout_Delete_Button {
+        public static string Default_Custom_Layout_Name {
             get {
-                return ResourceManager.GetString("Custom_Layout_Delete_Button", resourceCulture);
+                return ResourceManager.GetString("Default_Custom_Layout_Name", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Custom table layout creator.
+        ///   Looks up a localized string similar to Delete.
         /// </summary>
-        public static string Custom_Table_Layout {
+        public static string Delete {
             get {
-                return ResourceManager.GetString("Custom_Table_Layout", resourceCulture);
+                return ResourceManager.GetString("Delete", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete zone.
+        /// </summary>
+        public static string Delete_Zone {
+            get {
+                return ResourceManager.GetString("Delete_Zone", resourceCulture);
             }
         }
         
@@ -187,11 +259,38 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Edit selected layout.
+        ///   Looks up a localized string similar to Duplicate.
         /// </summary>
-        public static string Edit_Selected_Layout {
+        public static string Duplicate {
             get {
-                return ResourceManager.GetString("Edit_Selected_Layout", resourceCulture);
+                return ResourceManager.GetString("Duplicate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit.
+        /// </summary>
+        public static string Edit {
+            get {
+                return ResourceManager.GetString("Edit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit layout.
+        /// </summary>
+        public static string Edit_Layout {
+            get {
+                return ResourceManager.GetString("Edit_Layout", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit zones.
+        /// </summary>
+        public static string Edit_zones {
+            get {
+                return ResourceManager.GetString("Edit_zones", resourceCulture);
             }
         }
         
@@ -276,6 +375,33 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;zones-settings.json&apos; contains malformed data..
+        /// </summary>
+        public static string Error_Parsing_Zones_Settings_Malformed_Data {
+            get {
+                return ResourceManager.GetString("Error_Parsing_Zones_Settings_Malformed_Data", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Editor settings parsing error..
+        /// </summary>
+        public static string Error_Parsing_Zones_Settings_Title {
+            get {
+                return ResourceManager.GetString("Error_Parsing_Zones_Settings_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Would you like to continue? Malformed data will be lost..
+        /// </summary>
+        public static string Error_Parsing_Zones_Settings_User_Choice {
+            get {
+                return ResourceManager.GetString("Error_Parsing_Zones_Settings_User_Choice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error persisting custom layout.
         /// </summary>
@@ -330,6 +456,60 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create layouts that have overlapping zones.
+        /// </summary>
+        public static string Layout_Canvas_Description {
+            get {
+                return ResourceManager.GetString("Layout_Canvas_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Canvas.
+        /// </summary>
+        public static string Layout_Canvas_Title {
+            get {
+                return ResourceManager.GetString("Layout_Canvas_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Create layouts that are horizontally or vertically stacked.
+        /// </summary>
+        public static string Layout_Grid_Description {
+            get {
+                return ResourceManager.GetString("Layout_Grid_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Grid.
+        /// </summary>
+        public static string Layout_Grid_Title {
+            get {
+                return ResourceManager.GetString("Layout_Grid_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Merge zones.
+        /// </summary>
+        public static string Merge_zones {
+            get {
+                return ResourceManager.GetString("Merge_zones", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Monitor.
+        /// </summary>
+        public static string Monitor {
+            get {
+                return ResourceManager.GetString("Monitor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Name.
         /// </summary>
@@ -340,7 +520,17 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Note: Hold down Shift Key to change orientation of splitter.  To merge zones, select the zones and click &quot;merge&quot;..
+        ///   Looks up a localized string similar to Create or duplicate a layout to get started.
+        /// </summary>
+        public static string No_Custom_Layouts_Message {
+            get {
+                return ResourceManager.GetString("No_Custom_Layouts_Message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hold down Shift key to change orientation of splitter.
+        ///To merge zones, select the zones and click &quot;merge&quot;..
         /// </summary>
         public static string Note_Custom_Table {
             get {
@@ -348,6 +538,15 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Number of zones.
+        /// </summary>
+        public static string NumberOfZones {
+            get {
+                return ResourceManager.GetString("NumberOfZones", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reset layout.
         /// </summary>
@@ -358,7 +557,16 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Save and apply.
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        public static string Save {
+            get {
+                return ResourceManager.GetString("Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save &amp; apply.
         /// </summary>
         public static string Save_Apply {
             get {
@@ -366,6 +574,15 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Template settings.
+        /// </summary>
+        public static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show space around zones.
         /// </summary>
@@ -385,20 +602,11 @@ namespace FancyZonesEditor.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Custom tab selected, press ctrl + tab to switch to Templates.
+        ///   Looks up a localized string similar to No layout.
         /// </summary>
-        public static string Tab_Item_Custom {
+        public static string Template_Layout_Blank {
             get {
-                return ResourceManager.GetString("Tab_Item_Custom", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Templates tab selected, press ctrl + tab to switch to Custom.
-        /// </summary>
-        public static string Tab_Item_Templates {
-            get {
-                return ResourceManager.GetString("Tab_Item_Templates", resourceCulture);
+                return ResourceManager.GetString("Template_Layout_Blank", resourceCulture);
             }
         }
         

src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx

@@ -132,9 +132,6 @@
   <data name="Grid_Layout_Editor" xml:space="preserve">
     <value>Grid layout editor</value>
   </data>
-  <data name="Choose_Layout" xml:space="preserve">
-    <value>Choose your layout for this desktop</value>
-  </data>
   <data name="Crash_Report_Message_Box_Text_Part1" xml:space="preserve">
     <value>Error logged to </value>
   </data>
@@ -147,14 +144,11 @@
   <data name="Custom_Layout_Creator" xml:space="preserve">
     <value>Custom layout creator</value>
   </data>
-  <data name="Custom_Table_Layout" xml:space="preserve">
-    <value>Custom table layout creator</value>
-  </data>
   <data name="Distance_adjacent_zones" xml:space="preserve">
     <value>Distance to highlight adjacent zones</value>
   </data>
-  <data name="Edit_Selected_Layout" xml:space="preserve">
-    <value>Edit selected layout</value>
+  <data name="Edit_Layout" xml:space="preserve">
+    <value>Edit layout</value>
   </data>
   <data name="Fancy_Zones_Editor_App_Title" xml:space="preserve">
     <value>FancyZones Editor</value>
@@ -166,10 +160,11 @@
     <value>Name</value>
   </data>
   <data name="Note_Custom_Table" xml:space="preserve">
-    <value>Note: Hold down Shift Key to change orientation of splitter.  To merge zones, select the zones and click "merge".</value>
+    <value>Hold down Shift key to change orientation of splitter.
+To merge zones, select the zones and click "merge".</value>
   </data>
   <data name="Save_Apply" xml:space="preserve">
-    <value>Save and apply</value>
+    <value>Save &amp; apply</value>
   </data>
   <data name="Show_Space_Zones" xml:space="preserve">
     <value>Show space around zones</value>
@@ -186,13 +181,6 @@
   <data name="Zone_Count_Increment" xml:space="preserve">
     <value>Increment number of zones in template layout</value>
   </data>
-  <data name="Custom_Layout_Delete_Button" xml:space="preserve">
-    <value>Delete custom layout</value>
-  </data>
-  <data name="Custom_Layout_Create_New" xml:space="preserve">
-    <value>Create new custom</value>
-    <comment>As in Create new custom layout</comment>
-  </data>
   <data name="Error_Invalid_Arguments" xml:space="preserve">
     <value>FancyZones Editor arguments are invalid.</value>
   </data>
@@ -220,12 +208,6 @@
   <data name="Template_Layout_Rows" xml:space="preserve">
     <value>Rows</value>
   </data>
-  <data name="Tab_Item_Custom" xml:space="preserve">
-    <value>Custom tab selected, press ctrl + tab to switch to Templates</value>
-  </data>
-  <data name="Tab_Item_Templates" xml:space="preserve">
-    <value>Templates tab selected, press ctrl + tab to switch to Custom</value>
-  </data>
   <data name="Close" xml:space="preserve">
     <value>Close</value>
   </data>
@@ -257,4 +239,99 @@
     <value>Reset layout</value>
     <comment>as in Reset to a blank value</comment>
   </data>
+  <data name="Choose_Layout" xml:space="preserve">
+    <value>Choose the layout for this desktop</value>
+  </data>
+  <data name="Choose_layout_type" xml:space="preserve">
+    <value>Choose layout type</value>
+    <comment>Dialog header that allows the user to select a specific layout type</comment>
+  </data>
+  <data name="Create" xml:space="preserve">
+    <value>Create</value>
+    <comment>Button label that creates a new layout</comment>
+  </data>
+  <data name="Create_new_layout" xml:space="preserve">
+    <value>Create new layout</value>
+    <comment>Button label that allows the user to create a new layout</comment>
+  </data>
+  <data name="Custom_Layout_Create_New" xml:space="preserve">
+    <value>Custom layout</value>
+  </data>
+  <data name="Delete" xml:space="preserve">
+    <value>Delete</value>
+    <comment>Context menu label that allows the user duplicate a layout</comment>
+  </data>
+  <data name="Duplicate" xml:space="preserve">
+    <value>Duplicate</value>
+    <comment>Context menu label that allows the user duplicate a layout</comment>
+  </data>
+  <data name="Edit" xml:space="preserve">
+    <value>Edit</value>
+    <comment>Context menu label that allows the user edit a layout</comment>
+  </data>
+  <data name="Layout_Canvas_Description" xml:space="preserve">
+    <value>Create layouts that have overlapping zones</value>
+  </data>
+  <data name="Layout_Canvas_Title" xml:space="preserve">
+    <value>Canvas</value>
+  </data>
+  <data name="Layout_Grid_Description" xml:space="preserve">
+    <value>Create layouts that are horizontally or vertically stacked</value>
+  </data>
+  <data name="Layout_Grid_Title" xml:space="preserve">
+    <value>Grid</value>
+  </data>
+  <data name="Merge_zones" xml:space="preserve">
+    <value>Merge zones</value>
+    <comment>Button label that allows the user to merge 2 or more zones together</comment>
+  </data>
+  <data name="Monitor" xml:space="preserve">
+    <value>Monitor</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Template settings</value>
+  </data>
+  <data name="Are_You_Sure" xml:space="preserve">
+    <value>Are you sure?</value>
+  </data>
+  <data name="Are_You_Sure_Description" xml:space="preserve">
+    <value>Are you sure you want to delete this layout?</value>
+  </data>
+  <data name="Edit_zones" xml:space="preserve">
+    <value>Edit zones</value>
+  </data>
+  <data name="No_Custom_Layouts_Message" xml:space="preserve">
+    <value>Create or duplicate a layout to get started</value>
+  </data>
+  <data name="Delete_Zone" xml:space="preserve">
+    <value>Delete zone</value>
+    <comment>A tooltip on a button that allows the user to delete a zone</comment>
+  </data>
+  <data name="Error_Parsing_Zones_Settings_Malformed_Data" xml:space="preserve">
+    <value>'zones-settings.json' contains malformed data.</value>
+  </data>
+  <data name="Error_Parsing_Zones_Settings_Title" xml:space="preserve">
+    <value>Editor settings parsing error.</value>
+  </data>
+  <data name="Error_Parsing_Zones_Settings_User_Choice" xml:space="preserve">
+    <value>Would you like to continue? Malformed data will be lost.</value>
+  </data>
+  <data name="Apply_Layout" xml:space="preserve">
+    <value>Apply layout</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="NumberOfZones" xml:space="preserve">
+    <value>Number of zones</value>
+  </data>
+  <data name="Template_Layout_Blank" xml:space="preserve">
+    <value>No layout</value>
+  </data>
+  <data name="Create_Custom_From_Template" xml:space="preserve">
+    <value>Create custom layout</value>
+  </data>
+  <data name="Default_Custom_Layout_Name" xml:space="preserve">
+    <value>Custom layout</value>
+  </data>
 </root>