Commit 4ec07436 刘韬

将语言文件从xml转成csv扩展名为lngres

1 个父辈 15f3f25e
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\IDHIKCamera\bin\Debug\MvCameraControl.Net.dll</HintPath> <HintPath>..\..\..\..\IDHIKCamera\bin\Debug\MvCameraControl.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="MvCodeReaderSDK.Net, Version=1.5.0.2, Culture=neutral, processorArchitecture=AMD64"> <Reference Include="MvCodeReaderSDK.Net">
<SpecificVersion>False</SpecificVersion> <HintPath>..\SharedDll\MvCodeReaderSDK.Net.dll</HintPath>
<HintPath>D:\Desktop\项目\ns100\NS100\SharedDll\MvCodeReaderSDK.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
......
...@@ -259,7 +259,7 @@ namespace SmartScan ...@@ -259,7 +259,7 @@ namespace SmartScan
BLLCommon.extension.LoadPanel(PnlExtension, BLLCommon.macroKey); BLLCommon.extension.LoadPanel(PnlExtension, BLLCommon.macroKey);
//语言 //语言
CboLanguage.Items.AddRange(Language.Name); CboLanguage.Items.AddRange(Language.Name.ToArray());
CboLanguage.SelectedText = BLLCommon.config.Language; CboLanguage.SelectedText = BLLCommon.config.Language;
BLLCommon.AutoGenRules = AutoGenRule.LoadFile(); BLLCommon.AutoGenRules = AutoGenRule.LoadFile();
if (BLLCommon.config.OpenMaximize) Maximize(); if (BLLCommon.config.OpenMaximize) Maximize();
...@@ -324,6 +324,7 @@ namespace SmartScan ...@@ -324,6 +324,7 @@ namespace SmartScan
BLLCommon.config.Language = CboLanguage.Text; BLLCommon.config.Language = CboLanguage.Text;
BLLCommon.config.Save(); BLLCommon.config.Save();
changeBtnStartText(); changeBtnStartText();
Language.SetLanguage(this);
} }
} }
void changeBtnStartText() void changeBtnStartText()
......
...@@ -74,7 +74,7 @@ namespace SmartScan ...@@ -74,7 +74,7 @@ namespace SmartScan
//语言 //语言
CboLanguage.Items.Clear(); CboLanguage.Items.Clear();
CboLanguage.Items.AddRange(Language.Name); CboLanguage.Items.AddRange(Language.Name.ToArray());
CboLanguage.SelectedText = BLLCommon.config.Language; CboLanguage.SelectedText = BLLCommon.config.Language;
} }
......
...@@ -356,6 +356,12 @@ ...@@ -356,6 +356,12 @@
<DependentUpon>UsrCodeExtractList.cs</DependentUpon> <DependentUpon>UsrCodeExtractList.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.manifest" /> <None Include="app.manifest" />
<None Include="Language\en-US.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Language\zh-CN.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="log4net.config"> <None Include="log4net.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
...@@ -400,12 +406,6 @@ ...@@ -400,12 +406,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="App.ico" /> <Content Include="App.ico" />
<Content Include="Language\en-US.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Language\zh-CN.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\copy.png" /> <None Include="Resources\copy.png" />
<None Include="Resources\validate.png" /> <None Include="Resources\validate.png" />
<None Include="Resources\filter.png" /> <None Include="Resources\filter.png" />
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!