From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs b/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs
index 13d75a7..5adafe7 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs
@@ -1,12 +1,5 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
+using System;
namespace HStation.Desktop
{
@@ -21,7 +14,7 @@
public CloseWarningCtrl()
{
InitializeComponent();
-
+
}
@@ -29,7 +22,7 @@
private void buttonOK_Click(object sender, EventArgs e)
{
if (radioButtonMinimize.Checked)
- CloseStatus = CloseStatus.Notify ;
+ CloseStatus = CloseStatus.Notify;
else
CloseStatus = CloseStatus.Close;
@@ -47,16 +40,16 @@
}
if (CloseStatus == CloseStatus.Close)
{
-// if (SPump.WinFrmUI.GlobeParas.SoftUpgradeStatus == Model.eSoftUpgradeStatus.姝ｅ湪鏇存柊)
-// {
-// DialogResult result = MessageBox.Show("杞欢姝ｅ湪涓嬭浇鏇存柊鍖�, 濡傛灉姝ゆ椂鍏抽棴杞欢, 涓嬭浇灏嗙粓姝�", "璇㈤棶",
-//System.Windows.Forms.MessageBoxButtons.YesNo,
-//System.Windows.Forms.MessageBoxIcon.Warning);
-// if (result != DialogResult.Yes)
-// {
-// CloseStatus = CloseStatus.Notify;
-// }
-// }
+ // if (SPump.WinFrmUI.GlobeParas.SoftUpgradeStatus == Model.eSoftUpgradeStatus.姝ｅ湪鏇存柊)
+ // {
+ // DialogResult result = MessageBox.Show("杞欢姝ｅ湪涓嬭浇鏇存柊鍖�, 濡傛灉姝ゆ椂鍏抽棴杞欢, 涓嬭浇灏嗙粓姝�", "璇㈤棶",
+ //System.Windows.Forms.MessageBoxButtons.YesNo,
+ //System.Windows.Forms.MessageBoxIcon.Warning);
+ // if (result != DialogResult.Yes)
+ // {
+ // CloseStatus = CloseStatus.Notify;
+ // }
+ // }
}
}
@@ -68,20 +61,20 @@
private string _fontName = "寰蒋闆呴粦";
private void CloseWarningCtrl_Load(object sender, EventArgs e)
{
-
+
this.lblInfo.Font = new System.Drawing.Font(_fontName, 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButtonMinimize.Font = new System.Drawing.Font(_fontName, 14.25F);
this.radioButtonCloss.Font = new System.Drawing.Font(_fontName, 14.25F);
- this.checkBox1.Font = new System.Drawing.Font(_fontName, 9F);
+ this.checkBox1.Font = new System.Drawing.Font(_fontName, 9F);
LocationDialog();
}
-
+
//缈昏瘧鐣岄潰璇█
private void LocationDialog()
{
-
+
}
}
}
--
Gitblit v1.9.3