From 4d9fe5ed98ceb6b8fe9dc52ebfb80860ad1aee99 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 22 十月 2024 09:16:53 +0800
Subject: [PATCH] 合并冲突
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs
index b57ce98..024420d 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.Designer.cs
+++ b/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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3