## :date:2025-07-16 星期三更新

### RySmartEditor    V1.0.2507.1601
- *.[新增]新增文件内容索引搜索。
- *.[新增]新增打开文件自动定位到指定行的功能。
### SuperDesign    V3.0.2507.1601
#### 网页抓取工具
- *.[修复]修复历史记录无法记录的BUG。
#### 编码解码
- *.[新增]新增svg图片代码转Geometry代码的功能。
#### 项目功能->项目管理
- *.[新增]互斥运行标准改为以毕方文件夹为准,而不是以项目文件为准。
- *.[新增]支持同个毕方项目可以不用重启来快捷切换不同子项目。
- *.[新增]支持发布时和打包时自动编译功能。
- *.[修复]修复项目输出路径为相对路径时,更新引用dll可能不成功的BUG。
This commit is contained in:
zilinsoft committed 2025-07-16 09:08:09 +08:00
1 parent 30afab3ce9
commit 5a5faaf5dc
113 files changed
+832320 -898

No files matched your search

@@ -2,7 +2,8 @@
using System.Drawing;
using System.Windows.Forms;
using AutocompleteMenuNS;
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
public class ScintillaWrapper : ITextBoxWrapper
{
@@ -29,14 +29,14 @@ namespace ryControls
}
private void BDSearch_Click(object sender, EventArgs e)
{
if (base.SourceControl is ScintillaNET.Scintilla editor)
if (base.SourceControl is ScintillaNETV2.Scintilla editor)
{
RyFiles.OpenUrl("https://www.baidu.com/s?wd=" +RyWeb.WebDecode.UrlEncode(editor.SelectedText));
}
}
private void Find_Click(object sender, EventArgs e)
{
if(base.SourceControl is ScintillaNET.Scintilla editor)
if(base.SourceControl is ScintillaNETV2.Scintilla editor)
{
if(editor.Parent is HighlightEditor rich_txt)
{
@@ -46,8 +46,8 @@ namespace ryControls
}
private void SelectAll_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.SelectAll();
//Thread th = new Thread(sendkey);
//th.Start();
@@ -62,39 +62,39 @@ namespace ryControls
}
private void Undo_Click(object sender, EventArgs e)
{
if(!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if(!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.Undo();
}
private void Redo_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.Redo();
}
private void Cut_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.Cut();
}
private void Copy_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
//var ss = rich_txt.SelectedText;
rich_txt.Copy();
}
private void Paste_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.Paste();
}
private void Del_Click(object sender, EventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
rich_txt.DeleteRange(rich_txt.SelectionStart,rich_txt.SelectedText.Length);
}
public ToolStripSeparator AddSeparatorMenu()
@@ -115,8 +115,8 @@ namespace ryControls
private void ContextMenuStripRichText_Opening(object sender, CancelEventArgs e)
{
if (!(base.SourceControl is ScintillaNET.Scintilla)) { return; }
var rich_txt = (ScintillaNET.Scintilla)base.SourceControl;
if (!(base.SourceControl is ScintillaNETV2.Scintilla)) { return; }
var rich_txt = (ScintillaNETV2.Scintilla)base.SourceControl;
for (int i = 0; i < base.Items.Count; i++)
{
var item = base.Items[i];
@@ -28,13 +28,13 @@
/// </summary>
private void InitializeComponent()
{
this.FindResultsScintilla = new ScintillaNET.Scintilla();
this.FindResultsScintilla = new ScintillaNETV2.Scintilla();
this.SuspendLayout();
//
// FindResultsScintilla
//
this.FindResultsScintilla.AutoCMaxHeight = 9;
this.FindResultsScintilla.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
this.FindResultsScintilla.BiDirectionality = ScintillaNETV2.BiDirectionalDisplayType.Disabled;
this.FindResultsScintilla.CaretLineBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.FindResultsScintilla.CaretLineVisible = true;
this.FindResultsScintilla.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -46,7 +46,7 @@
this.FindResultsScintilla.TabIndents = true;
this.FindResultsScintilla.TabIndex = 4;
this.FindResultsScintilla.Text = "搜索结果";
this.FindResultsScintilla.WrapMode = ScintillaNET.WrapMode.None;
this.FindResultsScintilla.WrapMode = ScintillaNETV2.WrapMode.None;
this.FindResultsScintilla.KeyUp += new System.Windows.Forms.KeyEventHandler(this.FindResultsScintilla_KeyUp);
this.FindResultsScintilla.MouseClick += new System.Windows.Forms.MouseEventHandler(this.FindResultsScintilla_MouseClick);
this.FindResultsScintilla.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.FindResultsScintilla_MouseDoubleClick);
@@ -64,6 +64,6 @@
#endregion
private ScintillaNET.Scintilla FindResultsScintilla;
private ScintillaNETV2.Scintilla FindResultsScintilla;
}
}
@@ -8,7 +8,7 @@
using System.Linq;
using System.Text;
using System.Windows.Forms;
using ScintillaNET;
using ScintillaNETV2;
public partial class FindAllResultsPanel : UserControl
{
@@ -1,6 +1,6 @@
using Newtonsoft.Json.Linq;
using ryCommon;
using ScintillaNET;
using ScintillaNETV2;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -4,7 +4,7 @@ namespace ScintillaNET_FindReplaceDialog
using System.Collections.Generic;
using System.ComponentModel;
using System.Text.RegularExpressions;
using ScintillaNET;
using ScintillaNETV2;
using System.Drawing;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
@@ -123,7 +123,7 @@ namespace ScintillaNET_FindReplaceDialog
KeyPressed?.Invoke(this, e);
}
//[Editor(typeof(ScintillaNET.Design.FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
//[Editor(typeof(ScintillaNETV2.Design.FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
//public SearchFlags Flags
//{
// get
@@ -1,7 +1,7 @@
namespace ScintillaNET_FindReplaceDialog
{
using ryCommon;
using ScintillaNET;
using ScintillaNETV2;
using SuperDesign.Controls.Highlight.FindReplace;
using System;
using System.Collections.Generic;
@@ -9,7 +9,7 @@ namespace ScintillaNET_FindReplaceDialog
using System.Drawing;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using static ScintillaNET.Style;
using static ScintillaNETV2.Style;
public partial class FindReplaceDialog : Form
{
@@ -1,6 +1,6 @@
using ryCommon;
using ryControls;
using ScintillaNET;
using ScintillaNETV2;
using SuperDesign.Tools.SmartEditor;
using System;
using System.Collections.Generic;
@@ -15,7 +15,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using 开发辅助工具.Tools.SmartEditor;
using static ScintillaNET.Style;
using static ScintillaNETV2.Style;
using static System.Net.Mime.MediaTypeNames;
namespace ScintillaNET_FindReplaceDialog
@@ -408,7 +408,7 @@ namespace ScintillaNET_FindReplaceDialog
/// 正则表达式选项
/// </summary>
public RegexOptions RegexOptions { get; set; } = RegexOptions.None;
public ScintillaNET.SearchFlags SearchFlags { get; set; }
public ScintillaNETV2.SearchFlags SearchFlags { get; set; }
/// <summary>
/// 查找模式,0为普通查找,1表示扩展查找,2表示正则查找
/// </summary>
@@ -1,6 +1,6 @@
namespace ScintillaNET_FindReplaceDialog
{
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNET_FindReplaceDialog;
using System;
using System.ComponentModel;
@@ -1,6 +1,6 @@
#region Using Directives
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNET_FindReplaceDialog;
using System;
using System.Windows.Forms;
@@ -1,7 +1,8 @@
#region Using Directives
using ryCommon;
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using System;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
@@ -1,6 +1,6 @@
#region Using Directives
using ScintillaNET;
using ScintillaNETV2;
using System;
using System.Drawing;
using System.Windows.Forms;
@@ -1,5 +1,4 @@
using ScintillaNET;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
@@ -7,7 +6,6 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static ScintillaNET.Style;
using VPKSoft.ScintillaLexers;
using ScintillaNET_FindReplaceDialog.FindAllResults;
using ScintillaNET_FindReplaceDialog;
@@ -17,6 +15,7 @@ using static VPKSoft.ScintillaLexers.LexerEnumerations;
using Newtonsoft.Json.Linq;
using DiffPlex.Model;
using IfacesEnumsStructsClasses;
using ScintillaNETV2;
namespace ryControls
{
@@ -80,10 +79,10 @@ namespace ryControls
get { return Editor.ReadOnly; }
set { Editor.ReadOnly = value; }
}
[DefaultValue(ScintillaNET.BorderStyle.Fixed3D)]
[DefaultValue(ScintillaNETV2.BorderStyle.Fixed3D)]
[Category("Appearance")]
[Description("编辑器边框.")]
public ScintillaNET.BorderStyle BorderStyle
public ScintillaNETV2.BorderStyle BorderStyle
{
get { return Editor.BorderStyle; }
set { Editor.BorderStyle = value; }
@@ -131,7 +130,7 @@ namespace ryControls
Editor.Font = value;
for (int i = 0; i < Editor.Styles.Count; i++)
{
if (i != CallTip) SetStyleFont(i, value);
if (i != Style.CallTip) SetStyleFont(i, value);
}
}
}
@@ -422,7 +421,7 @@ namespace ryControls
// Calculate the width required to display the last line number
// and include some padding for good measure.
const int padding = 2;
scintilla.Margins[0].Width = scintilla.TextWidth(ScintillaNET.Style.LineNumber, new string('9', maxLineNumberCharLength + 1)) + padding;
scintilla.Margins[0].Width = scintilla.TextWidth(ScintillaNETV2.Style.LineNumber, new string('9', maxLineNumberCharLength + 1)) + padding;
mark = maxLineNumberCharLength;
}
}
@@ -537,7 +536,7 @@ namespace ryControls
{
Editor.TargetStart = 0;
Editor.TargetEnd = Editor.TextLength;
var pos= Editor.SearchInTarget(fun_line);
var pos= Editor.Text.IndexOfEx(fun_line);
if(pos>=0)
{
Editor.FirstVisibleLine = Editor.LineFromPosition(pos);
@@ -548,7 +547,7 @@ namespace ryControls
var str = fun_line.GetStr("", "(");
if(str.Length>0)
{
pos = Editor.SearchInTarget(str);
pos = Editor.Text.IndexOfEx(str);
if (pos >= 0)
{
Editor.FirstVisibleLine = Editor.LineFromPosition(pos);
@@ -675,7 +674,7 @@ namespace ryControls
Editor.Font = this.Font;
for (int i = 0; i < Editor.Styles.Count; i++)
{
if (i != CallTip) SetStyleFont(i, this.Font);
if (i != Style.CallTip) SetStyleFont(i, this.Font);
}
}
@@ -792,7 +791,7 @@ namespace ryControls
private Indicator _indicator;
public override ContextMenuStrip ContextMenuStrip { get => Editor.ContextMenuStrip; set => Editor.ContextMenuStrip = value; }
private readonly FindReplace MyFindReplace;
public ScintillaNET.Scintilla Editor { get; set; } = new Scintilla();
public Scintilla Editor { get; set; } = new Scintilla();
private readonly AutocompleteMenuNS.AutocompleteMenu AutoComplete = new AutocompleteMenuNS.AutocompleteMenu();
private readonly ryControls.ContextMenuStripHighlightText2 contextMenuStripHighlightText21 = new ContextMenuStripHighlightText2();
#endregion
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -26,10 +26,11 @@ SOFTWARE.
using System.Drawing;
using System.Linq;
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
using static VPKSoft.ScintillaLexers.GlobalScintillaFont;
using ScintillaNETV2;
namespace VPKSoft.ScintillaLexers.CreateSpecificLexer
{
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,8 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,8 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,8 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -29,7 +29,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
namespace VPKSoft.ScintillaLexers.CreateSpecificLexer
{
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,8 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.LexerColors;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.HelperClasses;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
@@ -25,7 +25,7 @@ SOFTWARE.
#endregion
using System.Collections.Generic;
using ScintillaNET;
using ScintillaNETV2;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
namespace VPKSoft.ScintillaLexers.CreateSpecificLexer
@@ -24,7 +24,7 @@ SOFTWARE.
*/
#endregion
using ScintillaNET;
using ScintillaNETV2;
namespace VPKSoft.ScintillaLexers
{
@@ -27,7 +27,7 @@ SOFTWARE.
using System;
using System.Collections.Generic;
using System.Linq;
using ScintillaNET;
using ScintillaNETV2;
namespace VPKSoft.ScintillaLexers.HelperClasses
{
@@ -26,7 +26,7 @@ SOFTWARE.
using System.Collections.Generic;
using System.Linq;
using ScintillaNET;
using ScintillaNETV2;
using static VPKSoft.ScintillaLexers.LexerEnumerations;
namespace VPKSoft.ScintillaLexers.HelperClasses
@@ -30,7 +30,7 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Xml.Linq;
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.CreateSpecificLexer;
using VPKSoft.ScintillaLexers.HelperClasses;
using VPKSoft.ScintillaLexers.ScintillaNotepadPlusPlus;
@@ -27,7 +27,7 @@ SOFTWARE.
using System.Drawing;
using System.Linq;
using System.Xml.Linq;
using ScintillaNET;
using ScintillaNETV2;
using VPKSoft.ScintillaLexers.CreateSpecificLexer;
using VPKSoft.ScintillaLexers.HelperClasses;
@@ -25,7 +25,7 @@ SOFTWARE.
#endregion
using System.Drawing;
using ScintillaNET;
using ScintillaNETV2;
namespace ScintillaDiff
{
@@ -36,7 +36,7 @@ using DiffPlex.DiffBuilder.Model;
using DiffPlex.Model;
using ScintillaDiff.Enumerations;
using ScintillaDiff.UtilityClasses;
using ScintillaNET;
using ScintillaNETV2;
using static ScintillaDiff.ScintillaDiffStyles;
namespace ScintillaDiff
@@ -61,7 +61,7 @@ namespace ScintillaDiff
//
scintillaOne = new ScrollSyncScintilla();
this.scintillaOne.AutoCMaxHeight = 9;
this.scintillaOne.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
this.scintillaOne.BiDirectionality = ScintillaNETV2.BiDirectionalDisplayType.Disabled;
this.scintillaOne.CaretLineBackColor = System.Drawing.Color.White;
this.scintillaOne.CaretLineVisible = true;
this.scintillaOne.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -73,14 +73,14 @@ namespace ScintillaDiff
this.scintillaOne.TabIndents = true;
this.scintillaOne.TabIndex = 0;
this.scintillaOne.UseRightToLeftReadingLayout = false;
this.scintillaOne.WrapMode = ScintillaNET.WrapMode.None;
this.scintillaOne.WrapMode = ScintillaNETV2.WrapMode.None;
this.scintillaOne.TextChanged += new System.EventHandler(this.Scintilla_TextChanged);
//
// scintillaTwo
//
scintillaTwo = new ScrollSyncScintilla();
this.scintillaTwo.AutoCMaxHeight = 9;
this.scintillaTwo.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
this.scintillaTwo.BiDirectionality = ScintillaNETV2.BiDirectionalDisplayType.Disabled;
this.scintillaTwo.CaretLineBackColor = System.Drawing.Color.White;
this.scintillaTwo.CaretLineVisible = true;
this.scintillaTwo.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -92,7 +92,7 @@ namespace ScintillaDiff
this.scintillaTwo.TabIndents = true;
this.scintillaTwo.TabIndex = 0;
this.scintillaTwo.UseRightToLeftReadingLayout = false;
this.scintillaTwo.WrapMode = ScintillaNET.WrapMode.None;
this.scintillaTwo.WrapMode = ScintillaNETV2.WrapMode.None;
this.scintillaTwo.TextChanged += new System.EventHandler(this.Scintilla_TextChanged);
this.scMain.Panel1.Controls.Add(scintillaOne);
this.scMain.Panel1.Controls.SetChildIndex(scintillaOne, 0);
@@ -1,4 +1,4 @@
using ScintillaNET;
using ScintillaNETV2;
namespace ScintillaDiff
{
@@ -28,15 +28,15 @@ using System;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using ScintillaNET;
using ScintillaNETV2;
namespace ScintillaDiff
{
/// <summary>
/// An inherited class from the <see cref="Scintilla"/> which can synchronize vertical scroll bar position with another <see cref="Scintilla"/> control.
/// Implements the <see cref="ScintillaNET.Scintilla" />
/// Implements the <see cref="ScintillaNETV2.Scintilla" />
/// </summary>
/// <seealso cref="ScintillaNET.Scintilla" />
/// <seealso cref="ScintillaNETV2.Scintilla" />
public class ScrollSyncScintilla : Scintilla
{
// ReSharper disable once CommentTypo
@@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ScintillaNET;
using ScintillaNETV2;
namespace ScintillaDiff
{