AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-merge-from-custom' into next

Browse source
This commit is contained in:
niel-archer 2011-12-30 02:48:10 +00:00
commit 5675dc6830
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/Editor/SyntaxRichTextBox.cs
View file

@ -899,9 +899,15 @@ namespace LSLEditor
public new void Paste() 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", ""); string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste; this.ColoredText = strTextToPaste;
@ -1147,7 +1153,7 @@ namespace LSLEditor
protected override void OnKeyPress(KeyPressEventArgs e) protected override void OnKeyPress(KeyPressEventArgs e)
{ {
ResetHighlichting(); ResetHighlighting();
char keyChar = e.KeyChar; char keyChar = e.KeyChar;
@ -1743,7 +1749,7 @@ namespace LSLEditor
{ {
BeginUpdate(); BeginUpdate();
ResetHighlichting(); ResetHighlighting();
string strW = GetNewWhiteSpace(-1); string strW = GetNewWhiteSpace(-1);
int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length); int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length);
@ -1892,7 +1898,7 @@ namespace LSLEditor
} }
} }
private void ResetHighlichting() private void ResetHighlighting()
{ {
if (HighLightList.Count == 0) if (HighLightList.Count == 0)
return; return;

14
trunk/Resource/ReleaseNotes.htm
View file

@ -11,7 +11,7 @@
<li>"Release Notes..." to help menu.</li> <li>"Release Notes..." to help menu.</li>
</ul> </ul>
* Changed - Changed
<ul> <ul>
<li>Updated About.htm</li> <li>Updated About.htm</li>
<li>Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.</li> <li>Tools => Options => Text Editor => General - Changed labels to properly reflect the output file format.</li>
@ -19,12 +19,14 @@
<li>UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.</li> <li>UTF-8 is now the default file output format. ANSI is deprecated and will be removed at a later date.</li>
</ul> </ul>
* Fixed: - Fixed:
<ul> <ul>
<li>2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term</li> <li>SF ID: 2995296 - Search | Comment Line (Ctl+K) Breaks Line After Search Term.</li>
<li>3461546 - ReleaseNotes.htm in source, but never used</li> <li>SF ID: 3461546 - ReleaseNotes.htm in source, but never used</li>
<li>no id - Fix for state change without state name passing syntax-check.</li> <li>SF ID: none - Fix for state change without state name passing syntax-check.</li>
<li>3465488 - lslint does not show errors.</li> <li>SF ID: 3465488 - lslint does not show errors.</li>
<li>SF ID: 2999054 - Unicode characters do not paste correctly.</li>
<li>SF ID: none - Fixed typo in Font/Colour options dialogue.</li>
</ul> </ul>
</div> </div>

6
trunk/Tools/TextEditorFontColors.Designer.cs generated
View file

@ -128,18 +128,18 @@ namespace LSLEditor.Tools
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(16, 24); this.checkBox1.Location = new System.Drawing.Point(16, 24);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(142, 17); this.checkBox1.Size = new System.Drawing.Size(145, 17);
this.checkBox1.TabIndex = 0; this.checkBox1.TabIndex = 0;
this.checkBox1.Text = "use original color scheme"; this.checkBox1.Text = "use original color scheme";
this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.UseVisualStyleBackColor = true;
// //
// EnvironmentFontColors // TextEditorFontColors
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Name = "EnvironmentFontColors"; this.Name = "TextEditorFontColors";
this.Size = new System.Drawing.Size(392, 272); this.Size = new System.Drawing.Size(392, 272);
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout(); this.groupBox5.PerformLayout();