### 2024-12-20 星期五更新
------ #### SuperDesign V3.0.2412.2001 - *.[新增]新增程序更新日志设置和自动发布功能。 - *.[修复]修复Post数据格式不正确时双击文本框会导致软件闪退的BUG。
This commit is contained in:
1 parent
03bcb8c5fd
commit
993f1ca1a9
349 files changed
+81977
-13873
No files matched your search
@@ -54,12 +54,55 @@ namespace ScintillaDiff
|
||||
public ScintillaDiffControl()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
if(!this.DesignMode)
|
||||
{
|
||||
//
|
||||
// scintillaOne
|
||||
//
|
||||
scintillaOne = new ScrollSyncScintilla();
|
||||
this.scintillaOne.AutoCMaxHeight = 9;
|
||||
this.scintillaOne.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
|
||||
this.scintillaOne.CaretLineBackColor = System.Drawing.Color.White;
|
||||
this.scintillaOne.CaretLineVisible = true;
|
||||
this.scintillaOne.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.scintillaOne.LexerName = null;
|
||||
this.scintillaOne.Location = new System.Drawing.Point(0, 23);
|
||||
this.scintillaOne.ScrollSync = this.scintillaTwo;
|
||||
this.scintillaOne.ScrollWidth = 1;
|
||||
this.scintillaOne.Size = new System.Drawing.Size(434, 431);
|
||||
this.scintillaOne.TabIndents = true;
|
||||
this.scintillaOne.TabIndex = 0;
|
||||
this.scintillaOne.UseRightToLeftReadingLayout = false;
|
||||
this.scintillaOne.WrapMode = ScintillaNET.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.CaretLineBackColor = System.Drawing.Color.White;
|
||||
this.scintillaTwo.CaretLineVisible = true;
|
||||
this.scintillaTwo.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.scintillaTwo.LexerName = null;
|
||||
this.scintillaTwo.Location = new System.Drawing.Point(0, 23);
|
||||
this.scintillaTwo.ScrollSync = this.scintillaOne;
|
||||
this.scintillaTwo.ScrollWidth = 1;
|
||||
this.scintillaTwo.Size = new System.Drawing.Size(480, 431);
|
||||
this.scintillaTwo.TabIndents = true;
|
||||
this.scintillaTwo.TabIndex = 0;
|
||||
this.scintillaTwo.UseRightToLeftReadingLayout = false;
|
||||
this.scintillaTwo.WrapMode = ScintillaNET.WrapMode.None;
|
||||
this.scintillaTwo.TextChanged += new System.EventHandler(this.Scintilla_TextChanged);
|
||||
this.scMain.Panel1.Controls.Add(scintillaOne);
|
||||
this.scMain.Panel1.Controls.SetChildIndex(scintillaOne, 0);
|
||||
this.scMain.Panel2.Controls.Add(scintillaTwo);
|
||||
this.scMain.Panel2.Controls.SetChildIndex(scintillaTwo, 0);
|
||||
scintillaOne.Tag = -1;
|
||||
scintillaTwo.Tag = -1;
|
||||
ReInit();
|
||||
}
|
||||
// this tag values are for line number length counting..
|
||||
scintillaOne.Tag = -1;
|
||||
scintillaTwo.Tag = -1;
|
||||
|
||||
ReInit();
|
||||
}
|
||||
public void ReInit()
|
||||
{
|
||||
@@ -106,9 +149,11 @@ namespace ScintillaDiff
|
||||
#endregion
|
||||
|
||||
#region PrivateFields
|
||||
private ScrollSyncScintilla scintillaOne;
|
||||
private ScrollSyncScintilla scintillaTwo;
|
||||
private string textLeft = string.Empty;
|
||||
private string textRight = string.Empty;
|
||||
private Bitmap imageRowAdded =SuperDesign.Properties.Resources.plus;
|
||||
private Bitmap imageRowAdded = SuperDesign.Properties.Resources.plus;
|
||||
private Bitmap imageRowDeleted = SuperDesign.Properties.Resources.minus;
|
||||
private Bitmap imageRowOk = SuperDesign.Properties.Resources.ok;
|
||||
private Bitmap imageRowDiff = SuperDesign.Properties.Resources.diff;
|
||||
@@ -1598,5 +1643,11 @@ namespace ScintillaDiff
|
||||
return JumpToLine(diffIndex, true);
|
||||
}
|
||||
#endregion
|
||||
|
||||
private void ScintillaDiffControl_Load(object sender, EventArgs e)
|
||||
{
|
||||
ryCommon.Auto.LeftClick(scintillaOne.Handle, 0, 0);
|
||||
ryCommon.Auto.LeftClick(scintillaTwo.Handle, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,11 +31,9 @@ namespace ScintillaDiff
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.scMain = new System.Windows.Forms.SplitContainer();
|
||||
this.scintillaOne = new ScintillaDiff.ScrollSyncScintilla();
|
||||
this.scintillaTwo = new ScintillaDiff.ScrollSyncScintilla();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
@@ -53,55 +51,15 @@ namespace ScintillaDiff
|
||||
//
|
||||
// scMain.Panel1
|
||||
//
|
||||
this.scMain.Panel1.Controls.Add(this.scintillaOne);
|
||||
this.scMain.Panel1.Controls.Add(this.panel1);
|
||||
//
|
||||
// scMain.Panel2
|
||||
//
|
||||
this.scMain.Panel2.Controls.Add(this.scintillaTwo);
|
||||
this.scMain.Panel2.Controls.Add(this.panel2);
|
||||
this.scMain.Size = new System.Drawing.Size(918, 454);
|
||||
this.scMain.SplitterDistance = 434;
|
||||
this.scMain.TabIndex = 0;
|
||||
//
|
||||
// scintillaOne
|
||||
//
|
||||
this.scintillaOne.AutoCMaxHeight = 9;
|
||||
this.scintillaOne.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
|
||||
this.scintillaOne.CaretLineBackColor = System.Drawing.Color.White;
|
||||
this.scintillaOne.CaretLineVisible = true;
|
||||
this.scintillaOne.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.scintillaOne.LexerName = null;
|
||||
this.scintillaOne.Location = new System.Drawing.Point(0, 23);
|
||||
this.scintillaOne.Name = "scintillaOne";
|
||||
this.scintillaOne.ScrollSync = this.scintillaTwo;
|
||||
this.scintillaOne.ScrollWidth = 1;
|
||||
this.scintillaOne.Size = new System.Drawing.Size(434, 431);
|
||||
this.scintillaOne.TabIndents = true;
|
||||
this.scintillaOne.TabIndex = 0;
|
||||
this.scintillaOne.UseRightToLeftReadingLayout = false;
|
||||
this.scintillaOne.WrapMode = ScintillaNET.WrapMode.None;
|
||||
this.scintillaOne.TextChanged += new System.EventHandler(this.Scintilla_TextChanged);
|
||||
//
|
||||
// scintillaTwo
|
||||
//
|
||||
this.scintillaTwo.AutoCMaxHeight = 9;
|
||||
this.scintillaTwo.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled;
|
||||
this.scintillaTwo.CaretLineBackColor = System.Drawing.Color.White;
|
||||
this.scintillaTwo.CaretLineVisible = true;
|
||||
this.scintillaTwo.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.scintillaTwo.LexerName = null;
|
||||
this.scintillaTwo.Location = new System.Drawing.Point(0, 23);
|
||||
this.scintillaTwo.Name = "scintillaTwo";
|
||||
this.scintillaTwo.ScrollSync = this.scintillaOne;
|
||||
this.scintillaTwo.ScrollWidth = 1;
|
||||
this.scintillaTwo.Size = new System.Drawing.Size(480, 431);
|
||||
this.scintillaTwo.TabIndents = true;
|
||||
this.scintillaTwo.TabIndex = 0;
|
||||
this.scintillaTwo.UseRightToLeftReadingLayout = false;
|
||||
this.scintillaTwo.WrapMode = ScintillaNET.WrapMode.None;
|
||||
this.scintillaTwo.TextChanged += new System.EventHandler(this.Scintilla_TextChanged);
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Controls.Add(this.label1);
|
||||
@@ -111,15 +69,6 @@ namespace ScintillaDiff
|
||||
this.panel1.Size = new System.Drawing.Size(434, 23);
|
||||
this.panel1.TabIndex = 1;
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.Controls.Add(this.label2);
|
||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panel2.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(480, 23);
|
||||
this.panel2.TabIndex = 2;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
@@ -129,6 +78,15 @@ namespace ScintillaDiff
|
||||
this.label1.TabIndex = 0;
|
||||
this.label1.Text = "文本1";
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.Controls.Add(this.label2);
|
||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panel2.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(480, 23);
|
||||
this.panel2.TabIndex = 2;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
@@ -145,6 +103,7 @@ namespace ScintillaDiff
|
||||
this.Controls.Add(this.scMain);
|
||||
this.Name = "ScintillaDiffControl";
|
||||
this.Size = new System.Drawing.Size(918, 454);
|
||||
this.Load += new System.EventHandler(this.ScintillaDiffControl_Load);
|
||||
this.SizeChanged += new System.EventHandler(this.ScintillaDiffer_SizeChanged);
|
||||
this.scMain.Panel1.ResumeLayout(false);
|
||||
this.scMain.Panel2.ResumeLayout(false);
|
||||
@@ -161,8 +120,6 @@ namespace ScintillaDiff
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.SplitContainer scMain;
|
||||
private ScrollSyncScintilla scintillaOne;
|
||||
private ScrollSyncScintilla scintillaTwo;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private System.Windows.Forms.Label label1;
|
||||
|
||||
Reference in new issue
Block a user