Skip to content

D
DataEditorX
Commit 519e5269 authored by JoyJ's avatar JoyJ
Browse files
Options

use nuget Data.SQLite; small fixes

parent 12d5a4b5
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 51 deletions
.gitignore
View file @ 519e5269
...@@ -225,3 +225,4 @@ pip-log.txt ...@@ -225,3 +225,4 @@ pip-log.txt
/win32/set /win32/set
/temp /temp
/packages
DataEditorX/DataEditForm.Designer.cs
View file @ 519e5269
...@@ -480,6 +480,7 @@ private void InitializeComponent() ...@@ -480,6 +480,7 @@ private void InitializeComponent()
this.menuitem_language.Name = "menuitem_language"; this.menuitem_language.Name = "menuitem_language";
this.menuitem_language.Size = new System.Drawing.Size(189, 22); this.menuitem_language.Size = new System.Drawing.Size(189, 22);
this.menuitem_language.Text = "Language"; this.menuitem_language.Text = "Language";
this.menuitem_language.Click += new System.EventHandler(this.menuitem_language_Click);
// //
// menuitem_checkupdate // menuitem_checkupdate
// //
......
DataEditorX/DataEditForm.cs
View file @ 519e5269
...@@ -465,10 +465,10 @@ void InitComboBox(ComboBox cb, List<long> keys, string[] values) ...@@ -465,10 +465,10 @@ void InitComboBox(ComboBox cb, List<long> keys, string[] values)
{ {
cb.Items.Clear(); cb.Items.Clear();
cb.Tag = keys; cb.Tag = keys;
//Improve 190324 by JoyJ //Improve 190324 by JoyJ
if (cb.Items.Count > 0) cb.Items.AddRange(values);
if (cb.Items.Count > 0)
{ {
cb.Items.AddRange(values);
cb.SelectedIndex = 0; cb.SelectedIndex = 0;
} }
} }
...@@ -2216,6 +2216,11 @@ private void DataEditForm_Load(object sender, EventArgs e) ...@@ -2216,6 +2216,11 @@ private void DataEditForm_Load(object sender, EventArgs e)
} }
private void menuitem_language_Click(object sender, EventArgs e)
{
}
void Tb_linkKeyPress(object sender, KeyPressEventArgs e) void Tb_linkKeyPress(object sender, KeyPressEventArgs e)
{ {
if(e.KeyChar != '0' && e.KeyChar != '1' && e.KeyChar != 1 && e.KeyChar!=22 && e.KeyChar!=3 && e.KeyChar != 8){ if(e.KeyChar != '0' && e.KeyChar != '1' && e.KeyChar != 1 && e.KeyChar!=22 && e.KeyChar!=3 && e.KeyChar != 8){
......
DataEditorX/DataEditorX.csproj
View file @ 519e5269
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.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">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<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>
...@@ -18,6 +19,8 @@ ...@@ -18,6 +19,8 @@
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -50,6 +53,12 @@ ...@@ -50,6 +53,12 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="FastColoredTextBox"> <Reference Include="FastColoredTextBox">
<HintPath>DLL\FastColoredTextBox.dll</HintPath> <HintPath>DLL\FastColoredTextBox.dll</HintPath>
</Reference> </Reference>
...@@ -58,10 +67,17 @@ ...@@ -58,10 +67,17 @@
<HintPath>DLL\Newtonsoft.Json.dll</HintPath> <HintPath>DLL\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.SQLite"> <Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>DLL\System.Data.SQLite.dll</HintPath> <HintPath>..\packages\System.Data.SQLite.Core.1.0.113.1\lib\net46\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.EF6, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.Linq, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
...@@ -199,6 +215,7 @@ ...@@ -199,6 +215,7 @@
<None Include="pack.db"> <None Include="pack.db">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" />
<None Include="readme.txt"> <None Include="readme.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
...@@ -244,4 +261,14 @@ ...@@ -244,4 +261,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.113.1\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.113.1\build\net46\System.Data.SQLite.Core.targets'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
</Target>
<Import Project="..\packages\System.Data.SQLite.Core.1.0.113.1\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.113.1\build\net46\System.Data.SQLite.Core.targets')" />
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
</Project> </Project>
\ No newline at end of file
DataEditorX/app.config
View file @ 519e5269
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<connectionStrings> <configSections>
<!-- Example connection to a SQL Server Database on localhost. --> <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<!-- <add name="ExampleConnectionString" <section name="entityFramework"
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
requirePermission="false"/>
</configSections>
<connectionStrings>
<!-- Example connection to a SQL Server Database on localhost. -->
<!-- <add name="ExampleConnectionString"
connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True" connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True"
providerName="System.Data.SqlClient" /> --> providerName="System.Data.SqlClient" /> -->
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- access these values via the property: <!-- access these values via the property:
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"/>
<add key="mse_auto_rarity" value="true"/> <add key="mse_auto_rarity" value="true"/>
<add key="pack_db" value="./pack.db"/> <add key="pack_db" value="./pack.db"/>
<!-- 1024 : 40--> <!-- 1024 : 40-->
<add key="autolength" value="37"/> <add key="autolength" value="37"/>
</appSettings> </appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
<entityFramework>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6"/>
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6"/>
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6"
description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"/>
<remove invariant="System.Data.SQLite"/><add name="SQLite Data Provider" invariant="System.Data.SQLite"
description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite"/></DbProviderFactories>
</system.data>
</configuration>
\ No newline at end of file
DataEditorX/packages.config 0 → 100644
View file @ 519e5269
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.4.4" targetFramework="net46" />
<package id="System.Data.SQLite" version="1.0.113.1" targetFramework="net46" />
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net46" />
<package id="System.Data.SQLite.EF6" version="1.0.113.0" targetFramework="net46" />
<package id="System.Data.SQLite.Linq" version="1.0.113.0" targetFramework="net46" />
</packages>
\ No newline at end of file
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