From d819916854d5c23e6ffa7cab3237615d0d50007f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 三月 2025 17:03:29 +0800
Subject: [PATCH] 到货单
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 54 +++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 1
DevApp/Gs.DevApp/DevFrm/XtraForm2.cs | 2
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 4 +
DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs | 72 ++++++++++++++++++++++--
5 files changed, 124 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 2bd6dcc..86a0e8e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -489,6 +489,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
index 555b968..eb6b4af 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
@@ -32,24 +32,34 @@
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
this.SuspendLayout();
//
// panelControl1
//
+ this.panelControl1.Controls.Add(this.labelControl3);
+ this.panelControl1.Controls.Add(this.labelControl2);
this.panelControl1.Controls.Add(this.labelControl1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
this.panelControl1.Location = new System.Drawing.Point(0, 0);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1046, 77);
+ this.panelControl1.Size = new System.Drawing.Size(1046, 59);
this.panelControl1.TabIndex = 0;
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(138, 54);
+ this.labelControl1.Location = new System.Drawing.Point(88, 12);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(30, 18);
this.labelControl1.TabIndex = 0;
@@ -57,11 +67,11 @@
//
// gcMain1
//
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.gcMain1.Location = new System.Drawing.Point(0, 123);
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1046, 531);
+ this.gcMain1.Size = new System.Drawing.Size(1044, 563);
this.gcMain1.TabIndex = 1;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -72,13 +82,55 @@
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsView.RowAutoHeight = true;
+ this.gridView1.RowHeight = 50;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Location = new System.Drawing.Point(217, 12);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(112, 18);
+ this.labelControl2.TabIndex = 1;
+ this.labelControl2.Text = "浣犲ソ锛宧ello锛�123";
+ //
+ // labelControl3
+ //
+ this.labelControl3.Location = new System.Drawing.Point(412, 13);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(24, 18);
+ this.labelControl3.TabIndex = 2;
+ this.labelControl3.Text = "123";
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 59);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1046, 595);
+ this.xtraTabControl1.TabIndex = 2;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1044, 563);
+ this.xtraTabPage1.Text = "xtraTabPage1";
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(298, 268);
+ this.xtraTabPage2.Text = "xtraTabPage2";
//
// XtraForm2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1046, 654);
- this.Controls.Add(this.gcMain1);
+ this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.panelControl1);
this.Name = "XtraForm2";
this.Text = "XtraForm2";
@@ -87,6 +139,9 @@
this.panelControl1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -97,5 +152,10 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
index c53b43d..d78979b 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
@@ -21,6 +21,8 @@
public XtraForm2()
{
InitializeComponent();
+ gridView1.RowHeight = 50; // 鎮ㄥ彲浠ユ牴鎹渶瑕佽皟鏁磋繖涓��
+ gridView1.OptionsView.RowAutoHeight = true;
getPageList(1);
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 2cea7c4..5099767 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -382,8 +382,10 @@
//
// btnIn
//
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
- this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
this.btnIn.Location = new System.Drawing.Point(1028, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 60d2168..eb4cddb 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -74,6 +74,8 @@
//
// barManager1
//
+ this.barManager1.AllowCustomization = false;
+ this.barManager1.AllowMoveBarOnToolbar = false;
this.barManager1.AllowShowToolbarsPopup = false;
this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
this.bar2});
@@ -120,6 +122,14 @@
//
// bar2
//
+ this.bar2.BarAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Disabled.Options.UseFont = true;
+ this.bar2.BarAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Hovered.Options.UseFont = true;
+ this.bar2.BarAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Normal.Options.UseFont = true;
+ this.bar2.BarAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.bar2.BarAppearance.Pressed.Options.UseFont = true;
this.bar2.BarName = "Main menu";
this.bar2.DockCol = 0;
this.bar2.DockRow = 0;
@@ -158,6 +168,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
+ this.bar2.OptionsBar.DrawBorder = false;
+ this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
this.bar2.Text = "Main menu";
@@ -269,6 +281,8 @@
this.btnQuery.Id = 23;
this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.viewmergeddata_32x32;
+ this.btnQuery.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnQuery.ItemAppearance.Normal.Options.UseFont = true;
this.btnQuery.Name = "btnQuery";
this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -301,6 +315,8 @@
this.btnReport.Id = 22;
this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printlayoutview_16x16;
this.btnReport.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printlayoutview_32x32;
+ this.btnReport.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnReport.ItemAppearance.Normal.Options.UseFont = true;
this.btnReport.Name = "btnReport";
this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnReport.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -311,6 +327,8 @@
this.btnDesign.Id = 26;
this.btnDesign.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.Image")));
this.btnDesign.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.LargeImage")));
+ this.btnDesign.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnDesign.ItemAppearance.Normal.Options.UseFont = true;
this.btnDesign.Name = "btnDesign";
this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -320,6 +338,8 @@
this.btnJianYan.Id = 27;
this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
+ this.btnJianYan.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnJianYan.ItemAppearance.Normal.Options.UseFont = true;
this.btnJianYan.Name = "btnJianYan";
this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -329,6 +349,8 @@
this.btnFjianYan.Id = 28;
this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
+ this.btnFjianYan.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnFjianYan.ItemAppearance.Normal.Options.UseFont = true;
this.btnFjianYan.Name = "btnFjianYan";
this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -338,6 +360,8 @@
this.btnPiZhun.Id = 29;
this.btnPiZhun.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
this.btnPiZhun.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boposition2_32x32;
+ this.btnPiZhun.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnPiZhun.ItemAppearance.Normal.Options.UseFont = true;
this.btnPiZhun.Name = "btnPiZhun";
this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -347,6 +371,8 @@
this.btnZhiLiangChk.Id = 31;
this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162;
this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321;
+ this.btnZhiLiangChk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhiLiangChk.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhiLiangChk.Name = "btnZhiLiangChk";
this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -356,6 +382,8 @@
this.btnZhiLiangFchk.Id = 33;
this.btnZhiLiangFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161;
this.btnZhiLiangFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x321;
+ this.btnZhiLiangFchk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhiLiangFchk.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -365,6 +393,8 @@
this.btnBoHui.Id = 37;
this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16;
this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32;
+ this.btnBoHui.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnBoHui.ItemAppearance.Normal.Options.UseFont = true;
this.btnBoHui.Name = "btnBoHui";
this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -374,6 +404,8 @@
this.btnCaiGouChk.Id = 34;
this.btnCaiGouChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_16x16;
this.btnCaiGouChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
+ this.btnCaiGouChk.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnCaiGouChk.ItemAppearance.Normal.Options.UseFont = true;
this.btnCaiGouChk.Name = "btnCaiGouChk";
this.btnCaiGouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -392,6 +424,8 @@
this.btnLog.Id = 18;
this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
+ this.btnLog.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnLog.ItemAppearance.Normal.Options.UseFont = true;
this.btnLog.Name = "btnLog";
this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -400,6 +434,8 @@
this.btnTzbl.Caption = "閫氱煡澶囨枡";
this.btnTzbl.Id = 41;
this.btnTzbl.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
+ this.btnTzbl.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnTzbl.ItemAppearance.Normal.Options.UseFont = true;
this.btnTzbl.Name = "btnTzbl";
this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -409,6 +445,8 @@
this.btnKg.Caption = "寮�宸�";
this.btnKg.Id = 42;
this.btnKg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x323;
+ this.btnKg.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnKg.ItemAppearance.Normal.Options.UseFont = true;
this.btnKg.Name = "btnKg";
this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnKg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -418,6 +456,8 @@
this.btnWg.Caption = "鎵嬪姩瀹屽伐";
this.btnWg.Id = 45;
this.btnWg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+ this.btnWg.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnWg.ItemAppearance.Normal.Options.UseFont = true;
this.btnWg.Name = "btnWg";
this.btnWg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -427,6 +467,8 @@
this.btnZhongTai.Caption = "鐘舵�佷慨鏀�";
this.btnZhongTai.Id = 44;
this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
+ this.btnZhongTai.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnZhongTai.ItemAppearance.Normal.Options.UseFont = true;
this.btnZhongTai.Name = "btnZhongTai";
this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnZhongTai.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -436,6 +478,8 @@
this.btnJieAn.Caption = "缁撴";
this.btnJieAn.Id = 38;
this.btnJieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copymodeldifferences_32x32;
+ this.btnJieAn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnJieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnJieAn.Name = "btnJieAn";
this.btnJieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -444,6 +488,8 @@
this.btnFjieAn.Caption = "鍙嶇粨妗�";
this.btnFjieAn.Id = 39;
this.btnFjieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wordwrap_32x32;
+ this.btnFjieAn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnFjieAn.ItemAppearance.Normal.Options.UseFont = true;
this.btnFjieAn.Name = "btnFjieAn";
this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -453,6 +499,8 @@
this.btnOa.Id = 54;
this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
+ this.btnOa.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnOa.ItemAppearance.Normal.Options.UseFont = true;
this.btnOa.Name = "btnOa";
this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
@@ -462,6 +510,8 @@
this.btnLayout.Id = 51;
this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.globalcolorscheme_16x16;
this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.globalcolorscheme_32x32;
+ this.btnLayout.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnLayout.ItemAppearance.Normal.Options.UseFont = true;
this.btnLayout.Name = "btnLayout";
//
// btnHelp
@@ -486,7 +536,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -515,7 +565,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 69);
+ this.Size = new System.Drawing.Size(1543, 68);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
--
Gitblit v1.9.3