冲突

duheng

2024-07-23 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02

 Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningCtrl.cs

@@ -1,12 +1,5 @@
using 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;
using 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()
        {
 

        }
    }
}