diff --git a/ClientsLibrary/AccountSupport/FormAccountDetails.cs b/ClientsLibrary/AccountSupport/FormAccountDetails.cs index c6bb485..8661242 100644 --- a/ClientsLibrary/AccountSupport/FormAccountDetails.cs +++ b/ClientsLibrary/AccountSupport/FormAccountDetails.cs @@ -92,6 +92,14 @@ namespace ClientsLibrary label9.Text = UserLocalization.Localization.AccountLastLoginIpAddress + ":"; label10.Text = UserLocalization.Localization.AccountLastLoginWay + ":"; label11.Text = UserLocalization.Localization.AccountLoginFailedCount + ":"; + userButton_upload.UIText = UserLocalization.Localization.ButtonUpload; + userButton_download.UIText = UserLocalization.Localization.ButtonDownload; + userButton_delete.UIText = UserLocalization.Localization.ButtonDelete; + + groupBox2.Text = UserLocalization.Localization.FileMyListTitle; + label_fileName.Text = UserLocalization.Localization.FileName + ":"; + label_fileSize.Text = UserLocalization.Localization.FileSize + ":"; + label_uploadTime.Text = UserLocalization.Localization.FileUploadTime + ":"; } @@ -148,7 +156,7 @@ namespace ClientsLibrary public void DownloadUserFileNames() { - treeView1.Nodes[0].Text = "我的云端文件(下载中)"; + treeView1.Nodes[0].Text = UserLocalization.Localization.FileDownloading; treeView1.Nodes[0].Nodes.Clear(); treeView1.Refresh(); @@ -168,16 +176,16 @@ namespace ClientsLibrary treeView1.Nodes[0].Nodes.Add(node); } - treeView1.Nodes[0].Text = "我的云端文件(" + files.Length + ")"; + treeView1.Nodes[0].Text = UserLocalization.Localization.FileMy + "(" + files.Length + ")"; } else { - treeView1.Nodes[0].Text = "我的云端文件(NULL)"; + treeView1.Nodes[0].Text = UserLocalization.Localization.FileMy + "(NULL)"; } } else { - treeView1.Nodes[0].Text = "我的云端文件(下载失败)"; + treeView1.Nodes[0].Text = UserLocalization.Localization + "(下载失败)"; } treeView1.ExpandAll(); diff --git a/ClientsLibrary/UserClient.cs b/ClientsLibrary/UserClient.cs index 3c18cb0..6c37072 100644 --- a/ClientsLibrary/UserClient.cs +++ b/ClientsLibrary/UserClient.cs @@ -36,7 +36,7 @@ namespace ClientsLibrary /// /// 本软件的当前版本,用来验证更新的关键依据 /// - public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171007"); + public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171008"); /// diff --git a/CommonLibrary/LocalizationSupport/ChineseLocalization.cs b/CommonLibrary/LocalizationSupport/ChineseLocalization.cs index 188b671..a34d430 100644 --- a/CommonLibrary/LocalizationSupport/ChineseLocalization.cs +++ b/CommonLibrary/LocalizationSupport/ChineseLocalization.cs @@ -32,6 +32,17 @@ namespace CommonLibrary #endregion + #region 文件相关 + + public string FileName { get; set; } = "文件名"; + public string FileSize { get; set; } = "文件大小"; + public string FileUploadTime { get; set; } = "上传时间"; + public string FileDownloading { get; set; } = "我的云端文件(下载中)"; + public string FileMy { get; set; } = "我的云端文件"; + public string FileMyListTitle { get; set; } = "个人文件,支持拖拽上传,双击下载"; + + #endregion + #region 按钮相关 /// @@ -59,6 +70,14 @@ namespace CommonLibrary /// public string ButtonCancel { get; set; } = "取消"; /// + /// 上传 + /// + public string ButtonUpload { get; set; } = "上传"; + /// + /// 下载 + /// + public string ButtonDownload { get; set; } = "下载"; + /// /// 删除选中项 /// public string ButtonDeleteSelected { get; set; } = "删除选中项"; diff --git a/CommonLibrary/LocalizationSupport/EnglishLocalization.cs b/CommonLibrary/LocalizationSupport/EnglishLocalization.cs index b526bd8..7c470fe 100644 --- a/CommonLibrary/LocalizationSupport/EnglishLocalization.cs +++ b/CommonLibrary/LocalizationSupport/EnglishLocalization.cs @@ -31,6 +31,19 @@ namespace CommonLibrary #endregion + + + #region 文件相关 + + public string FileName { get; set; } = "Name"; + public string FileSize { get; set; } = "Size"; + public string FileUploadTime { get; set; } = "Time"; + public string FileDownloading { get; set; } = "My Cloud Files(downloading)"; + public string FileMy { get; set; } = "My Cloud Files"; + public string FileMyListTitle { get; set; } = "Personal files,drag to upload"; + + #endregion + #region 按钮相关 /// @@ -58,6 +71,14 @@ namespace CommonLibrary /// public string ButtonCancel { get; set; } = "Cancel"; /// + /// 上传 + /// + public string ButtonUpload { get; set; } = "Upload"; + /// + /// 下载 + /// + public string ButtonDownload { get; set; } = "Download"; + /// /// 删除选中项 /// public string ButtonDeleteSelected { get; set; } = "Delete Selected"; diff --git a/CommonLibrary/LocalizationSupport/Localization.cs b/CommonLibrary/LocalizationSupport/Localization.cs index e2f8b70..8669fad 100644 --- a/CommonLibrary/LocalizationSupport/Localization.cs +++ b/CommonLibrary/LocalizationSupport/Localization.cs @@ -101,6 +101,17 @@ namespace CommonLibrary #endregion + #region 文件相关 + + string FileName { get; set; } + string FileSize { get; set; } + string FileUploadTime { get; set; } + string FileDownloading { get; set; } + string FileMy { get; set; } + string FileMyListTitle { get; set; } + + #endregion + #region 按钮相关 /// @@ -128,6 +139,14 @@ namespace CommonLibrary /// string ButtonCancel { get; set; } /// + /// 上传 + /// + string ButtonUpload { get; set; } + /// + /// 下载 + /// + string ButtonDownload { get; set; } + /// /// 删除选中项 /// string ButtonDeleteSelected { get; set; } diff --git a/CommonLibrary/ProtocolSupport/CommonProtocol.cs b/CommonLibrary/ProtocolSupport/CommonProtocol.cs index ad74b17..d5d652f 100644 --- a/CommonLibrary/ProtocolSupport/CommonProtocol.cs +++ b/CommonLibrary/ProtocolSupport/CommonProtocol.cs @@ -45,7 +45,7 @@ namespace CommonLibrary * **************************************************************************/ - SoftBasic.FrameworkVersion = new SystemVersion("1.6.4"); + SoftBasic.FrameworkVersion = new SystemVersion("1.6.5"); } diff --git a/README.md b/README.md index 9f142c5..c960b93 100644 --- a/README.md +++ b/README.md @@ -247,6 +247,11 @@ using HslCommunication; ###### 统一的系统配置界面,门牌为【管理员】-【系统配置】 ![](https://github.com/dathlin/ClientServerProject/raw/master/软件系统客户端模版/screenshots/client17.png) + +##### 中英文双语支持,目前仅先适配我的信息和系统配置界面 + +![](https://github.com/dathlin/ClientServerProject/raw/master/软件系统客户端模版/screenshots/client18.png) +
diff --git a/软件系统客户端模版/screenshots/client18.png b/软件系统客户端模版/screenshots/client18.png new file mode 100644 index 0000000..7278bbb Binary files /dev/null and b/软件系统客户端模版/screenshots/client18.png differ diff --git a/软件系统客户端模版/screenshots/client2.png b/软件系统客户端模版/screenshots/client2.png index 50997da..7227008 100644 Binary files a/软件系统客户端模版/screenshots/client2.png and b/软件系统客户端模版/screenshots/client2.png differ