From 6ab82e2c95d6ad274983c985bde0175bb436719f Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 09 十一月 2024 18:07:56 +0800 Subject: [PATCH] 1 --- DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 12 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 168 +----- DevApp/Gs.DevApp/Gs.DevApp.csproj | 1 DevApp/Gs.DevApp/Properties/Resources.resx | 1043 ++++++++++++++++++++-------------------- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 238 ++++----- 6 files changed, 689 insertions(+), 783 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs index dea5f47..484e70d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs @@ -39,6 +39,9 @@ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fSubsidiary = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fumbrella = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl(); @@ -56,7 +59,6 @@ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -66,21 +68,18 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.panel1 = new System.Windows.Forms.Panel(); + this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit(); + this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier(); this.labelControl5 = new DevExpress.XtraEditors.LabelControl(); - this.txt_iCount = new DevExpress.XtraEditors.TextEdit(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); this.labelControl4 = new DevExpress.XtraEditors.LabelControl(); - this.txt_tc = new DevExpress.XtraEditors.TextEdit(); this.labelControl3 = new DevExpress.XtraEditors.LabelControl(); - this.txt_psnQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); - this.txt_suppName = new DevExpress.XtraEditors.TextEdit(); + this.txt_suppId = new DevExpress.XtraEditors.TextEdit(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); - this.txt_suppNo = new DevExpress.XtraEditors.TextEdit(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -98,11 +97,10 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_tc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit(); this.SuspendLayout(); // // gvMx1trLotno @@ -232,6 +230,36 @@ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; this.gvMx1.OptionsView.ShowGroupPanel = false; // + // gridColumn1 + // + this.gridColumn1.Caption = "搴撲綅"; + this.gridColumn1.FieldName = "depostSections"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 6; + this.gridColumn1.Width = 94; + // + // gridColumn2 + // + this.gridColumn2.Caption = "浠撳簱"; + this.gridColumn2.FieldName = "depostCode"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 7; + this.gridColumn2.Width = 94; + // + // gridColumn3 + // + this.gridColumn3.Caption = "浠撳簱鍚嶇О"; + this.gridColumn3.FieldName = "dpName"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 8; + this.gridColumn3.Width = 94; + // // gv_fSubsidiary // this.gv_fSubsidiary.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -260,7 +288,7 @@ // this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createDate1.Appearance.Options.UseFont = true; - this.lb_createDate1.Location = new System.Drawing.Point(257, 15); + this.lb_createDate1.Location = new System.Drawing.Point(271, 15); this.lb_createDate1.Name = "lb_createDate1"; this.lb_createDate1.Size = new System.Drawing.Size(68, 21); this.lb_createDate1.TabIndex = 252; @@ -272,7 +300,7 @@ this.txt_createDate1.Name = "txt_createDate1"; this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate1.Properties.Appearance.Options.UseFont = true; - this.txt_createDate1.Size = new System.Drawing.Size(150, 28); + this.txt_createDate1.Size = new System.Drawing.Size(228, 28); this.txt_createDate1.TabIndex = 252; // // lb_itemUnit @@ -287,7 +315,7 @@ // // txt_itemUnit // - this.txt_itemUnit.Location = new System.Drawing.Point(85, 88); + this.txt_itemUnit.Location = new System.Drawing.Point(85, 87); this.txt_itemUnit.Name = "txt_itemUnit"; this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemUnit.Properties.Appearance.Options.UseFont = true; @@ -305,7 +333,7 @@ this.gv_itemUnit.OptionsColumn.AllowEdit = false; this.gv_itemUnit.Tag = "query_a.item_unit"; this.gv_itemUnit.Visible = true; - this.gv_itemUnit.VisibleIndex = 3; + this.gv_itemUnit.VisibleIndex = 4; this.gv_itemUnit.Width = 94; // // lb_itemModel @@ -338,7 +366,7 @@ this.gv_itemModel.OptionsColumn.AllowEdit = false; this.gv_itemModel.Tag = "query_a.item_model"; this.gv_itemModel.Visible = true; - this.gv_itemModel.VisibleIndex = 2; + this.gv_itemModel.VisibleIndex = 3; this.gv_itemModel.Width = 94; // // lb_itemName @@ -371,7 +399,7 @@ this.gv_itemName.OptionsColumn.AllowEdit = false; this.gv_itemName.Tag = "query_a.item_name"; this.gv_itemName.Visible = true; - this.gv_itemName.VisibleIndex = 1; + this.gv_itemName.VisibleIndex = 2; this.gv_itemName.Width = 94; // // lb_itemNo @@ -404,7 +432,7 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; - this.gv_itemNo.VisibleIndex = 0; + this.gv_itemNo.VisibleIndex = 1; this.gv_itemNo.Width = 94; // // gv_id @@ -417,19 +445,9 @@ this.gv_id.Name = "gv_id"; this.gv_id.OptionsColumn.AllowEdit = false; this.gv_id.Tag = "query_a.id"; + this.gv_id.Visible = true; + this.gv_id.VisibleIndex = 0; this.gv_id.Width = 94; - // - // gv_guid - // - this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_guid.AppearanceCell.Options.UseFont = true; - this.gv_guid.Caption = "guid "; - this.gv_guid.FieldName = "guid"; - this.gv_guid.MinWidth = 50; - this.gv_guid.Name = "gv_guid"; - this.gv_guid.OptionsColumn.AllowEdit = false; - this.gv_guid.Tag = "query_a.guid"; - this.gv_guid.Width = 94; // // toolBarMenu1 // @@ -462,7 +480,6 @@ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gv_guid, this.gv_id, this.gv_itemNo, this.gv_itemName, @@ -533,16 +550,16 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_tc_1); + this.panel1.Controls.Add(this.txt_suppNo_1); this.panel1.Controls.Add(this.labelControl5); - this.panel1.Controls.Add(this.txt_iCount); + this.panel1.Controls.Add(this.txt_iCount_1); this.panel1.Controls.Add(this.labelControl4); - this.panel1.Controls.Add(this.txt_tc); this.panel1.Controls.Add(this.labelControl3); - this.panel1.Controls.Add(this.txt_psnQty); + this.panel1.Controls.Add(this.txt_psnQty_1); this.panel1.Controls.Add(this.labelControl2); - this.panel1.Controls.Add(this.txt_suppName); + this.panel1.Controls.Add(this.txt_suppId); this.panel1.Controls.Add(this.labelControl1); - this.panel1.Controls.Add(this.txt_suppNo); this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); this.panel1.Controls.Add(this.lb_createDate1); @@ -561,102 +578,101 @@ this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(1126, 182); this.panel1.TabIndex = 1; - this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); + // + // txt_tc_1 + // + this.txt_tc_1.Location = new System.Drawing.Point(697, 15); + this.txt_tc_1.Name = "txt_tc_1"; + this.txt_tc_1.Properties.Caption = ""; + this.txt_tc_1.Size = new System.Drawing.Size(94, 24); + this.txt_tc_1.TabIndex = 265; + // + // txt_suppNo_1 + // + this.txt_suppNo_1.KeyFile = ""; + this.txt_suppNo_1.Location = new System.Drawing.Point(349, 51); + this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0); + this.txt_suppNo_1.Name = "txt_suppNo_1"; + this.txt_suppNo_1.Size = new System.Drawing.Size(228, 30); + this.txt_suppNo_1.TabIndex = 264; // // labelControl5 // this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl5.Appearance.Options.UseFont = true; - this.labelControl5.Location = new System.Drawing.Point(518, 55); + this.labelControl5.Location = new System.Drawing.Point(587, 56); this.labelControl5.Name = "labelControl5"; this.labelControl5.Size = new System.Drawing.Size(102, 21); this.labelControl5.TabIndex = 261; this.labelControl5.Text = "鎵撳嵃鏉$爜寮犳暟"; // - // txt_iCount + // txt_iCount_1 // - this.txt_iCount.Location = new System.Drawing.Point(626, 49); - this.txt_iCount.Name = "txt_iCount"; - this.txt_iCount.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_iCount.Properties.Appearance.Options.UseFont = true; - this.txt_iCount.Size = new System.Drawing.Size(150, 28); - this.txt_iCount.TabIndex = 262; + this.txt_iCount_1.Location = new System.Drawing.Point(697, 49); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Size = new System.Drawing.Size(150, 28); + this.txt_iCount_1.TabIndex = 262; // // labelControl4 // this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl4.Appearance.Options.UseFont = true; - this.labelControl4.Location = new System.Drawing.Point(546, 15); + this.labelControl4.Location = new System.Drawing.Point(655, 15); this.labelControl4.Name = "labelControl4"; this.labelControl4.Size = new System.Drawing.Size(34, 21); this.labelControl4.TabIndex = 259; this.labelControl4.Text = "鐗归噰"; // - // txt_tc - // - this.txt_tc.Location = new System.Drawing.Point(626, 12); - this.txt_tc.Name = "txt_tc"; - this.txt_tc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_tc.Properties.Appearance.Options.UseFont = true; - this.txt_tc.Size = new System.Drawing.Size(150, 28); - this.txt_tc.TabIndex = 260; - // // labelControl3 // this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl3.Appearance.Options.UseFont = true; - this.labelControl3.Location = new System.Drawing.Point(518, 91); + this.labelControl3.Location = new System.Drawing.Point(587, 91); this.labelControl3.Name = "labelControl3"; this.labelControl3.Size = new System.Drawing.Size(102, 21); this.labelControl3.TabIndex = 257; this.labelControl3.Text = "姣忓紶鏉$爜鏁伴噺"; // - // txt_psnQty + // txt_psnQty_1 // - this.txt_psnQty.Location = new System.Drawing.Point(626, 88); - this.txt_psnQty.Name = "txt_psnQty"; - this.txt_psnQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_psnQty.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty.Size = new System.Drawing.Size(150, 28); - this.txt_psnQty.TabIndex = 258; + this.txt_psnQty_1.Location = new System.Drawing.Point(697, 87); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(150, 28); + this.txt_psnQty_1.TabIndex = 258; // // labelControl2 // this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl2.Appearance.Options.UseFont = true; - this.labelControl2.Location = new System.Drawing.Point(245, 91); + this.labelControl2.Location = new System.Drawing.Point(270, 91); this.labelControl2.Name = "labelControl2"; - this.labelControl2.Size = new System.Drawing.Size(85, 21); + this.labelControl2.Size = new System.Drawing.Size(69, 21); this.labelControl2.TabIndex = 255; - this.labelControl2.Text = "渚涘簲鍟嗗悕绉�"; + this.labelControl2.Text = "渚涘簲鍟咺D"; // - // txt_suppName + // txt_suppId // - this.txt_suppName.Location = new System.Drawing.Point(349, 88); - this.txt_suppName.Name = "txt_suppName"; - this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_suppName.Properties.Appearance.Options.UseFont = true; - this.txt_suppName.Size = new System.Drawing.Size(150, 28); - this.txt_suppName.TabIndex = 256; + this.txt_suppId.Enabled = false; + this.txt_suppId.Location = new System.Drawing.Point(349, 87); + this.txt_suppId.Name = "txt_suppId"; + this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_suppId.Properties.Appearance.Options.UseFont = true; + this.txt_suppId.Size = new System.Drawing.Size(228, 28); + this.txt_suppId.TabIndex = 256; // // labelControl1 // this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl1.Appearance.Options.UseFont = true; - this.labelControl1.Location = new System.Drawing.Point(245, 55); + this.labelControl1.Location = new System.Drawing.Point(254, 56); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(85, 21); this.labelControl1.TabIndex = 253; this.labelControl1.Text = "渚涘簲鍟嗙紪鍙�"; - // - // txt_suppNo - // - this.txt_suppNo.Location = new System.Drawing.Point(349, 49); - this.txt_suppNo.Name = "txt_suppNo"; - this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_suppNo.Properties.Appearance.Options.UseFont = true; - this.txt_suppNo.Size = new System.Drawing.Size(150, 28); - this.txt_suppNo.TabIndex = 254; // // labelControl11 // @@ -673,36 +689,6 @@ this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; - // - // gridColumn1 - // - this.gridColumn1.Caption = "搴撲綅"; - this.gridColumn1.FieldName = "depostSections"; - this.gridColumn1.MinWidth = 25; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 6; - this.gridColumn1.Width = 94; - // - // gridColumn2 - // - this.gridColumn2.Caption = "浠撳簱"; - this.gridColumn2.FieldName = "depostCode"; - this.gridColumn2.MinWidth = 25; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 7; - this.gridColumn2.Width = 94; - // - // gridColumn3 - // - this.gridColumn3.Caption = "浠撳簱鍚嶇О"; - this.gridColumn3.FieldName = "dpName"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 8; - this.gridColumn3.Width = 94; // // Frm_InitialBarcode // @@ -730,11 +716,10 @@ this.tabMx.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_tc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit(); this.ResumeLayout(false); } @@ -782,19 +767,18 @@ private DevExpress.XtraEditors.TextEdit txt_itemNo; private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo; private DevExpress.XtraGrid.Columns.GridColumn gv_id; - private DevExpress.XtraGrid.Columns.GridColumn gv_guid; private DevExpress.XtraEditors.LabelControl labelControl2; - private DevExpress.XtraEditors.TextEdit txt_suppName; + private DevExpress.XtraEditors.TextEdit txt_suppId; private DevExpress.XtraEditors.LabelControl labelControl1; - private DevExpress.XtraEditors.TextEdit txt_suppNo; private DevExpress.XtraEditors.LabelControl labelControl3; - private DevExpress.XtraEditors.TextEdit txt_psnQty; + private DevExpress.XtraEditors.TextEdit txt_psnQty_1; private DevExpress.XtraEditors.LabelControl labelControl5; - private DevExpress.XtraEditors.TextEdit txt_iCount; + private DevExpress.XtraEditors.TextEdit txt_iCount_1; private DevExpress.XtraEditors.LabelControl labelControl4; - private DevExpress.XtraEditors.TextEdit txt_tc; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private UserControl.UcLookSupplier txt_suppNo_1; + private DevExpress.XtraEditors.CheckEdit txt_tc_1; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs index 8bc3082..1e6fb42 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs @@ -1,5 +1,3 @@ -using DevExpress.XtraGrid.Views.Grid; -using DevExpress.XtraGrid.Views.Grid.ViewInfo; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; @@ -19,13 +17,9 @@ public Frm_InitialBarcode() { InitializeComponent(); - this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; - this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; - this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; - this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; - this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; @@ -42,6 +36,12 @@ Font f = new Font("寰蒋闆呴粦", 16); Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); + }; + //璁剧疆渚涘簲鍟嗛�夋嫨 + this.txt_suppNo_1.KeyFile = "id"; + this.txt_suppNo_1.EditChanged += (s, e) => + { + txt_suppId.Text = this.txt_suppNo_1.GetId(); }; } @@ -88,125 +88,26 @@ } /// <summary> - /// 鍙栨秷浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) - { - UtilityHelper.JumpToTab(xtraTabControl1, 0); - } - - /// <summary> - /// 鍒犻櫎浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) - { - string rowGuid = "", rowName = ""; - // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) - return; - List<dynamic> lst = new List<dynamic>(); - lst.Add(rowGuid); - var _obj = lst; - try - { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); - } - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - - /// <summary> /// 鍒锋柊浜嬩欢 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { - UtilityHelper.JumpToTab(xtraTabControl1, 0); - getPageList(1, UtilityHelper.GetPageSize()); + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + getPageList(1, UtilityHelper.GetPageSize()); } + /// <summary> - /// 淇敼浜嬩欢 + /// 鎵撳嵃 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e) { - string rowGuid = "", rowName = ""; - // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - getModel(rowGuid, true, 1); - } - /// <summary> - /// 鏂板浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) - { - UtilityHelper.JumpToTab(xtraTabControl1, 1); - lbGuid.Text = ""; - List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gridViews.Add(gvMx1); - UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); - Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); - } - /// <summary> - /// 淇濆瓨浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) - { - toolBarMenu1.isSetBtn = false; - //if (string.IsNullOrEmpty(txt_account.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); - // txt_account.Focus(); - return; - } - var _obj = new - { - guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //涓诲缓 - }; - try - { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - if (_rtn.rtnCode > 0) - { - lbGuid.Text = _rtn.rtnData; - toolBarMenu1.isSetBtn = true; - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); - } - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } + } /// <summary> @@ -228,22 +129,22 @@ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) - { - DataTable dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - int dddd = dd.rtnData.pages;//鎬婚〉 - pageBar1.TotalPages = dddd; - pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟 - pageBar1.CurrentPage = curPage;//褰撳墠椤� - pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず - pageBar1.setTxt(); - } - else - { - ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); - } + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + int dddd = dd.rtnData.pages;//鎬婚〉 + pageBar1.TotalPages = dddd; + pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず + pageBar1.setTxt(); + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } } catch (Exception ex) { @@ -264,7 +165,7 @@ }; try { - string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj)); + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { @@ -300,11 +201,6 @@ { ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } - - private void panel1_Paint(object sender, PaintEventArgs e) - { - } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 9498d85..aa8803a 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -852,6 +852,7 @@ <None Include="Resources\updatetableofcontents_32x32.png" /> <None Include="Resources\updatetableofcontents_16x16.png" /> <None Include="Resources\close_16x16.png" /> + <None Include="Resources\print_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index b548229..71933b5 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -983,6 +983,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap print_16x16 { + get { + object obj = ResourceManager.GetObject("print_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap publicfix_32x32 { get { object obj = ResourceManager.GetObject("publicfix_32x32", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index b608870..f15da16 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -118,47 +118,149 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, + <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap, + <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, + <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox2_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sendxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, + <data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="forcetesting_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, + <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, + <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbuttons_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_16x161.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing, + Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -167,64 +269,26 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="boposition2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boposition2_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, + <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, + <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -233,26 +297,100 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, + <data name="salesperiodlifetime_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\salesperiodlifetime_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, + <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="salesperiodlifetime_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\salesperiodlifetime_32x32.png;System.Drawing.Bitmap, + <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\first_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -261,13 +399,113 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, + <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, + <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="zoom100_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\zoom100_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="find_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\find_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\first_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -276,18 +514,223 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\task_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="boposition2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boposition2_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\group2_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, + Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap, + <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, + <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -299,447 +742,7 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox2_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\first_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="zoom100_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\zoom100_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, - Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="find_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\find_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\group2_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbuttons_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_16x161.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\first_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing, - Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="forcetesting_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\task_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="print_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\print_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 8becef4..c43e44e 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -44,6 +44,7 @@ btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick; btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick; btnBoHui.ItemClick += BtnBoHui_ItemClick; + btnPrint.ItemClick += BtnPrint_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -52,6 +53,7 @@ actions = lst; } + /// <summary> @@ -62,6 +64,14 @@ base.OnCreateControl(); if (Parent != null) getNamespace(); } + + private void BtnPrint_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnPrintClick != null) + btnPrintClick(this, e); + } + + private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e) { if (btnBoHuiClick != null) @@ -806,6 +816,8 @@ /// </summary> public event EventHandler btnBoHuiClick; + + public event EventHandler btnPrintClick; #endregion #region 鍏叡灞炴�� -- Gitblit v1.9.3