From 1ed7421381702ef0edaee7d505f31cf48d98c78d Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 11:07:00 +0100 Subject: [PATCH 1/3] Design --- instat/dlgStringHandling.resx | 470 +++++++++++++++++++++++++++------- 1 file changed, 373 insertions(+), 97 deletions(-) diff --git a/instat/dlgStringHandling.resx b/instat/dlgStringHandling.resx index c52b0196c72..c8e198ab648 100644 --- a/instat/dlgStringHandling.resx +++ b/instat/dlgStringHandling.resx @@ -127,13 +127,13 @@ - 255, 70 + 251, 80 45, 13 - 11 + 8 Column: @@ -157,13 +157,13 @@ NoControl - 254, 155 + 251, 168 65, 13 - 15 + 12 Replace By: @@ -187,13 +187,13 @@ NoControl - 254, 112 + 251, 122 44, 13 - 13 + 10 Pattern: @@ -220,10 +220,10 @@ NoControl - 60, 12 + 24, 12 - 95, 27 + 80, 27 1 @@ -256,10 +256,10 @@ NoControl - 432, 12 + 336, 12 - 95, 27 + 80, 27 5 @@ -292,10 +292,10 @@ NoControl - 339, 12 + 258, 12 - 95, 27 + 80, 27 4 @@ -328,10 +328,10 @@ NoControl - 246, 12 + 180, 12 - 95, 27 + 80, 27 3 @@ -364,10 +364,10 @@ NoControl - 153, 12 + 102, 12 - 95, 27 + 80, 27 2 @@ -400,10 +400,10 @@ NoControl - 525, 12 + 414, 12 - 95, 27 + 80, 27 6 @@ -426,6 +426,312 @@ 7 + + cmdClear + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 0 + + + cmdBackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 1 + + + cmdWBackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 2 + + + cmdDollarSign + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 3 + + + cmdOpenCloseParenthesis + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 4 + + + cmdBackSlashd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 5 + + + cmdBackSlashs + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 6 + + + cmdPower + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 7 + + + cmdOpenBracketCaretClosedBracket + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 8 + + + cmdPlus + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 9 + + + cmdBackSlashw + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 10 + + + cmdMultiply + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 11 + + + cmdOpenCloseBrace + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 12 + + + cmdOpenClosedBracket + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 13 + + + cmdSingleQuote + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 14 + + + cmdQuote + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 15 + + + cmdQuestionMark + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 16 + + + cmdDBackSlah + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 17 + + + cmdStar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 18 + + + cmdBbackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 19 + + + cmdBackSlashb + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 20 + + + cmdSbackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 21 + + + cmdOr + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 22 + + + 423, 81 + + + 2, 3, 2, 3 + + + 2, 3, 2, 3 + + + 239, 141 + + + 18 + + + Regex keyboard + + + grpRegex + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + Microsoft Sans Serif, 6.75pt @@ -442,7 +748,7 @@ 37, 60 - 145 + 17 Clear @@ -472,7 +778,7 @@ 38, 30 - 140 + 22 \ @@ -502,7 +808,7 @@ 38, 30 - 139 + 16 \ W @@ -532,7 +838,7 @@ 38, 30 - 138 + 11 $ @@ -562,7 +868,7 @@ 38, 30 - 137 + 5 ( ) @@ -592,7 +898,7 @@ 38, 30 - 136 + 20 \ d @@ -625,7 +931,7 @@ 38, 30 - 132 + 18 \ s @@ -655,7 +961,7 @@ 38, 30 - 133 + 10 ^ @@ -685,7 +991,7 @@ 38, 30 - 131 + 3 [ ^ ] @@ -715,7 +1021,7 @@ 38, 30 - 130 + 7 + @@ -745,7 +1051,7 @@ 38, 30 - 129 + 15 \ w @@ -775,7 +1081,7 @@ 38, 30 - 128 + 9 . @@ -805,7 +1111,7 @@ 38, 30 - 127 + 4 { } @@ -835,7 +1141,7 @@ 38, 30 - 126 + 2 [ ] @@ -865,7 +1171,7 @@ 38, 30 - 125 + 1 ' ' @@ -895,7 +1201,7 @@ 38, 30 - 124 + 0 " " @@ -925,7 +1231,7 @@ 38, 30 - 123 + 8 ? @@ -955,7 +1261,7 @@ 38, 30 - 122 + 21 \ D @@ -985,7 +1291,7 @@ 38, 30 - 121 + 6 * @@ -1015,7 +1321,7 @@ 38, 30 - 120 + 14 \ B @@ -1045,7 +1351,7 @@ 38, 30 - 119 + 13 \ b @@ -1075,7 +1381,7 @@ 38, 30 - 118 + 19 \ S @@ -1105,7 +1411,7 @@ 38, 30 - 117 + 12 |, @@ -1122,36 +1428,6 @@ 22 - - 423, 81 - - - 2, 3, 2, 3 - - - 2, 3, 2, 3 - - - 239, 141 - - - 180 - - - Regex keyboard - - - grpRegex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - True @@ -1159,13 +1435,13 @@ NoControl - 324, 215 + 336, 232 56, 17 - 183 + 17 Regex @@ -1189,13 +1465,13 @@ NoControl - 268, 215 + 266, 232 50, 17 - 182 + 16 Fixed @@ -1213,13 +1489,13 @@ 1 - 262, 211 + 258, 227 - 116, 25 + 150, 28 - 181 + 15 ucrPnlFixedRegex @@ -1236,11 +1512,14 @@ 10, 260 + + 4, 5, 4, 5 + 293, 24 - 18 + 19 ucrSaveStringHandling @@ -1261,16 +1540,16 @@ 6, 13 - 665, 342 + 673, 346 - 9, 231 + 10, 232 239, 20 - 17 + 14 ucrChkIncludeRegularExpressions @@ -1285,7 +1564,7 @@ 6 - 250, 89 + 250, 95 0, 0, 0, 0 @@ -1294,7 +1573,7 @@ 158, 20 - 12 + 9 ucrReceiverStringHandling @@ -1309,13 +1588,13 @@ 13 - 250, 171 + 250, 183 158, 20 - 16 + 13 ucrInputReplaceBy @@ -1330,7 +1609,7 @@ 17 - 250, 129 + 250, 139 158, 20 @@ -1351,7 +1630,7 @@ 18 - 9, 45 + 10, 45 0, 0, 0, 0 @@ -1375,13 +1654,13 @@ 19 - 9, 290 + 10, 289 406, 52 - 19 + 20 ucrBase @@ -1396,10 +1675,10 @@ 20 - 60, 3 + 10, 8 - 560, 39 + 493, 39 0 @@ -1416,9 +1695,6 @@ 21 - - NoControl - CenterScreen @@ -1432,7 +1708,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 250, 127 + 250, 139 2, 3, 2, 3 @@ -1441,7 +1717,7 @@ 158, 28 - 14 + 11 ucrReceiverForRegexExpression From 79cb23048cc24e320df338ec019d67b554bfd34f Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 11:24:25 +0100 Subject: [PATCH 2/3] Change size --- instat/dlgStringHandling.resx | 336 +++------------------------------- instat/dlgStringHandling.vb | 17 +- 2 files changed, 41 insertions(+), 312 deletions(-) diff --git a/instat/dlgStringHandling.resx b/instat/dlgStringHandling.resx index c8e198ab648..8342b13c851 100644 --- a/instat/dlgStringHandling.resx +++ b/instat/dlgStringHandling.resx @@ -426,312 +426,6 @@ 7 - - cmdClear - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 0 - - - cmdBackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 1 - - - cmdWBackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 2 - - - cmdDollarSign - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 3 - - - cmdOpenCloseParenthesis - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 4 - - - cmdBackSlashd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 5 - - - cmdBackSlashs - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 6 - - - cmdPower - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 7 - - - cmdOpenBracketCaretClosedBracket - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 8 - - - cmdPlus - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 9 - - - cmdBackSlashw - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 10 - - - cmdMultiply - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 11 - - - cmdOpenCloseBrace - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 12 - - - cmdOpenClosedBracket - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 13 - - - cmdSingleQuote - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 14 - - - cmdQuote - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 15 - - - cmdQuestionMark - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 16 - - - cmdDBackSlah - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 17 - - - cmdStar - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 18 - - - cmdBbackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 19 - - - cmdBackSlashb - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 20 - - - cmdSbackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 21 - - - cmdOr - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 22 - - - 423, 81 - - - 2, 3, 2, 3 - - - 2, 3, 2, 3 - - - 239, 141 - - - 18 - - - Regex keyboard - - - grpRegex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - Microsoft Sans Serif, 6.75pt @@ -1428,6 +1122,36 @@ 22 + + 423, 81 + + + 2, 3, 2, 3 + + + 2, 3, 2, 3 + + + 239, 141 + + + 18 + + + Regex Keyboard + + + grpRegex + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True diff --git a/instat/dlgStringHandling.vb b/instat/dlgStringHandling.vb index bc616afd765..55335c6da7b 100644 --- a/instat/dlgStringHandling.vb +++ b/instat/dlgStringHandling.vb @@ -120,7 +120,7 @@ Public Class dlgStringHandling ucrChkIncludeRegularExpressions.Checked = False rdoFixed.Checked = True rdoCount.Checked = True - Visibile() + VisibleRdo() ucrInputReplaceBy.Reset() ucrSaveStringHandling.Reset() @@ -160,7 +160,7 @@ Public Class dlgStringHandling End Sub 'temporary fix. - Private Sub Visibile() + Private Sub VisibleRdo() If ucrChkIncludeRegularExpressions.Checked Then rdoRegex.Visible = True rdoFixed.Visible = True @@ -289,7 +289,7 @@ Public Class dlgStringHandling Me.Size = New Size(iFullWidth, Me.Height) Else grpRegex.Visible = False - Me.Size = New Size(iFullWidth / 1.57, Me.Height) + Me.Size = New Size(536, Me.Height) End If End Sub @@ -409,10 +409,15 @@ Public Class dlgStringHandling ucrReceiverForRegexExpression.Clear() End Sub - Private Sub ucrPnlFixedRegex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlFixedRegex.ControlContentsChanged, ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverForRegexExpression.ControlValueChanged, ucrInputPattern.ControlValueChanged - Visibile() + Private Sub ucrAll_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverForRegexExpression.ControlValueChanged, ucrInputPattern.ControlValueChanged + VisibleRdo() AddRemoveParameters() - 'ChangeSize() + End Sub + + Private Sub ucrPnlFixedRegex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlFixedRegex.ControlContentsChanged + VisibleRdo() + AddRemoveParameters() + ChangeSize() End Sub Private Sub ucrReceiverStringHandling_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStringHandling.ControlContentsChanged, ucrPnlStringHandling.ControlContentsChanged, ucrInputPattern.ControlContentsChanged, ucrReceiverForRegexExpression.ControlContentsChanged, ucrPnlFixedRegex.ControlContentsChanged, ucrChkIncludeRegularExpressions.ControlContentsChanged, ucrSaveStringHandling.ControlContentsChanged From 6f16c56836db09ff0535497a7b749740da341b0c Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 13:37:13 +0100 Subject: [PATCH 3/3] fixing width line --- instat/dlgStringHandling.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgStringHandling.vb b/instat/dlgStringHandling.vb index 55335c6da7b..f607eda85d5 100644 --- a/instat/dlgStringHandling.vb +++ b/instat/dlgStringHandling.vb @@ -289,7 +289,7 @@ Public Class dlgStringHandling Me.Size = New Size(iFullWidth, Me.Height) Else grpRegex.Visible = False - Me.Size = New Size(536, Me.Height) + Me.Size = New Size(iFullWidth / 1.29, Me.Height) End If End Sub