dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续支持本地化，配置信息的本地化语言支持，v1.6.4

Browse Source
This commit is contained in:
dathlin
2017-10-08 09:41:29 +08:00
parent 3cccf070ab
commit b1875d046f
11 changed files with 242 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ClientsLibrary/Configuration/ClientConfiguration.Designer.cs generated
View File

@@ -77,10 +77,10 @@
this.userButton_delete.CustomerInformation = "";
this.userButton_delete.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_delete.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_delete.Location = new System.Drawing.Point(477, 23);
this.userButton_delete.Location = new System.Drawing.Point(444, 23);
this.userButton_delete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton_delete.Name = "userButton_delete";
this.userButton_delete.Size = new System.Drawing.Size(78, 25);
this.userButton_delete.Size = new System.Drawing.Size(111, 25);
this.userButton_delete.TabIndex = 9;
this.userButton_delete.UIText = "删除选中项";
this.userButton_delete.Click += new System.EventHandler(this.userButton_delete_Click);
@@ -96,22 +96,22 @@
//
// userButton1
//
this.userButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.userButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton1.BackColor = System.Drawing.Color.Transparent;
this.userButton1.CustomerInformation = "";
this.userButton1.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton1.Location = new System.Drawing.Point(98, 436);
this.userButton1.Location = new System.Drawing.Point(129, 436);
this.userButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton1.Name = "userButton1";
this.userButton1.Size = new System.Drawing.Size(98, 25);
this.userButton1.Size = new System.Drawing.Size(120, 25);
this.userButton1.TabIndex = 11;
this.userButton1.UIText = "添加客户端标识";
this.userButton1.Click += new System.EventHandler(this.userButton1_Click);
//
// userButton2
//
this.userButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.userButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton2.BackColor = System.Drawing.Color.Transparent;
this.userButton2.CustomerInformation = "";
this.userButton2.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
@@ -119,7 +119,7 @@
this.userButton2.Location = new System.Drawing.Point(3, 436);
this.userButton2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton2.Name = "userButton2";
this.userButton2.Size = new System.Drawing.Size(89, 25);
this.userButton2.Size = new System.Drawing.Size(120, 25);
this.userButton2.TabIndex = 12;
this.userButton2.UIText = "获取本机标识";
this.userButton2.Click += new System.EventHandler(this.userButton2_Click);

37
ClientsLibrary/Configuration/ClientConfiguration.cs
View File

@@ -8,16 +8,25 @@ using System.Text;
using System.Windows.Forms;
using Newtonsoft.Json.Linq;
using HslCommunication;
using CommonLibrary;
namespace ClientsLibrary.Configuration
{
public partial class ClientConfiguration : UserControl
{
#region Contructor
public ClientConfiguration()
{
InitializeComponent();
}
#endregion
#region Clients Delete
private void userButton_delete_Click(object sender, EventArgs e)
{
if(listBox1.SelectedItem!=null)
@@ -26,6 +35,11 @@ namespace ClientsLibrary.Configuration
}
}
#endregion
private void userButton2_Click(object sender, EventArgs e)
{
textBox1.Text = UserClient.JsonSettings.SystemInfo;
@@ -61,6 +75,9 @@ namespace ClientsLibrary.Configuration
MessageBox.Show("请求服务器失败，请稍后重试！");
userButton3.Enabled = false;
}
// 本地化
UILocalization();
}
private void userButton3_Click(object sender, EventArgs e)
@@ -92,5 +109,25 @@ namespace ClientsLibrary.Configuration
MessageBox.Show("上传失败！");
}
}
#region Localization Support
/// <summary>
/// 本地化显示的操作，还未完成
/// </summary>
private void UILocalization()
{
checkBox1.Text = UserLocalization.Localization.CheckBoxTrustEnable;
label1.Text = UserLocalization.Localization.GeneralAllowLoginList;
userButton_delete.UIText = UserLocalization.Localization.ButtonDeleteSelected;
userButton2.UIText = UserLocalization.Localization.ButtonGetComputerID;
userButton1.UIText = UserLocalization.Localization.ButtonAddComputerID;
userButton3.UIText = UserLocalization.Localization.ButtonSave;
}
#endregion
}
}

36
ClientsLibrary/Configuration/GeneralConfiguration.cs
View File

@@ -8,16 +8,26 @@ using System.Text;
using System.Windows.Forms;
using HslCommunication;
using Newtonsoft.Json.Linq;
using CommonLibrary;
namespace ClientsLibrary.Configuration
{
public partial class GeneralConfiguration : UserControl
{
#region Constructor
public GeneralConfiguration()
{
InitializeComponent();
}
#endregion
#region Control Load
private void GeneralConfiguration_Load(object sender, EventArgs e)
{
// 初始化
@@ -33,8 +43,16 @@ namespace ClientsLibrary.Configuration
MessageBox.Show("请求服务器失败，请稍后重试！");
userButton2.Enabled = false;
}
// 文本本地化
UILocalization();
}
#endregion
#region Submit
private void userButton2_Click(object sender, EventArgs e)
{
JObject json = new JObject
@@ -55,5 +73,23 @@ namespace ClientsLibrary.Configuration
MessageBox.Show("上传失败！");
}
}
#endregion
#region Localization Support
/// <summary>
/// 本地化显示的操作，还未完成
/// </summary>
private void UILocalization()
{
checkBox1.Text = UserLocalization.Localization.CheckBoxAllowUserMulti;
checkBox2.Text = UserLocalization.Localization.CheckBoxAllowFrameLogin;
userButton2.UIText = UserLocalization.Localization.ButtonSave;
}
#endregion
}
}

96
ClientsLibrary/Configuration/ListConfiguration.Designer.cs generated
View File

@@ -30,9 +30,9 @@
{
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.Factory = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.userButton_login = new HslCommunication.Controls.UserButton();
this.userButton1 = new HslCommunication.Controls.UserButton();
this.userButton2 = new HslCommunication.Controls.UserButton();
this.userButton_add = new HslCommunication.Controls.UserButton();
this.userButton_delete = new HslCommunication.Controls.UserButton();
this.userButton_save = new HslCommunication.Controls.UserButton();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
@@ -60,58 +60,58 @@
this.Factory.Name = "Factory";
this.Factory.Width = 400;
//
// userButton_login
// userButton_add
//
this.userButton_login.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton_login.BackColor = System.Drawing.Color.Transparent;
this.userButton_login.CustomerInformation = "";
this.userButton_login.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_login.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_login.Location = new System.Drawing.Point(3, 417);
this.userButton_login.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton_login.Name = "userButton_login";
this.userButton_login.Size = new System.Drawing.Size(78, 25);
this.userButton_login.TabIndex = 7;
this.userButton_login.UIText = "新增";
this.userButton_login.Click += new System.EventHandler(this.userButton_login_Click);
this.userButton_add.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton_add.BackColor = System.Drawing.Color.Transparent;
this.userButton_add.CustomerInformation = "";
this.userButton_add.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_add.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_add.Location = new System.Drawing.Point(3, 417);
this.userButton_add.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton_add.Name = "userButton_add";
this.userButton_add.Size = new System.Drawing.Size(78, 25);
this.userButton_add.TabIndex = 7;
this.userButton_add.UIText = "新增";
this.userButton_add.Click += new System.EventHandler(this.userButton_Add_Click);
//
// userButton1
// userButton_delete
//
this.userButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton1.BackColor = System.Drawing.Color.Transparent;
this.userButton1.CustomerInformation = "";
this.userButton1.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton1.Location = new System.Drawing.Point(87, 417);
this.userButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton1.Name = "userButton1";
this.userButton1.Size = new System.Drawing.Size(78, 25);
this.userButton1.TabIndex = 8;
this.userButton1.UIText = "删除";
this.userButton1.Click += new System.EventHandler(this.userButton1_Click);
this.userButton_delete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.userButton_delete.BackColor = System.Drawing.Color.Transparent;
this.userButton_delete.CustomerInformation = "";
this.userButton_delete.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_delete.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_delete.Location = new System.Drawing.Point(87, 417);
this.userButton_delete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton_delete.Name = "userButton_delete";
this.userButton_delete.Size = new System.Drawing.Size(78, 25);
this.userButton_delete.TabIndex = 8;
this.userButton_delete.UIText = "删除";
this.userButton_delete.Click += new System.EventHandler(this.userButton1_Click);
//
// userButton2
// userButton_save
//
this.userButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.userButton2.BackColor = System.Drawing.Color.Transparent;
this.userButton2.CustomerInformation = "";
this.userButton2.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton2.Location = new System.Drawing.Point(419, 417);
this.userButton2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton2.Name = "userButton2";
this.userButton2.Size = new System.Drawing.Size(78, 25);
this.userButton2.TabIndex = 9;
this.userButton2.UIText = "保存";
this.userButton2.Click += new System.EventHandler(this.userButton2_Click);
this.userButton_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.userButton_save.BackColor = System.Drawing.Color.Transparent;
this.userButton_save.CustomerInformation = "";
this.userButton_save.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_save.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_save.Location = new System.Drawing.Point(419, 417);
this.userButton_save.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton_save.Name = "userButton_save";
this.userButton_save.Size = new System.Drawing.Size(78, 25);
this.userButton_save.TabIndex = 9;
this.userButton_save.UIText = "保存";
this.userButton_save.Click += new System.EventHandler(this.userButton2_Click);
//
// ArrayConfiguration
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.userButton2);
this.Controls.Add(this.userButton1);
this.Controls.Add(this.userButton_login);
this.Controls.Add(this.userButton_save);
this.Controls.Add(this.userButton_delete);
this.Controls.Add(this.userButton_add);
this.Controls.Add(this.dataGridView1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
@@ -127,8 +127,8 @@
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.DataGridViewTextBoxColumn Factory;
private HslCommunication.Controls.UserButton userButton_login;
private HslCommunication.Controls.UserButton userButton1;
private HslCommunication.Controls.UserButton userButton2;
private HslCommunication.Controls.UserButton userButton_add;
private HslCommunication.Controls.UserButton userButton_delete;
private HslCommunication.Controls.UserButton userButton_save;
}
}

46
ClientsLibrary/Configuration/ListConfiguration.cs
View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using HslCommunication;
using CommonLibrary;
namespace ClientsLibrary.Configuration
{
@@ -39,6 +40,7 @@ namespace ClientsLibrary.Configuration
#endregion
#region Public Method
public void SetInfomation(int download, int upload, string headText)
@@ -48,11 +50,16 @@ namespace ClientsLibrary.Configuration
HeadText = headText;
}
#endregion
#region Control Load
private void FactoryConfiguration_Load(object sender, EventArgs e)
{
dataGridView1.Columns[0].HeaderText = HeadText;
// 向服务器请求数据初始化
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(Download, "");
if (result.IsSuccess)
@@ -68,16 +75,28 @@ namespace ClientsLibrary.Configuration
else
{
MessageBox.Show(result.Message);
userButton2.Enabled = false;
userButton_save.Enabled = false;
}
// 本地化支持
UILocalization();
}
private void userButton_login_Click(object sender, EventArgs e)
#endregion
#region List Add
private void userButton_Add_Click(object sender, EventArgs e)
{
dataGridView1.Rows.Add();
}
#endregion
#region List Delete
private void userButton1_Click(object sender, EventArgs e)
{
if (dataGridView1.SelectedRows != null)
@@ -89,6 +108,11 @@ namespace ClientsLibrary.Configuration
}
}
#endregion
#region Submit
private void userButton2_Click(object sender, EventArgs e)
{
List<string> data = new List<string>();
@@ -112,5 +136,23 @@ namespace ClientsLibrary.Configuration
MessageBox.Show("修改失败！原因：" + result.Message);
}
}
#endregion
#region Localization Support
/// <summary>
/// 本地化显示的操作，还未完成
/// </summary>
private void UILocalization()
{
userButton_add.UIText = UserLocalization.Localization.ButtonAdd;
userButton_delete.UIText = UserLocalization.Localization.ButtonDelete;
userButton_save.UIText = UserLocalization.Localization.ButtonSave;
}
#endregion
}
}

3
ClientsLibrary/Configuration/ListConfiguration.resx
View File

@@ -120,7 +120,4 @@
<metadata name="Factory.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Factory.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

6
ClientsLibrary/Configuration/RolesConfiguration.Designer.cs generated
View File

@@ -102,7 +102,7 @@
this.userButton2.CustomerInformation = "";
this.userButton2.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton2.Location = new System.Drawing.Point(168, 427);
this.userButton2.Location = new System.Drawing.Point(171, 427);
this.userButton2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton2.Name = "userButton2";
this.userButton2.Size = new System.Drawing.Size(78, 25);
@@ -117,7 +117,7 @@
this.userButton1.CustomerInformation = "";
this.userButton1.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton1.Location = new System.Drawing.Point(0, 427);
this.userButton1.Location = new System.Drawing.Point(3, 427);
this.userButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton1.Name = "userButton1";
this.userButton1.Size = new System.Drawing.Size(78, 25);
@@ -225,7 +225,7 @@
this.userButton5.CustomerInformation = "";
this.userButton5.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton5.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton5.Location = new System.Drawing.Point(84, 427);
this.userButton5.Location = new System.Drawing.Point(87, 427);
this.userButton5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.userButton5.Name = "userButton5";
this.userButton5.Size = new System.Drawing.Size(78, 25);

21
CommonLibrary/LocalizationSupport/ChineseLocalization.cs
View File

@@ -21,8 +21,16 @@ namespace CommonLibrary
/// 描述
/// </summary>
public string GeneralDescription { get; set; } = "描述";
public string GeneralAllowLoginList { get; set; } = "允许登录列表";
#region 复选框
public string CheckBoxAllowUserMulti { get; set; } = "是否允许一个账户重复登录 (admin 除外)";
public string CheckBoxAllowFrameLogin { get; set; } = "是否允许框架版本不匹配的客户端登录";
public string CheckBoxTrustEnable { get; set; } = "是否强制启用指定客户端登录";
#endregion
#region 按钮相关
@@ -50,6 +58,19 @@ namespace CommonLibrary
/// 取消
/// </summary>
public string ButtonCancel { get; set; } = "取消";
/// <summary>
/// 删除选中项
/// </summary>
public string ButtonDeleteSelected { get; set; } = "删除选中项";
/// <summary>
/// 获取本机标识
/// </summary>
public string ButtonGetComputerID { get; set; } = "获取本机标识";
/// <summary>
/// 新增客户端标识
/// </summary>
public string ButtonAddComputerID { get; set; } = "新增客户端标识";
#endregion

21
CommonLibrary/LocalizationSupport/EnglishLocalization.cs
View File

@@ -20,8 +20,17 @@ namespace CommonLibrary
/// 描述
/// </summary>
public string GeneralDescription { get; set; } = "Descrition";
public string GeneralAllowLoginList { get; set; } = "Allow login list";
#region 复选框
public string CheckBoxAllowUserMulti { get; set; } = "Allow an account to log if online (except admin)";
public string CheckBoxAllowFrameLogin { get; set; } = "Allows the client to log in if the framework version does not match";
public string CheckBoxTrustEnable { get; set; } = "Enable the specified client login";
#endregion
#region 按钮相关
/// <summary>
@@ -48,6 +57,18 @@ namespace CommonLibrary
/// 取消
/// </summary>
public string ButtonCancel { get; set; } = "Cancel";
/// <summary>
/// 删除选中项
/// </summary>
public string ButtonDeleteSelected { get; set; } = "Delete Selected";
/// <summary>
/// 获取本机标识
/// </summary>
public string ButtonGetComputerID { get; set; } = "Get ComputerID";
/// <summary>
/// 新增客户端标识
/// </summary>
public string ButtonAddComputerID { get; set; } = "Add ComputerID";
#endregion

26
CommonLibrary/LocalizationSupport/Localization.cs
View File

@@ -87,9 +87,19 @@ namespace CommonLibrary
/// 描述
/// </summary>
string GeneralDescription { get; set; }
/// <summary>
/// 允许登录列表
/// </summary>
string GeneralAllowLoginList { get; set; }
#region 复选框
string CheckBoxAllowUserMulti { get; set; }
string CheckBoxAllowFrameLogin { get; set; }
string CheckBoxTrustEnable { get; set; }
#endregion
#region 按钮相关
@@ -117,6 +127,18 @@ namespace CommonLibrary
/// 取消
/// </summary>
string ButtonCancel { get; set; }
/// <summary>
/// 删除选中项
/// </summary>
string ButtonDeleteSelected { get; set; }
/// <summary>
/// 获取本机标识
/// </summary>
string ButtonGetComputerID { get; set; }
/// <summary>
/// 新增客户端标识
/// </summary>
string ButtonAddComputerID { get; set; }
#endregion
@@ -143,7 +165,7 @@ namespace CommonLibrary
string AccountRoleAdd { get; set; }
string AccountRoleEdit { get; set; }
string AccountRoleNameList { get; set; } // 角色名称列表
string AccountRoleAccountList { get; set; } //关联账户列表
string AccountRoleAccountList { get; set; } // 关联账户列表
#endregion

2
CommonLibrary/ProtocolSupport/CommonProtocol.cs
View File

@@ -45,7 +45,7 @@ namespace CommonLibrary
*
**************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.6.3");
SoftBasic.FrameworkVersion = new SystemVersion("1.6.4");
}