420 Textbox cseréje RichTextbox-ra

diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs
index 991a334deda893131bcdfa6c32d01b90f21dfed1..52c6e818d54c69277c5c22f8e04ad3ddeafbea8b 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.Designer.cs
+++ b/client/Maestro/ArchiveMetadataForm.Designer.cs
@@ -32,7 +32,7 @@
             this.txtItemDescription = new System.Windows.Forms.TextBox();\r
             this.textBox_mediaID = new System.Windows.Forms.TextBox();\r
             this.txtMediaTitle = new System.Windows.Forms.TextBox();\r
-            this.txtMediaDescription = new System.Windows.Forms.TextBox();\r
+            this.rtxtMediaDescription = new System.Windows.Forms.RichTextBox();\r
             this.label_stuffTitle = new System.Windows.Forms.Label();\r
             this.groupBox1 = new System.Windows.Forms.GroupBox();\r
             this.btnOk = new System.Windows.Forms.Button();\r
@@ -65,7 +65,7 @@
             this.label_stuffID.Location = new System.Drawing.Point(6, 6);\r
             this.label_stuffID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_stuffID.Name = "label_stuffID";\r
-            this.label_stuffID.Size = new System.Drawing.Size(113, 17);\r
+            this.label_stuffID.Size = new System.Drawing.Size(132, 20);\r
             this.label_stuffID.TabIndex = 0;\r
             this.label_stuffID.Text = "Anyag azonosító";\r
             // \r
@@ -75,7 +75,7 @@
             this.label_stuffDescription.Location = new System.Drawing.Point(33, 68);\r
             this.label_stuffDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_stuffDescription.Name = "label_stuffDescription";\r
-            this.label_stuffDescription.Size = new System.Drawing.Size(86, 17);\r
+            this.label_stuffDescription.Size = new System.Drawing.Size(101, 20);\r
             this.label_stuffDescription.TabIndex = 2;\r
             this.label_stuffDescription.Text = "Anyag leírás";\r
             // \r
@@ -86,7 +86,7 @@
             this.label_mediaTitle.Location = new System.Drawing.Point(39, 174);\r
             this.label_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_mediaTitle.Name = "label_mediaTitle";\r
-            this.label_mediaTitle.Size = new System.Drawing.Size(80, 17);\r
+            this.label_mediaTitle.Size = new System.Drawing.Size(95, 20);\r
             this.label_mediaTitle.TabIndex = 4;\r
             this.label_mediaTitle.Text = "Média cím";\r
             // \r
@@ -98,7 +98,7 @@
             this.txtItemID.Margin = new System.Windows.Forms.Padding(4);\r
             this.txtItemID.Name = "txtItemID";\r
             this.txtItemID.ReadOnly = true;\r
-            this.txtItemID.Size = new System.Drawing.Size(750, 23);\r
+            this.txtItemID.Size = new System.Drawing.Size(750, 26);\r
             this.txtItemID.TabIndex = 6;\r
             this.txtItemID.TabStop = false;\r
             // \r
@@ -109,7 +109,7 @@
             this.txtItemTitle.Location = new System.Drawing.Point(127, 34);\r
             this.txtItemTitle.Margin = new System.Windows.Forms.Padding(4);\r
             this.txtItemTitle.Name = "txtItemTitle";\r
-            this.txtItemTitle.Size = new System.Drawing.Size(750, 23);\r
+            this.txtItemTitle.Size = new System.Drawing.Size(750, 26);\r
             this.txtItemTitle.TabIndex = 1;\r
             // \r
             // txtItemDescription\r
@@ -132,7 +132,7 @@
             this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
             this.textBox_mediaID.ReadOnly = true;\r
-            this.textBox_mediaID.Size = new System.Drawing.Size(750, 23);\r
+            this.textBox_mediaID.Size = new System.Drawing.Size(750, 26);\r
             this.textBox_mediaID.TabIndex = 9;\r
             this.textBox_mediaID.TabStop = false;\r
             // \r
@@ -143,19 +143,19 @@
             this.txtMediaTitle.Location = new System.Drawing.Point(127, 171);\r
             this.txtMediaTitle.Margin = new System.Windows.Forms.Padding(4);\r
             this.txtMediaTitle.Name = "txtMediaTitle";\r
-            this.txtMediaTitle.Size = new System.Drawing.Size(750, 23);\r
+            this.txtMediaTitle.Size = new System.Drawing.Size(750, 26);\r
             this.txtMediaTitle.TabIndex = 3;\r
             // \r
-            // txtMediaDescription\r
+            // rtxtMediaDescription\r
             // \r
-            this.txtMediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.txtMediaDescription.Location = new System.Drawing.Point(3, 3);\r
-            this.txtMediaDescription.Margin = new System.Windows.Forms.Padding(4);\r
-            this.txtMediaDescription.Multiline = true;\r
-            this.txtMediaDescription.Name = "txtMediaDescription";\r
-            this.txtMediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
-            this.txtMediaDescription.Size = new System.Drawing.Size(851, 202);\r
-            this.txtMediaDescription.TabIndex = 4;\r
+            this.rtxtMediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.rtxtMediaDescription.Location = new System.Drawing.Point(3, 3);\r
+            this.rtxtMediaDescription.Margin = new System.Windows.Forms.Padding(4);\r
+            this.rtxtMediaDescription.Multiline = true;\r
+            this.rtxtMediaDescription.Name = "rtxtMediaDescription";\r
+            this.rtxtMediaDescription.Size = new System.Drawing.Size(851, 198);\r
+            this.rtxtMediaDescription.TabIndex = 4;\r
+            this.rtxtMediaDescription.Text = "";\r
             // \r
             // label_stuffTitle\r
             // \r
@@ -164,7 +164,7 @@
             this.label_stuffTitle.Location = new System.Drawing.Point(37, 37);\r
             this.label_stuffTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_stuffTitle.Name = "label_stuffTitle";\r
-            this.label_stuffTitle.Size = new System.Drawing.Size(82, 17);\r
+            this.label_stuffTitle.Size = new System.Drawing.Size(96, 20);\r
             this.label_stuffTitle.TabIndex = 1;\r
             this.label_stuffTitle.Text = "Anyag cím";\r
             // \r
@@ -237,7 +237,7 @@
             this.cbFolders.Location = new System.Drawing.Point(102, 22);\r
             this.cbFolders.Margin = new System.Windows.Forms.Padding(4, 6, 4, 4);\r
             this.cbFolders.Name = "cbFolders";\r
-            this.cbFolders.Size = new System.Drawing.Size(231, 24);\r
+            this.cbFolders.Size = new System.Drawing.Size(231, 28);\r
             this.cbFolders.TabIndex = 8;\r
             // \r
             // dtScheduled\r
@@ -248,7 +248,7 @@
             this.dtScheduled.Location = new System.Drawing.Point(7, 23);\r
             this.dtScheduled.Margin = new System.Windows.Forms.Padding(4);\r
             this.dtScheduled.Name = "dtScheduled";\r
-            this.dtScheduled.Size = new System.Drawing.Size(87, 23);\r
+            this.dtScheduled.Size = new System.Drawing.Size(87, 26);\r
             this.dtScheduled.TabIndex = 7;\r
             this.dtScheduled.ValueChanged += new System.EventHandler(this.OnDateChanged);\r
             // \r
@@ -257,7 +257,7 @@
             this.comboTags.FormattingEnabled = true;\r
             this.comboTags.Location = new System.Drawing.Point(127, 203);\r
             this.comboTags.Name = "comboTags";\r
-            this.comboTags.Size = new System.Drawing.Size(318, 24);\r
+            this.comboTags.Size = new System.Drawing.Size(318, 28);\r
             this.comboTags.TabIndex = 11;\r
             // \r
             // tcMediaDesc\r
@@ -275,11 +275,11 @@
             // \r
             // tabMediaDesc\r
             // \r
-            this.tabMediaDesc.Controls.Add(this.txtMediaDescription);\r
-            this.tabMediaDesc.Location = new System.Drawing.Point(4, 25);\r
+            this.tabMediaDesc.Controls.Add(this.rtxtMediaDescription);\r
+            this.tabMediaDesc.Location = new System.Drawing.Point(4, 29);\r
             this.tabMediaDesc.Name = "tabMediaDesc";\r
             this.tabMediaDesc.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabMediaDesc.Size = new System.Drawing.Size(857, 208);\r
+            this.tabMediaDesc.Size = new System.Drawing.Size(857, 204);\r
             this.tabMediaDesc.TabIndex = 0;\r
             this.tabMediaDesc.Text = "Média leírás";\r
             this.tabMediaDesc.UseVisualStyleBackColor = true;\r
@@ -288,10 +288,10 @@
             // \r
             this.tabMediaImport.Controls.Add(this.groupBox3);\r
             this.tabMediaImport.Controls.Add(this.groupBox2);\r
-            this.tabMediaImport.Location = new System.Drawing.Point(4, 25);\r
+            this.tabMediaImport.Location = new System.Drawing.Point(4, 29);\r
             this.tabMediaImport.Name = "tabMediaImport";\r
             this.tabMediaImport.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tabMediaImport.Size = new System.Drawing.Size(857, 208);\r
+            this.tabMediaImport.Size = new System.Drawing.Size(857, 204);\r
             this.tabMediaImport.TabIndex = 1;\r
             this.tabMediaImport.Text = "Média leírás beemelése";\r
             this.tabMediaImport.UseVisualStyleBackColor = true;\r
@@ -324,7 +324,7 @@
             this.label_mediaID.Location = new System.Drawing.Point(8, 141);\r
             this.label_mediaID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label_mediaID.Name = "label_mediaID";\r
-            this.label_mediaID.Size = new System.Drawing.Size(111, 17);\r
+            this.label_mediaID.Size = new System.Drawing.Size(131, 20);\r
             this.label_mediaID.TabIndex = 3;\r
             this.label_mediaID.Text = "Média azonosító";\r
             // \r
@@ -334,7 +334,7 @@
             this.label1.Location = new System.Drawing.Point(66, 206);\r
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(53, 17);\r
+            this.label1.Size = new System.Drawing.Size(64, 20);\r
             this.label1.TabIndex = 15;\r
             this.label1.Text = "Cimkék";\r
             // \r
@@ -366,7 +366,7 @@
             // \r
             // ArchiveMetadataForm\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);\r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 20F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.CancelButton = this.btnCancel;\r
             this.ClientSize = new System.Drawing.Size(889, 549);\r
@@ -395,7 +395,6 @@
             this.groupBox1.ResumeLayout(false);\r
             this.tcMediaDesc.ResumeLayout(false);\r
             this.tabMediaDesc.ResumeLayout(false);\r
-            this.tabMediaDesc.PerformLayout();\r
             this.tabMediaImport.ResumeLayout(false);\r
             this.groupBox3.ResumeLayout(false);\r
             this.groupBox2.ResumeLayout(false);\r
@@ -415,7 +414,7 @@
         private System.Windows.Forms.TextBox txtItemDescription;\r
         private System.Windows.Forms.TextBox textBox_mediaID;\r
         private System.Windows.Forms.TextBox txtMediaTitle;\r
-        private System.Windows.Forms.TextBox txtMediaDescription;\r
+        private System.Windows.Forms.RichTextBox rtxtMediaDescription;\r
         private System.Windows.Forms.GroupBox groupBox1;\r
         private System.Windows.Forms.Button btnOk;\r
         private System.Windows.Forms.Button btnCancel;\r

diff --git a/client/Maestro/ArchiveMetadataForm.cs b/client/Maestro/ArchiveMetadataForm.cs
index 04d2530a52ed2370d1c6233e5e64ae72cad9c4f7..99f768573a65d7ac87c38943fcd22b7ad72f4f13 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.cs
+++ b/client/Maestro/ArchiveMetadataForm.cs
@@ -31,7 +31,7 @@ namespace Maestro {
             txtItemDescription.Text = model.itemDescription;\r
             textBox_mediaID.Text = model.mediaHouseId;\r
             txtMediaTitle.Text = model.mediaTitle;\r
-            txtMediaDescription.Text = model.mediaDescription;\r
+            rtxtMediaDescription.Text = model.mediaDescription;\r
             if (octopusAPI == null) {\r
                 dtScheduled.Enabled = false;\r
                 cbFolders.Enabled = false;\r
@@ -70,7 +70,7 @@ namespace Maestro {
             model.itemDescription = txtItemDescription.Text;\r
             model.mediaHouseId = textBox_mediaID.Text;\r
             model.mediaTitle = txtMediaTitle.Text;\r
-            model.mediaDescription = txtMediaDescription.Text;\r
+            model.mediaDescription = rtxtMediaDescription.Text;\r
             model.tags = textTags.Lines;\r
             DialogResult = DialogResult.OK;\r
             Close();\r
@@ -85,7 +85,7 @@ namespace Maestro {
             Cursor.Current = Cursors.WaitCursor;\r
             try {\r
 \r
-                if (!String.IsNullOrEmpty(txtMediaDescription.Text)) {\r
+                if (!String.IsNullOrEmpty(rtxtMediaDescription.Text)) {\r
                     if (!MsgBox.YesNoQuestion("A média leírása nem üres és törlődni fog. Folytatja?"))\r
                         return;\r
                 }\r
@@ -97,7 +97,7 @@ namespace Maestro {
                 if (String.IsNullOrEmpty(text))\r
                     MsgBox.Info("A tükör üres vagy nem található.");\r
                 else\r
-                    txtMediaDescription.Text = text;\r
+                    rtxtMediaDescription.Text = text;\r
             } catch { }\r
 \r
 \r
@@ -112,7 +112,7 @@ namespace Maestro {
                 ArchiveMetadata metadata = MXFMetadataReader.Read(selectedSource.FileInfo.FullName, false);\r
                 txtItemTitle.Text = metadata.itemTitle;\r
                 txtMediaTitle.Text = metadata.mediaTitle;\r
-                txtMediaDescription.Text = metadata.mediaDescription;\r
+                rtxtMediaDescription.Text = metadata.mediaDescription;\r
             } catch (Exception ex) {\r
                 MessageBox.Show("Hiba! A rendszer üzenete: " + ex.Message);\r
             }\r