From 2a6ff5d0b3336839e87e7f39ee4bc5f1c6c1e413 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 3 Jan 2013 17:32:06 +0000 Subject: [PATCH] =?UTF-8?q?B2012-397=20=E2=80=93=20fixed=20pasted=20logic?= =?UTF-8?q?=20with=20respect=20to=20the=20default=20(v=20button)=20setting?= =?UTF-8?q?=20and=20the=20two=20paste=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Volian.Controls.Library/StepTabRibbon.cs | 24 +++++++++++++----- .../StepTabRibbon.designer.cs | Bin 487090 -> 487122 bytes 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index fa55aa45..46c1f67d 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1031,7 +1031,8 @@ namespace Volian.Controls.Library } #endregion #region Home Tab - private bool _PastePlainText = false; + private bool _PastePlainTextOvrRide = false; + private bool _PasteStepTextOvrRide = false; private void btnPaste_Click(object sender, EventArgs e) { StartGridEditing(SelectionOption.End); @@ -1053,17 +1054,20 @@ namespace Volian.Controls.Library cmb.SelectedText = myDO.GetData(DataFormats.UnicodeText).ToString(); else if (myDO.GetDataPresent(DataFormats.Text)) cmb.SelectedText = myDO.GetData(DataFormats.Text).ToString(); - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; return; } else { SaveErrorInLogProblemWithType(ctrl); - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; return; } } - if (myDO.GetDataPresent(DataFormats.Rtf) && !_PastePlainText && !PastePlainTextSetting) + //if (myDO.GetDataPresent(DataFormats.Rtf) && !_PastePlainTextOvrRide && !PastePlainTextSetting) + if (myDO.GetDataPresent(DataFormats.Rtf) && (_PasteStepTextOvrRide || (!_PastePlainTextOvrRide && !PastePlainTextSetting))) { string tmpForLink = myDO.GetData(DataFormats.Rtf).ToString(); tmpForLink = Regex.Replace(tmpForLink, @"#Link:ReferencedObject:[0-9]+ ", @"#Link:ReferencedObject: "); @@ -1087,7 +1091,8 @@ namespace Volian.Controls.Library //myRtb.SelectedText = myDO.GetData(DataFormats.Text).ToString(); } if (myRtb.SelectionLength == 0 && myRtb is StepRTB) myRtb.SelectionFont = (myRtb as StepRTB).MyStyleFont.WindowsFont; - _PastePlainText = false; + _PastePlainTextOvrRide = false; + _PasteStepTextOvrRide = false; } private void SaveErrorInLogProblemWithType(Control ctrl) @@ -2449,7 +2454,14 @@ namespace Volian.Controls.Library private void btnPasteText_Click(object sender, EventArgs e) { StartGridEditing(SelectionOption.End); - _PastePlainText = true; + _PastePlainTextOvrRide = true; + btnPaste_Click(sender, e); + } + + private void btnPasteStepText_Click(object sender, EventArgs e) + { + StartGridEditing(SelectionOption.End); + _PasteStepTextOvrRide = true; btnPaste_Click(sender, e); } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 6dde583ce022a969e56b0049b90bdec03fbd12e8..95a96df70e949c5dbb88f0d8c2e0bdc7f137d398 100644 GIT binary patch delta 95 zcmdmVSN76f*@hOzElg>h(?7H`2~2-7g~@FCfgg-qlYOc=+She50WtITb)77qX2TU& oOy6^gm1p_~bykk)Kowfk4UVz$fw)}ldTOjd%(h)mjlIPK0QKo6jsO4v delta 95 zcmca~S9a4~*@hOzElg>h(;K>2jixWS#mF-Kzz;^Q$v)K_?fW{JfS7svzD|};vmpvL oXs~ijzjun2Yq|i41yrFmJ>VECABfA