合并冲突

tangxu

2024-10-22 4d9fe5ed98ceb6b8fe9dc52ebfb80860ad1aee99

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs

@@ -1,14 +1,19 @@

using static System.Net.Mime.MediaTypeNames;
using System.Drawing.Printing;
using System.Windows.Forms;
using System.Xml.Linq;

namespace DPumpHydr.WinFrmUI.Volute
{
    partial class MainViewPage
    {
        /// <summary> 
        /// <summary>
        /// 必需的设计器变量。
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary> 
        /// <summary>
        /// 清理所有正在使用的资源。
        /// </summary>
        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
@@ -21,52 +26,59 @@
            base.Dispose(disposing);
        }

        #region 组件设计器生成的代码
        #region Windows 窗体设计器生成的代码

        /// <summary> 
        /// <summary>
        /// 设计器支持所需的方法 - 不要修改
        /// 使用代码编辑器修改此方法的内容。
        /// </summary>
        private void InitializeComponent()
        {
            label2 = new System.Windows.Forms.Label();
            pictureBox1 = new System.Windows.Forms.PictureBox();
            ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
            ribbonForm = new Ribbon();
            panel1 = new Panel();
            SuspendLayout();
            // 
            // label2
            // ribbonForm
            // 
            label2.AutoSize = true;
            label2.Location = new System.Drawing.Point(181, 65);
            label2.Name = "label2";
            label2.Size = new System.Drawing.Size(43, 17);
            label2.TabIndex = 1;
            label2.Text = "label2";
            ribbonForm.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
            ribbonForm.Location = new System.Drawing.Point(0, 0);
            ribbonForm.Minimized = false;
            ribbonForm.Name = "ribbonForm";
            // 
            // pictureBox1
            // 
            pictureBox1.Image = Properties.Resources.folder_Closed_16xLG;
            pictureBox1.Location = new System.Drawing.Point(232, 133);
            pictureBox1.Name = "pictureBox1";
            pictureBox1.Size = new System.Drawing.Size(100, 50);
            pictureBox1.TabIndex = 2;
            pictureBox1.TabStop = false;
            // 
            ribbonForm.OrbDropDown.BorderRoundness = 8;
            ribbonForm.OrbDropDown.Location = new System.Drawing.Point(0, 0);
            ribbonForm.OrbDropDown.Name = "";
            ribbonForm.OrbDropDown.TabIndex = 0;
            ribbonForm.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
            ribbonForm.Size = new System.Drawing.Size(933, 147);
            ribbonForm.TabIndex = 0;
            ribbonForm.Text = "ribbonForm";
            // 
            // panel1
            // 
            panel1.Dock = DockStyle.Fill;
            panel1.Location = new System.Drawing.Point(0, 147);
            panel1.Name = "panel1";
            panel1.Size = new System.Drawing.Size(933, 491);
            panel1.TabIndex = 1;
            // 
            // MainViewPage
            // 
            AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            Controls.Add(pictureBox1);
            Controls.Add(label2);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(panel1);
            Controls.Add(ribbonForm);
            Margin = new Padding(4);
            Name = "MainViewPage";
            Size = new System.Drawing.Size(754, 515);
            ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
            Size = new System.Drawing.Size(933, 638);
            ResumeLayout(false);
            PerformLayout();
        }

        #endregion
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.PictureBox pictureBox1;

        private System.Windows.Forms.Ribbon ribbonForm;
        private Panel panel1;
    }
}