Fixes for plain fetchxml

rappen · Jan 14, 2023 · 51b890f · 51b890f
1 parent c3e80dc
commit 51b890f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -1125,7 +1125,7 @@ internal static QExStyle[] GetComboBoxItems()
                 {
                     Tag = QExStyleEnum.FetchXML,
                     Creator = "Microsoft",
-                    ClassName = "<plain fetchxml>",
+                    ClassName = "plain fetchxml",
                     HelpUrl = "https://learn.microsoft.com/en-us/power-apps/developer/data-platform/use-fetchxml-construct-query",
                 }
             };

diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -867,6 +867,7 @@ private void cmbQExStyle_SelectedIndexChanged(object sender, EventArgs e)
                 rbQExObjectinitializer.Enabled = true;
                 cmbQExFlavor.Enabled = true;
                 chkQExComments.Enabled = true;
+                numQExIndent.Enabled = true;
                 switch (fxb.settings.CodeGenerators.QExStyle)
                 {
                     case QExStyleEnum.QueryExpression:
@@ -890,9 +891,14 @@ private void cmbQExStyle_SelectedIndexChanged(object sender, EventArgs e)
                         rbQExObjectinitializer.Enabled = false;
                         cmbQExFlavor.Enabled = false;
                         chkQExComments.Enabled = false;
-                        rbQExLineByLine.Checked = true;
-                        cmbQExFlavor.SelectedIndex = -1;
                         chkQExComments.Checked = false;
+                        rbQExLineByLine.Checked = true;
+                        if (fxb.settings.CodeGenerators.QExFlavor != QExFlavorEnum.LateBound)
+                        {
+                            cmbQExFlavor.SelectedIndex = 0;
+                        }
+                        numQExIndent.Value = 0;
+                        numQExIndent.Enabled = false;
                         break;
                 }
                 fxb.UpdateLiveXML();