장비목록에 필터기능 업데이트 및 매크로 일괄 적용기능확인

This commit is contained in:
chikyun.kim
2018-10-05 08:19:19 +09:00
parent 340a6fd3ef
commit 7c5391a5e6
9 changed files with 383 additions and 328 deletions

View File

@@ -30,11 +30,11 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bsB = new System.Windows.Forms.BindingSource(this.components);
this.dsEQ = new dsEQ();
this.dsEQ = new FEQ0000.dsEQ();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -49,7 +49,7 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tbFilter = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.btFind = new System.Windows.Forms.ToolStripButton();
this.dv = new System.Windows.Forms.DataGridView();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -86,21 +86,21 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton();
this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
this.cmbDate = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton();
this.taB = new dsEQTableAdapters.EquipmentBTableAdapter();
this.taB = new FEQ0000.dsEQTableAdapters.EquipmentBTableAdapter();
this.bsF = new System.Windows.Forms.BindingSource(this.components);
this.taF = new dsEQTableAdapters.EquipmentFTableAdapter();
this.tam = new dsEQTableAdapters.TableAdapterManager();
this.taME = new dsEQTableAdapters.EquipmentMETableAdapter();
this.taF = new FEQ0000.dsEQTableAdapters.EquipmentFTableAdapter();
this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager();
this.taME = new FEQ0000.dsEQTableAdapters.EquipmentMETableAdapter();
this.bsME = new System.Windows.Forms.BindingSource(this.components);
this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton();
this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
@@ -137,7 +137,7 @@
this.toolStripSeparator1,
this.toolStripLabel1,
this.tbFilter,
this.toolStripButton1});
this.btFind});
this.bn.Location = new System.Drawing.Point(0, 604);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -266,15 +266,16 @@
this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFilter.Name = "tbFilter";
this.tbFilter.Size = new System.Drawing.Size(150, 25);
this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown);
//
// toolStripButton1
// btFind
//
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(64, 22);
this.toolStripButton1.Text = "Find(&F)";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image")));
this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btFind.Name = "btFind";
this.btFind.Size = new System.Drawing.Size(64, 22);
this.btFind.Text = "Find(&F)";
this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// dv
//
@@ -310,9 +311,9 @@
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn1.HeaderText = "idx";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
@@ -619,6 +620,34 @@
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 30);
//
// toolStripButton2
//
this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton7,
this.applyToolStripMenuItem});
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(99, 27);
this.toolStripButton2.Text = "Data Macro";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton7
//
this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton7.Name = "toolStripButton7";
this.toolStripButton7.Size = new System.Drawing.Size(112, 20);
this.toolStripButton7.Text = "Macro Manager";
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
//
// applyToolStripMenuItem
//
this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
this.applyToolStripMenuItem.Text = "Apply";
this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click);
//
// toolStripButton4
//
this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -688,7 +717,8 @@
this.tam.EquipmentFilterTableAdapter = null;
this.tam.EquipmentFTableAdapter = this.taF;
this.tam.EquipmentMETableAdapter = this.taME;
this.tam.UpdateOrder = dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
this.tam.LineCodeTableAdapter = null;
this.tam.UpdateOrder = FEQ0000.dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// taME
//
@@ -699,34 +729,6 @@
this.bsME.DataMember = "EquipmentME";
this.bsME.DataSource = this.dsEQ;
//
// toolStripButton2
//
this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton7,
this.applyToolStripMenuItem});
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(99, 27);
this.toolStripButton2.Text = "Data Macro";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// applyToolStripMenuItem
//
this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
this.applyToolStripMenuItem.Text = "Apply";
this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click);
//
// toolStripButton7
//
this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton7.Name = "toolStripButton7";
this.toolStripButton7.Size = new System.Drawing.Size(112, 20);
this.toolStripButton7.Text = "Macro Manager";
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
//
// fEquipment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -801,7 +803,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbFilter;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;