From: Omar Sweidan Date: Tue, 28 Jun 2022 14:23:09 +0000 (+0200) Subject: 420 Textbox cseréje RichTextbox-ra X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=1098170bce13d3a52a2592b2fe9c6fdc01ae80cc;p=mediacube.git 420 Textbox cseréje RichTextbox-ra --- diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs index 991a334d..52c6e818 100644 --- a/client/Maestro/ArchiveMetadataForm.Designer.cs +++ b/client/Maestro/ArchiveMetadataForm.Designer.cs @@ -32,7 +32,7 @@ this.txtItemDescription = new System.Windows.Forms.TextBox(); this.textBox_mediaID = new System.Windows.Forms.TextBox(); this.txtMediaTitle = new System.Windows.Forms.TextBox(); - this.txtMediaDescription = new System.Windows.Forms.TextBox(); + this.rtxtMediaDescription = new System.Windows.Forms.RichTextBox(); this.label_stuffTitle = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.btnOk = new System.Windows.Forms.Button(); @@ -65,7 +65,7 @@ this.label_stuffID.Location = new System.Drawing.Point(6, 6); this.label_stuffID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_stuffID.Name = "label_stuffID"; - this.label_stuffID.Size = new System.Drawing.Size(113, 17); + this.label_stuffID.Size = new System.Drawing.Size(132, 20); this.label_stuffID.TabIndex = 0; this.label_stuffID.Text = "Anyag azonosító"; // @@ -75,7 +75,7 @@ this.label_stuffDescription.Location = new System.Drawing.Point(33, 68); this.label_stuffDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_stuffDescription.Name = "label_stuffDescription"; - this.label_stuffDescription.Size = new System.Drawing.Size(86, 17); + this.label_stuffDescription.Size = new System.Drawing.Size(101, 20); this.label_stuffDescription.TabIndex = 2; this.label_stuffDescription.Text = "Anyag leírás"; // @@ -86,7 +86,7 @@ this.label_mediaTitle.Location = new System.Drawing.Point(39, 174); this.label_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_mediaTitle.Name = "label_mediaTitle"; - this.label_mediaTitle.Size = new System.Drawing.Size(80, 17); + this.label_mediaTitle.Size = new System.Drawing.Size(95, 20); this.label_mediaTitle.TabIndex = 4; this.label_mediaTitle.Text = "Média cím"; // @@ -98,7 +98,7 @@ this.txtItemID.Margin = new System.Windows.Forms.Padding(4); this.txtItemID.Name = "txtItemID"; this.txtItemID.ReadOnly = true; - this.txtItemID.Size = new System.Drawing.Size(750, 23); + this.txtItemID.Size = new System.Drawing.Size(750, 26); this.txtItemID.TabIndex = 6; this.txtItemID.TabStop = false; // @@ -109,7 +109,7 @@ this.txtItemTitle.Location = new System.Drawing.Point(127, 34); this.txtItemTitle.Margin = new System.Windows.Forms.Padding(4); this.txtItemTitle.Name = "txtItemTitle"; - this.txtItemTitle.Size = new System.Drawing.Size(750, 23); + this.txtItemTitle.Size = new System.Drawing.Size(750, 26); this.txtItemTitle.TabIndex = 1; // // txtItemDescription @@ -132,7 +132,7 @@ this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4); this.textBox_mediaID.Name = "textBox_mediaID"; this.textBox_mediaID.ReadOnly = true; - this.textBox_mediaID.Size = new System.Drawing.Size(750, 23); + this.textBox_mediaID.Size = new System.Drawing.Size(750, 26); this.textBox_mediaID.TabIndex = 9; this.textBox_mediaID.TabStop = false; // @@ -143,19 +143,19 @@ this.txtMediaTitle.Location = new System.Drawing.Point(127, 171); this.txtMediaTitle.Margin = new System.Windows.Forms.Padding(4); this.txtMediaTitle.Name = "txtMediaTitle"; - this.txtMediaTitle.Size = new System.Drawing.Size(750, 23); + this.txtMediaTitle.Size = new System.Drawing.Size(750, 26); this.txtMediaTitle.TabIndex = 3; // - // txtMediaDescription + // rtxtMediaDescription // - this.txtMediaDescription.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtMediaDescription.Location = new System.Drawing.Point(3, 3); - this.txtMediaDescription.Margin = new System.Windows.Forms.Padding(4); - this.txtMediaDescription.Multiline = true; - this.txtMediaDescription.Name = "txtMediaDescription"; - this.txtMediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtMediaDescription.Size = new System.Drawing.Size(851, 202); - this.txtMediaDescription.TabIndex = 4; + this.rtxtMediaDescription.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtxtMediaDescription.Location = new System.Drawing.Point(3, 3); + this.rtxtMediaDescription.Margin = new System.Windows.Forms.Padding(4); + this.rtxtMediaDescription.Multiline = true; + this.rtxtMediaDescription.Name = "rtxtMediaDescription"; + this.rtxtMediaDescription.Size = new System.Drawing.Size(851, 198); + this.rtxtMediaDescription.TabIndex = 4; + this.rtxtMediaDescription.Text = ""; // // label_stuffTitle // @@ -164,7 +164,7 @@ this.label_stuffTitle.Location = new System.Drawing.Point(37, 37); this.label_stuffTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_stuffTitle.Name = "label_stuffTitle"; - this.label_stuffTitle.Size = new System.Drawing.Size(82, 17); + this.label_stuffTitle.Size = new System.Drawing.Size(96, 20); this.label_stuffTitle.TabIndex = 1; this.label_stuffTitle.Text = "Anyag cím"; // @@ -237,7 +237,7 @@ this.cbFolders.Location = new System.Drawing.Point(102, 22); this.cbFolders.Margin = new System.Windows.Forms.Padding(4, 6, 4, 4); this.cbFolders.Name = "cbFolders"; - this.cbFolders.Size = new System.Drawing.Size(231, 24); + this.cbFolders.Size = new System.Drawing.Size(231, 28); this.cbFolders.TabIndex = 8; // // dtScheduled @@ -248,7 +248,7 @@ this.dtScheduled.Location = new System.Drawing.Point(7, 23); this.dtScheduled.Margin = new System.Windows.Forms.Padding(4); this.dtScheduled.Name = "dtScheduled"; - this.dtScheduled.Size = new System.Drawing.Size(87, 23); + this.dtScheduled.Size = new System.Drawing.Size(87, 26); this.dtScheduled.TabIndex = 7; this.dtScheduled.ValueChanged += new System.EventHandler(this.OnDateChanged); // @@ -257,7 +257,7 @@ this.comboTags.FormattingEnabled = true; this.comboTags.Location = new System.Drawing.Point(127, 203); this.comboTags.Name = "comboTags"; - this.comboTags.Size = new System.Drawing.Size(318, 24); + this.comboTags.Size = new System.Drawing.Size(318, 28); this.comboTags.TabIndex = 11; // // tcMediaDesc @@ -275,11 +275,11 @@ // // tabMediaDesc // - this.tabMediaDesc.Controls.Add(this.txtMediaDescription); - this.tabMediaDesc.Location = new System.Drawing.Point(4, 25); + this.tabMediaDesc.Controls.Add(this.rtxtMediaDescription); + this.tabMediaDesc.Location = new System.Drawing.Point(4, 29); this.tabMediaDesc.Name = "tabMediaDesc"; this.tabMediaDesc.Padding = new System.Windows.Forms.Padding(3); - this.tabMediaDesc.Size = new System.Drawing.Size(857, 208); + this.tabMediaDesc.Size = new System.Drawing.Size(857, 204); this.tabMediaDesc.TabIndex = 0; this.tabMediaDesc.Text = "Média leírás"; this.tabMediaDesc.UseVisualStyleBackColor = true; @@ -288,10 +288,10 @@ // this.tabMediaImport.Controls.Add(this.groupBox3); this.tabMediaImport.Controls.Add(this.groupBox2); - this.tabMediaImport.Location = new System.Drawing.Point(4, 25); + this.tabMediaImport.Location = new System.Drawing.Point(4, 29); this.tabMediaImport.Name = "tabMediaImport"; this.tabMediaImport.Padding = new System.Windows.Forms.Padding(3); - this.tabMediaImport.Size = new System.Drawing.Size(857, 208); + this.tabMediaImport.Size = new System.Drawing.Size(857, 204); this.tabMediaImport.TabIndex = 1; this.tabMediaImport.Text = "Média leírás beemelése"; this.tabMediaImport.UseVisualStyleBackColor = true; @@ -324,7 +324,7 @@ this.label_mediaID.Location = new System.Drawing.Point(8, 141); this.label_mediaID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_mediaID.Name = "label_mediaID"; - this.label_mediaID.Size = new System.Drawing.Size(111, 17); + this.label_mediaID.Size = new System.Drawing.Size(131, 20); this.label_mediaID.TabIndex = 3; this.label_mediaID.Text = "Média azonosító"; // @@ -334,7 +334,7 @@ this.label1.Location = new System.Drawing.Point(66, 206); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 17); + this.label1.Size = new System.Drawing.Size(64, 20); this.label1.TabIndex = 15; this.label1.Text = "Cimkék"; // @@ -366,7 +366,7 @@ // // ArchiveMetadataForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(889, 549); @@ -395,7 +395,6 @@ this.groupBox1.ResumeLayout(false); this.tcMediaDesc.ResumeLayout(false); this.tabMediaDesc.ResumeLayout(false); - this.tabMediaDesc.PerformLayout(); this.tabMediaImport.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox2.ResumeLayout(false); @@ -415,7 +414,7 @@ private System.Windows.Forms.TextBox txtItemDescription; private System.Windows.Forms.TextBox textBox_mediaID; private System.Windows.Forms.TextBox txtMediaTitle; - private System.Windows.Forms.TextBox txtMediaDescription; + private System.Windows.Forms.RichTextBox rtxtMediaDescription; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button btnOk; private System.Windows.Forms.Button btnCancel; diff --git a/client/Maestro/ArchiveMetadataForm.cs b/client/Maestro/ArchiveMetadataForm.cs index 04d2530a..99f76857 100644 --- a/client/Maestro/ArchiveMetadataForm.cs +++ b/client/Maestro/ArchiveMetadataForm.cs @@ -31,7 +31,7 @@ namespace Maestro { txtItemDescription.Text = model.itemDescription; textBox_mediaID.Text = model.mediaHouseId; txtMediaTitle.Text = model.mediaTitle; - txtMediaDescription.Text = model.mediaDescription; + rtxtMediaDescription.Text = model.mediaDescription; if (octopusAPI == null) { dtScheduled.Enabled = false; cbFolders.Enabled = false; @@ -70,7 +70,7 @@ namespace Maestro { model.itemDescription = txtItemDescription.Text; model.mediaHouseId = textBox_mediaID.Text; model.mediaTitle = txtMediaTitle.Text; - model.mediaDescription = txtMediaDescription.Text; + model.mediaDescription = rtxtMediaDescription.Text; model.tags = textTags.Lines; DialogResult = DialogResult.OK; Close(); @@ -85,7 +85,7 @@ namespace Maestro { Cursor.Current = Cursors.WaitCursor; try { - if (!String.IsNullOrEmpty(txtMediaDescription.Text)) { + if (!String.IsNullOrEmpty(rtxtMediaDescription.Text)) { if (!MsgBox.YesNoQuestion("A média leírása nem üres és törlődni fog. Folytatja?")) return; } @@ -97,7 +97,7 @@ namespace Maestro { if (String.IsNullOrEmpty(text)) MsgBox.Info("A tükör üres vagy nem található."); else - txtMediaDescription.Text = text; + rtxtMediaDescription.Text = text; } catch { } @@ -112,7 +112,7 @@ namespace Maestro { ArchiveMetadata metadata = MXFMetadataReader.Read(selectedSource.FileInfo.FullName, false); txtItemTitle.Text = metadata.itemTitle; txtMediaTitle.Text = metadata.mediaTitle; - txtMediaDescription.Text = metadata.mediaDescription; + rtxtMediaDescription.Text = metadata.mediaDescription; } catch (Exception ex) { MessageBox.Show("Hiba! A rendszer üzenete: " + ex.Message); }