From 9490957edfc694a0378ee52af47e921b8ac44e7a Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 04 六月 2024 09:12:11 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
index 8a0d553..577e51a 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
@@ -118,11 +118,11 @@
this.toolStripTextBox_姘村钩鏃嬭浆瑙掑害 = new System.Windows.Forms.ToolStripTextBox();
this.杞存棆杞琓oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.杞撮暅鍍廡oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.缂╂斁ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripTextBox_缂╂斁姣斾緥 = new System.Windows.Forms.ToolStripTextBox();
this.toolStripMenuItem_鏀惧ぇ2鍊� = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem_缂╁皬2鍊� = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.鍏抽榾鍒嗘瀽ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.鍏抽榾鍒嗘瀽涓嶈�冭檻姘存簮ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.杩為�氭�ф鏌oolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
@@ -146,6 +146,7 @@
this.鎺掑垪ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.妤煎眰绠＄悊ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.姘撮噺鍒嗛厤ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton();
this.閲嶇疆ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -237,7 +238,6 @@
this.鍙嶉�塗oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.timer_draw = new System.Windows.Forms.Timer(this.components);
this.map = new Hydro.MapUI.DMap();
- this.姘撮噺鍒嗛厤ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -616,8 +616,8 @@
this.姘村钩鏃嬭浆ToolStripMenuItem,
this.杞存棆杞琓oolStripMenuItem,
this.杞撮暅鍍廡oolStripMenuItem,
- this.toolStripSeparator7,
this.缂╂斁ToolStripMenuItem,
+ this.toolStripSeparator7,
this.鍏抽榾鍒嗘瀽ToolStripMenuItem,
this.杩為�氭�ф鏌oolStripMenuItem1,
this.涓嬫父杩為�氭�oolStripMenuItem,
@@ -634,7 +634,8 @@
this.瀵归綈ToolStripMenuItem,
this.鎺掑垪ToolStripMenuItem,
this.toolStripSeparator22,
- this.妤煎眰绠＄悊ToolStripMenuItem});
+ this.妤煎眰绠＄悊ToolStripMenuItem,
+ this.姘撮噺鍒嗛厤ToolStripMenuItem});
this.toolStripDropDownButton_宸ュ叿.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton_宸ュ叿.Image")));
this.toolStripDropDownButton_宸ュ叿.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton_宸ュ叿.Name = "toolStripDropDownButton_宸ュ叿";
@@ -672,11 +673,6 @@
this.杞撮暅鍍廡oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.杞撮暅鍍廡oolStripMenuItem.Text = "杞撮暅鍍�";
//
- // toolStripSeparator7
- //
- this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
- //
// 缂╂斁ToolStripMenuItem
//
this.缂╂斁ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -709,6 +705,11 @@
this.toolStripMenuItem_缂╁皬2鍊�.Size = new System.Drawing.Size(160, 22);
this.toolStripMenuItem_缂╁皬2鍊�.Text = "缂╁皬2鍊�";
this.toolStripMenuItem_缂╁皬2鍊�.Click += new System.EventHandler(this.缂╂斁ToolStripMenuItem_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
//
// 鍏抽榾鍒嗘瀽ToolStripMenuItem
//
@@ -883,6 +884,12 @@
this.妤煎眰绠＄悊ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.妤煎眰绠＄悊ToolStripMenuItem.Text = "妤煎眰绠＄悊";
this.妤煎眰绠＄悊ToolStripMenuItem.Click += new System.EventHandler(this.妤煎眰绠＄悊ToolStripMenuItem_Click);
+ //
+ // 姘撮噺鍒嗛厤ToolStripMenuItem
+ //
+ this.姘撮噺鍒嗛厤ToolStripMenuItem.Name = "姘撮噺鍒嗛厤ToolStripMenuItem";
+ this.姘撮噺鍒嗛厤ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ this.姘撮噺鍒嗛厤ToolStripMenuItem.Text = "姘撮噺鍒嗛厤";
//
// toolStripSeparator8
//
@@ -1591,12 +1598,6 @@
this.map.Name = "map";
this.map.Size = new System.Drawing.Size(1051, 554);
this.map.TabIndex = 8;
- //
- // 姘撮噺鍒嗛厤ToolStripMenuItem
- //
- this.姘撮噺鍒嗛厤ToolStripMenuItem.Name = "姘撮噺鍒嗛厤ToolStripMenuItem";
- this.姘撮噺鍒嗛厤ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
- this.姘撮噺鍒嗛厤ToolStripMenuItem.Text = "姘撮噺鍒嗛厤";
//
// MapViewer
//
--
Gitblit v1.9.3