Remaining view layout of the LayoutXML window #766

rappen · Aug 18, 2022 · e8e242a · e8e242a
1 parent 636b216
commit e8e242a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/FetchXmlBuilder/FXBGui.cs b/FetchXmlBuilder/FXBGui.cs
@@ -242,6 +242,11 @@ private IDockContent dockDeSerialization(string persistString)
                 dockControlFetchXml = new XmlContentControl(this);
                 return dockControlFetchXml;
             }
+            else if (persistString == XmlContentControl.GetPersistString(ContentType.LayoutXML) && dockControlLayoutXml?.IsDisposed != false)
+            {
+                dockControlLayoutXml = new XmlContentControl(ContentType.LayoutXML, SaveFormat.None, this);
+                return dockControlLayoutXml;
+            }
             return null;
         }
 

diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -15,7 +15,14 @@ public class FXBSettings
         private bool _useFriendlyNames;
 
         public bool UseFriendlyNames
-        { get { return _useFriendlyNames; } set { _useFriendlyNames = value; FetchXmlBuilder.friendlyNames = value; } }
+        {
+            get { return _useFriendlyNames; }
+            set
+            {
+                _useFriendlyNames = value;
+                FetchXmlBuilder.friendlyNames = value;
+            }
+        }
 
         public QueryOptions QueryOptions { get; set; } = new QueryOptions();
         public ResultOptions Results { get; set; } = new ResultOptions();
@@ -64,7 +71,7 @@ public class DockStates
         public DockState ResultView { get; set; } = DockState.Document;
         public DockState FetchResult { get; set; } = DockState.Document;
         public DockState FetchXML { get; set; } = DockState.Document;
-        public DockState LayoutXML { get; set; } = DockState.DockRight;
+        public DockState LayoutXML { get; set; } = DockState.Document;
         public DockState FetchXMLCs { get; set; } = DockState.DockRight;
         public DockState FetchXMLJs { get; set; } = DockState.DockRight;
         public DockState QueryExpression { get; set; } = DockState.DockRight;
@@ -83,6 +90,7 @@ public class ContentWindows
     {
         public ContentWindow FetchResult { get; set; } = new ContentWindow();
         public ContentWindow FetchXmlWindow { get; set; } = new ContentWindow();
+        public ContentWindow LayoutXmlWindow { get; set; } = new ContentWindow();
         public ContentWindow SQLWindow { get; set; } = new ContentWindow();
         public ContentWindow FetchXmlCsWindow { get; set; } = new ContentWindow();
         public ContentWindow FetchXmlJsWindow { get; set; } = new ContentWindow();
@@ -100,6 +108,9 @@ internal ContentWindow GetContentWindow(ContentType type)
                 case ContentType.FetchXML:
                     return FetchXmlWindow;
 
+                case ContentType.LayoutXML:
+                    return LayoutXmlWindow;
+
                 case ContentType.SQL_Query:
                     return SQLWindow;
 
@@ -123,6 +134,10 @@ internal void SetContentWindow(ContentType type, ContentWindow windowSettings)
                     FetchXmlWindow = windowSettings;
                     break;
 
+                case ContentType.LayoutXML:
+                    LayoutXmlWindow = windowSettings;
+                    break;
+
                 case ContentType.SQL_Query:
                     SQLWindow = windowSettings;
                     break;