From dbafcedefd3840d48b978de50141a15cffcc1e09 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 09:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs | 147 ++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 80 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
index 900ace8..29d5276 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
@@ -1,69 +1,57 @@
锘縰sing System.ComponentModel;
+using DevExpress.XtraEditors;
namespace Gs.DevApp.UserControl
{
- public partial class ShowDialogForm : DevExpress.XtraEditors.XtraForm
+ public partial class ShowDialogForm : XtraForm
{
+ #region Events
+
+ protected override void OnClosing(CancelEventArgs e)
+ {
+ base.OnClosing(e);
+ }
+
+ #endregion
+
#region Fields & Properties
- /// <summary>
- /// 鏍囬
- /// </summary>
- private string caption;
- public string Caption
- {
- get { return caption; }
- set { caption = value; }
- }
/// <summary>
- /// 娑堟伅
+ /// 鏍囬
/// </summary>
- private string message;
+ public string Caption { get; set; }
- public string Message
- {
- get { return message; }
- set { message = value; }
- }
/// <summary>
- /// 鎻忚堪
+ /// 娑堟伅
/// </summary>
- private string content;
+ public string Message { get; set; }
- public string Content
- {
- get { return content; }
- set { content = value; }
- }
/// <summary>
- /// 杩涘害鏉℃渶灏忓��
+ /// 鎻忚堪
/// </summary>
- private int minProcess = 1;
+ public string Content { get; set; }
- public int MinProcess
- {
- get { return minProcess; }
- set { minProcess = value; }
- }
/// <summary>
- /// 杩涘害鏉℃渶澶у��
+ /// 杩涘害鏉℃渶灏忓��
/// </summary>
- private int maxProcess = 100;
+ public int MinProcess { get; set; } = 1;
- public int MaxProcess
- {
- get { return maxProcess; }
- set { maxProcess = value; }
- }
+ /// <summary>
+ /// 杩涘害鏉℃渶澶у��
+ /// </summary>
+ public int MaxProcess { get; set; } = 100;
+
#endregion
#region Constructed Function
+
public ShowDialogForm()
{
InitializeComponent();
}
+
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆
/// </summary>
/// <param name="_caption">鎻愮ず</param>
public ShowDialogForm(string _caption)
@@ -72,101 +60,100 @@
}
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆
/// </summary>
/// <param name="_caption"></param>
/// <param name="_message"></param>
- public ShowDialogForm(string _caption,string _message)
- : this(_caption, _message, "",100)
+ public ShowDialogForm(string _caption, string _message)
+ : this(_caption, _message, "", 100)
{
}
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆
/// </summary>
/// <param name="_caption"></param>
/// <param name="_message"></param>
/// <param name="_content"></param>
- public ShowDialogForm(string _caption, string _message,string _content)
+ public ShowDialogForm(string _caption, string _message, string _content)
: this(_caption, _message, _content, 100)
{
}
-
+
/// <summary>
- /// 璁剧疆
+ /// 璁剧疆
/// </summary>
/// <param name="_caption">鎻愮ず</param>
/// <param name="_message">娑堟伅鍐呭</param>
/// <param name="_content">璇︾粏鎻忚堪</param>
/// <param name="_maxProcess">杩涘害鏉℃渶澶у��</param>
- public ShowDialogForm(string _caption, string _message,string _content,int _maxProcess)
+ public ShowDialogForm(string _caption, string _message, string _content,
+ int _maxProcess)
: this()
{
- this.Caption = "";
- this.Message = "";
- this.Content = "";
+ Caption = "";
+ Message = "";
+ Content = "";
- this.Caption = _caption == "" ? "鎻愮ず" : _caption;
- this.Message = _message == "" ? "姝ｅ湪鍔犺浇锛岃绋嶅悗......" : _message;
- this.Content = _content;
- this.maxProcess = _maxProcess > this.MinProcess ? _maxProcess : MinProcess;
-
- lblCaption.Text = this.Caption;
- // lblMessage.Text = this.Message;
- lblContent.Text = this.Content;
+ Caption = _caption == "" ? "鎻愮ず" : _caption;
+ Message = _message == "" ? "姝ｅ湪鍔犺浇锛岃绋嶅悗......" : _message;
+ Content = _content;
+ MaxProcess = _maxProcess > MinProcess ? _maxProcess : MinProcess;
+
+ lblCaption.Text = Caption;
+ // lblMessage.Text = this.Message;
+ lblContent.Text = Content;
progressShow.Properties.Minimum = MinProcess;
progressShow.Properties.Maximum = MaxProcess;
progressShow.Properties.Step = 1;
progressShow.PerformStep();
- this.ShowInTaskbar = false;
- this.TopMost = true;
- this.Show();
- this.Refresh();
+ ShowInTaskbar = false;
+ TopMost = true;
+ Show();
+ Refresh();
}
+
#endregion
#region Methods
+
/// <summary>
- /// 璁剧疆鎻愮ず
+ /// 璁剧疆鎻愮ず
/// </summary>
/// <param name="newCaption"></param>
public void SetCaption(string newCaption)
{
- this.Caption = newCaption;
- lblCaption.Text = this.Caption;
+ Caption = newCaption;
+ lblCaption.Text = Caption;
progressShow.PerformStep();
- this.Refresh();
+ Refresh();
}
+
/// <summary>
- /// 璁剧疆娑堟伅
+ /// 璁剧疆娑堟伅
/// </summary>
/// <param name="newMessage"></param>
public void SetMessage(string newMessage)
{
- this.Message = newMessage;
- // lblMessage.Text = this.Message;
+ Message = newMessage;
+ // lblMessage.Text = this.Message;
progressShow.PerformStep();
- this.Refresh();
+ Refresh();
}
+
/// <summary>
- /// 璁剧疆鎻忚堪
+ /// 璁剧疆鎻忚堪
/// </summary>
/// <param name="newContent"></param>
public void SetContent(string newContent)
{
- this.Content = newContent;
- lblContent.Text = this.Content;
+ Content = newContent;
+ lblContent.Text = Content;
progressShow.PerformStep();
- this.Refresh();
+ Refresh();
}
- #endregion
- #region Events
- protected override void OnClosing(CancelEventArgs e)
- {
- base.OnClosing(e);
- }
#endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3