From: Bellai Ádám Date: Mon, 2 Oct 2017 11:42:03 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=18a5f24c1b4ee00b9218cbcb90f01c07d49c74dc;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30497 --- diff --git a/client/Maestro/ArchiveMetadata.Designer.cs b/client/Maestro/ArchiveMetadata.Designer.cs index ed3ab778..0c7b7136 100644 --- a/client/Maestro/ArchiveMetadata.Designer.cs +++ b/client/Maestro/ArchiveMetadata.Designer.cs @@ -24,7 +24,6 @@ /// private void InitializeComponent() { this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label_stuffID = new System.Windows.Forms.Label(); this.label_stuffDescription = new System.Windows.Forms.Label(); this.label_mediaID = new System.Windows.Forms.Label(); @@ -40,54 +39,24 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.button_cancel = new System.Windows.Forms.Button(); this.button_ok = new System.Windows.Forms.Button(); - this.tableLayoutPanel1.SuspendLayout(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.groupBox1.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 29.55975F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70.44025F)); - this.tableLayoutPanel1.Controls.Add(this.label_stuffID, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.label_stuffDescription, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label_mediaID, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label_mediaTitle, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.label_mediaDescription, 0, 5); - this.tableLayoutPanel1.Controls.Add(this.textBox_stuffID, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.textBox_stuffTitle, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.textBox_stuffDescription, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.textBox_mediaID, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.textBox_mediaTitle, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.textBox_mediaDescription, 1, 5); - this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 6; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(324, 330); - this.tableLayoutPanel1.TabIndex = 0; - // // label_stuffID // this.label_stuffID.AutoSize = true; - this.label_stuffID.Dock = System.Windows.Forms.DockStyle.Top; this.label_stuffID.Location = new System.Drawing.Point(3, 0); this.label_stuffID.Name = "label_stuffID"; - this.label_stuffID.Size = new System.Drawing.Size(89, 13); + this.label_stuffID.Size = new System.Drawing.Size(87, 13); this.label_stuffID.TabIndex = 0; this.label_stuffID.Text = "Anyag azonosító"; // // label_stuffDescription // this.label_stuffDescription.AutoSize = true; - this.label_stuffDescription.Location = new System.Drawing.Point(3, 108); + this.label_stuffDescription.Location = new System.Drawing.Point(3, 78); this.label_stuffDescription.Name = "label_stuffDescription"; this.label_stuffDescription.Size = new System.Drawing.Size(66, 13); this.label_stuffDescription.TabIndex = 2; @@ -96,7 +65,7 @@ // label_mediaID // this.label_mediaID.AutoSize = true; - this.label_mediaID.Location = new System.Drawing.Point(3, 162); + this.label_mediaID.Location = new System.Drawing.Point(3, 145); this.label_mediaID.Name = "label_mediaID"; this.label_mediaID.Size = new System.Drawing.Size(86, 13); this.label_mediaID.TabIndex = 3; @@ -105,7 +74,7 @@ // label_mediaTitle // this.label_mediaTitle.AutoSize = true; - this.label_mediaTitle.Location = new System.Drawing.Point(3, 216); + this.label_mediaTitle.Location = new System.Drawing.Point(3, 184); this.label_mediaTitle.Name = "label_mediaTitle"; this.label_mediaTitle.Size = new System.Drawing.Size(57, 13); this.label_mediaTitle.TabIndex = 4; @@ -114,7 +83,7 @@ // label_mediaDescription // this.label_mediaDescription.AutoSize = true; - this.label_mediaDescription.Location = new System.Drawing.Point(3, 270); + this.label_mediaDescription.Location = new System.Drawing.Point(3, 223); this.label_mediaDescription.Name = "label_mediaDescription"; this.label_mediaDescription.Size = new System.Drawing.Size(65, 13); this.label_mediaDescription.TabIndex = 5; @@ -122,24 +91,21 @@ // // textBox_stuffID // - this.textBox_stuffID.Dock = System.Windows.Forms.DockStyle.Top; - this.textBox_stuffID.Location = new System.Drawing.Point(98, 3); + this.textBox_stuffID.Location = new System.Drawing.Point(3, 16); 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.Dock = System.Windows.Forms.DockStyle.Top; - this.textBox_stuffTitle.Location = new System.Drawing.Point(98, 57); + this.textBox_stuffTitle.Location = new System.Drawing.Point(3, 55); 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.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_stuffDescription.Location = new System.Drawing.Point(98, 111); + this.textBox_stuffDescription.Location = new System.Drawing.Point(3, 94); this.textBox_stuffDescription.Multiline = true; this.textBox_stuffDescription.Name = "textBox_stuffDescription"; this.textBox_stuffDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; @@ -148,24 +114,21 @@ // // textBox_mediaID // - this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Top; - this.textBox_mediaID.Location = new System.Drawing.Point(98, 165); + this.textBox_mediaID.Location = new System.Drawing.Point(3, 161); 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.Dock = System.Windows.Forms.DockStyle.Top; - this.textBox_mediaTitle.Location = new System.Drawing.Point(98, 219); + this.textBox_mediaTitle.Location = new System.Drawing.Point(3, 200); 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.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_mediaDescription.Location = new System.Drawing.Point(98, 273); + this.textBox_mediaDescription.Location = new System.Drawing.Point(3, 239); this.textBox_mediaDescription.Multiline = true; this.textBox_mediaDescription.Name = "textBox_mediaDescription"; this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; @@ -175,7 +138,7 @@ // label_stuffTitle // this.label_stuffTitle.AutoSize = true; - this.label_stuffTitle.Location = new System.Drawing.Point(3, 54); + this.label_stuffTitle.Location = new System.Drawing.Point(3, 39); this.label_stuffTitle.Name = "label_stuffTitle"; this.label_stuffTitle.Size = new System.Drawing.Size(58, 13); this.label_stuffTitle.TabIndex = 1; @@ -188,15 +151,15 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; this.groupBox1.Location = new System.Drawing.Point(0, 330); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(324, 58); + this.groupBox1.Size = new System.Drawing.Size(236, 58); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // // button_cancel // - this.button_cancel.Dock = System.Windows.Forms.DockStyle.Left; + 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(3, 16); + 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; @@ -206,8 +169,8 @@ // // button_ok // - this.button_ok.Dock = System.Windows.Forms.DockStyle.Right; - this.button_ok.Location = new System.Drawing.Point(246, 16); + 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; @@ -215,25 +178,47 @@ 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; + // // ArchiveMetadata // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(324, 388); + this.ClientSize = new System.Drawing.Size(236, 388); + this.Controls.Add(this.flowLayoutPanel1); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.tableLayoutPanel1); + this.Icon = global::Maestro.Properties.Resources.AppIcon; this.Name = "ArchiveMetadata"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Metaadat"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); this.groupBox1.ResumeLayout(false); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); this.ResumeLayout(false); } #endregion private System.ComponentModel.BackgroundWorker backgroundWorker1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Label label_stuffTitle; private System.Windows.Forms.Label label_stuffID; private System.Windows.Forms.Label label_stuffDescription; @@ -249,5 +234,6 @@ 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; } } \ No newline at end of file diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 3c899413..b42fc3e3 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -72,6 +72,7 @@ namespace Maestro { Tooltip = "Story ID", ID = selectedID }; + EnableArchiveMetadataButtonAndCreateMetadataModel(); } private void ModifyArchiveMetadataClick(object sender, EventArgs e) { @@ -135,6 +136,7 @@ namespace Maestro { ID = selectedID, VariantID = variantID }; + EnableArchiveMetadataButtonAndCreateMetadataModel(); } } }