From 22f55533c54d78ca7376b686eea9dcb2ff1fe097 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bellai=20=C3=81d=C3=A1m?= Date: Mon, 2 Oct 2017 12:46:31 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30498 --- client/Maestro/ArchiveMetadata.Designer.cs | 162 +++++++++++---------- client/PlanAIRClient/TrafficIDSelector.cs | 4 +- 2 files changed, 90 insertions(+), 76 deletions(-) diff --git a/client/Maestro/ArchiveMetadata.Designer.cs b/client/Maestro/ArchiveMetadata.Designer.cs index 0c7b7136..5adba67e 100644 --- a/client/Maestro/ArchiveMetadata.Designer.cs +++ b/client/Maestro/ArchiveMetadata.Designer.cs @@ -37,17 +37,17 @@ this.textBox_mediaDescription = new System.Windows.Forms.TextBox(); this.label_stuffTitle = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.button_cancel = new System.Windows.Forms.Button(); - this.button_ok = new System.Windows.Forms.Button(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.button_Ok = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // label_stuffID // - this.label_stuffID.AutoSize = true; - this.label_stuffID.Location = new System.Drawing.Point(3, 0); + this.label_stuffID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_stuffID.Location = new System.Drawing.Point(3, 7); this.label_stuffID.Name = "label_stuffID"; this.label_stuffID.Size = new System.Drawing.Size(87, 13); this.label_stuffID.TabIndex = 0; @@ -55,8 +55,8 @@ // // label_stuffDescription // - this.label_stuffDescription.AutoSize = true; - this.label_stuffDescription.Location = new System.Drawing.Point(3, 78); + this.label_stuffDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_stuffDescription.Location = new System.Drawing.Point(3, 97); this.label_stuffDescription.Name = "label_stuffDescription"; this.label_stuffDescription.Size = new System.Drawing.Size(66, 13); this.label_stuffDescription.TabIndex = 2; @@ -64,8 +64,8 @@ // // label_mediaID // - this.label_mediaID.AutoSize = true; - this.label_mediaID.Location = new System.Drawing.Point(3, 145); + this.label_mediaID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_mediaID.Location = new System.Drawing.Point(3, 171); this.label_mediaID.Name = "label_mediaID"; this.label_mediaID.Size = new System.Drawing.Size(86, 13); this.label_mediaID.TabIndex = 3; @@ -73,8 +73,8 @@ // // label_mediaTitle // - this.label_mediaTitle.AutoSize = true; - this.label_mediaTitle.Location = new System.Drawing.Point(3, 184); + this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_mediaTitle.Location = new System.Drawing.Point(3, 211); this.label_mediaTitle.Name = "label_mediaTitle"; this.label_mediaTitle.Size = new System.Drawing.Size(57, 13); this.label_mediaTitle.TabIndex = 4; @@ -82,8 +82,9 @@ // // label_mediaDescription // + this.label_mediaDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label_mediaDescription.AutoSize = true; - this.label_mediaDescription.Location = new System.Drawing.Point(3, 223); + this.label_mediaDescription.Location = new System.Drawing.Point(3, 251); this.label_mediaDescription.Name = "label_mediaDescription"; this.label_mediaDescription.Size = new System.Drawing.Size(65, 13); this.label_mediaDescription.TabIndex = 5; @@ -91,21 +92,21 @@ // // textBox_stuffID // - this.textBox_stuffID.Location = new System.Drawing.Point(3, 16); + this.textBox_stuffID.Location = new System.Drawing.Point(3, 23); this.textBox_stuffID.Name = "textBox_stuffID"; this.textBox_stuffID.Size = new System.Drawing.Size(223, 20); this.textBox_stuffID.TabIndex = 6; // // textBox_stuffTitle // - this.textBox_stuffTitle.Location = new System.Drawing.Point(3, 55); + this.textBox_stuffTitle.Location = new System.Drawing.Point(3, 63); this.textBox_stuffTitle.Name = "textBox_stuffTitle"; this.textBox_stuffTitle.Size = new System.Drawing.Size(223, 20); this.textBox_stuffTitle.TabIndex = 7; // // textBox_stuffDescription // - this.textBox_stuffDescription.Location = new System.Drawing.Point(3, 94); + this.textBox_stuffDescription.Location = new System.Drawing.Point(3, 113); this.textBox_stuffDescription.Multiline = true; this.textBox_stuffDescription.Name = "textBox_stuffDescription"; this.textBox_stuffDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; @@ -114,21 +115,21 @@ // // textBox_mediaID // - this.textBox_mediaID.Location = new System.Drawing.Point(3, 161); + this.textBox_mediaID.Location = new System.Drawing.Point(3, 187); this.textBox_mediaID.Name = "textBox_mediaID"; this.textBox_mediaID.Size = new System.Drawing.Size(223, 20); this.textBox_mediaID.TabIndex = 9; // // textBox_mediaTitle // - this.textBox_mediaTitle.Location = new System.Drawing.Point(3, 200); + this.textBox_mediaTitle.Location = new System.Drawing.Point(3, 227); this.textBox_mediaTitle.Name = "textBox_mediaTitle"; this.textBox_mediaTitle.Size = new System.Drawing.Size(223, 20); this.textBox_mediaTitle.TabIndex = 10; // // textBox_mediaDescription // - this.textBox_mediaDescription.Location = new System.Drawing.Point(3, 239); + this.textBox_mediaDescription.Location = new System.Drawing.Point(3, 267); this.textBox_mediaDescription.Multiline = true; this.textBox_mediaDescription.Name = "textBox_mediaDescription"; this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; @@ -137,8 +138,8 @@ // // label_stuffTitle // - this.label_stuffTitle.AutoSize = true; - this.label_stuffTitle.Location = new System.Drawing.Point(3, 39); + this.label_stuffTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_stuffTitle.Location = new System.Drawing.Point(3, 47); this.label_stuffTitle.Name = "label_stuffTitle"; this.label_stuffTitle.Size = new System.Drawing.Size(58, 13); this.label_stuffTitle.TabIndex = 1; @@ -146,73 +147,84 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.button_cancel); - this.groupBox1.Controls.Add(this.button_ok); + this.groupBox1.Controls.Add(this.button_Ok); + this.groupBox1.Controls.Add(this.buttonCancel); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBox1.Location = new System.Drawing.Point(0, 330); + this.groupBox1.Location = new System.Drawing.Point(0, 413); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(236, 58); + this.groupBox1.Size = new System.Drawing.Size(244, 48); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // - // button_cancel - // - this.button_cancel.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.button_cancel.ForeColor = System.Drawing.SystemColors.ControlText; - this.button_cancel.Location = new System.Drawing.Point(83, 16); - this.button_cancel.Name = "button_cancel"; - this.button_cancel.Size = new System.Drawing.Size(75, 39); - this.button_cancel.TabIndex = 0; - this.button_cancel.Text = "Cancel"; - this.button_cancel.UseVisualStyleBackColor = true; - this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); - // - // button_ok - // - this.button_ok.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.button_ok.Location = new System.Drawing.Point(158, 16); - this.button_ok.Name = "button_ok"; - this.button_ok.Size = new System.Drawing.Size(75, 39); - this.button_ok.TabIndex = 1; - this.button_ok.Text = "OK"; - this.button_ok.UseVisualStyleBackColor = true; - this.button_ok.Click += new System.EventHandler(this.button_ok_Click); - // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Controls.Add(this.label_stuffID); - this.flowLayoutPanel1.Controls.Add(this.textBox_stuffID); - this.flowLayoutPanel1.Controls.Add(this.label_stuffTitle); - this.flowLayoutPanel1.Controls.Add(this.textBox_stuffTitle); - this.flowLayoutPanel1.Controls.Add(this.label_stuffDescription); - this.flowLayoutPanel1.Controls.Add(this.textBox_stuffDescription); - this.flowLayoutPanel1.Controls.Add(this.label_mediaID); - this.flowLayoutPanel1.Controls.Add(this.textBox_mediaID); - this.flowLayoutPanel1.Controls.Add(this.label_mediaTitle); - this.flowLayoutPanel1.Controls.Add(this.textBox_mediaTitle); - this.flowLayoutPanel1.Controls.Add(this.label_mediaDescription); - this.flowLayoutPanel1.Controls.Add(this.textBox_mediaDescription); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(236, 330); - this.flowLayoutPanel1.TabIndex = 2; + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.textBox_mediaDescription, 0, 11); + this.tableLayoutPanel1.Controls.Add(this.textBox_mediaTitle, 0, 9); + this.tableLayoutPanel1.Controls.Add(this.label_mediaTitle, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.textBox_mediaID, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.label_mediaID, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.textBox_stuffDescription, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.textBox_stuffTitle, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.textBox_stuffID, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.label_stuffID, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label_mediaDescription, 0, 10); + this.tableLayoutPanel1.Controls.Add(this.label_stuffDescription, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 2); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 12; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 413); + this.tableLayoutPanel1.TabIndex = 3; + // + // buttonCancel + // + this.buttonCancel.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.buttonCancel.Location = new System.Drawing.Point(88, 13); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 0; + this.buttonCancel.Text = "Mégse"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // button_Ok + // + this.button_Ok.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.button_Ok.Location = new System.Drawing.Point(167, 13); + this.button_Ok.Name = "button_Ok"; + this.button_Ok.Size = new System.Drawing.Size(75, 23); + this.button_Ok.TabIndex = 1; + this.button_Ok.Text = "Rendben"; + this.button_Ok.UseVisualStyleBackColor = true; // // ArchiveMetadata // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(236, 388); - this.Controls.Add(this.flowLayoutPanel1); + this.ClientSize = new System.Drawing.Size(244, 461); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.groupBox1); this.Icon = global::Maestro.Properties.Resources.AppIcon; this.Name = "ArchiveMetadata"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Metaadat"; this.groupBox1.ResumeLayout(false); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); } @@ -232,8 +244,8 @@ private System.Windows.Forms.TextBox textBox_mediaTitle; private System.Windows.Forms.TextBox textBox_mediaDescription; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Button button_cancel; - private System.Windows.Forms.Button button_ok; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.Button button_Ok; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index ef614ff0..acc44da0 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -121,7 +121,7 @@ namespace TrafficClient { } private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) + if (e.RowIndex == -1 || e.ColumnIndex != 0) return; DataGridView gridView = sender as DataGridView; if (gridView == null) @@ -129,6 +129,8 @@ namespace TrafficClient { //nincs multiselect DataGridViewCell checkBoxCell = gridView.SelectedCells[0]; SetCheckBoxAndInvokeIDChangeEvent(checkBoxCell, e.RowIndex); + //bool isChecked = (bool)checkBoxCell.Value; + //checkBoxCell.Value = !isChecked; } private void SetCheckBoxAndInvokeIDChangeEvent(DataGridViewCell checkBoxCell, int rowIndex) { -- 2.54.0