Merge pull request #440 from africanmathsinitiative/master

updated my master
Patowhiz · Oct 26, 2023 · 1ecc958 · 1ecc958
2 parents 8c9827c + 536a3c4
commit 1ecc958
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/instat/dlgUnstack.resx b/instat/dlgUnstack.resx
@@ -352,7 +352,7 @@
     <value>4, 4, 4, 4</value>
   </data>
   <data name="ucrChkCarryColumns.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 23</value>
+    <value>135, 23</value>
   </data>
   <data name="ucrChkCarryColumns.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
@@ -373,7 +373,7 @@
     <value>True</value>
   </data>
   <data name="ucrNudValuesFill.Location" type="System.Drawing.Point, System.Drawing">
-    <value>154, 279</value>
+    <value>172, 279</value>
   </data>
   <data name="ucrNudValuesFill.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 20</value>
@@ -526,7 +526,7 @@
     <value>9, 412</value>
   </data>
   <data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 52</value>
+    <value>408, 52</value>
   </data>
   <data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -642,9 +642,6 @@
   <data name="&gt;&gt;ucrChkAddPrefix.ZOrder" xml:space="preserve">
     <value>18</value>
   </data>
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>

diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb
@@ -52,8 +52,7 @@ Public Class sdgProportionsPercentages
         ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34))
         ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages")
 
-        ucrPnlBY.AddToLinkedControls(ucrReceiverByFactor, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
-        ucrPnlBY.AddToLinkedControls(ucrChkDisplayAsDecimal, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
+        ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
         ucrChkProportionsPercentages.AddToLinkedControls(ucrPnlBY, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=rdoByFactors)
         ucrChkProportionsPercentages.AddToLinkedControls(ucrSelectorProportionsPercentiles, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
         ucrPnlBY.AddToLinkedControls(ucrReceiverColumn, objValues:={rdoByColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
@@ -83,4 +82,12 @@ Public Class sdgProportionsPercentages
             ucrReceiverColumn.SetMeAsReceiver()
         End If
     End Sub
+
+    Private Sub ucrChkProportionsPercentages_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlContentsChanged
+        'temporarily fixes issue #8588
+        If ucrChkProportionsPercentages.Checked Then
+            rdoByFactors.Checked = True
+        End If
+    End Sub
+
 End Class
diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R
@@ -167,6 +167,7 @@ pkgs <-
     "formattable",
     #A 'ggplot2' extension that allows text to follow curved paths.
     "geomtextpath",
+    "moderndive",
     "collapse"
  )
 pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version)