From cc38d42bf9cf510c93f08e3e6f1a0f966c32e25d Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Wed, 17 Mar 2021 15:45:12 -0700
Subject: [PATCH] Adjustments for editor to make langauge more clear for how to
 interact with editor. (#10298)

---
 .../FancyZonesEditor/GridEditorWindow.xaml    | 23 +++++++---
 .../Properties/Resources.Designer.cs          | 46 +++++++++++++++----
 .../Properties/Resources.resx                 | 20 ++++++--
 3 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
index eba84aadcc..b816c73d6b 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
@@ -35,12 +35,23 @@
                 Margin="0,4,0,0" />
         </Grid>
         <StackPanel Margin="16">
-            <TextBlock Text="{x:Static props:Resources.Note_Custom_Table}"
-                       Foreground="{DynamicResource SecondaryForegroundBrush}"
-                       Style="{StaticResource CaptionTextBlockStyle}"
-                       Margin="0,8,0,0"
-                       TextWrapping="Wrap" />
-      
+            <StackPanel Margin="0,8,0,0">
+                <TextBlock 
+                    TextWrapping="Wrap">
+                    <Run 
+                        FontWeight="Bold" 
+                        Text="{x:Static props:Resources.SplitterName}" />
+                    <Run Text="{x:Static props:Resources.SplitterDescription}" />
+                </TextBlock>
+                <TextBlock 
+                    Margin="0,8,0,0"
+                    TextWrapping="Wrap">
+                    <Run 
+                        FontWeight="Bold" 
+                        Text="{x:Static props:Resources.MergeName}" />
+                    <Run Text="{x:Static props:Resources.MergeDescription}" />
+                </TextBlock>
+            </StackPanel>
             <Grid Margin="0,24,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
index 7e6b14a20e..4c2b446366 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
@@ -501,6 +501,24 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Click and drag across zones..
+        /// </summary>
+        public static string MergeDescription {
+            get {
+                return ResourceManager.GetString("MergeDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Merge/Delete:.
+        /// </summary>
+        public static string MergeName {
+            get {
+                return ResourceManager.GetString("MergeName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Monitor.
         /// </summary>
@@ -528,16 +546,6 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
-        /// <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 {
-                return ResourceManager.GetString("Note_Custom_Table", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Number of zones.
         /// </summary>
@@ -601,6 +609,24 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Hold Shift key for vertical split..
+        /// </summary>
+        public static string SplitterDescription {
+            get {
+                return ResourceManager.GetString("SplitterDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Splitter:.
+        /// </summary>
+        public static string SplitterName {
+            get {
+                return ResourceManager.GetString("SplitterName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to No layout.
         /// </summary>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
index 46f43279ab..9a08373776 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
@@ -159,10 +159,6 @@
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
-  <data name="Note_Custom_Table" xml:space="preserve">
-    <value>Hold down Shift key to change orientation of splitter.
-To merge zones, hold down the left mouse button, drag the mouse to the zone to merge, release the mouse button and click "Merge zones".</value>
-  </data>
   <data name="Save_Apply" xml:space="preserve">
     <value>Save &amp; apply</value>
   </data>
@@ -334,4 +330,20 @@ To merge zones, hold down the left mouse button, drag the mouse to the zone to m
   <data name="Default_Custom_Layout_Name" xml:space="preserve">
     <value>Custom layout</value>
   </data>
+  <data name="MergeDescription" xml:space="preserve">
+    <value>Click and drag across zones.</value>
+    <comment>Click mouse, hold button down and drag across multiple zones in tool</comment>
+  </data>
+  <data name="MergeName" xml:space="preserve">
+    <value>Merge/Delete:</value>
+    <comment>Title for concept behind Merging two zones together or removing an zone</comment>
+  </data>
+  <data name="SplitterDescription" xml:space="preserve">
+    <value>Hold Shift key for vertical split.</value>
+    <comment>A segmenter visual for splitting one item into two.  This would be the vertical line. Shift key is referring to key on keyboard</comment>
+  </data>
+  <data name="SplitterName" xml:space="preserve">
+    <value>Splitter:</value>
+    <comment>Title for concept: A segmenter visual for splitting one item into two.  This would be the vertical line</comment>
+  </data>
 </root>
\ No newline at end of file