Skip to content

Commit

Permalink
Merge pull request #404 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history 
Updating branch
  • Loading branch information
@maxwellfundi
maxwellfundi authored Feb 8, 2019
2 parents 23d7239 + ac1f39f commit f7eeff9
Show file tree
Hide file tree
Showing 32 changed files with 2,496 additions and 1,893 deletions.
12 changes: 6 additions & 6 deletions instat/dlgBarAndPieChart.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@
<value>NoControl</value>
</data>
<data name="rdoPieChart.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 12</value>
<value>206, 12</value>
</data>
<data name="rdoPieChart.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 28</value>
<value>110, 28</value>
</data>
<data name="rdoPieChart.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
Expand Down Expand Up @@ -280,10 +280,10 @@
<value>NoControl</value>
</data>
<data name="rdoBarChart.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 12</value>
<value>98, 12</value>
</data>
<data name="rdoBarChart.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 28</value>
<value>110, 28</value>
</data>
<data name="rdoBarChart.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -505,10 +505,10 @@
<value>12</value>
</data>
<data name="ucrPnlOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>107, 6</value>
<value>87, 6</value>
</data>
<data name="ucrPnlOptions.Size" type="System.Drawing.Size, System.Drawing">
<value>211, 36</value>
<value>241, 36</value>
</data>
<data name="ucrPnlOptions.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand Down
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
6 changes: 3 additions & 3 deletions instat/dlgCombine.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<value>NoControl</value>
</data>
<data name="lblSeparator.Location" type="System.Drawing.Point, System.Drawing">
<value>273, 188</value>
<value>266, 188</value>
</data>
<data name="lblSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 13</value>
Expand Down Expand Up @@ -199,7 +199,7 @@
<value>1</value>
</data>
<data name="ucrInputSeparator.Location" type="System.Drawing.Point, System.Drawing">
<value>385, 180</value>
<value>359, 180</value>
</data>
<data name="ucrInputSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>87, 21</value>
Expand Down Expand Up @@ -289,7 +289,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>518, 333</value>
<value>452, 333</value>
</data>
<data name="ucrSelectorCombineFactors.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 10</value>
Expand Down
Loading

0 comments on commit f7eeff9

Please sign in to comment.