Merge remote-tracking branch 'origin/master' into view-layout

rappen · Jul 1, 2022 · 5897543 · 5897543
2 parents e5a0421 + 34a96ac
commit 5897543
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 54 deletions.
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -2,6 +2,7 @@
 using Rappen.XTB.FetchXmlBuilder.AppCode;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using System;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Rappen.XTB.FetchXmlBuilder.DockControls
@@ -83,6 +84,10 @@ private void RefreshData()
             crmGridView1.SuspendLayout();
             crmGridView1.Refresh();
             crmGridView1.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
+            crmGridView1.Columns.Cast<DataGridViewColumn>()
+                .Where(c => c.Width > form.settings.Results.MaxColumnWidth)
+                .ToList()
+                .ForEach(c => c.Width = form.settings.Results.MaxColumnWidth);
             crmGridView1.ResumeLayout();
         }
 

diff --git a/FetchXmlBuilder/FetchXmlBuilder.csproj b/FetchXmlBuilder/FetchXmlBuilder.csproj
@@ -475,6 +475,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\About.resx">
       <DependentUpon>About.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DockControls\ResultGrid.resx">
       <DependentUpon>ResultGrid.cs</DependentUpon>

diff --git a/FetchXmlBuilder/Forms/Settings.Designer.cs b/FetchXmlBuilder/Forms/Settings.Designer.cs
diff --git a/FetchXmlBuilder/Forms/Settings.cs b/FetchXmlBuilder/Forms/Settings.cs
@@ -42,6 +42,7 @@ private void PopulateSettings(FXBSettings settings)
             cmbResult.SelectedIndex = SettingResultToComboBoxItem(settings.Results.ResultOutput);
             chkResAllPages.Checked = settings.Results.RetrieveAllPages;
             chkClickableLinks.Checked = settings.Results.ClickableLinks;
+            numMaxColumnWidth.Value = settings.Results.MaxColumnWidth;
             propXmlColors.SelectedObject = settings.XmlColors;
             txtFetch.ConfigureForXml(settings);
             txtFetch.FormatXML(settings.QueryOptions.NewQueryTemplate, settings);
@@ -82,6 +83,7 @@ internal FXBSettings GetSettings()
             settings.Results.ResultOutput = ResultItemToSettingResult(cmbResult.SelectedIndex);
             settings.Results.RetrieveAllPages = chkResAllPages.Checked;
             settings.Results.ClickableLinks = chkClickableLinks.Checked;
+            settings.Results.MaxColumnWidth = (int)numMaxColumnWidth.Value;
             settings.OpenUncustomizableViews = chkAppAllowUncustViews.Checked;
             settings.AddConditionToFilter = chkAddConditionToFilter.Checked;
             settings.UseSQL4CDS = chkUseSQL4CDS.Checked;

diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -55,6 +55,7 @@ public class ResultOptions
         public bool AlwaysNewWindow { get; set; } = false;
         public bool QuickFilter { get; set; } = false;
         public bool ClickableLinks { get; set; } = true;
+        public int MaxColumnWidth { get; set; } = 500;
     }
 
     public class DockStates

diff --git a/Rappen.XTB.Helper b/Rappen.XTB.Helper