From 72fc0a80525259db399bada3713ab5b7bce326d4 Mon Sep 17 00:00:00 2001 From: niel-archer Date: Fri, 30 Dec 2011 03:53:56 +0000 Subject: [PATCH] BUG 2999054: Adding code to prefer Unicode format from clipboard before accepting ANSI text. git-svn-id: https://lsleditor.svn.sourceforge.net/svnroot/lsleditor@64 3f4676ac-adda-40fd-8265-58d1435b1672 --- trunk/Editor/SyntaxRichTextBox.cs | 16 +++++++++++----- trunk/Resource/ReleaseNotes.htm | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/trunk/Editor/SyntaxRichTextBox.cs b/trunk/Editor/SyntaxRichTextBox.cs index 61e622f..2a1866a 100644 --- a/trunk/Editor/SyntaxRichTextBox.cs +++ b/trunk/Editor/SyntaxRichTextBox.cs @@ -899,9 +899,15 @@ namespace LSLEditor public new void Paste() { - ResetHighlichting(); + ResetHighlighting(); - if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true)) + // First try with Unicode + if (Clipboard.GetDataObject().GetDataPresent(DataFormats.UnicodeText, true)) + { + string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.UnicodeText, true).ToString().Replace("\r", ""); + this.ColoredText = strTextToPaste; + } // failing that try ANSI text. + else if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true)) { string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", ""); this.ColoredText = strTextToPaste; @@ -1147,7 +1153,7 @@ namespace LSLEditor protected override void OnKeyPress(KeyPressEventArgs e) { - ResetHighlichting(); + ResetHighlighting(); char keyChar = e.KeyChar; @@ -1743,7 +1749,7 @@ namespace LSLEditor { BeginUpdate(); - ResetHighlichting(); + ResetHighlighting(); string strW = GetNewWhiteSpace(-1); int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length); @@ -1892,7 +1898,7 @@ namespace LSLEditor } } - private void ResetHighlichting() + private void ResetHighlighting() { if (HighLightList.Count == 0) return; diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm index 98c683f..f987402 100644 --- a/trunk/Resource/ReleaseNotes.htm +++ b/trunk/Resource/ReleaseNotes.htm @@ -5,25 +5,27 @@
-

2012 - Release 2.x.x

- * Added +

2012-01 - Release 2.x.x

+ - Added
  • "Release Notes..." to help menu.
- * Changed + - Changed
  • Updated About.htm
  • Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.
  • UTF-8 output no longer prefixes the B.O.M. character.
    • +
  • UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.
- * Bugs Fixed: + - Fixed:
    -
  • 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term
    • -
  • 3461546 - ReleaseNotes.htm in source, but never used
    • -
  • 3465488 - lslint does not show errors.
    • -
  • no id - Fix for state change without state name passing syntax-check.
    • +
  • SF ID: 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term
    • +
  • SF ID: 3461546 - ReleaseNotes.htm in source, but never used
    • +
  • SF ID: none - Fix for state change without state name passing syntax-check.
    • +
  • SF ID: 3465488 - lslint does not show errors.
    • +
  • SF ID: 2999054 - Unicode characters do not paste correctly