Skip to content

T
Thick-Common
Commit 5a3153e2 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修改语言包路径，添加zh

parent 21bce6a5
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 55 deletions
MultiLayout/FlyLayoutManager.cs
View file @ 5a3153e2
......@@ -45,6 +45,7 @@ namespace MultiLayout
return p;
}
public static Func<string, bool> Authorize;
NLog.ILogger logger = NLog.LogManager.GetCurrentClassLogger();
......
MultiLayout/MainWindow.xaml
View file @ 5a3153e2
......@@ -10,7 +10,6 @@
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
......
MultiLayout/MainWindow.xaml.cs
View file @ 5a3153e2
......@@ -33,6 +33,8 @@ namespace MultiLayout
WdMainVm viewModel;
NavigationService NavigationService => frame.NavigationService;
public Action<IUnityContainer> Register;
public MainWindow()
{
InitializeComponent();
......@@ -58,8 +60,14 @@ namespace MultiLayout
//---------------------------------------------------------
//加载 unity
container.RegisterInstance(lp);
if (Register != null)
{
Register.Invoke(container);
}
else
{
UnityConfExt.Load(container);
}
container.RegisterInstance<Window>(this);
//---------------------------------------------------------
......
MultiLayout/MultiLayout.csproj
View file @ 5a3153e2
......@@ -263,19 +263,19 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgMe.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgMe.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgLoading.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgLoading.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.CustomMenu.xaml">
<Page Include="Themes\StringResources\zh\StringResource.CustomMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.xaml">
<Page Include="Themes\StringResources\zh\StringResource.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......
MultiLayout/UcSingleGage/UcSingleGage.xaml.cs
View file @ 5a3153e2
......@@ -34,6 +34,11 @@ namespace MultiLayout
private void button_option_click(object sender, RoutedEventArgs e)
{
if (FlyLayoutManager.Authorize != null)
{
if (!FlyLayoutManager.Authorize.Invoke("Menu"))
return;
}
PgMenu p = new PgMenu();
p.Init(manager);
FlyLayoutManager.NavigationService.Navigate(p);
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/App.xaml
View file @ 5a3153e2
......@@ -14,7 +14,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<!--项目字符串-->
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/en/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" />
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
View file @ 5a3153e2
......@@ -125,6 +125,7 @@
</Compile>
<Compile Include="DependOn\WarningSystem2ServiceClientWithName.cs" />
<Compile Include="IErrNoTranslator.cs" />
<Compile Include="OnInit\OnInitAuthorize.cs" />
<Compile Include="OnInit\OnInitAutoScan.cs" />
<Compile Include="OnInit\OnInitControllerState.cs" />
<Compile Include="OnInit\OnInitReboot.cs" />
......@@ -369,7 +370,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.FlyADIODefine.xaml">
<Page Include="Themes\StringResources\zh\StringResource.FlyADIODefine.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -393,7 +394,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgReject.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgReject.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -401,23 +402,23 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.OnInit.xaml">
<Page Include="Themes\StringResources\zh\StringResource.OnInit.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.WdAbHelper.xaml">
<Page Include="Themes\StringResources\zh\StringResource.WdAbHelper.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgPwManager.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgPwManager.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgCustomSections.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgCustomSections.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgGageInfo.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgGageInfo.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -425,11 +426,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.WdFlyADAccess.xaml">
<Page Include="Themes\StringResources\zh\StringResource.WdFlyADAccess.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgErrorAllTable.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgErrorAllTable.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -437,7 +438,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.ControllerState.xaml">
<Page Include="Themes\StringResources\zh\StringResource.ControllerState.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -453,7 +454,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.DynArea.xaml">
<Page Include="Themes\StringResources\zh\StringResource.DynArea.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -461,7 +462,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.Graph.xaml">
<Page Include="Themes\StringResources\zh\StringResource.Graph.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -469,7 +470,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.Menu.xaml">
<Page Include="Themes\StringResources\zh\StringResource.Menu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -489,7 +490,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgInitParam.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgInitParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -497,19 +498,19 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgFlyAd.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgFlyAd.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgCurve.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgCurve.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgBorderSearch.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgBorderSearch.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgAddress.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgAddress.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -517,7 +518,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgGetSample.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgGetSample.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -525,7 +526,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgGrid.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgGrid.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -533,19 +534,19 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgScanCorr.xaml">
<Page Include="Themes\StringResources\zh\StringResource.PgScanCorr.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.CustomMenu.xaml">
<Page Include="Themes\StringResources\zh\StringResource.CustomMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.CtMicroGage.xaml">
<Page Include="Themes\StringResources\zh\StringResource.CtMicroGage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\StringResources\StringResource.xaml">
<Page Include="Themes\StringResources\zh\StringResource.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/OnInit/OnInitAuthorize.cs 0 → 100644
View file @ 5a3153e2
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FLY.Thick.Base.UI.OnInit
{
class OnInitAuthorize
{
}
}
Project.FLY.Thick.Base/FLY.Thick.Base/Common/ERRNOs.cs
View file @ 5a3153e2
......@@ -17,28 +17,28 @@ namespace FLY.Thick.Base.Common
public ERRNOs()
{
string resourceName = $"dict.StringResource.ERRNO";
var rd_errnos = (ResourceDictionary)Application.Current.FindResource(resourceName);//异常直接让它出错
Type t = this.GetType();
var fields = t.GetFields();
foreach (var field in fields)
{
if (field.Name.StartsWith("ERRNO_"))
{
var errno = (ERRNO)field.GetValue(this);
errno.Description = ToDescription(rd_errnos,field.Name);
field.SetValue(this, errno);
}
}
}
string ToDescription(ResourceDictionary rd_errnos, string errNoKey)
{
string resourceName = $"str.ERRNO.{errNoKey}";
return (string)rd_errnos[resourceName];//异常直接让它出错
//string resourceName = $"dict.StringResource.ERRNO";
//var rd_errnos = (ResourceDictionary)Application.Current.FindResource(resourceName);//异常直接让它出错
//Type t = this.GetType();
//var fields = t.GetFields();
//foreach (var field in fields)
//{
// if (field.Name.StartsWith("ERRNO_"))
// {
// var errno = (ERRNO)field.GetValue(this);
// errno.Description = ToDescription(rd_errnos,field.Name);
// field.SetValue(this, errno);
// }
//}
}
//string ToDescription(ResourceDictionary rd_errnos, string errNoKey)
//{
// string resourceName = $"str.ERRNO.{errNoKey}";
// return (string)rd_errnos[resourceName];//异常直接让它出错
//}
public virtual List<ERRNO> GetAll()
{
......
Project.FLY.Thick.Base/FLY.Thick.Base/FLY.Thick.Base.csproj
View file @ 5a3153e2
......@@ -169,7 +169,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.ERRNO.xaml">
<Page Include="Themes\StringResources\zh\StringResource.ERRNO.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......
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