Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added option to compare by row in the Compare Columns dialog #6433

Merged
merged 11 commits into from
May 24, 2021
Merged

Added option to compare by row in the Compare Columns dialog #6433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
468dd24
Fixed issues with dlgCompareColumns
HawardKetoyoMsatsi Apr 28, 2021
fb7f5ff
Implemented change in dialog size...
HawardKetoyoMsatsi Apr 28, 2021
18dbafe
removed commented code
HawardKetoyoMsatsi May 5, 2021
b68c453
Fixed raised issues
HawardKetoyoMsatsi May 7, 2021
46f560b
Update instat/dlgCompareColumns.vb
May 20, 2021
bcb1b8e
Update instat/dlgCompareColumns.vb
May 20, 2021
fbb7ff7
Update instat/dlgCompareColumns.vb
May 20, 2021
a6e476c
Update instat/dlgCompareColumns.vb
May 20, 2021
95af7e4
Merge branch 'master' into updated_compare_columns_dialog
May 20, 2021
373114f
Updated dlgCompare columns.vb
HawardKetoyoMsatsi May 20, 2021
32ddead
updated code
HawardKetoyoMsatsi May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions instat/dlgCompareColumns.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 44 additions & 13 deletions instat/dlgCompareColumns.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
<value>0</value>
</data>
<data name="ucrChkUnion.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 104</value>
<value>11, 98</value>
</data>
<data name="ucrChkUnion.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 20</value>
Expand All @@ -307,7 +307,7 @@
<value>1</value>
</data>
<data name="ucrChkIntersection.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 78</value>
<value>11, 74</value>
</data>
<data name="ucrChkIntersection.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 20</value>
Expand All @@ -328,7 +328,7 @@
<value>2</value>
</data>
<data name="ucrChkSecondNotFirst.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 52</value>
<value>11, 50</value>
</data>
<data name="ucrChkSecondNotFirst.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 20</value>
Expand Down Expand Up @@ -369,6 +369,33 @@
<data name="&gt;&gt;ucrChkFirstNotSecond.ZOrder" xml:space="preserve">
<value>4</value>
</data>

<data name="grpComparisions.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 270</value>
</data>
<data name="grpComparisions.Size" type="System.Drawing.Size, System.Drawing">
<value>271, 154</value>
</data>
<data name="grpComparisions.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="grpComparisions.Text" xml:space="preserve">
<value>Comparisons to Display:</value>
</data>
<data name="&gt;&gt;grpComparisions.Name" xml:space="preserve">
<value>grpComparisions</value>
</data>
<data name="&gt;&gt;grpComparisions.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;grpComparisions.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;grpComparisions.ZOrder" xml:space="preserve">
<value>0</value>
</data>


<data name="lblTolerance.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
Expand Down Expand Up @@ -397,7 +424,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblTolerance.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="rdoByValue.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
<value>Button</value>
Expand All @@ -409,7 +436,7 @@
<value>NoControl</value>
</data>
<data name="rdoByValue.Location" type="System.Drawing.Point, System.Drawing">
<value>180, 13</value>
<value>215, 13</value>
</data>
<data name="rdoByValue.Size" type="System.Drawing.Size, System.Drawing">
<value>96, 28</value>
Expand All @@ -433,7 +460,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;rdoByValue.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="rdoByRow.Appearance" type="System.Windows.Forms.Appearance, System.Windows.Forms">
<value>Button</value>
Expand All @@ -445,7 +472,7 @@
<value>NoControl</value>
</data>
<data name="rdoByRow.Location" type="System.Drawing.Point, System.Drawing">
<value>84, 13</value>
<value>117, 13</value>
</data>
<data name="rdoByRow.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 28</value>
Expand All @@ -469,7 +496,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;rdoByRow.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="ucrInputTolerance.Location" type="System.Drawing.Point, System.Drawing">
<value>328, 197</value>
Expand All @@ -490,10 +517,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrInputTolerance.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="ucrPnlOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>67, 8</value>
<value>101, 8</value>
</data>
<data name="ucrPnlOptions.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
Expand All @@ -514,7 +541,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrPnlOptions.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="ucrSaveLogical.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 426</value>
Expand All @@ -523,7 +550,11 @@
<value>4, 5, 4, 5</value>
</data>
<data name="ucrSaveLogical.Size" type="System.Drawing.Size, System.Drawing">

<value>341, 24</value>

<value>280, 22</value>

</data>
<data name="ucrSaveLogical.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
Expand All @@ -538,7 +569,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrSaveLogical.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="ucrChkSort.Location" type="System.Drawing.Point, System.Drawing">
<value>270, 242</value>
Expand All @@ -559,7 +590,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrChkSort.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 456</value>
Expand Down
Loading