Skip to content

D
DataEditorX
Commit b6ed0271 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:purerosefallen/DataEditorX

parents 03ba593d 54d8021c
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 27 deletions
DataEditorX/Controls/FastColoredTextBoxEx.cs
View file @ b6ed0271
...@@ -64,6 +64,7 @@ protected override void OnToolTip() ...@@ -64,6 +64,7 @@ protected override void OnToolTip()
if (ea.ToolTipText != null) if (ea.ToolTipText != null)
{ {
lbTooltip.Visible = true;
lbTooltip.Text = $"{ea.ToolTipTitle}\r\n\r\n{ea.ToolTipText}"; lbTooltip.Text = $"{ea.ToolTipTitle}\r\n\r\n{ea.ToolTipText}";
lbTooltip.Location = new Point(this.Size.Width - 500, this.lastMouseCoord.Y + this.CharHeight); lbTooltip.Location = new Point(this.Size.Width - 500, this.lastMouseCoord.Y + this.CharHeight);
//this.ToolTip.ToolTipTitle = ea.ToolTipTitle; //this.ToolTip.ToolTipTitle = ea.ToolTipTitle;
...@@ -125,6 +126,7 @@ private void InitializeComponent() ...@@ -125,6 +126,7 @@ private void InitializeComponent()
this.lbTooltip.Name = "lbTooltip"; this.lbTooltip.Name = "lbTooltip";
this.lbTooltip.Size = new System.Drawing.Size(0, 28); this.lbTooltip.Size = new System.Drawing.Size(0, 28);
this.lbTooltip.TabIndex = 1; this.lbTooltip.TabIndex = 1;
this.lbTooltip.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbTooltip_MouseMove);
// //
// FastColoredTextBoxEx // FastColoredTextBoxEx
// //
...@@ -133,10 +135,21 @@ private void InitializeComponent() ...@@ -133,10 +135,21 @@ private void InitializeComponent()
this.Controls.Add(this.lbTooltip); this.Controls.Add(this.lbTooltip);
this.Name = "FastColoredTextBoxEx"; this.Name = "FastColoredTextBoxEx";
this.Size = new System.Drawing.Size(584, 327); this.Size = new System.Drawing.Size(584, 327);
this.Load += new System.EventHandler(this.FastColoredTextBoxEx_Load);
((System.ComponentModel.ISupportInitialize)(this)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }
private void FastColoredTextBoxEx_Load(object sender, EventArgs e)
{
}
private void lbTooltip_MouseMove(object sender, MouseEventArgs e)
{
lbTooltip.Visible = false;
}
} }
} }
DataEditorX/Core/TaskHelper.cs
View file @ b6ed0271
...@@ -76,6 +76,7 @@ public Card[] CardList ...@@ -76,6 +76,7 @@ public Card[] CardList
public TaskHelper(string datapath, BackgroundWorker worker, MSEConfig mcfg) public TaskHelper(string datapath, BackgroundWorker worker, MSEConfig mcfg)
{ {
this.Datapath = datapath;
this.worker = worker; this.worker = worker;
this.mseHelper = new MseMaker(mcfg); this.mseHelper = new MseMaker(mcfg);
this.imgSet = new ImageSet(); this.imgSet = new ImageSet();
...@@ -97,12 +98,12 @@ public void Cancel() ...@@ -97,12 +98,12 @@ public void Cancel()
this.isRun = false; this.isRun = false;
this.isCancel = true; this.isCancel = true;
} }
public MyTask getLastTask() public MyTask GetLastTask()
{ {
return this.lastTask; return this.lastTask;
} }
public void testPendulumText(string desc){ public void TestPendulumText(string desc){
this.mseHelper.TestPendulum(desc); this.mseHelper.TestPendulum(desc);
} }
#endregion #endregion
...@@ -277,6 +278,9 @@ public string MSEImagePath ...@@ -277,6 +278,9 @@ public string MSEImagePath
{ {
get { return this.mseHelper.ImagePath; } get { return this.mseHelper.ImagePath; }
} }
public string Datapath { get; }
public void SaveMSEs(string file, Card[] cards,bool isUpdate) public void SaveMSEs(string file, Card[] cards,bool isUpdate)
{ {
if(cards == null) if(cards == null)
......
DataEditorX/DataEditForm.cs
View file @ b6ed0271
...@@ -1166,6 +1166,10 @@ public void CheckUpdate(bool showNew) ...@@ -1166,6 +1166,10 @@ public void CheckUpdate(bool showNew)
{ {
if (!this.isRun()) if (!this.isRun())
{ {
if (this.tasker == null)
{
this.tasker = new TaskHelper("", new System.ComponentModel.BackgroundWorker(), null);
}
this.tasker.SetTask(MyTask.CheckUpdate, null, showNew.ToString()); this.tasker.SetTask(MyTask.CheckUpdate, null, showNew.ToString());
this.Run(LanguageHelper.GetMsg(LMSG.checkUpdate)); this.Run(LanguageHelper.GetMsg(LMSG.checkUpdate));
} }
...@@ -1352,7 +1356,7 @@ void BgWorker1RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerC ...@@ -1352,7 +1356,7 @@ void BgWorker1RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerC
} }
else else
{ {
MyTask mt = this.tasker.getLastTask(); MyTask mt = this.tasker.GetLastTask();
switch (mt) switch (mt)
{ {
case MyTask.CheckUpdate: case MyTask.CheckUpdate:
...@@ -2079,7 +2083,7 @@ void Menuitem_testPendulumTextClick(object sender, EventArgs e) ...@@ -2079,7 +2083,7 @@ void Menuitem_testPendulumTextClick(object sender, EventArgs e)
{ {
Card c = this.GetCard(); Card c = this.GetCard();
if(c != null){ if(c != null){
this.tasker.testPendulumText(c.desc); this.tasker.TestPendulumText(c.desc);
} }
} }
void Menuitem_export_select_sqlClick(object sender, EventArgs e) void Menuitem_export_select_sqlClick(object sender, EventArgs e)
......
DataEditorX/DataEditorX.csproj
View file @ b6ed0271
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{3FA42393-3D90-4DE1-93FC-33FCB3045845}</ProjectGuid> <ProjectGuid>{3FA42393-3D90-4DE1-93FC-33FCB3045845}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>DataEditorX</RootNamespace> <RootNamespace>DataEditorX</RootNamespace>
<AssemblyName>DataEditorX</AssemblyName> <AssemblyName>DataEditorX</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<StartupObject>DataEditorX.Program</StartupObject> <StartupObject>DataEditorX.Program</StartupObject>
<ApplicationIcon>icon.ico</ApplicationIcon> <ApplicationIcon>icon.ico</ApplicationIcon>
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -42,6 +43,12 @@ ...@@ -42,6 +43,12 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath> <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FastColoredTextBox"> <Reference Include="FastColoredTextBox">
<HintPath>DLL\FastColoredTextBox.dll</HintPath> <HintPath>DLL\FastColoredTextBox.dll</HintPath>
......
DataEditorX/app.config
View file @ b6ed0271
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<connectionStrings> <connectionStrings>
<!-- Example connection to a SQL Server Database on localhost. --> <!-- Example connection to a SQL Server Database on localhost. -->
...@@ -11,40 +11,40 @@ ...@@ -11,40 +11,40 @@
System.Configuration.ConfigurationManager.AppSettings[key] System.Configuration.ConfigurationManager.AppSettings[key]
--> -->
<!-- MSE language data/mse_xxx.txt --> <!-- MSE language data/mse_xxx.txt -->
<add key="mse" value="Chinese-Simplified" /> <add key="mse" value="Chinese-Simplified"/>
<!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt --> <!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt -->
<add key="language" value="english" /> <add key="language" value="english"/>
<!-- Check system language when running program first time --> <!-- Check system language when running program first time -->
<add key="check_system_language" value="true" /> <add key="check_system_language" value="true"/>
<!-- async load data --> <!-- async load data -->
<add key="async" value="false" /> <add key="async" value="false"/>
<!-- DataEditorX source code --> <!-- DataEditorX source code -->
<add key="sourceURL" value="https://github.com/purerosefallen/DataEditorX" /> <add key="sourceURL" value="https://github.com/purerosefallen/DataEditorX"/>
<!-- DataEditorX update url--> <!-- DataEditorX update url-->
<add key="updateURL" value="https://cdn01.moecube.com/DataEditorX/version.txt" /> <add key="updateURL" value="https://cdn01.moecube.com/DataEditorX/version.txt" />
<!-- delete,modify with card's files image script --> <!-- delete,modify with card's files image script -->
<add key="opera_with_cards_file" value="true" /> <add key="opera_with_cards_file" value="true"/>
<!-- open file in this.such as lua --> <!-- open file in this.such as lua -->
<add key="open_file_in_this" value="true" /> <add key="open_file_in_this" value="true"/>
<!-- check update when opening application automatically --> <!-- check update when opening application automatically -->
<add key="auto_check_update" value="true" /> <add key="auto_check_update" value="true"/>
<!-- add require automatically --> <!-- add require automatically -->
<add key="add require" value="" /> <add key="add require" value=""/>
<!-- Cut Images Setting --> <!-- Cut Images Setting -->
<add key="image_quilty" value="100" /> <add key="image_quilty" value="100"/>
<add key="image" value="44,64,177,254" /> <add key="image" value="44,64,177,254"/>
<add key="image_other" value="25,54,128,128" /> <add key="image_other" value="25,54,128,128"/>
<add key="image_xyz" value="24,51,128,128" /> <add key="image_xyz" value="24,51,128,128"/>
<add key="image_pendulum" value="16,50,147,109" /> <add key="image_pendulum" value="16,50,147,109"/>
<!-- CodeEdiotr Setting <!-- CodeEdiotr Setting
IME = true 使用輸入法，正常顯示文字，反應變慢 IME = true 使用輸入法，正常顯示文字，反應變慢
IME = false English IME = false English
--> -->
<add key="IME" value="false" /> <add key="IME" value="false"/>
<add key="wordwrap" value="true" /> <add key="wordwrap" value="true"/>
<add key="tabisspace" value="false" /> <add key="tabisspace" value="false"/>
<add key="fontname" value="Consolas" /> <add key="fontname" value="Consolas"/>
<add key="fontsize" value="14.5" /> <add key="fontsize" value="14.5"/>
<!-- MSE path--> <!-- MSE path-->
<add key="mse_path" value="./MagicSetEditor2/mse.exe"/> <add key="mse_path" value="./MagicSetEditor2/mse.exe"/>
<add key="mse_exprotpath" value="./exprot"/> <add key="mse_exprotpath" value="./exprot"/>
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
<!-- 1024 : 40--> <!-- 1024 : 40-->
<add key="autolength" value="37"/> <add key="autolength" value="37"/>
</appSettings> </appSettings>
</configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
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