合并冲突

tangxu

2024-10-22 4d9fe5ed98ceb6b8fe9dc52ebfb80860ad1aee99

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
using System;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
 
namespace DPumpHydr.DesktopMain
{
    public partial class frmMainWindowRLT : DPumpHydr.WinFrmUI.RLT.Forms.MaterialForm
    {
        //private readonly MaterialSkinManager materialSkinManager;
 
        public frmMainWindowRLT()
        {
            InitializeComponent();
            this.DrawerShowIconsWhenHidden = true;
            this.DrawerTabControl = mainTabControl;
 
 
            //DPumpHydr.WinFrmUI.RLT.Controls.ParrotSplashScreen parrotSplashScreen1 
            //    = new DPumpHydr.WinFrmUI.RLT.Controls.ParrotSplashScreen();
            //parrotSplashScreen1.AllowDragging = true;
            //parrotSplashScreen1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
            //parrotSplashScreen1.BottomText = "江苏大学....";
            //parrotSplashScreen1.BottomTextColor = System.Drawing.Color.Blue;
            //parrotSplashScreen1.BottomTextSize = 9;
            //parrotSplashScreen1.EllipseCornerRadius = 15;
            //parrotSplashScreen1.IsEllipse = true;
            //parrotSplashScreen1.LoadedColor = System.Drawing.Color.DodgerBlue;
            //parrotSplashScreen1.ProgressBarBorder = false;
            //parrotSplashScreen1.ProgressBarStyle = DPumpHydr.WinFrmUI.RLT.Controls.ParrotFlatProgressBar.Style.Material;
            //parrotSplashScreen1.SecondsDisplayed = 1000;//1秒
            //parrotSplashScreen1.ShowProgressBar = true;
            ////parrotSplashScreen1.SplashIcon = ((System.Drawing.Icon)(resources.GetObject("parrotSplashScreen1.SplashIcon")));
            //parrotSplashScreen1.SplashSize = new System.Drawing.Size(520, 280);
            //parrotSplashScreen1.TopText = "欢迎使用水力设计软件";
            //parrotSplashScreen1.TopTextColor = System.Drawing.Color.White;
            //parrotSplashScreen1.TopTextSize = 36;
            //parrotSplashScreen1.UnloadedColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
         
 
            //parrotSplashScreen1.InitializeLoader(this);
 
 
 
        }
 
   
    }
}