git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/ArchiveMetadata.Designer.cs b/client/Maestro/ArchiveMetadata.Designer.cs
index ed3ab778915da5f6456ab6490d12dd2d8c884f48..0c7b7136fbf791beea8c18b295d3562e7b2a93ce 100644 (file)
--- a/client/Maestro/ArchiveMetadata.Designer.cs
+++ b/client/Maestro/ArchiveMetadata.Designer.cs
@@ -24,7 +24,6 @@
         /// </summary>\r
         private void InitializeComponent() {\r
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();\r
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
             this.label_stuffID = new System.Windows.Forms.Label();\r
             this.label_stuffDescription = new System.Windows.Forms.Label();\r
             this.label_mediaID = new System.Windows.Forms.Label();\r
@@ -40,54 +39,24 @@
             this.groupBox1 = new System.Windows.Forms.GroupBox();\r
             this.button_cancel = new System.Windows.Forms.Button();\r
             this.button_ok = new System.Windows.Forms.Button();\r
-            this.tableLayoutPanel1.SuspendLayout();\r
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.groupBox1.SuspendLayout();\r
+            this.flowLayoutPanel1.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
-            // tableLayoutPanel1\r
-            // \r
-            this.tableLayoutPanel1.ColumnCount = 2;\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 29.55975F));\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70.44025F));\r
-            this.tableLayoutPanel1.Controls.Add(this.label_stuffID, 0, 0);\r
-            this.tableLayoutPanel1.Controls.Add(this.label_stuffDescription, 0, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.label_mediaID, 0, 3);\r
-            this.tableLayoutPanel1.Controls.Add(this.label_mediaTitle, 0, 4);\r
-            this.tableLayoutPanel1.Controls.Add(this.label_mediaDescription, 0, 5);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_stuffID, 1, 0);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_stuffTitle, 1, 1);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_stuffDescription, 1, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_mediaID, 1, 3);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_mediaTitle, 1, 4);\r
-            this.tableLayoutPanel1.Controls.Add(this.textBox_mediaDescription, 1, 5);\r
-            this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 1);\r
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
-            this.tableLayoutPanel1.RowCount = 6;\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(324, 330);\r
-            this.tableLayoutPanel1.TabIndex = 0;\r
-            // \r
             // label_stuffID\r
             // \r
             this.label_stuffID.AutoSize = true;\r
-            this.label_stuffID.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.label_stuffID.Location = new System.Drawing.Point(3, 0);\r
             this.label_stuffID.Name = "label_stuffID";\r
-            this.label_stuffID.Size = new System.Drawing.Size(89, 13);\r
+            this.label_stuffID.Size = new System.Drawing.Size(87, 13);\r
             this.label_stuffID.TabIndex = 0;\r
             this.label_stuffID.Text = "Anyag azonosító";\r
             // \r
             // label_stuffDescription\r
             // \r
             this.label_stuffDescription.AutoSize = true;\r
-            this.label_stuffDescription.Location = new System.Drawing.Point(3, 108);\r
+            this.label_stuffDescription.Location = new System.Drawing.Point(3, 78);\r
             this.label_stuffDescription.Name = "label_stuffDescription";\r
             this.label_stuffDescription.Size = new System.Drawing.Size(66, 13);\r
             this.label_stuffDescription.TabIndex = 2;\r
@@ -96,7 +65,7 @@
             // label_mediaID\r
             // \r
             this.label_mediaID.AutoSize = true;\r
-            this.label_mediaID.Location = new System.Drawing.Point(3, 162);\r
+            this.label_mediaID.Location = new System.Drawing.Point(3, 145);\r
             this.label_mediaID.Name = "label_mediaID";\r
             this.label_mediaID.Size = new System.Drawing.Size(86, 13);\r
             this.label_mediaID.TabIndex = 3;\r
@@ -105,7 +74,7 @@
             // label_mediaTitle\r
             // \r
             this.label_mediaTitle.AutoSize = true;\r
-            this.label_mediaTitle.Location = new System.Drawing.Point(3, 216);\r
+            this.label_mediaTitle.Location = new System.Drawing.Point(3, 184);\r
             this.label_mediaTitle.Name = "label_mediaTitle";\r
             this.label_mediaTitle.Size = new System.Drawing.Size(57, 13);\r
             this.label_mediaTitle.TabIndex = 4;\r
@@ -114,7 +83,7 @@
             // label_mediaDescription\r
             // \r
             this.label_mediaDescription.AutoSize = true;\r
-            this.label_mediaDescription.Location = new System.Drawing.Point(3, 270);\r
+            this.label_mediaDescription.Location = new System.Drawing.Point(3, 223);\r
             this.label_mediaDescription.Name = "label_mediaDescription";\r
             this.label_mediaDescription.Size = new System.Drawing.Size(65, 13);\r
             this.label_mediaDescription.TabIndex = 5;\r
@@ -122,24 +91,21 @@
             // \r
             // textBox_stuffID\r
             // \r
-            this.textBox_stuffID.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.textBox_stuffID.Location = new System.Drawing.Point(98, 3);\r
+            this.textBox_stuffID.Location = new System.Drawing.Point(3, 16);\r
             this.textBox_stuffID.Name = "textBox_stuffID";\r
             this.textBox_stuffID.Size = new System.Drawing.Size(223, 20);\r
             this.textBox_stuffID.TabIndex = 6;\r
             // \r
             // textBox_stuffTitle\r
             // \r
-            this.textBox_stuffTitle.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.textBox_stuffTitle.Location = new System.Drawing.Point(98, 57);\r
+            this.textBox_stuffTitle.Location = new System.Drawing.Point(3, 55);\r
             this.textBox_stuffTitle.Name = "textBox_stuffTitle";\r
             this.textBox_stuffTitle.Size = new System.Drawing.Size(223, 20);\r
             this.textBox_stuffTitle.TabIndex = 7;\r
             // \r
             // textBox_stuffDescription\r
             // \r
-            this.textBox_stuffDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_stuffDescription.Location = new System.Drawing.Point(98, 111);\r
+            this.textBox_stuffDescription.Location = new System.Drawing.Point(3, 94);\r
             this.textBox_stuffDescription.Multiline = true;\r
             this.textBox_stuffDescription.Name = "textBox_stuffDescription";\r
             this.textBox_stuffDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
@@ -148,24 +114,21 @@
             // \r
             // textBox_mediaID\r
             // \r
-            this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.textBox_mediaID.Location = new System.Drawing.Point(98, 165);\r
+            this.textBox_mediaID.Location = new System.Drawing.Point(3, 161);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
             this.textBox_mediaID.Size = new System.Drawing.Size(223, 20);\r
             this.textBox_mediaID.TabIndex = 9;\r
             // \r
             // textBox_mediaTitle\r
             // \r
-            this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.textBox_mediaTitle.Location = new System.Drawing.Point(98, 219);\r
+            this.textBox_mediaTitle.Location = new System.Drawing.Point(3, 200);\r
             this.textBox_mediaTitle.Name = "textBox_mediaTitle";\r
             this.textBox_mediaTitle.Size = new System.Drawing.Size(223, 20);\r
             this.textBox_mediaTitle.TabIndex = 10;\r
             // \r
             // textBox_mediaDescription\r
             // \r
-            this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textBox_mediaDescription.Location = new System.Drawing.Point(98, 273);\r
+            this.textBox_mediaDescription.Location = new System.Drawing.Point(3, 239);\r
             this.textBox_mediaDescription.Multiline = true;\r
             this.textBox_mediaDescription.Name = "textBox_mediaDescription";\r
             this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
@@ -175,7 +138,7 @@
             // label_stuffTitle\r
             // \r
             this.label_stuffTitle.AutoSize = true;\r
-            this.label_stuffTitle.Location = new System.Drawing.Point(3, 54);\r
+            this.label_stuffTitle.Location = new System.Drawing.Point(3, 39);\r
             this.label_stuffTitle.Name = "label_stuffTitle";\r
             this.label_stuffTitle.Size = new System.Drawing.Size(58, 13);\r
             this.label_stuffTitle.TabIndex = 1;\r
@@ -188,15 +151,15 @@
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
             this.groupBox1.Location = new System.Drawing.Point(0, 330);\r
             this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(324, 58);\r
+            this.groupBox1.Size = new System.Drawing.Size(236, 58);\r
             this.groupBox1.TabIndex = 1;\r
             this.groupBox1.TabStop = false;\r
             // \r
             // button_cancel\r
             // \r
-            this.button_cancel.Dock = System.Windows.Forms.DockStyle.Left;\r
+            this.button_cancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.button_cancel.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            this.button_cancel.Location = new System.Drawing.Point(3, 16);\r
+            this.button_cancel.Location = new System.Drawing.Point(83, 16);\r
             this.button_cancel.Name = "button_cancel";\r
             this.button_cancel.Size = new System.Drawing.Size(75, 39);\r
             this.button_cancel.TabIndex = 0;\r
@@ -206,8 +169,8 @@
             // \r
             // button_ok\r
             // \r
-            this.button_ok.Dock = System.Windows.Forms.DockStyle.Right;\r
-            this.button_ok.Location = new System.Drawing.Point(246, 16);\r
+            this.button_ok.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            this.button_ok.Location = new System.Drawing.Point(158, 16);\r
             this.button_ok.Name = "button_ok";\r
             this.button_ok.Size = new System.Drawing.Size(75, 39);\r
             this.button_ok.TabIndex = 1;\r
@@ -215,25 +178,47 @@
             this.button_ok.UseVisualStyleBackColor = true;\r
             this.button_ok.Click += new System.EventHandler(this.button_ok_Click);\r
             // \r
+            // flowLayoutPanel1\r
+            // \r
+            this.flowLayoutPanel1.Controls.Add(this.label_stuffID);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_stuffID);\r
+            this.flowLayoutPanel1.Controls.Add(this.label_stuffTitle);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_stuffTitle);\r
+            this.flowLayoutPanel1.Controls.Add(this.label_stuffDescription);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_stuffDescription);\r
+            this.flowLayoutPanel1.Controls.Add(this.label_mediaID);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_mediaID);\r
+            this.flowLayoutPanel1.Controls.Add(this.label_mediaTitle);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_mediaTitle);\r
+            this.flowLayoutPanel1.Controls.Add(this.label_mediaDescription);\r
+            this.flowLayoutPanel1.Controls.Add(this.textBox_mediaDescription);\r
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;\r
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(236, 330);\r
+            this.flowLayoutPanel1.TabIndex = 2;\r
+            // \r
             // ArchiveMetadata\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(324, 388);\r
+            this.ClientSize = new System.Drawing.Size(236, 388);\r
+            this.Controls.Add(this.flowLayoutPanel1);\r
             this.Controls.Add(this.groupBox1);\r
-            this.Controls.Add(this.tableLayoutPanel1);\r
+            this.Icon = global::Maestro.Properties.Resources.AppIcon;\r
             this.Name = "ArchiveMetadata";\r
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Metaadat";\r
-            this.tableLayoutPanel1.ResumeLayout(false);\r
-            this.tableLayoutPanel1.PerformLayout();\r
             this.groupBox1.ResumeLayout(false);\r
+            this.flowLayoutPanel1.ResumeLayout(false);\r
+            this.flowLayoutPanel1.PerformLayout();\r
             this.ResumeLayout(false);\r
 \r
         }\r
 \r
         #endregion\r
         private System.ComponentModel.BackgroundWorker backgroundWorker1;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
         private System.Windows.Forms.Label label_stuffTitle;\r
         private System.Windows.Forms.Label label_stuffID;\r
         private System.Windows.Forms.Label label_stuffDescription;\r
@@ -249,5 +234,6 @@
         private System.Windows.Forms.GroupBox groupBox1;\r
         private System.Windows.Forms.Button button_cancel;\r
         private System.Windows.Forms.Button button_ok;\r
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;\r
     }\r
 }
\ No newline at end of file

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 3c899413812571063878ebc9e332a6397b3e521b..b42fc3e30ee824f10ddc774e783770e757a09b43 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -72,6 +72,7 @@ namespace Maestro {
                 Tooltip = "Story ID",\r
                 ID = selectedID\r
             };\r
+            EnableArchiveMetadataButtonAndCreateMetadataModel();\r
         }\r
 \r
         private void ModifyArchiveMetadataClick(object sender, EventArgs e) {\r
@@ -135,6 +136,7 @@ namespace Maestro {
                 ID = selectedID,\r
                 VariantID = variantID\r
             };\r
+            EnableArchiveMetadataButtonAndCreateMetadataModel();\r
         }\r
     }\r
 }\r