From 970022ca59c5c22cf572c458c01e0328be85a253 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 08 六月 2024 12:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
WinfrmUI/Hydro.WinfrmUI.Viewer/frmMain-bak.designer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinfrmUI/Hydro.WinfrmUI.Viewer/frmMain-bak.designer.cs b/WinfrmUI/Hydro.WinfrmUI.Viewer/frmMain-bak.designer.cs
index e94dec2..8c7de42 100644
--- a/WinfrmUI/Hydro.WinfrmUI.Viewer/frmMain-bak.designer.cs
+++ b/WinfrmUI/Hydro.WinfrmUI.Viewer/frmMain-bak.designer.cs
@@ -13,7 +13,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMainbak));
DevExpress.XtraBars.Ribbon.GalleryItemGroup galleryItemGroup1 = new DevExpress.XtraBars.Ribbon.GalleryItemGroup();
DevExpress.XtraBars.Ribbon.GalleryItemGroup galleryItemGroup2 = new DevExpress.XtraBars.Ribbon.GalleryItemGroup();
DevExpress.XtraBars.Ribbon.GalleryItemGroup galleryItemGroup3 = new DevExpress.XtraBars.Ribbon.GalleryItemGroup();
@@ -2163,7 +2163,7 @@
this.ribbonPage6.Name = "ribbonPage6";
this.ribbonPage6.Text = "ribbonPage6";
//
- // frmMain
+ // frmMainbak
//
this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -2176,7 +2176,7 @@
this.IsMdiContainer = true;
this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.MinimumSize = new System.Drawing.Size(700, 380);
- this.Name = "frmMain";
+ this.Name = "frmMainbak";
this.Ribbon = this.ribbonControl1;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.StatusBar = this.ribbonStatusBar1;
--
Gitblit v1.9.3