From 89a67a9f715165fa9d6b983998ecbd1c613dfb33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bellai=20=C3=81d=C3=A1m?= Date: Mon, 2 Oct 2017 13:24:32 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30502 --- client/Maestro/ArchiveMetadata.Designer.cs | 66 ++++++++++++---------- client/Maestro/MaestroForm.Source.cs | 10 +++- 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/client/Maestro/ArchiveMetadata.Designer.cs b/client/Maestro/ArchiveMetadata.Designer.cs index ce96f751..7d69dc51 100644 --- a/client/Maestro/ArchiveMetadata.Designer.cs +++ b/client/Maestro/ArchiveMetadata.Designer.cs @@ -37,9 +37,9 @@ this.textBox_mediaDescription = new System.Windows.Forms.TextBox(); this.label_stuffTitle = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.buttonCancel = new System.Windows.Forms.Button(); this.button_Ok = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); @@ -92,48 +92,54 @@ // // textBox_stuffID // + this.textBox_stuffID.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox_stuffID.Location = new System.Drawing.Point(3, 23); this.textBox_stuffID.Name = "textBox_stuffID"; - this.textBox_stuffID.Size = new System.Drawing.Size(223, 20); + this.textBox_stuffID.Size = new System.Drawing.Size(238, 20); this.textBox_stuffID.TabIndex = 6; // // textBox_stuffTitle // + this.textBox_stuffTitle.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox_stuffTitle.Location = new System.Drawing.Point(3, 63); this.textBox_stuffTitle.Name = "textBox_stuffTitle"; - this.textBox_stuffTitle.Size = new System.Drawing.Size(223, 20); + this.textBox_stuffTitle.Size = new System.Drawing.Size(238, 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(3, 103); this.textBox_stuffDescription.Multiline = true; this.textBox_stuffDescription.Name = "textBox_stuffDescription"; this.textBox_stuffDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox_stuffDescription.Size = new System.Drawing.Size(223, 48); + this.textBox_stuffDescription.Size = new System.Drawing.Size(238, 48); this.textBox_stuffDescription.TabIndex = 8; // // textBox_mediaID // + this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox_mediaID.Location = new System.Drawing.Point(3, 177); this.textBox_mediaID.Name = "textBox_mediaID"; - this.textBox_mediaID.Size = new System.Drawing.Size(223, 20); + this.textBox_mediaID.Size = new System.Drawing.Size(238, 20); this.textBox_mediaID.TabIndex = 9; // // textBox_mediaTitle // + this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox_mediaTitle.Location = new System.Drawing.Point(3, 217); this.textBox_mediaTitle.Name = "textBox_mediaTitle"; - this.textBox_mediaTitle.Size = new System.Drawing.Size(223, 20); + this.textBox_mediaTitle.Size = new System.Drawing.Size(238, 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(3, 257); this.textBox_mediaDescription.Multiline = true; this.textBox_mediaDescription.Name = "textBox_mediaDescription"; this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox_mediaDescription.Size = new System.Drawing.Size(223, 54); + this.textBox_mediaDescription.Size = new System.Drawing.Size(238, 153); this.textBox_mediaDescription.TabIndex = 11; // // label_stuffTitle @@ -156,6 +162,28 @@ this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // + // button_Ok + // + this.button_Ok.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.button_Ok.Location = new System.Drawing.Point(167, 19); + this.button_Ok.Name = "button_Ok"; + this.button_Ok.Size = new System.Drawing.Size(75, 23); + this.button_Ok.TabIndex = 1; + this.button_Ok.Text = "Rendben"; + this.button_Ok.UseVisualStyleBackColor = true; + this.button_Ok.Click += new System.EventHandler(this.button_Ok_Click_1); + // + // buttonCancel + // + this.buttonCancel.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.buttonCancel.Location = new System.Drawing.Point(88, 19); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 0; + this.buttonCancel.Text = "Mégse"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 1; @@ -191,28 +219,6 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 413); this.tableLayoutPanel1.TabIndex = 3; // - // buttonCancel - // - this.buttonCancel.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.buttonCancel.Location = new System.Drawing.Point(88, 19); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 0; - this.buttonCancel.Text = "Mégse"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); - // - // button_Ok - // - this.button_Ok.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.button_Ok.Location = new System.Drawing.Point(167, 19); - this.button_Ok.Name = "button_Ok"; - this.button_Ok.Size = new System.Drawing.Size(75, 23); - this.button_Ok.TabIndex = 1; - this.button_Ok.Text = "Rendben"; - this.button_Ok.UseVisualStyleBackColor = true; - this.button_Ok.Click += new System.EventHandler(this.button_Ok_Click_1); - // // ArchiveMetadata // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 9ea1b4af..c944991c 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -172,10 +172,14 @@ namespace Maestro { string query = selectedSources[0]; int separatorPosition = query.IndexOf("-") < 0 ? query.IndexOf("_") : query.IndexOf("-"); int dotPosition = query.IndexOf("."); - if (dotPosition < 0) + if (separatorPosition > 0) { startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition); - else - startingName = query.Substring(0, dotPosition); + } else { + if (dotPosition < 0) + startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition); + else + startingName = query.Substring(0, dotPosition); + } } private void SetTextSelectedSourceTextFromCheckBoxes() { -- 2.54.0