Minor UI fixes

rappen · Jan 25, 2023 · aebee57 · aebee57
1 parent ddd03f2
commit aebee57
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 98 deletions.
diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -6,7 +6,6 @@
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Forms;
 using Rappen.XTB.FetchXmlBuilder.Settings;
-using Rappen.XTB.Helper;
 using Rappen.XTB.XmlEditorUtils;
 using System;
 using System.Collections.Generic;
@@ -905,6 +904,9 @@ private void cmbQExStyle_SelectedIndexChanged(object sender, EventArgs e)
             {
                 linkStyleHelp.Text = string.Empty;
             }
+            panParseQE.Visible =
+                fxb.settings.CodeGenerators.QExStyle == QExStyleEnum.QueryExpression &&
+                fxb.settings.CodeGenerators.QExFlavor == QExFlavorEnum.LateBound;
         }
 
         private void cmbQExFlavor_SelectedIndexChanged(object sender, EventArgs e)
@@ -915,13 +917,16 @@ private void cmbQExFlavor_SelectedIndexChanged(object sender, EventArgs e)
                 linkFlavorHelp.Text = flavor.Creator;
                 tt.SetToolTip(linkFlavorHelp, flavor.HelpUrl);
                 btnQExFlavorSettings.Visible = flavor.Tag == QExFlavorEnum.LCGconstants;
-                cmbQExFlavor.Width = cmbQExStyle.Width - (flavor.Tag == QExFlavorEnum.LCGconstants ? btnQExFlavorSettings.Width + 6 : 0);
+                linkFlavorHelp.Left = btnQExFlavorSettings.Left + (flavor.Tag == QExFlavorEnum.LCGconstants ? btnQExFlavorSettings.Width + 6 : 0);
                 UpdateXML(fxb.GetQueryExpressionCode());
             }
             else
             {
                 linkFlavorHelp.Text = string.Empty;
             }
+            panParseQE.Visible =
+                fxb.settings.CodeGenerators.QExStyle == QExStyleEnum.QueryExpression &&
+                fxb.settings.CodeGenerators.QExFlavor == QExFlavorEnum.LateBound;
         }
 
         private void chkQExFilterVariables_CheckedChanged(object sender, EventArgs e)

diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.designer.cs b/FetchXmlBuilder/DockControls/XmlContentControl.designer.cs
diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.resx b/FetchXmlBuilder/DockControls/XmlContentControl.resx
@@ -136,9 +136,6 @@
   <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="autocompleteImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>77, 17</value>
   </metadata>
@@ -147,7 +144,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACC
-        DQAAAk1TRnQBSQFMAgEBBQEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBBQEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA