Skip to content

D
DataEditorX
Commit 79c92359 authored by keyongyu's avatar keyongyu
Browse files
Options

2.2.7.2

parent 1491cfc3
Show whitespace changes
Inline Side-by-side
Showing with 333 additions and 282 deletions
DataEditorX/CodeEditForm.Designer.cs
View file @ 79c92359
......@@ -35,7 +35,6 @@ protected override void Dispose(bool disposing)
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.menuitem_file = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_open = new System.Windows.Forms.ToolStripMenuItem();
......@@ -51,9 +50,9 @@ private void InitializeComponent()
this.menuitem_setcard = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_help = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_about = new System.Windows.Forms.ToolStripMenuItem();
this.tb_input = new System.Windows.Forms.TextBox();
this.fctb = new FastColoredTextBoxNS.FastColoredTextBoxEx();
this.documentMap1 = new FastColoredTextBoxNS.DocumentMap();
this.tb_input = new System.Windows.Forms.TextBox();
this.menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fctb)).BeginInit();
this.SuspendLayout();
......@@ -182,6 +181,17 @@ private void InitializeComponent()
this.menuitem_about.Text = "About";
this.menuitem_about.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
//
// tb_input
//
this.tb_input.BackColor = System.Drawing.SystemColors.Control;
this.tb_input.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tb_input.Location = new System.Drawing.Point(0, 394);
this.tb_input.Margin = new System.Windows.Forms.Padding(0);
this.tb_input.Name = "tb_input";
this.tb_input.Size = new System.Drawing.Size(504, 21);
this.tb_input.TabIndex = 1;
this.tb_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Tb_inputKeyDown);
//
// fctb
//
this.fctb.AutoCompleteBracketsList = new char[] {
......@@ -195,8 +205,10 @@ private void InitializeComponent()
'\"',
'\'',
'\''};
this.fctb.AutoIndent = false;
this.fctb.AutoIndentChars = false;
this.fctb.AutoIndentCharsPatterns = "\n^\\s*[\\w\\.]+(\\s\\w+)?\\s*(?<range>=)\\s*(?<range>.+)\n";
this.fctb.AutoIndentExistingLines = false;
this.fctb.AutoScrollMinSize = new System.Drawing.Size(0, 22);
this.fctb.BackBrush = null;
this.fctb.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
......@@ -245,17 +257,6 @@ private void InitializeComponent()
this.documentMap1.Text = "documentMap1";
this.documentMap1.Visible = false;
//
// tb_input
//
this.tb_input.BackColor = System.Drawing.SystemColors.Control;
this.tb_input.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tb_input.Location = new System.Drawing.Point(0, 394);
this.tb_input.Margin = new System.Windows.Forms.Padding(0);
this.tb_input.Name = "tb_input";
this.tb_input.Size = new System.Drawing.Size(504, 21);
this.tb_input.TabIndex = 1;
this.tb_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Tb_inputKeyDown);
//
// CodeEditForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -277,6 +278,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.fctb)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
private System.Windows.Forms.ToolStripMenuItem menuitem_setcard;
private System.Windows.Forms.ToolStripMenuItem menuitem_replace;
......
DataEditorX/CodeEditForm.cs
View file @ 79c92359
......@@ -36,6 +36,7 @@ public partial class CodeEditForm : DockContent
AutocompleteMenu popupMenu_con;
AutocompleteMenu popupMenu_find;
string nowFile;
public string NowFile { get { return nowFile; } }
string title;
string oldtext;
Dictionary<string,string> tooltipDic;
......@@ -84,7 +85,6 @@ void InitForm()
fctb.ImeMode=ImeMode.On;
}
public void LoadXml(string xmlfile)
{
fctb.DescriptionFile=xmlfile;
......
DataEditorX/MainForm.cs
View file @ 79c92359
......@@ -33,7 +33,6 @@ public partial class MainForm : Form
string conflang,conflang_de,conflang_ce,confmsg,conflang_pe;
DataEditForm compare1,compare2;
Card[] tCards;
Dictionary<DataEditForm,string> list;
//
DataConfig datacfg = null;
CodeConfig codecfg = null;
......@@ -57,7 +56,6 @@ void Init(string datapath)
tCards = null;
hittorylist = new List<string>();
list = new Dictionary<DataEditForm,string>();
this.datapath = datapath;
InitDataEditor();
InitCodeEditor();
......@@ -180,11 +178,13 @@ void MenuHistoryItem_Click(object sender, EventArgs e)
{
ToolStripMenuItem tsmi=sender as ToolStripMenuItem;
if(tsmi!=null){
string file=tsmi.Text;
if(MainForm.isScript(file))
string file = tsmi.Text;
if (MainForm.isScript(file))
{
OpenScript(file);
}
else
Open(tsmi.Text);
Open(file);
}
}
#endregion
......@@ -224,6 +224,10 @@ public void OpenScript(string file)
if(!string.IsNullOrEmpty(file) && File.Exists(file)){
AddHistory(file);
}
if (checkOpen(file))
return;
if (OpenInNull(file))
return;
CodeEditForm cf=new CodeEditForm();
LANG.InitForm(cf, conflang_ce);
LANG.SetLanguage(cf);
......@@ -258,6 +262,11 @@ void InitDataEditor()
}
public void Open(string file)
{
if (MainForm.isScript(file))
{
OpenScript(file);
return;
}
if(!string.IsNullOrEmpty(file) && File.Exists(file)){
AddHistory(file);
}
......@@ -275,47 +284,77 @@ public void Open(string file)
InitDataEditor();
def.InitGameData(datacfg);
def.DockAreas = DockAreas.Document;
def.FormClosed+=new FormClosedEventHandler(def_FormClosed);
def.Show(dockPanel1, DockState.Document);
list.Add(def, "");
}
bool checkOpen(string file)
{
foreach(DataEditForm df in list.Keys)
DockContentCollection contents = dockPanel1.Contents;
foreach (DockContent dc in contents)
{
if (!MainForm.isScript(file))
{
DataEditForm df = dc as DataEditForm;
if (df != null && !df.IsDisposed)
{
if(df!=null && !df.IsDisposed)
if (df.getNowCDB() == file)
{
if(df.getNowCDB()==file)
df.Show();
return true;
}
}
}
else
{
CodeEditForm cf = dc as CodeEditForm;
if (cf != null && !cf.IsDisposed)
{
if (cf.NowFile == file)
{
cf.Show();
return true;
}
}
}
}
return false;
}
bool OpenInNull(string file)
{
if(string.IsNullOrEmpty(file) || !File.Exists(file))
return false;
foreach(DataEditForm df in list.Keys)
DockContentCollection contents = dockPanel1.Contents;
foreach (DockContent dc in contents)
{
if (!MainForm.isScript(file))
{
if(df!=null && !df.IsDisposed)
DataEditForm df = dc as DataEditForm;
if (df != null && !df.IsDisposed)
{
if (string.IsNullOrEmpty(df.getNowCDB()))
{
if(string.IsNullOrEmpty(df.getNowCDB())){
df.Open(file);
df.Show();
return true;
}
}
}
return false;
}
void def_FormClosed(object sender, FormClosedEventArgs e)
else
{
DataEditForm df=sender as DataEditForm;
if(df!=null)
CodeEditForm cf = dc as CodeEditForm;
if (cf != null && !cf.IsDisposed)
{
if (string.IsNullOrEmpty(cf.NowFile))
{
list.Remove(df);
cf.Open(file);
cf.Show();
return true;
}
}
}
}
return false;
}
void DataEditorToolStripMenuItemClick(object sender, EventArgs e)
......
DataEditorX/Properties/AssemblyInfo.cs
View file @ 79c92359
......@@ -28,4 +28,4 @@
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("2.2.7.1")]
[assembly: AssemblyVersion("2.2.7.2")]
DataEditorX/readme.txt
View file @ 79c92359
[DataEditorX]2.2.7.1[DataEditorX]
[DataEditorX]2.2.7.2[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★文件关联
......@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义
Ctrl+鼠标滑轮 缩放文字
★更新历史
2.2.7.2
打开脚本，重复的时候，显示标签
2.2.7.1
历史记录分离，脚本编辑器的卡片信息描述
2.2.7.0
......
win32/DataEditorX.exe
View file @ 79c92359
No preview for this file type
win32/chinese/history.txt
View file @ 79c92359
# history
F:\games\ygopro\script\c78835747.lua
F:\games\ygopro\script\c50485594.lua
F:\games\ygopro\script\c17857780.lua
F:\games\ygopro\script\c47198668.lua
F:\games\ygopro\script\c168917.lua
F:\games\ygopro\script\c65518099.lua
F:\games\ygopro\p.zip.cdb
F:\games\ygopro\script\c64496451.lua
F:\games\ygopro\script\c78835747.lua
\ No newline at end of file
win32/readme.txt
View file @ 79c92359
[DataEditorX]2.2.7.1[DataEditorX]
[DataEditorX]2.2.7.2[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★文件关联
......@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义
Ctrl+鼠标滑轮 缩放文字
★更新历史
2.2.7.2
打开脚本，重复的时候，显示标签
2.2.7.1
历史记录分离，脚本编辑器的卡片信息描述
2.2.7.0
......
win32/win32.zip
View file @ 79c92359
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment