From 1784f1ec8b29328ffc161fa3141ab117e6057974 Mon Sep 17 00:00:00 2001 From: Lazarus Kioko Muthenya Date: Thu, 7 Feb 2019 14:27:35 +0300 Subject: [PATCH 1/3] Designer edits on the filter dialog --- instat/dlgRestrict.Designer.vb | 2 +- instat/dlgRestrict.resx | 82 ++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb index 4d34a8bb08d..78450b7c21a 100644 --- a/instat/dlgRestrict.Designer.vb +++ b/instat/dlgRestrict.Designer.vb @@ -95,7 +95,7 @@ Partial Class dlgRestrict 'ucrInputFilterPreview ' Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True - Me.ucrInputFilterPreview.IsMultiline = False + Me.ucrInputFilterPreview.IsMultiline = True Me.ucrInputFilterPreview.IsReadOnly = False resources.ApplyResources(Me.ucrInputFilterPreview, "ucrInputFilterPreview") Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" diff --git a/instat/dlgRestrict.resx b/instat/dlgRestrict.resx index eee05317286..263afd8509f 100644 --- a/instat/dlgRestrict.resx +++ b/instat/dlgRestrict.resx @@ -169,7 +169,7 @@ 6 - 10, 307 + 10, 333 410, 53 @@ -223,10 +223,10 @@ 6, 13 - 446, 366 + 418, 388 - 10, 256 + 10, 254 291, 24 @@ -246,18 +246,6 @@ 0 - - 174, 22 - - - 165, 17 - - - 1 - - - Apply As Subset - rdoApplyAsSubset @@ -270,18 +258,6 @@ 0 - - 6, 22 - - - 154, 17 - - - 0 - - - Apply As Filter - rdoApplyAsFilter @@ -319,10 +295,10 @@ 1 - 163, 281 + 163, 284 - 277, 21 + 246, 42 7 @@ -399,4 +375,52 @@ 4 + + 174, 22 + + + 165, 17 + + + 1 + + + Apply As Subset + + + rdoApplyAsSubset + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpApplyOptions + + + 0 + + + 6, 22 + + + 154, 17 + + + 0 + + + Apply As Filter + + + rdoApplyAsFilter + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpApplyOptions + + + 1 + \ No newline at end of file From 4c78d8f9d4d10122d24bf758c9a375d1b3dd53dc Mon Sep 17 00:00:00 2001 From: Lazarus Kioko Muthenya Date: Thu, 7 Feb 2019 16:51:41 +0300 Subject: [PATCH 2/3] Changing the text for the proportions and percentages button --- instat/dlgColumnStats.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 3564148c218..8086a56bd1b 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -349,7 +349,7 @@ 7 - Proportions/Percentages... + Prop and Percentages... cmdProportionsPercentages From 42bd04e10deedaae031b9ea4b54c224d79a4eadb Mon Sep 17 00:00:00 2001 From: Lazarus Kioko Muthenya Date: Thu, 7 Feb 2019 16:54:51 +0300 Subject: [PATCH 3/3] Adding a full stop --- instat/dlgColumnStats.resx | 110 ++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 25 deletions(-) diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 8086a56bd1b..5bbfe2a5d56 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -180,6 +180,90 @@ 5 + + ucrChkOriginalLevel + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOptions + + + 0 + + + ucrChkStoreResults + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOptions + + + 1 + + + ucrChkOmitMissing + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOptions + + + 2 + + + ucrChkPrintOutput + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOptions + + + 3 + + + ucrChkDropUnusedLevels + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOptions + + + 4 + + + 10, 196 + + + 160, 145 + + + 5 + + + Options + + + grpOptions + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 25, 42 @@ -285,30 +369,6 @@ 4 - - 10, 196 - - - 160, 145 - - - 5 - - - Options - - - grpOptions - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - NoControl @@ -349,7 +409,7 @@ 7 - Prop and Percentages... + Prop. and Percentages... cmdProportionsPercentages