From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 61956b6..acb2682 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -34,7 +34,6 @@
this.fluentDesignFormContainer1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormContainer();
this.tab = new DevExpress.XtraTab.XtraTabControl();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.tooLoading = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel4 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -52,6 +51,7 @@
this.barAbout = new DevExpress.XtraBars.BarSubItem();
this.barUs = new DevExpress.XtraBars.BarButtonItem();
this.barHelp = new DevExpress.XtraBars.BarButtonItem();
+ this.barEasy = new DevExpress.XtraBars.BarButtonItem();
this.barButtonItem7 = new DevExpress.XtraBars.BarButtonItem();
this.barHeaderItem1 = new DevExpress.XtraBars.BarHeaderItem();
this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -72,14 +72,19 @@
this.barHeaderItem2 = new DevExpress.XtraBars.BarHeaderItem();
this.barListItem4 = new DevExpress.XtraBars.BarListItem();
this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
+ this.barSubItem4 = new DevExpress.XtraBars.BarSubItem();
this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
+ this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.tabCloseCurrent = new System.Windows.Forms.ToolStripMenuItem();
+ this.tabCloseAll = new System.Windows.Forms.ToolStripMenuItem();
this.fluentDesignFormContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
this.statusStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
+ this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// fluentDesignFormContainer1
@@ -107,7 +112,6 @@
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabel1,
this.tooLoading,
this.toolStripStatusLabel4,
this.toolStripStatusLabel3,
@@ -119,12 +123,6 @@
this.statusStrip1.Size = new System.Drawing.Size(806, 26);
this.statusStrip1.TabIndex = 5;
this.statusStrip1.Text = "statusStrip1";
- //
- // toolStripStatusLabel1
- //
- this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(17, 20);
- this.toolStripStatusLabel1.Text = " ";
//
// tooLoading
//
@@ -197,7 +195,9 @@
this.barMsg,
this.barHeaderItem2,
this.barListItem4,
- this.barButtonItem5});
+ this.barButtonItem5,
+ this.barSubItem4,
+ this.barEasy});
this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
this.fluentDesignFormControl1.Manager = this.fluentFormDefaultManager1;
this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
@@ -270,7 +270,8 @@
this.barAbout.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barAbout.ImageOptions.LargeImage")));
this.barAbout.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
new DevExpress.XtraBars.LinkPersistInfo(this.barUs),
- new DevExpress.XtraBars.LinkPersistInfo(this.barHelp)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.barHelp),
+ new DevExpress.XtraBars.LinkPersistInfo(this.barEasy)});
this.barAbout.Name = "barAbout";
this.barAbout.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
//
@@ -285,6 +286,12 @@
this.barHelp.Caption = "鍦ㄧ嚎甯姪";
this.barHelp.Id = 9;
this.barHelp.Name = "barHelp";
+ //
+ // barEasy
+ //
+ this.barEasy.Caption = "EasyCode";
+ this.barEasy.Id = 33;
+ this.barEasy.Name = "barEasy";
//
// barButtonItem7
//
@@ -419,9 +426,14 @@
this.barButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem5.ImageOptions.LargeImage")));
this.barButtonItem5.Name = "barButtonItem5";
//
+ // barSubItem4
+ //
+ this.barSubItem4.Caption = "barSubItem4";
+ this.barSubItem4.Id = 32;
+ this.barSubItem4.Name = "barSubItem4";
+ //
// fluentFormDefaultManager1
//
- this.fluentFormDefaultManager1.DockingEnabled = false;
this.fluentFormDefaultManager1.Form = this;
this.fluentFormDefaultManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
this.barButtonItem1,
@@ -453,8 +465,10 @@
this.barMsg,
this.barHeaderItem2,
this.barListItem4,
- this.barButtonItem5});
- this.fluentFormDefaultManager1.MaxItemId = 32;
+ this.barButtonItem5,
+ this.barSubItem4,
+ this.barEasy});
+ this.fluentFormDefaultManager1.MaxItemId = 34;
//
// acrd
//
@@ -466,6 +480,29 @@
this.acrd.TabIndex = 1;
this.acrd.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
//
+ // contextMenuStrip1
+ //
+ this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tabCloseCurrent,
+ this.tabCloseAll});
+ this.contextMenuStrip1.Name = "contextMenuStrip1";
+ this.contextMenuStrip1.Size = new System.Drawing.Size(158, 56);
+ //
+ // tabCloseCurrent
+ //
+ this.tabCloseCurrent.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
+ this.tabCloseCurrent.Name = "tabCloseCurrent";
+ this.tabCloseCurrent.Size = new System.Drawing.Size(157, 26);
+ this.tabCloseCurrent.Text = "鍏抽棴褰撳墠椤�";
+ //
+ // tabCloseAll
+ //
+ this.tabCloseAll.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
+ this.tabCloseAll.Name = "tabCloseAll";
+ this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
+ this.tabCloseAll.Text = "鍏抽棴鍏跺畠椤�";
+ //
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -476,6 +513,7 @@
this.Controls.Add(this.acrd);
this.Controls.Add(this.fluentDesignFormControl1);
this.FluentDesignFormControl = this.fluentDesignFormControl1;
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
this.Name = "FrmMain";
this.NavigationControl = this.acrd;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -488,6 +526,7 @@
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
+ this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -533,8 +572,12 @@
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3;
private System.Windows.Forms.ToolStripStatusLabel toolTime;
private System.Windows.Forms.ToolStripStatusLabel tooLoading;
- private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel4;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel5;
+ private DevExpress.XtraBars.BarButtonItem barEasy;
+ private DevExpress.XtraBars.BarSubItem barSubItem4;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent;
+ private System.Windows.Forms.ToolStripMenuItem tabCloseAll;
}
}
\ No newline at end of file
--
Gitblit v1.9.3