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

diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs
index 99f8a5d91d5eaf98254b54607c72fc912fec534a..2c644bc25954e12a976cff61a183c5e3ecb9c15d 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.Designer.cs
+++ b/client/Maestro/ArchiveMetadataForm.Designer.cs
@@ -169,7 +169,7 @@
             // btnOk\r
             // \r
             this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.btnOk.Location = new System.Drawing.Point(488, 19);\r
+            this.btnOk.Location = new System.Drawing.Point(484, 16);\r
             this.btnOk.Name = "btnOk";\r
             this.btnOk.Size = new System.Drawing.Size(75, 23);\r
             this.btnOk.TabIndex = 1;\r
@@ -180,7 +180,8 @@
             // btnCancel\r
             // \r
             this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
-            this.btnCancel.Location = new System.Drawing.Point(409, 19);\r
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
+            this.btnCancel.Location = new System.Drawing.Point(405, 16);\r
             this.btnCancel.Name = "btnCancel";\r
             this.btnCancel.Size = new System.Drawing.Size(75, 23);\r
             this.btnCancel.TabIndex = 0;\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index e24f81d7a22df61bed54a2c151343cd88c51d669..cca7c4c757eabe1da9bc9193fcbcdec5eee7c9b7 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -393,7 +393,6 @@ namespace Maestro {
             // octopusIDSelector\r
             // \r
             this.octopusIDSelector.BackColor = System.Drawing.Color.White;\r
-            this.octopusIDSelector.Disposeabel = false;\r
             this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.octopusIDSelector.ErrorReporter = null;\r
             this.octopusIDSelector.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r