Skip to content

Commit

Permalink
Merge pull request #980 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history 
merge from main
  • Loading branch information
@dannyparsons
dannyparsons authored Feb 7, 2019
2 parents 0c744bd + ca6ab12 commit 132cc3b
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 55 deletions.
110 changes: 85 additions & 25 deletions instat/dlgColumnStats.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,90 @@
<data name="&gt;&gt;lblByFactors.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Name" xml:space="preserve">
<value>ucrChkOriginalLevel</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkOriginalLevel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;ucrChkStoreResults.Name" xml:space="preserve">
<value>ucrChkStoreResults</value>
</data>
<data name="&gt;&gt;ucrChkStoreResults.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkStoreResults.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkStoreResults.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.Name" xml:space="preserve">
<value>ucrChkOmitMissing</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.Name" xml:space="preserve">
<value>ucrChkPrintOutput</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkPrintOutput.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.Name" xml:space="preserve">
<value>ucrChkDropUnusedLevels</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.Type" xml:space="preserve">
<value>instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.Parent" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;ucrChkDropUnusedLevels.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="grpOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 196</value>
</data>
<data name="grpOptions.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 145</value>
</data>
<data name="grpOptions.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="grpOptions.Text" xml:space="preserve">
<value>Options</value>
</data>
<data name="&gt;&gt;grpOptions.Name" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;grpOptions.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;grpOptions.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;grpOptions.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="ucrChkOriginalLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 42</value>
</data>
Expand Down Expand Up @@ -285,30 +369,6 @@
<data name="&gt;&gt;ucrChkDropUnusedLevels.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="grpOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 196</value>
</data>
<data name="grpOptions.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 145</value>
</data>
<data name="grpOptions.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="grpOptions.Text" xml:space="preserve">
<value>Options</value>
</data>
<data name="&gt;&gt;grpOptions.Name" xml:space="preserve">
<value>grpOptions</value>
</data>
<data name="&gt;&gt;grpOptions.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;grpOptions.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;grpOptions.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cmdSummaries.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
Expand Down Expand Up @@ -349,7 +409,7 @@
<value>7</value>
</data>
<data name="cmdProportionsPercentages.Text" xml:space="preserve">
<value>Proportions/Percentages...</value>
<value>Prop. and Percentages...</value>
</data>
<data name="&gt;&gt;cmdProportionsPercentages.Name" xml:space="preserve">
<value>cmdProportionsPercentages</value>
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgRestrict.Designer.vb
View file

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

82 changes: 53 additions & 29 deletions instat/dlgRestrict.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<value>6</value>
</data>
<data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 307</value>
<value>10, 333</value>
</data>
<data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
<value>410, 53</value>
Expand Down Expand Up @@ -223,10 +223,10 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>446, 366</value>
<value>418, 388</value>
</data>
<data name="ucrNewDataFrameName.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 256</value>
<value>10, 254</value>
</data>
<data name="ucrNewDataFrameName.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 24</value>
Expand All @@ -246,18 +246,6 @@
<data name="&gt;&gt;ucrNewDataFrameName.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="rdoApplyAsSubset.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 22</value>
</data>
<data name="rdoApplyAsSubset.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 17</value>
</data>
<data name="rdoApplyAsSubset.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="rdoApplyAsSubset.Text" xml:space="preserve">
<value>Apply As Subset</value>
</data>
<data name="&gt;&gt;rdoApplyAsSubset.Name" xml:space="preserve">
<value>rdoApplyAsSubset</value>
</data>
Expand All @@ -270,18 +258,6 @@
<data name="&gt;&gt;rdoApplyAsSubset.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="rdoApplyAsFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 22</value>
</data>
<data name="rdoApplyAsFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 17</value>
</data>
<data name="rdoApplyAsFilter.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="rdoApplyAsFilter.Text" xml:space="preserve">
<value>Apply As Filter</value>
</data>
<data name="&gt;&gt;rdoApplyAsFilter.Name" xml:space="preserve">
<value>rdoApplyAsFilter</value>
</data>
Expand Down Expand Up @@ -319,10 +295,10 @@
<value>1</value>
</data>
<data name="ucrInputFilterPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 281</value>
<value>163, 284</value>
</data>
<data name="ucrInputFilterPreview.Size" type="System.Drawing.Size, System.Drawing">
<value>277, 21</value>
<value>246, 42</value>
</data>
<data name="ucrInputFilterPreview.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand Down Expand Up @@ -399,4 +375,52 @@
<data name="&gt;&gt;ucrReceiverFilter.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="rdoApplyAsSubset.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 22</value>
</data>
<data name="rdoApplyAsSubset.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 17</value>
</data>
<data name="rdoApplyAsSubset.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="rdoApplyAsSubset.Text" xml:space="preserve">
<value>Apply As Subset</value>
</data>
<data name="&gt;&gt;rdoApplyAsSubset.Name" xml:space="preserve">
<value>rdoApplyAsSubset</value>
</data>
<data name="&gt;&gt;rdoApplyAsSubset.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rdoApplyAsSubset.Parent" xml:space="preserve">
<value>grpApplyOptions</value>
</data>
<data name="&gt;&gt;rdoApplyAsSubset.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="rdoApplyAsFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 22</value>
</data>
<data name="rdoApplyAsFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 17</value>
</data>
<data name="rdoApplyAsFilter.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="rdoApplyAsFilter.Text" xml:space="preserve">
<value>Apply As Filter</value>
</data>
<data name="&gt;&gt;rdoApplyAsFilter.Name" xml:space="preserve">
<value>rdoApplyAsFilter</value>
</data>
<data name="&gt;&gt;rdoApplyAsFilter.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rdoApplyAsFilter.Parent" xml:space="preserve">
<value>grpApplyOptions</value>
</data>
<data name="&gt;&gt;rdoApplyAsFilter.ZOrder" xml:space="preserve">
<value>1</value>
</data>
</root>

0 comments on commit 132cc3b

Please sign in to comment.