Merge pull request #7083 from ChrisMarsh82/Linux-display

Updated AutoScaleMode
IDEMSInternational · Jan 10, 2022 · 0938948 · 0938948
2 parents 93573bf + 35ccadd
commit 0938948
Show file tree

Hide file tree

Showing 69 changed files with 870 additions and 4,731 deletions.
diff --git a/instat/UcrGeomListWithAes.designer.vb b/instat/UcrGeomListWithAes.designer.vb
diff --git a/instat/UcrGeomListWithAes.resx b/instat/UcrGeomListWithAes.resx
diff --git a/instat/UcrPanel.Designer.vb b/instat/UcrPanel.Designer.vb
diff --git a/instat/UcrPanel.resx b/instat/UcrPanel.resx
@@ -117,49 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="pnlRadios.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pnlRadios.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="pnlRadios.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="pnlRadios.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;pnlRadios.Name" xml:space="preserve">
-    <value>pnlRadios</value>
-  </data>
-  <data name="&gt;&gt;pnlRadios.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;pnlRadios.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;pnlRadios.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>UcrPanel</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>instat.ucrCore, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
 </root>
diff --git a/instat/dlgFromLibrary.resx b/instat/dlgFromLibrary.resx
@@ -143,6 +143,18 @@
   <data name="&gt;&gt;cmdLibraryCollection.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="clmDatasets.Text" xml:space="preserve">
+    <value>Data</value>
+  </data>
+  <data name="clmDatasets.Width" type="System.Int32, mscorlib">
+    <value>142</value>
+  </data>
+  <data name="clmDesc.Text" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="clmDesc.Width" type="System.Int32, mscorlib">
+    <value>266</value>
+  </data>
   <data name="lstCollection.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 79</value>
   </data>
@@ -164,18 +176,6 @@
   <data name="&gt;&gt;lstCollection.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
-  <data name="clmDatasets.Text" xml:space="preserve">
-    <value>Data</value>
-  </data>
-  <data name="clmDatasets.Width" type="System.Int32, mscorlib">
-    <value>142</value>
-  </data>
-  <data name="clmDesc.Text" xml:space="preserve">
-    <value>Description</value>
-  </data>
-  <data name="clmDesc.Width" type="System.Int32, mscorlib">
-    <value>266</value>
-  </data>
   <data name="lblFromPackage.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -297,14 +297,17 @@
   <data name="ucrInputPackages.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="ucrInputPackages.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
   <data name="ucrInputPackages.Location" type="System.Drawing.Point, System.Drawing">
     <value>108, 51</value>
   </data>
   <data name="ucrInputPackages.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>6, 8, 6, 8</value>
   </data>
   <data name="ucrInputPackages.Size" type="System.Drawing.Size, System.Drawing">
-    <value>137, 21</value>
+    <value>0, 0</value>
   </data>
   <data name="ucrInputPackages.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -324,6 +327,9 @@
   <data name="ucrBase.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>None</value>
   </data>
+  <data name="ucrBase.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
   <data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 287</value>
   </data>
@@ -348,9 +354,6 @@
   <data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
-  <data name="ucrPnlOptions.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
   <data name="ucrPnlOptions.Location" type="System.Drawing.Point, System.Drawing">
     <value>59, 2</value>
   </data>
@@ -375,8 +378,8 @@
   <data name="&gt;&gt;ucrPnlOptions.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="ucrNewDataFrameName.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="ucrNewDataFrameName.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
   </data>
   <data name="ucrNewDataFrameName.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 259</value>