From: Vásáry Dániel Date: Fri, 17 Nov 2017 23:00:57 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=fff8c6ec15ab237ed7f7b71c2e3e8ff3016d5d20;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30745 --- diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj index a2cda676..21120b51 100644 --- a/client/AudioRecorder/AudioRecorder.csproj +++ b/client/AudioRecorder/AudioRecorder.csproj @@ -93,8 +93,7 @@ MinimumRecommendedRules.ruleset - - + maestro.ico diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs index a26553f5..6321529e 100644 --- a/client/DxPlay/Properties/Resources.Designer.cs +++ b/client/DxPlay/Properties/Resources.Designer.cs @@ -60,16 +60,6 @@ namespace DxPlay.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap ic_pause_black_24dp_1x { - get { - object obj = ResourceManager.GetObject("ic_pause_black_24dp_1x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -80,16 +70,6 @@ namespace DxPlay.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap ic_play_arrow_black_24dp_1x { - get { - object obj = ResourceManager.GetObject("ic_play_arrow_black_24dp_1x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -100,16 +80,6 @@ namespace DxPlay.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap ic_stop_black_24dp_1x { - get { - object obj = ResourceManager.GetObject("ic_stop_black_24dp_1x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx index 7082277d..8ecd0b9f 100644 --- a/client/DxPlay/Properties/Resources.resx +++ b/client/DxPlay/Properties/Resources.resx @@ -130,21 +130,12 @@ ..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ic_pause_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ic_play_arrow_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ic_stop_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/client/IntegrationTests/IntegrationTests.csproj b/client/IntegrationTests/IntegrationTests.csproj index 0b541ad5..46a27fb5 100644 --- a/client/IntegrationTests/IntegrationTests.csproj +++ b/client/IntegrationTests/IntegrationTests.csproj @@ -115,6 +115,7 @@ + ..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll diff --git a/client/IntegrationTests/MaestroIT.cs b/client/IntegrationTests/MaestroIT.cs index 9524133c..f0b67ccf 100644 --- a/client/IntegrationTests/MaestroIT.cs +++ b/client/IntegrationTests/MaestroIT.cs @@ -14,6 +14,7 @@ using MaestroShared.Configuration; using MaestroShared.Commons; using MaestroShared.Targets; using MaestroShared.Target; +using System.Drawing; namespace IntegrationTests { public sealed class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid { @@ -244,7 +245,7 @@ namespace IntegrationTests { string connectionString = "SERVER=" + server + ";" + "DATABASE=" + database + ";" + "UID=" + uid + ";" + "PASSWORD=" + password + ";Convert Zero Datetime=true;"; - + MySqlConnection connection = new MySqlConnection(connectionString); try { connection.Open(); @@ -275,5 +276,23 @@ namespace IntegrationTests { sb.Clear(); } } + + [TestMethod] + public void png2ico() { + + using (FileStream stream = File.OpenWrite(@"C:\temp\test.ico")) { + Bitmap bitmap = (Bitmap)Image.FromFile(@"c:\_documents\icons\web\ic_play_arrow_black_24dp_1x.png"); + + //ColorMap[] colorMap = new ColorMap[1]; + //colorMap[0] = new ColorMap(); + //colorMap[0].OldColor = Color.Black; + //colorMap[0].NewColor = Color.Blue; + //ImageAttributes attr = new ImageAttributes(); + //attr.SetRemapTable(colorMap); + + Bitmap resized = new Bitmap(bitmap, new Size(16, 16)); + Icon.FromHandle(resized.GetHicon()).Save(stream); + } + } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs index 8edd6160..cb23d552 100644 --- a/client/Maestro/ArchiveMetadataForm.Designer.cs +++ b/client/Maestro/ArchiveMetadataForm.Designer.cs @@ -47,37 +47,45 @@ // label_stuffID // this.label_stuffID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_stuffID.Location = new System.Drawing.Point(8, 5); + this.label_stuffID.AutoSize = true; + this.label_stuffID.Location = new System.Drawing.Point(11, 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(87, 13); + this.label_stuffID.Size = new System.Drawing.Size(113, 17); this.label_stuffID.TabIndex = 0; this.label_stuffID.Text = "Anyag azonosító"; // // label_stuffDescription // this.label_stuffDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_stuffDescription.Location = new System.Drawing.Point(8, 83); + this.label_stuffDescription.AutoSize = true; + this.label_stuffDescription.Location = new System.Drawing.Point(11, 102); + 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(66, 13); + this.label_stuffDescription.Size = new System.Drawing.Size(86, 17); this.label_stuffDescription.TabIndex = 2; this.label_stuffDescription.Text = "Anyag leírás"; // // label_mediaID // this.label_mediaID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_mediaID.Location = new System.Drawing.Point(8, 205); + this.label_mediaID.AutoSize = true; + this.label_mediaID.Location = new System.Drawing.Point(11, 253); + 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(86, 13); + this.label_mediaID.Size = new System.Drawing.Size(111, 17); this.label_mediaID.TabIndex = 3; this.label_mediaID.Text = "Média azonosító"; // // label_mediaTitle // this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label_mediaTitle.Location = new System.Drawing.Point(8, 244); + this.label_mediaTitle.AutoSize = true; + this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label_mediaTitle.Location = new System.Drawing.Point(11, 301); + 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(57, 13); + this.label_mediaTitle.Size = new System.Drawing.Size(80, 17); this.label_mediaTitle.TabIndex = 4; this.label_mediaTitle.Text = "Média cím"; // @@ -85,73 +93,82 @@ // this.label_mediaDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label_mediaDescription.AutoSize = true; - this.label_mediaDescription.Location = new System.Drawing.Point(8, 283); + this.label_mediaDescription.Location = new System.Drawing.Point(11, 349); + this.label_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_mediaDescription.Name = "label_mediaDescription"; - this.label_mediaDescription.Size = new System.Drawing.Size(65, 13); + this.label_mediaDescription.Size = new System.Drawing.Size(84, 17); this.label_mediaDescription.TabIndex = 5; this.label_mediaDescription.Text = "Média leírás"; // // textBox_itemID // this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_itemID.Location = new System.Drawing.Point(8, 21); + this.textBox_itemID.Location = new System.Drawing.Point(11, 27); + this.textBox_itemID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_itemID.Name = "textBox_itemID"; this.textBox_itemID.ReadOnly = true; - this.textBox_itemID.Size = new System.Drawing.Size(532, 20); + this.textBox_itemID.Size = new System.Drawing.Size(660, 23); this.textBox_itemID.TabIndex = 6; // // textBox_itemTitle // this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_itemTitle.Location = new System.Drawing.Point(8, 60); + this.textBox_itemTitle.Location = new System.Drawing.Point(11, 75); + this.textBox_itemTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_itemTitle.Name = "textBox_itemTitle"; - this.textBox_itemTitle.Size = new System.Drawing.Size(532, 20); + this.textBox_itemTitle.Size = new System.Drawing.Size(660, 23); this.textBox_itemTitle.TabIndex = 7; // // textBox_itemDescription // this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_itemDescription.Location = new System.Drawing.Point(8, 99); + this.textBox_itemDescription.Location = new System.Drawing.Point(11, 123); + this.textBox_itemDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_itemDescription.Multiline = true; this.textBox_itemDescription.Name = "textBox_itemDescription"; this.textBox_itemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox_itemDescription.Size = new System.Drawing.Size(532, 103); + this.textBox_itemDescription.Size = new System.Drawing.Size(660, 126); this.textBox_itemDescription.TabIndex = 8; // // textBox_mediaID // this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_mediaID.Location = new System.Drawing.Point(8, 221); + this.textBox_mediaID.Location = new System.Drawing.Point(11, 274); + this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_mediaID.Name = "textBox_mediaID"; this.textBox_mediaID.ReadOnly = true; - this.textBox_mediaID.Size = new System.Drawing.Size(532, 20); + this.textBox_mediaID.Size = new System.Drawing.Size(660, 23); this.textBox_mediaID.TabIndex = 9; // // textBox_mediaTitle // this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_mediaTitle.Location = new System.Drawing.Point(8, 260); + this.textBox_mediaTitle.Location = new System.Drawing.Point(11, 322); + this.textBox_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_mediaTitle.Name = "textBox_mediaTitle"; - this.textBox_mediaTitle.Size = new System.Drawing.Size(532, 20); + this.textBox_mediaTitle.Size = new System.Drawing.Size(660, 23); this.textBox_mediaTitle.TabIndex = 10; // // textBox_mediaDescription // this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox_mediaDescription.Location = new System.Drawing.Point(8, 299); + this.textBox_mediaDescription.Location = new System.Drawing.Point(11, 370); + this.textBox_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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(532, 216); + this.textBox_mediaDescription.Size = new System.Drawing.Size(660, 113); this.textBox_mediaDescription.TabIndex = 11; // // label_stuffTitle // this.label_stuffTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label_stuffTitle.Location = new System.Drawing.Point(8, 44); + this.label_stuffTitle.AutoSize = true; + this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label_stuffTitle.Location = new System.Drawing.Point(11, 54); + 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(58, 13); + this.label_stuffTitle.Size = new System.Drawing.Size(82, 17); this.label_stuffTitle.TabIndex = 1; this.label_stuffTitle.Text = "Anyag cím"; // @@ -160,18 +177,21 @@ this.groupBox1.Controls.Add(this.btnOk); this.groupBox1.Controls.Add(this.btnCancel); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBox1.Location = new System.Drawing.Point(0, 523); + this.groupBox1.Location = new System.Drawing.Point(0, 486); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(548, 48); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(682, 59); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // // btnOk // this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.btnOk.Location = new System.Drawing.Point(467, 16); + this.btnOk.Location = new System.Drawing.Point(574, 20); + this.btnOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(75, 23); + this.btnOk.Size = new System.Drawing.Size(100, 28); this.btnOk.TabIndex = 1; this.btnOk.Text = "Rendben"; this.btnOk.UseVisualStyleBackColor = true; @@ -181,9 +201,10 @@ // this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(388, 16); + this.btnCancel.Location = new System.Drawing.Point(468, 20); + this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Size = new System.Drawing.Size(100, 28); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Mégsem"; this.btnCancel.UseVisualStyleBackColor = true; @@ -207,8 +228,9 @@ this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 2); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5); + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6); this.tableLayoutPanel1.RowCount = 12; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -222,20 +244,22 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(548, 523); + this.tableLayoutPanel1.Size = new System.Drawing.Size(682, 486); this.tableLayoutPanel1.TabIndex = 3; // // ArchiveMetadataForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(548, 571); + this.ClientSize = new System.Drawing.Size(682, 545); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.groupBox1); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.Icon = global::Maestro.Properties.Resources.AppIcon; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "ArchiveMetadataForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Archiv adatok"; this.groupBox1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); diff --git a/client/Maestro/ArchiveMetadataForm.cs b/client/Maestro/ArchiveMetadataForm.cs index ce594fc7..e93d6622 100644 --- a/client/Maestro/ArchiveMetadataForm.cs +++ b/client/Maestro/ArchiveMetadataForm.cs @@ -1,5 +1,4 @@ using System.Windows.Forms; -using Maestro.Metadata; using MaestroShared.Metadata; namespace Maestro { @@ -7,7 +6,7 @@ namespace Maestro { private ArchiveMetadata model; - public ArchiveMetadataForm(ArchiveMetadata model) : this() { + public ArchiveMetadataForm(ref ArchiveMetadata model) : this() { this.model = model; textBox_itemID.Text = model.itemHouseId; textBox_itemTitle.Text = model.itemTitle; diff --git a/client/Maestro/Configuration/configuration-playout-ingest.json b/client/Maestro/Configuration/configuration-playout-ingest.json index ddd13040..aa818ef7 100644 --- a/client/Maestro/Configuration/configuration-playout-ingest.json +++ b/client/Maestro/Configuration/configuration-playout-ingest.json @@ -1,6 +1,6 @@ { "title": "Lebony betöltő", - "active": false, + "active": true, "startInTray": false, "enableCustomMetadataId": true, "player": { diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 54c0d742..2d6834b4 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -327,9 +327,6 @@ - - - @@ -337,6 +334,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index f4474813..60924ec4 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -26,34 +26,31 @@ namespace Maestro { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupSource = new System.Windows.Forms.GroupBox(); this.dgSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); + this.treeFolders = new System.Windows.Forms.TreeView(); + this.ilFolders = new System.Windows.Forms.ImageList(this.components); this.pSourceFilter = new System.Windows.Forms.TableLayoutPanel(); this.txtSourceFilter = new System.Windows.Forms.TextBox(); this.picClearFilter = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.pSourceDisplay = new System.Windows.Forms.TableLayoutPanel(); + this.tsSource = new System.Windows.Forms.ToolStrip(); + this.btnShowFolders = new System.Windows.Forms.ToolStripButton(); this.textSelectedSource = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.btnLookupBySource = new System.Windows.Forms.Button(); - this.ctxmActions = new System.Windows.Forms.ContextMenuStrip(this.components); - this.ctxiDefineSegments = new System.Windows.Forms.ToolStripMenuItem(); - this.ctxiModifyArchiveMetadata = new System.Windows.Forms.ToolStripMenuItem(); this.scOperations = new System.Windows.Forms.SplitContainer(); this.scRightOperations = new System.Windows.Forms.SplitContainer(); this.groupMetadata = new System.Windows.Forms.GroupBox(); @@ -62,11 +59,13 @@ namespace Maestro { this.octopusIDSelector = new OctopusClient.OctopusIDSelector(); this.tpTraffic = new System.Windows.Forms.TabPage(); this.trafficIDSelector = new TrafficClient.TrafficIDSelector(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.pMetadataDisplay = new System.Windows.Forms.TableLayoutPanel(); this.btnLookupMetadata = new System.Windows.Forms.Button(); - this.mbActions = new Maestro.MenuButton(); this.labelSelectedMetadata = new System.Windows.Forms.Label(); this.textSelectedMetadata = new System.Windows.Forms.TextBox(); + this.tsMetadata = new System.Windows.Forms.ToolStrip(); + this.btnEditMetadata = new System.Windows.Forms.ToolStripButton(); + this.btnDefineSegments = new System.Windows.Forms.ToolStripButton(); this.groupTarget = new System.Windows.Forms.GroupBox(); this.panelActions = new System.Windows.Forms.TableLayoutPanel(); this.pExecute = new System.Windows.Forms.Panel(); @@ -97,8 +96,8 @@ namespace Maestro { ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); this.pSourceFilter.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).BeginInit(); - this.tableLayoutPanel2.SuspendLayout(); - this.ctxmActions.SuspendLayout(); + this.pSourceDisplay.SuspendLayout(); + this.tsSource.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.scOperations)).BeginInit(); this.scOperations.Panel1.SuspendLayout(); this.scOperations.Panel2.SuspendLayout(); @@ -111,7 +110,8 @@ namespace Maestro { this.tabMetadata.SuspendLayout(); this.tpOctopus.SuspendLayout(); this.tpTraffic.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); + this.pMetadataDisplay.SuspendLayout(); + this.tsMetadata.SuspendLayout(); this.groupTarget.SuspendLayout(); this.pExecute.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); @@ -133,8 +133,9 @@ namespace Maestro { // this.groupSource.BackColor = System.Drawing.Color.Transparent; this.groupSource.Controls.Add(this.dgSource); + this.groupSource.Controls.Add(this.treeFolders); this.groupSource.Controls.Add(this.pSourceFilter); - this.groupSource.Controls.Add(this.tableLayoutPanel2); + this.groupSource.Controls.Add(this.pSourceDisplay); this.groupSource.Dock = System.Windows.Forms.DockStyle.Fill; this.groupSource.Location = new System.Drawing.Point(0, 0); this.groupSource.Name = "groupSource"; @@ -158,35 +159,35 @@ namespace Maestro { this.dgSource.BackgroundColor = System.Drawing.Color.White; this.dgSource.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgSource.DataSource = this.bindingSource; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgSource.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgSource.DefaultCellStyle = dataGridViewCellStyle2; this.dgSource.Dock = System.Windows.Forms.DockStyle.Fill; this.dgSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgSource.EnableHeadersVisualStyles = false; this.dgSource.Location = new System.Drawing.Point(10, 47); this.dgSource.Name = "dgSource"; this.dgSource.RowHeadersVisible = false; - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgSource.Size = new System.Drawing.Size(330, 352); + this.dgSource.Size = new System.Drawing.Size(330, 159); this.dgSource.TabIndex = 0; this.dgSource.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.sourceGridView_CellContentClick); this.dgSource.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellEnter); @@ -196,6 +197,26 @@ namespace Maestro { this.dgSource.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridSource_CellPainting); this.dgSource.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridSource_KeyDown); // + // treeFolders + // + this.treeFolders.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.treeFolders.Dock = System.Windows.Forms.DockStyle.Bottom; + this.treeFolders.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.treeFolders.ImageIndex = 0; + this.treeFolders.ImageList = this.ilFolders; + this.treeFolders.Location = new System.Drawing.Point(10, 206); + this.treeFolders.Name = "treeFolders"; + this.treeFolders.SelectedImageIndex = 0; + this.treeFolders.Size = new System.Drawing.Size(330, 161); + this.treeFolders.TabIndex = 18; + this.treeFolders.Visible = false; + // + // ilFolders + // + this.ilFolders.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilFolders.ImageStream"))); + this.ilFolders.TransparentColor = System.Drawing.Color.Transparent; + this.ilFolders.Images.SetKeyName(0, "ic_folder_open_black_24dp_1x.png"); + // // pSourceFilter // this.pSourceFilter.AutoSize = true; @@ -240,23 +261,52 @@ namespace Maestro { this.picClearFilter.TabStop = false; this.picClearFilter.Click += new System.EventHandler(this.picClearFilter_Click); // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 2; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.Controls.Add(this.textSelectedSource, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.btnLookupBySource, 1, 1); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 399); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(330, 62); - this.tableLayoutPanel2.TabIndex = 12; + // pSourceDisplay + // + this.pSourceDisplay.ColumnCount = 2; + this.pSourceDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.pSourceDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.pSourceDisplay.Controls.Add(this.tsSource, 0, 0); + this.pSourceDisplay.Controls.Add(this.textSelectedSource, 0, 2); + this.pSourceDisplay.Controls.Add(this.label1, 0, 1); + this.pSourceDisplay.Controls.Add(this.btnLookupBySource, 1, 2); + this.pSourceDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pSourceDisplay.Location = new System.Drawing.Point(10, 367); + this.pSourceDisplay.Margin = new System.Windows.Forms.Padding(0); + this.pSourceDisplay.Name = "pSourceDisplay"; + this.pSourceDisplay.RowCount = 3; + this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.pSourceDisplay.Size = new System.Drawing.Size(330, 94); + this.pSourceDisplay.TabIndex = 12; + // + // tsSource + // + this.pSourceDisplay.SetColumnSpan(this.tsSource, 2); + this.tsSource.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.tsSource.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btnShowFolders}); + this.tsSource.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.tsSource.Location = new System.Drawing.Point(0, 0); + this.tsSource.Name = "tsSource"; + this.tsSource.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.tsSource.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.tsSource.Size = new System.Drawing.Size(330, 30); + this.tsSource.TabIndex = 18; + // + // btnShowFolders + // + this.btnShowFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnShowFolders.Image = global::Maestro.Properties.Resources.ic_folder_open_black_24dp_1x; + this.btnShowFolders.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.btnShowFolders.ImageTransparentColor = System.Drawing.Color.GreenYellow; + this.btnShowFolders.Name = "btnShowFolders"; + this.btnShowFolders.Size = new System.Drawing.Size(28, 28); + this.btnShowFolders.ToolTipText = "Mappák"; + this.btnShowFolders.Click += new System.EventHandler(this.OnShowFolders); // // textSelectedSource // @@ -264,7 +314,7 @@ namespace Maestro { this.textSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.textSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill; this.textSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textSelectedSource.Location = new System.Drawing.Point(3, 28); + this.textSelectedSource.Location = new System.Drawing.Point(3, 63); this.textSelectedSource.Name = "textSelectedSource"; this.textSelectedSource.ReadOnly = true; this.textSelectedSource.Size = new System.Drawing.Size(288, 26); @@ -273,13 +323,13 @@ namespace Maestro { // label1 // this.label1.AutoSize = true; - this.tableLayoutPanel2.SetColumnSpan(this.label1, 2); + this.pSourceDisplay.SetColumnSpan(this.label1, 2); this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.Location = new System.Drawing.Point(3, 0); + this.label1.Location = new System.Drawing.Point(3, 30); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); - this.label1.Size = new System.Drawing.Size(324, 25); + this.label1.Size = new System.Drawing.Size(324, 30); this.label1.TabIndex = 13; this.label1.Text = "Selected source"; // @@ -293,36 +343,13 @@ namespace Maestro { this.btnLookupBySource.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLookupBySource.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); this.btnLookupBySource.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x; - this.btnLookupBySource.Location = new System.Drawing.Point(297, 28); + this.btnLookupBySource.Location = new System.Drawing.Point(297, 63); this.btnLookupBySource.Name = "btnLookupBySource"; this.btnLookupBySource.Size = new System.Drawing.Size(30, 26); this.btnLookupBySource.TabIndex = 14; this.btnLookupBySource.UseVisualStyleBackColor = false; this.btnLookupBySource.Click += new System.EventHandler(this.OnLookupBySource); // - // ctxmActions - // - this.ctxmActions.ImageScalingSize = new System.Drawing.Size(19, 19); - this.ctxmActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ctxiDefineSegments, - this.ctxiModifyArchiveMetadata}); - this.ctxmActions.Name = "contextMenuMetadataActions"; - this.ctxmActions.Size = new System.Drawing.Size(207, 48); - // - // ctxiDefineSegments - // - this.ctxiDefineSegments.Name = "ctxiDefineSegments"; - this.ctxiDefineSegments.Size = new System.Drawing.Size(206, 22); - this.ctxiDefineSegments.Text = "Define segments"; - this.ctxiDefineSegments.Click += new System.EventHandler(this.OnDefineSegmentsClick); - // - // ctxiModifyArchiveMetadata - // - this.ctxiModifyArchiveMetadata.Name = "ctxiModifyArchiveMetadata"; - this.ctxiModifyArchiveMetadata.Size = new System.Drawing.Size(206, 22); - this.ctxiModifyArchiveMetadata.Text = "Modify archive metadata"; - this.ctxiModifyArchiveMetadata.Click += new System.EventHandler(this.OnArchiveMetadataClick); - // // scOperations // this.scOperations.BackColor = System.Drawing.SystemColors.Control; @@ -364,7 +391,7 @@ namespace Maestro { // this.groupMetadata.BackColor = System.Drawing.Color.Transparent; this.groupMetadata.Controls.Add(this.tabMetadata); - this.groupMetadata.Controls.Add(this.tableLayoutPanel1); + this.groupMetadata.Controls.Add(this.pMetadataDisplay); this.groupMetadata.Dock = System.Windows.Forms.DockStyle.Fill; this.groupMetadata.Location = new System.Drawing.Point(0, 0); this.groupMetadata.Name = "groupMetadata"; @@ -385,23 +412,23 @@ namespace Maestro { this.tabMetadata.Location = new System.Drawing.Point(10, 23); this.tabMetadata.Name = "tabMetadata"; this.tabMetadata.SelectedIndex = 0; - this.tabMetadata.Size = new System.Drawing.Size(330, 376); + this.tabMetadata.Size = new System.Drawing.Size(330, 347); this.tabMetadata.TabIndex = 1; // // tpOctopus // + this.tpOctopus.BackColor = System.Drawing.Color.Transparent; this.tpOctopus.Controls.Add(this.octopusIDSelector); this.tpOctopus.Location = new System.Drawing.Point(4, 24); this.tpOctopus.Name = "tpOctopus"; this.tpOctopus.Padding = new System.Windows.Forms.Padding(3); - this.tpOctopus.Size = new System.Drawing.Size(322, 348); + this.tpOctopus.Size = new System.Drawing.Size(322, 319); this.tpOctopus.TabIndex = 0; this.tpOctopus.Text = "Octopus"; - this.tpOctopus.UseVisualStyleBackColor = true; // // octopusIDSelector // - this.octopusIDSelector.BackColor = System.Drawing.Color.White; + this.octopusIDSelector.BackColor = System.Drawing.Color.Transparent; this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill; this.octopusIDSelector.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.octopusIDSelector.IDChangedEvent = null; @@ -409,19 +436,19 @@ namespace Maestro { this.octopusIDSelector.Margin = new System.Windows.Forms.Padding(0); this.octopusIDSelector.MinimumSize = new System.Drawing.Size(200, 300); this.octopusIDSelector.Name = "octopusIDSelector"; - this.octopusIDSelector.Size = new System.Drawing.Size(316, 342); + this.octopusIDSelector.Size = new System.Drawing.Size(316, 313); this.octopusIDSelector.TabIndex = 1; // // tpTraffic // + this.tpTraffic.BackColor = System.Drawing.Color.Transparent; this.tpTraffic.Controls.Add(this.trafficIDSelector); this.tpTraffic.Location = new System.Drawing.Point(4, 24); this.tpTraffic.Name = "tpTraffic"; this.tpTraffic.Padding = new System.Windows.Forms.Padding(3); - this.tpTraffic.Size = new System.Drawing.Size(322, 348); + this.tpTraffic.Size = new System.Drawing.Size(322, 319); this.tpTraffic.TabIndex = 1; this.tpTraffic.Text = "Traffic"; - this.tpTraffic.UseVisualStyleBackColor = true; // // trafficIDSelector // @@ -430,30 +457,30 @@ namespace Maestro { this.trafficIDSelector.Dock = System.Windows.Forms.DockStyle.Fill; this.trafficIDSelector.IDChangedEvent = null; this.trafficIDSelector.Location = new System.Drawing.Point(3, 3); - this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(4); + this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(0); this.trafficIDSelector.Name = "trafficIDSelector"; - this.trafficIDSelector.Padding = new System.Windows.Forms.Padding(6); - this.trafficIDSelector.Size = new System.Drawing.Size(316, 342); + this.trafficIDSelector.Size = new System.Drawing.Size(316, 313); this.trafficIDSelector.TabIndex = 0; // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.btnLookupMetadata, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.mbActions, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.labelSelectedMetadata, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.textSelectedMetadata, 0, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 399); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(330, 62); - this.tableLayoutPanel1.TabIndex = 4; + // pMetadataDisplay + // + this.pMetadataDisplay.ColumnCount = 2; + this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.pMetadataDisplay.Controls.Add(this.btnLookupMetadata, 1, 2); + this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 1); + this.pMetadataDisplay.Controls.Add(this.textSelectedMetadata, 0, 2); + this.pMetadataDisplay.Controls.Add(this.tsMetadata, 0, 0); + this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pMetadataDisplay.Location = new System.Drawing.Point(10, 370); + this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0); + this.pMetadataDisplay.Name = "pMetadataDisplay"; + this.pMetadataDisplay.RowCount = 3; + this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.pMetadataDisplay.Size = new System.Drawing.Size(330, 91); + this.pMetadataDisplay.TabIndex = 4; // // btnLookupMetadata // @@ -465,39 +492,22 @@ namespace Maestro { this.btnLookupMetadata.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLookupMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); this.btnLookupMetadata.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x; - this.btnLookupMetadata.Location = new System.Drawing.Point(297, 29); + this.btnLookupMetadata.Location = new System.Drawing.Point(297, 59); this.btnLookupMetadata.Name = "btnLookupMetadata"; this.btnLookupMetadata.Size = new System.Drawing.Size(30, 26); this.btnLookupMetadata.TabIndex = 16; this.btnLookupMetadata.UseVisualStyleBackColor = false; this.btnLookupMetadata.Click += new System.EventHandler(this.OnLookupByMetadata); // - // mbActions - // - this.mbActions.BackColor = System.Drawing.Color.Transparent; - this.mbActions.Cursor = System.Windows.Forms.Cursors.Hand; - this.mbActions.Dock = System.Windows.Forms.DockStyle.Fill; - this.mbActions.FlatAppearance.BorderSize = 0; - this.mbActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.mbActions.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.mbActions.Image = global::Maestro.Properties.Resources.ic_playlist_add_check_black_24dp_1x; - this.mbActions.Location = new System.Drawing.Point(297, 0); - this.mbActions.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.mbActions.Menu = this.ctxmActions; - this.mbActions.Name = "mbActions"; - this.mbActions.Size = new System.Drawing.Size(30, 26); - this.mbActions.TabIndex = 15; - this.mbActions.UseVisualStyleBackColor = false; - // // labelSelectedMetadata // this.labelSelectedMetadata.AutoSize = true; this.labelSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill; this.labelSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0); + this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 31); this.labelSelectedMetadata.Name = "labelSelectedMetadata"; this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); - this.labelSelectedMetadata.Size = new System.Drawing.Size(288, 26); + this.labelSelectedMetadata.Size = new System.Drawing.Size(288, 25); this.labelSelectedMetadata.TabIndex = 13; this.labelSelectedMetadata.Text = "Selected metadata"; // @@ -507,12 +517,51 @@ namespace Maestro { this.textSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.textSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill; this.textSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textSelectedMetadata.Location = new System.Drawing.Point(3, 29); + this.textSelectedMetadata.Location = new System.Drawing.Point(3, 59); this.textSelectedMetadata.Name = "textSelectedMetadata"; this.textSelectedMetadata.Size = new System.Drawing.Size(288, 26); this.textSelectedMetadata.TabIndex = 12; this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnMetadataIDChanged); // + // tsMetadata + // + this.pMetadataDisplay.SetColumnSpan(this.tsMetadata, 2); + this.tsMetadata.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.tsMetadata.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btnEditMetadata, + this.btnDefineSegments}); + this.tsMetadata.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.tsMetadata.Location = new System.Drawing.Point(0, 0); + this.tsMetadata.Name = "tsMetadata"; + this.tsMetadata.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.tsMetadata.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.tsMetadata.Size = new System.Drawing.Size(330, 31); + this.tsMetadata.TabIndex = 17; + // + // btnEditMetadata + // + this.btnEditMetadata.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnEditMetadata.Image = global::Maestro.Properties.Resources.ic_receipt_black_24dp_1x; + this.btnEditMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.btnEditMetadata.ImageTransparentColor = System.Drawing.Color.GreenYellow; + this.btnEditMetadata.Name = "btnEditMetadata"; + this.btnEditMetadata.Size = new System.Drawing.Size(28, 28); + this.btnEditMetadata.Text = "toolStripButton2"; + this.btnEditMetadata.ToolTipText = "Metaadat"; + this.btnEditMetadata.Click += new System.EventHandler(this.OnEditMetadata); + // + // btnDefineSegments + // + this.btnDefineSegments.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnDefineSegments.Image = global::Maestro.Properties.Resources.ic_playlist_add_check_black_24dp_1x; + this.btnDefineSegments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.btnDefineSegments.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnDefineSegments.Name = "btnDefineSegments"; + this.btnDefineSegments.Size = new System.Drawing.Size(28, 28); + this.btnDefineSegments.Text = "toolStripButton3"; + this.btnDefineSegments.ToolTipText = "Szegmensek"; + this.btnDefineSegments.Click += new System.EventHandler(this.OnDefineSegments); + // // groupTarget // this.groupTarget.BackColor = System.Drawing.Color.Transparent; @@ -610,6 +659,7 @@ namespace Maestro { this.tabSystem.Controls.Add(this.tabPage1); this.tabSystem.Controls.Add(this.tabPage2); this.tabSystem.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabSystem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.tabSystem.Location = new System.Drawing.Point(10, 23); this.tabSystem.Name = "tabSystem"; this.tabSystem.SelectedIndex = 0; @@ -619,10 +669,10 @@ namespace Maestro { // tabPage1 // this.tabPage1.Controls.Add(this.dgJobs); - this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Location = new System.Drawing.Point(4, 24); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(994, 98); + this.tabPage1.Size = new System.Drawing.Size(994, 96); this.tabPage1.TabIndex = 0; this.tabPage1.Text = global::Maestro.StringResources.FOLYAMATOK; this.tabPage1.UseVisualStyleBackColor = true; @@ -637,14 +687,6 @@ namespace Maestro { this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dgJobs.BackgroundColor = System.Drawing.Color.White; this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.columnLabel, @@ -657,35 +699,27 @@ namespace Maestro { this.columnOutput, this.columnKillDate}); this.dgJobs.DataSource = this.bindingSourceJobs; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle21.NullValue = null; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgJobs.DefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.NullValue = null; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgJobs.DefaultCellStyle = dataGridViewCellStyle6; this.dgJobs.Dock = System.Windows.Forms.DockStyle.Fill; this.dgJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgJobs.EnableHeadersVisualStyles = false; this.dgJobs.GridColor = System.Drawing.Color.White; this.dgJobs.Location = new System.Drawing.Point(3, 3); this.dgJobs.Name = "dgJobs"; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle22; this.dgJobs.RowHeadersVisible = false; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle7; this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgJobs.Size = new System.Drawing.Size(988, 92); + this.dgJobs.Size = new System.Drawing.Size(988, 90); this.dgJobs.TabIndex = 0; this.dgJobs.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridJobs_CellEnter); this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick); @@ -702,8 +736,8 @@ namespace Maestro { // this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnID.DataPropertyName = "ID"; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnID.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnID.DefaultCellStyle = dataGridViewCellStyle4; this.columnID.HeaderText = "ID"; this.columnID.Name = "columnID"; this.columnID.Width = 44; @@ -720,8 +754,8 @@ namespace Maestro { // this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnStatus.DataPropertyName = "Status"; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnStatus.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnStatus.DefaultCellStyle = dataGridViewCellStyle5; this.columnStatus.HeaderText = "Status"; this.columnStatus.Name = "columnStatus"; this.columnStatus.Width = 66; @@ -769,10 +803,10 @@ namespace Maestro { // tabPage2 // this.tabPage2.Controls.Add(this.dgMessages); - this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Location = new System.Drawing.Point(4, 24); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(994, 98); + this.tabPage2.Size = new System.Drawing.Size(994, 96); this.tabPage2.TabIndex = 1; this.tabPage2.Text = global::Maestro.StringResources.UZENETEK; this.tabPage2.UseVisualStyleBackColor = true; @@ -785,27 +819,19 @@ namespace Maestro { this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dgMessages.BackgroundColor = System.Drawing.Color.White; this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2}); - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Red; - dataGridViewCellStyle26.NullValue = null; - dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle26.SelectionForeColor = System.Drawing.Color.Red; - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgMessages.DefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle9.NullValue = null; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9; this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill; this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgMessages.EnableHeadersVisualStyles = false; @@ -813,20 +839,12 @@ namespace Maestro { this.dgMessages.Location = new System.Drawing.Point(3, 3); this.dgMessages.Name = "dgMessages"; this.dgMessages.ReadOnly = true; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle27; this.dgMessages.RowHeadersVisible = false; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgMessages.Size = new System.Drawing.Size(988, 92); + this.dgMessages.Size = new System.Drawing.Size(988, 90); this.dgMessages.TabIndex = 1; // // dataGridViewTextBoxColumn1 @@ -842,8 +860,8 @@ namespace Maestro { // this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn2.DataPropertyName = "Message"; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.ReadOnly = true; @@ -877,9 +895,10 @@ namespace Maestro { this.pSourceFilter.ResumeLayout(false); this.pSourceFilter.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).EndInit(); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.ctxmActions.ResumeLayout(false); + this.pSourceDisplay.ResumeLayout(false); + this.pSourceDisplay.PerformLayout(); + this.tsSource.ResumeLayout(false); + this.tsSource.PerformLayout(); this.scOperations.Panel1.ResumeLayout(false); this.scOperations.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.scOperations)).EndInit(); @@ -893,8 +912,10 @@ namespace Maestro { this.tpOctopus.ResumeLayout(false); this.tpTraffic.ResumeLayout(false); this.tpTraffic.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); + this.pMetadataDisplay.ResumeLayout(false); + this.pMetadataDisplay.PerformLayout(); + this.tsMetadata.ResumeLayout(false); + this.tsMetadata.PerformLayout(); this.groupTarget.ResumeLayout(false); this.pExecute.ResumeLayout(false); this.scMain.Panel1.ResumeLayout(false); @@ -938,12 +959,9 @@ namespace Maestro { private System.Windows.Forms.TabPage tpTraffic; private System.Windows.Forms.BindingSource metadataInfoBindingSource; private System.Windows.Forms.Panel pExecute; - private System.Windows.Forms.ContextMenuStrip ctxmActions; - private System.Windows.Forms.ToolStripMenuItem ctxiDefineSegments; - private System.Windows.Forms.ToolStripMenuItem ctxiModifyArchiveMetadata; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TableLayoutPanel pSourceDisplay; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel pMetadataDisplay; private TrafficClient.TrafficIDSelector trafficIDSelector; private System.Windows.Forms.Button btnLookupBySource; private System.Windows.Forms.TabControl tabSystem; @@ -965,8 +983,14 @@ namespace Maestro { private System.Windows.Forms.TableLayoutPanel pSourceFilter; private System.Windows.Forms.TextBox txtSourceFilter; private System.Windows.Forms.PictureBox picClearFilter; - private MenuButton mbActions; private System.Windows.Forms.Button btnLookupMetadata; + private System.Windows.Forms.ToolStrip tsMetadata; + private System.Windows.Forms.ToolStripButton btnEditMetadata; + private System.Windows.Forms.ToolStripButton btnDefineSegments; + private System.Windows.Forms.ToolStrip tsSource; + private System.Windows.Forms.ToolStripButton btnShowFolders; + private System.Windows.Forms.TreeView treeFolders; + private System.Windows.Forms.ImageList ilFolders; } } diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 48213df3..b1a442a6 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -93,7 +93,7 @@ namespace Maestro { mediaCubeApi = new MediaCubeApi(metadata.Server.Address.ToString(), metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout, errorMessageBus); } - private void OnArchiveMetadataClick(object sender, EventArgs e) { + private void OnEditMetadata(object sender, EventArgs e) { if (archiveMetadata == null) archiveMetadata = GetArchiveMetadata(); @@ -104,10 +104,16 @@ namespace Maestro { return; } - ArchiveMetadataForm form = new ArchiveMetadataForm(archiveMetadata); + ArchiveMetadataForm form = new ArchiveMetadataForm(ref archiveMetadata); DialogResult result = form.ShowDialog(); - if (result == DialogResult.OK && String.IsNullOrEmpty(textSelectedMetadata.Text)) + + if (result == DialogResult.OK && String.IsNullOrEmpty(textSelectedMetadata.Text)) { + ArchiveMetadata saved = archiveMetadata; textSelectedMetadata.Text = archiveMetadata.itemHouseId; + archiveMetadata = saved; + SelectedMetadata.MetadataText = archiveMetadata.itemTitle; + } + UpdateEditArchiveMetadataStatus(); } private MetadataType GuessMetadataType(string id) { @@ -142,7 +148,7 @@ namespace Maestro { return MetadataType.MediaCube; } - private void OnDefineSegmentsClick(object sender, EventArgs e) { + private void OnDefineSegments(object sender, EventArgs e) { if (SelectedSource?.FileInfo == null) return; Cursor = Cursors.WaitCursor; @@ -154,6 +160,21 @@ namespace Maestro { Cursor = Cursors.Default; player.ShowDialog(); CreateSegments(movieSegments); + UpdateDefineSegmentsStatus(); + } + + private void UpdateDefineSegmentsStatus() { + if(segments == null || segments.Count == 0) + btnDefineSegments.Image = Properties.Resources.ic_playlist_add_check_black_24dp_1x; + else + btnDefineSegments.Image = Properties.Resources.ic_playlist_add_check_black_24dp_1x_green; + } + + private void UpdateEditArchiveMetadataStatus() { + if (archiveMetadata == null || !archiveMetadata.IsFilled) + btnEditMetadata.Image = Properties.Resources.ic_receipt_black_24dp_1x; + else + btnEditMetadata.Image = Properties.Resources.ic_receipt_black_24dp_1x_green; } private void CreateSegments(BindingList movieSegments) { @@ -419,31 +440,31 @@ namespace Maestro { config = Configuration.GetMetadataProvider(); if (config == null) return; - if (!octopusIDSelector.LookupByPlaceHolder(id)) - MessageBox.Show("Nincs találat."); + octopusIDSelector.LookupByPlaceHolder(id); break; case MetadataType.OctopusStory: config = Configuration.GetMetadataProvider(); if (config == null) return; - if (!octopusIDSelector.LookupByStory(id)) - MessageBox.Show("Nincs találat."); + octopusIDSelector.LookupByStory(id); break; } } private void UpdateEditArchiveMetadataEnabled() { - ctxiModifyArchiveMetadata.Enabled = SelectedSource != null; + btnEditMetadata.Enabled = SelectedSource != null; + UpdateEditArchiveMetadataStatus(); } private void UpdateDefineSegmentEnabled() { - ctxiDefineSegments.Enabled = + btnDefineSegments.Enabled = Configuration.Player != null && Configuration.Player.SegmentEditor && SelectedSource != null && SelectedSource.FileInfo != null && SelectedMetadata != null && validTypes.ToList().Contains(SelectedMetadata.Kind); + UpdateDefineSegmentsStatus(); } private void UpdateLookupByMetadataEnabled() { diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 1f0ee28f..537b70b3 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -5,6 +5,7 @@ using MaestroShared.Configuration; using MaestroShared.Metadata; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; @@ -48,11 +49,13 @@ namespace Maestro { formTooltip.SetToolTip(groupSource, remoteAddress?.ToString()); if (Configuration?.Source is UNCSource) { + btnShowFolders.Enabled = true; logger.Debug("UNC source initialization"); source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, Configuration.Source.Filter); logger.Debug("UNC source created"); } if (Configuration?.Source is NEXIOSource) { + btnShowFolders.Enabled = false; logger.Debug("NEXIO source initialization"); source = new NexioRESTSource(this, MessageBus, Configuration.Source.Filter); logger.Debug("NEXIO source created"); @@ -63,6 +66,47 @@ namespace Maestro { dgSource.Columns.AddRange(source.Columns); } + private string GetLastSegment(string path) { + Uri uri = new Uri(path); + return uri.Segments[uri.Segments.Length - 1]; + } + + private void ShowFolders() { + dgSource.Visible = false; + treeFolders.Visible = true; + treeFolders.Dock = DockStyle.Fill; + FileSystemSource source = bindingSource.DataSource as FileSystemSource; + if (source == null) { + HideFolders(); + btnShowFolders.CheckState = CheckState.Unchecked; + } + Uri address = Configuration.Source.Local.Address; + string[] folders = Directory.GetDirectories(address.LocalPath); + TreeNode rootNode = treeFolders.Nodes.Add(GetLastSegment(Configuration.Source.Local.Address.ToString())); + foreach (var folder in folders) { + TreeNode folderNode = rootNode.Nodes.Add(GetLastSegment(folder)); + folderNode.Nodes.Add(".."); + folderNode.ImageIndex = 0; + + } + } + + private void HideFolders() { + dgSource.Visible = true; + treeFolders.Visible = false; + treeFolders.Nodes.Clear(); + } + + private void OnShowFolders(object sender, EventArgs e) { + if (btnShowFolders.CheckState == CheckState.Checked) { + HideFolders(); + btnShowFolders.CheckState = CheckState.Unchecked; + } else { + ShowFolders(); + btnShowFolders.CheckState = CheckState.Checked; + } + } + private void dataGridSource_CellMouseEnter(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex > -1 && IsPlayColumn(e.ColumnIndex)) dgSource.Cursor = Cursors.Hand; @@ -89,7 +133,7 @@ namespace Maestro { if (selectedrows == null) return; if (e.ColumnIndex == 0) { - + UpdateCheckStates(selectedrows); return; } @@ -110,7 +154,7 @@ namespace Maestro { catch (Exception ex) { MessageBox.Show(ex.Message); } - + dgSource.Enabled = true; } } @@ -131,10 +175,17 @@ namespace Maestro { else item.IsChecked = checkedCount == selectedRows.Count ? false : true; - if (item.IsChecked) - selectedSourceRows.Add(row); - else - selectedSourceRows.Remove(row); + if (item.IsChecked) { + if (!selectedSourceRows.Contains(row)) { + selectedSourceRows.Add(row); + Debug.WriteLine("Added " + AsISourceItem(row).Name); + } + } else { + if (selectedSourceRows.Contains(row)) { + selectedSourceRows.Remove(row); + Debug.WriteLine("Removed " + AsISourceItem(row).Name); + } + } } SetSelectedSource(); } @@ -143,7 +194,9 @@ namespace Maestro { string selectionPrefix = null; string selectedNames = String.Empty; foreach (DataGridViewRow actual in selectedSourceRows) { - string name = (actual.DataBoundItem as ISourceItem).Name; + string name = (actual.DataBoundItem as ISourceItem)?.Name; + if (String.IsNullOrEmpty(name)) + continue; selectedNames += name + " "; string currentPrefix = GetPrefix(name); if (selectionPrefix == null) diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index af6f54eb..3765ab69 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -123,6 +123,7 @@ namespace Maestro { private bool EnsureMetadata(Target target) { if ((target.SaveArchiveMetadata || target.SaveMorpheusMetadata || target.NexioServer) && (archiveMetadata == null || !archiveMetadata.IsFilled)) { archiveMetadata = GetArchiveMetadata(); + UpdateEditArchiveMetadataStatus(); if (archiveMetadata == null) { MessageBox.Show(String.Format("A {0} folyamat nem futtatható kísérő adatok nélkül.", target.Label)); return false; diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 8635e3c4..3035bb2a 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -30,8 +30,12 @@ namespace Maestro { public IMessageBus MessageBus { get; set; } private IMessageBus errorMessageBus = new MessageBus(); private ToolTip formTooltip = new ToolTip(); - private ConfigurationInfo configuration; + + private static readonly Color highlightColor = Color.White; + private static readonly Color defaultColor = SystemColors.Control; + + public ConfigurationInfo Configuration { get { return configuration; } set { @@ -67,8 +71,8 @@ namespace Maestro { //columnProgress.HeaderText = StringResources.ALLAPOT; columnStatus.HeaderText = StringResources.STATUSZ; columnLabel.HeaderText = StringResources.CIM; - ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA; - ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK; + //ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA; + //ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK; } private void InitializeComponents() { @@ -82,6 +86,11 @@ namespace Maestro { InitializeTarget(); InitializeJobs(); InitializeControlTexts(); + + SetColor(groupMetadata, defaultColor); + SetColor(groupTarget, defaultColor); + SetColor(groupActions, defaultColor); + } private void OnMessage(IMessage message) { @@ -138,8 +147,28 @@ namespace Maestro { private void groupBox_Enter(object sender, EventArgs e) { Control control = sender as Control; - control.Font = new Font(control.Font, FontStyle.Regular); - control.BackColor = Color.White; + control.Font = new Font(control.Font, FontStyle.Bold); + SetColor(control, highlightColor); + } + + private void SetColor(Control control, Color color) { + if (textSelectedSource.Equals(control) || textSelectedMetadata.Equals(control) || btnExecute.Equals(control)) + return; + if (control is DataGridView) { + DataGridView dataGridView = control as DataGridView; + dataGridView.BackgroundColor = color; + dataGridView.DefaultCellStyle.BackColor = color; + } else + if (control is DateTimePicker) { + DateTimePicker dateTimePicker = control as DateTimePicker; + dateTimePicker.CalendarMonthBackground = color; + } else + control.BackColor = color; + if (control.HasChildren) { + foreach (Control child in control.Controls) { + SetColor(child, color); + } + } } private void groupBox_Leave(object sender, EventArgs e) { @@ -149,7 +178,7 @@ namespace Maestro { else control = sender as Control; control.Font = new Font(control.Font, FontStyle.Regular); - control.BackColor = Color.Transparent; + SetColor(control, defaultColor); } private void MaestroForm_FormClosed(object sender, FormClosedEventArgs e) { diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx index f5b51644..71d12937 100644 --- a/client/Maestro/MaestroForm.resx +++ b/client/Maestro/MaestroForm.resx @@ -120,6 +120,49 @@ 17, 17 + + 1049, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc + BwAAAk1TRnQBSQFMAwEBAAEQAQABEAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA + AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA + AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm + AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ + AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm + AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz + AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm + AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm + AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA + ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm + AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm + ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm + AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA + AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ + AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz + AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ + AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA + AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM + AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm + ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ + AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ + ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM + ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm + AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM + AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA + AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA + ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 + Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/+CAAH/AQcK7wEHAfQyAAEH + DAABETIAAe8LAAHvMwAB7wsAAe8zAAHvCwAB7zMAAe8LAAHvMwAB7wsAAe8zAAHvCwAB7zMAAe8BAArv + AW0BDjIAAe8LAAEOAfEyAAHxAQ4EAAHv+AABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA + FwAD/wEAAv8GAAL/BgABgAEBBgABgAEBBgABnwH5BgABnwH5BgABnwH5BgABnwH5BgABnwH5BgABnwH5 + BgABgAEBBgABgAEBBgABgAH/BgAC/wYAAv8GAAL/BgAL + + @@ -129,8 +172,11 @@ 3/jmkprcKEuYE8aOir3NRGolzAnzVFoPuyGPLs5GSj/4XULq1sxx1wAAAABJRU5ErkJggg== - - 512, 17 + + 951, 17 + + + 846, 17 True diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs index a4c70ac8..c82e2281 100644 --- a/client/Maestro/Program.cs +++ b/client/Maestro/Program.cs @@ -89,8 +89,6 @@ namespace Maestro { public static string UserName { get; set; } public TrayApplicationContext() { - string str = Regex.Replace("Aéá.ú-óüöA", "[^0-9A-Za-z-._]", "_"); - Debug.WriteLine(str); } private bool HasCommandlineParameter(string parameter) { diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 71f7984e..99c27c59 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1")] -[assembly: AssemblyFileVersion("2.0.1")] +[assembly: AssemblyVersion("2.0.2.1")] +[assembly: AssemblyFileVersion("2.0.2.1")] diff --git a/client/Maestro/Properties/Resources.Designer.cs b/client/Maestro/Properties/Resources.Designer.cs index 18be0c5e..027760f0 100644 --- a/client/Maestro/Properties/Resources.Designer.cs +++ b/client/Maestro/Properties/Resources.Designer.cs @@ -80,6 +80,36 @@ namespace Maestro.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_folder_open_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_folder_open_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_list_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_list_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_note_add_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_note_add_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -90,6 +120,46 @@ namespace Maestro.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_playlist_add_check_black_24dp_1x_green { + get { + object obj = ResourceManager.GetObject("ic_playlist_add_check_black_24dp_1x_green", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_receipt_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_receipt_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_receipt_black_24dp_1x_green { + get { + object obj = ResourceManager.GetObject("ic_receipt_black_24dp_1x_green", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_reorder_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_reorder_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -103,39 +173,59 @@ namespace Maestro.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap mediacube_logo_v2_half_hard_edge { + internal static System.Drawing.Bitmap ic_settings_black_24dp_1x { get { - object obj = ResourceManager.GetObject("mediacube_logo_v2_half_hard_edge", resourceCulture); + object obj = ResourceManager.GetObject("ic_settings_black_24dp_1x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Icon Pause { + internal static System.Drawing.Bitmap ic_subject_black_24dp_1x { get { - object obj = ResourceManager.GetObject("Pause", resourceCulture); - return ((System.Drawing.Icon)(obj)); + object obj = ResourceManager.GetObject("ic_subject_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Icon Play { + internal static System.Drawing.Bitmap ic_toc_black_24dp_1x { get { - object obj = ResourceManager.GetObject("Play", resourceCulture); - return ((System.Drawing.Icon)(obj)); + object obj = ResourceManager.GetObject("ic_toc_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_view_headline_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_view_headline_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap mediacube_logo_v2_half_hard_edge { + get { + object obj = ResourceManager.GetObject("mediacube_logo_v2_half_hard_edge", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon Stop { + internal static System.Drawing.Icon Play { get { - object obj = ResourceManager.GetObject("Stop", resourceCulture); + object obj = ResourceManager.GetObject("Play", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/client/Maestro/Properties/Resources.resx b/client/Maestro/Properties/Resources.resx index e2629027..75f430b0 100644 --- a/client/Maestro/Properties/Resources.resx +++ b/client/Maestro/Properties/Resources.resx @@ -124,15 +124,9 @@ ..\Resources\ic_clear_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Pause.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Play.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Stop.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ic_search_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,4 +136,37 @@ ..\Resources\mediacube_logo_v2_half_hard_edge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ic_folder_open_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_list_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_note_add_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_playlist_add_check_black_24dp_1x_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_receipt_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_receipt_black_24dp_1x_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_reorder_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_settings_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_subject_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_toc_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ic_view_headline_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/client/Maestro/Resources/Pause.ico b/client/Maestro/Resources/Pause.ico deleted file mode 100644 index 4385a539..00000000 Binary files a/client/Maestro/Resources/Pause.ico and /dev/null differ diff --git a/client/Maestro/Resources/Play.ico b/client/Maestro/Resources/Play.ico index 2b5c9964..c9ba2942 100644 Binary files a/client/Maestro/Resources/Play.ico and b/client/Maestro/Resources/Play.ico differ diff --git a/client/Maestro/Resources/Stop.ico b/client/Maestro/Resources/Stop.ico deleted file mode 100644 index f9d158c1..00000000 Binary files a/client/Maestro/Resources/Stop.ico and /dev/null differ diff --git a/client/Maestro/Resources/ic_folder_open_black_24dp_1x.png b/client/Maestro/Resources/ic_folder_open_black_24dp_1x.png new file mode 100644 index 00000000..d7f35714 Binary files /dev/null and b/client/Maestro/Resources/ic_folder_open_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_list_black_24dp_1x.png b/client/Maestro/Resources/ic_list_black_24dp_1x.png new file mode 100644 index 00000000..25a7a09f Binary files /dev/null and b/client/Maestro/Resources/ic_list_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_note_add_black_24dp_1x.png b/client/Maestro/Resources/ic_note_add_black_24dp_1x.png new file mode 100644 index 00000000..711622d3 Binary files /dev/null and b/client/Maestro/Resources/ic_note_add_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_pause_black_24dp_1x.png b/client/Maestro/Resources/ic_pause_black_24dp_1x.png new file mode 100644 index 00000000..6145664b Binary files /dev/null and b/client/Maestro/Resources/ic_pause_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_play_arrow_black_24dp_1x.png b/client/Maestro/Resources/ic_play_arrow_black_24dp_1x.png new file mode 100644 index 00000000..d78c57ba Binary files /dev/null and b/client/Maestro/Resources/ic_play_arrow_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_play_circle_outline_black_24dp_1x.png b/client/Maestro/Resources/ic_play_circle_outline_black_24dp_1x.png new file mode 100644 index 00000000..a84ffc07 Binary files /dev/null and b/client/Maestro/Resources/ic_play_circle_outline_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_playlist_add_check_black_24dp_1x_green1.png b/client/Maestro/Resources/ic_playlist_add_check_black_24dp_1x_green1.png new file mode 100644 index 00000000..e0729642 Binary files /dev/null and b/client/Maestro/Resources/ic_playlist_add_check_black_24dp_1x_green1.png differ diff --git a/client/Maestro/Resources/ic_playlist_add_check_black_24dp_2x.png b/client/Maestro/Resources/ic_playlist_add_check_black_24dp_2x.png new file mode 100644 index 00000000..24855e94 Binary files /dev/null and b/client/Maestro/Resources/ic_playlist_add_check_black_24dp_2x.png differ diff --git a/client/Maestro/Resources/ic_receipt_black_24dp_1x.png b/client/Maestro/Resources/ic_receipt_black_24dp_1x.png new file mode 100644 index 00000000..5d68f94c Binary files /dev/null and b/client/Maestro/Resources/ic_receipt_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_receipt_black_24dp_1x_green.png b/client/Maestro/Resources/ic_receipt_black_24dp_1x_green.png new file mode 100644 index 00000000..b65ca5a5 Binary files /dev/null and b/client/Maestro/Resources/ic_receipt_black_24dp_1x_green.png differ diff --git a/client/Maestro/Resources/ic_receipt_black_24dp_2x.png b/client/Maestro/Resources/ic_receipt_black_24dp_2x.png new file mode 100644 index 00000000..de0f06a6 Binary files /dev/null and b/client/Maestro/Resources/ic_receipt_black_24dp_2x.png differ diff --git a/client/Maestro/Resources/ic_reorder_black_24dp_1x.png b/client/Maestro/Resources/ic_reorder_black_24dp_1x.png new file mode 100644 index 00000000..d18997cd Binary files /dev/null and b/client/Maestro/Resources/ic_reorder_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_settings_black_24dp_1x.png b/client/Maestro/Resources/ic_settings_black_24dp_1x.png new file mode 100644 index 00000000..c59419c0 Binary files /dev/null and b/client/Maestro/Resources/ic_settings_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_stop_black_24dp_1x.png b/client/Maestro/Resources/ic_stop_black_24dp_1x.png new file mode 100644 index 00000000..0588f0b4 Binary files /dev/null and b/client/Maestro/Resources/ic_stop_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_subject_black_24dp_1x.png b/client/Maestro/Resources/ic_subject_black_24dp_1x.png new file mode 100644 index 00000000..6bd6a3c1 Binary files /dev/null and b/client/Maestro/Resources/ic_subject_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_toc_black_24dp_1x.png b/client/Maestro/Resources/ic_toc_black_24dp_1x.png new file mode 100644 index 00000000..e58710be Binary files /dev/null and b/client/Maestro/Resources/ic_toc_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/ic_view_headline_black_24dp_1x.png b/client/Maestro/Resources/ic_view_headline_black_24dp_1x.png new file mode 100644 index 00000000..c08fe446 Binary files /dev/null and b/client/Maestro/Resources/ic_view_headline_black_24dp_1x.png differ diff --git a/client/Maestro/Resources/installforge-installer-project.ifp b/client/Maestro/Resources/installforge-installer-project.ifp index 24818498..22a3b598 100644 Binary files a/client/Maestro/Resources/installforge-installer-project.ifp and b/client/Maestro/Resources/installforge-installer-project.ifp differ diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index 525e39d9..f635e17b 100644 --- a/client/Maestro/Sources/FileSystemSource.cs +++ b/client/Maestro/Sources/FileSystemSource.cs @@ -23,6 +23,7 @@ namespace Maestro.Sources { private List cache; private BackgroundWorker pathWatcherWorker = new BackgroundWorker(); private string path; + private string rootPath; FileSystemWatcher watcher; public DataGridViewColumn[] Columns { @@ -66,6 +67,7 @@ namespace Maestro.Sources { } public ListSortDescriptionCollection SortDescriptions => null; + public ListSortDirection SortDirection { get; set; } public PropertyDescriptor SortProperty { get; set; } public bool SupportsAdvancedSorting => false; @@ -172,8 +174,8 @@ namespace Maestro.Sources { } public void Startup(Uri address) { - string path = address.LocalPath; - this.path = path; + path = address.LocalPath; + rootPath = path; pathWatcherWorker.RunWorkerAsync(); } diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 40be4a3c..2a842f66 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -94,8 +94,12 @@ namespace MaestroShared.Targets { Status = INPROGRESS; //DateTime started = DateTime.Now; string currentFile = GetOutputFilePath(workingDir, OutputName); - if (FileExists(currentFile) && parameters.TargetConfig.DisableFileVersioning) - DeleteFile(currentFile); + if (FileExists(currentFile) && parameters.TargetConfig.DisableFileVersioning) { + if (parameters.TargetConfig.NexioServer) { + MessageBox.Show(String.Format($"Az '{OutputName}' állomány már létezik. A feltöltéshez új Octopus azonosító generálása szükséges.")); + } else + DeleteFile(currentFile); + } UploadFile(); //logger.Info("Spend (s):" + (DateTime.Now - started).TotalSeconds); ExecuteCompleted(); @@ -322,10 +326,13 @@ namespace MaestroShared.Targets { string result = text .Replace(PATTERN_ID, ID) .Replace(PATTERN_IDROOT, idRoot) - .Replace(PATTERN_TEXT, HYPHEN + RemoveDiacritics(parameters.MetadataText)) .Replace(PATTERN_SOURCENAME, Path.GetFileNameWithoutExtension(InputName)) .Replace(PATTERN_TIMESTAMP, DateTime.Now.ToString(DATETIME_FORMAT, CultureInfo.InvariantCulture)) .Replace(PATTERN_DATESTAMP, DateTime.Now.ToString(DATE_FORMAT_NODOTS, CultureInfo.InvariantCulture)); + + if (!String.IsNullOrEmpty(parameters.MetadataText)) + result = result.Replace(PATTERN_TEXT, HYPHEN + RemoveDiacritics(parameters.MetadataText)); + // replace hungarian and special characters result = Regex.Replace(result, NORMALIZE_TEXT_PATTERN, UNDERSCORE); if (result.Length > 100) diff --git a/client/OctopusClient/OctopusIDSelector.Designer.cs b/client/OctopusClient/OctopusIDSelector.Designer.cs index ac63f15f..3d92bff0 100644 --- a/client/OctopusClient/OctopusIDSelector.Designer.cs +++ b/client/OctopusClient/OctopusIDSelector.Designer.cs @@ -166,7 +166,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; + this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.treeOctopus); this.Controls.Add(this.pSeparator); this.Controls.Add(this.pSearch); diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index 2a07b2e1..cc6de4d9 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -19,6 +19,7 @@ namespace OctopusClient { private OctopusAPI client; public OnSelectedIDChanged IDChangedEvent { get; set; } private OctopusConfiguration configuration; + private bool refreshDisabled; public OctopusConfiguration Configuration { set { @@ -140,7 +141,7 @@ namespace OctopusClient { continue; foreach (MosObject mosObject in mosObjects) { TreeNode placeHolderNode = storyNode.Nodes.Add(mosObject.ObjID, String.Format($"{mosObject.ObjID}")); - placeHolderNode.Tag = mosObject.ID; + placeHolderNode.Tag = story; if (configuration.DisablePlaceHolderCheck) HideCheckBox(treeOctopus, placeHolderNode); else { @@ -180,7 +181,7 @@ namespace OctopusClient { if (selectedNode.Checked) { Story story = selectedNode.Tag as Story; - string text = String.Format($"{story.Name}_{story.Format}"); + string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"); IDChangedEvent?.Invoke(story.ParentStoryID, selectedNode.Name, text); } else IDChangedEvent?.Invoke(null, null, null); @@ -208,33 +209,35 @@ namespace OctopusClient { var rundown = client.GetRundownsByStoryID(storyId)?.FirstOrDefault(); if (rundown == null) { var storyFolder = client.GetStoryFoldersByStoryID(storyId)?.FirstOrDefault(); - if (storyFolder == null) - return false; - rbStoryFolder.Checked = true; - RefreshFolders(); - List storyFolders = cbFolders.DataSource as List; - if (storyFolders == null) - return false; - var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault(); - if (folderToSelect == null) - return false; - lookupStoryId = storyId; - cbFolders.SelectedItem = folderToSelect; + if (storyFolder != null) { + rbStoryFolder.Checked = true; + List storyFolders = cbFolders.DataSource as List; + if (storyFolders != null) { + var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault(); + if (folderToSelect != null) { + lookupStoryId = storyId; + cbFolders.SelectedItem = folderToSelect; + } + } + } } else { - rbRundown.Checked = true; + refreshDisabled = true; dtScheduled.Value = rundown.Start; - RefreshFolders(); + refreshDisabled = false; + rbRundown.Checked = true; List rundowns = cbFolders.DataSource as List; - if (rundowns == null) - return false; - var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault(); - if (rundownToSelect == null) - return false; - lookupStoryId = storyId; - cbFolders.SelectedItem = rundownToSelect; + if (rundowns != null) { + var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault(); + if (rundownToSelect != null) { + lookupStoryId = storyId; + cbFolders.SelectedItem = rundownToSelect; + } + } } txtFilter.Text = lookupStoryId; lookupStoryId = null; + if (selectedNode == null) + MessageBox.Show("Nincs találat."); return selectedNode != null; } @@ -244,33 +247,37 @@ namespace OctopusClient { var rundown = client.GetRundownsByPlaceHolderId(placeHolderId)?.FirstOrDefault(); if (rundown == null) { var storyFolder = client.GetStoryFoldersByPlaceHolderId(placeHolderId)?.FirstOrDefault(); - if (storyFolder == null) - return false; - rbStoryFolder.Checked = true; - RefreshFolders(); - List storyFolders = cbFolders.DataSource as List; - if (storyFolders == null) - return false; - var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault(); - if (folderToSelect == null) - return false; - lookupPlaceHolderId = placeHolderId; - cbFolders.SelectedItem = folderToSelect; + if (storyFolder != null) { + rbStoryFolder.Checked = true; + List storyFolders = cbFolders.DataSource as List; + if (storyFolders != null) { + var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault(); + if (folderToSelect != null) { + lookupPlaceHolderId = placeHolderId; + cbFolders.SelectedItem = folderToSelect; + } + } + } + } else { - rbRundown.Checked = true; + refreshDisabled = true; dtScheduled.Value = rundown.Start; - RefreshFolders(); + refreshDisabled = false; + rbRundown.Checked = true; List rundowns = cbFolders.DataSource as List; - if (rundowns == null) - return false; - var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault(); - if (rundownToSelect == null) - return false; - lookupPlaceHolderId = placeHolderId; - cbFolders.SelectedItem = rundownToSelect; + if (rundowns != null) { + var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault(); + if (rundownToSelect != null) { + lookupPlaceHolderId = placeHolderId; + cbFolders.SelectedItem = rundownToSelect; + } + } + } txtFilter.Text = lookupPlaceHolderId; lookupPlaceHolderId = null; + if (selectedNode == null) + MessageBox.Show("Nincs találat."); return selectedNode != null; } @@ -279,6 +286,8 @@ namespace OctopusClient { } private void RefreshFolders() { + if (refreshDisabled) + return; ClearSelection(); Cursor.Current = Cursors.WaitCursor; if (rbRundown.Checked) { diff --git a/client/PasswordEncrypter/PasswordEncrypter.csproj b/client/PasswordEncrypter/PasswordEncrypter.csproj index c196e877..7a1d3936 100644 --- a/client/PasswordEncrypter/PasswordEncrypter.csproj +++ b/client/PasswordEncrypter/PasswordEncrypter.csproj @@ -56,8 +56,7 @@ true - - + maestro.ico @@ -79,7 +78,7 @@ - + \ No newline at end of file diff --git a/client/PasswordEncrypter/mediacube_logo_small_yellow.ico b/client/PasswordEncrypter/maestro.ico similarity index 100% rename from client/PasswordEncrypter/mediacube_logo_small_yellow.ico rename to client/PasswordEncrypter/maestro.ico diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs index 48502582..dbddf5af 100644 --- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs +++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs @@ -29,9 +29,9 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components); this.dtScheduled = new System.Windows.Forms.DateTimePicker(); this.txtFilter = new System.Windows.Forms.TextBox(); @@ -133,6 +133,7 @@ // pSearch // this.pSearch.AutoSize = true; + this.pSearch.BackColor = System.Drawing.Color.Transparent; this.pSearch.ColumnCount = 2; this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); @@ -179,36 +180,36 @@ this.dgTraffic.BackgroundColor = System.Drawing.Color.White; this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgTraffic.DataSource = this.trafficAPIBindingSource; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle5; this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill; this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgTraffic.EnableHeadersVisualStyles = false; - this.dgTraffic.Location = new System.Drawing.Point(0, 72); + this.dgTraffic.Location = new System.Drawing.Point(0, 78); this.dgTraffic.Margin = new System.Windows.Forms.Padding(0); this.dgTraffic.MultiSelect = false; this.dgTraffic.Name = "dgTraffic"; this.dgTraffic.RowHeadersVisible = false; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgTraffic.Size = new System.Drawing.Size(300, 328); + this.dgTraffic.Size = new System.Drawing.Size(300, 322); this.dgTraffic.TabIndex = 0; this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -228,9 +229,9 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.BackColor = System.Drawing.Color.White; - this.Controls.Add(this.pSeparator); + this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.dgTraffic); + this.Controls.Add(this.pSeparator); this.Controls.Add(this.pSearch); this.Name = "TrafficIDSelector"; this.Size = new System.Drawing.Size(300, 400); diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml index 2ea650ba..ef66dee9 100644 --- a/server/-product/log4j2.xml +++ b/server/-product/log4j2.xml @@ -41,7 +41,7 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java index bbc0b511..0e9ee5c4 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java @@ -56,8 +56,8 @@ public class ArchiveListBuilderStep extends JobStep { result.setMediaTitle(getMetadata(dbObject, MEDIA_TITLE)); result.setMediaDescription(getMetadata(dbObject, MEDIA_DESCRIPTION)); - result.setMediaFile(mediaFilePath); - result.setCatchedFile(catchedFilePath); + result.setMediaFile(mediaFilePath.toString()); + result.setCatchedFile(catchedFilePath.toString()); } catch (IOException e) { logger.catching(e); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java index 61a6b293..29dfa805 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java @@ -1,5 +1,7 @@ package user.jobengine.server.steps; +import java.io.File; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +41,7 @@ public class MetadataTransformStep extends JobStep { } catch (Exception e) { logger.catching(e); if (!archiveItem.removeCatchedFile()) - logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", archiveItem.getMediaFile().toFile().getName()); + logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", new File(archiveItem.getMediaFile()).getName()); throw e; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java index 9271e46b..1cf1f1d3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java @@ -1,7 +1,7 @@ package user.jobengine.server.steps; +import java.io.File; import java.io.IOException; -import java.nio.file.Path; import java.sql.Timestamp; import java.util.Date; @@ -27,7 +27,7 @@ import user.jobengine.server.JobEngineException; public class TSMBackupStep extends JobStep { private static final Logger logger = LogManager.getLogger(); private IItemManager manager; - private Path sourceMediaFile; + private File sourceMediaFile; private Store tsmStore; private StoreUri targetUri; private FileType fileType; @@ -36,6 +36,7 @@ public class TSMBackupStep extends JobStep { public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { try { setAndCheck(archiveItem, mediaCubeMedia, jobEngine); + File sourceMediaFile = new File(archiveItem.getMediaFile()); StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, sourceMediaFile.getParent().toString()); @@ -52,24 +53,23 @@ public class TSMBackupStep extends JobStep { evt.setCancel(!canContinue()); } }); - String sourceFileName = sourceMediaFile.toFile().getName(); + String sourceFileName = sourceMediaFile.getName(); RemoteFile remoteFile = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName); saveMetadata(mediaCubeMedia, sourceFileName); - logger.info(getMarker(), "Az '{}' állomány archiválása sikeres.", archiveItem.getMediaFile().toFile().getName()); + logger.info(getMarker(), "Az '{}' állomány archiválása sikeres.", sourceMediaFile.getName()); if (killDateDays > 0) { - KillDateFile killDateFile = new KillDateFile(sourceMediaFile.getParent().toString(), sourceMediaFile.getFileName().toString()); + KillDateFile killDateFile = new KillDateFile(sourceMediaFile.getParent().toString(), sourceMediaFile.getName().toString()); killDateFile.create(killDateDays, getMarker()); } } catch (Exception e) { logger.catching(e); - logger.error(getMarker(), "Az '{}' állomány archiválása sikertelen. A rendszer hibaüzenete: {}", archiveItem.getMediaFile().toFile().getName(), - e.getMessage()); + logger.error(getMarker(), "Az '{}' állomány archiválása sikertelen. A rendszer hibaüzenete: {}", sourceMediaFile.getName(), e.getMessage()); if (!archiveItem.removeCatchedFile()) logger.error(getMarker(), "Az '{}' állomány .catched jelző állománya nem törölhető. Az újabb archiválási kísérlethez annak kézi eltávolítása szükséges!", - archiveItem.getMediaFile().toFile().getName()); + sourceMediaFile.getName()); throw e; } return null; @@ -98,14 +98,14 @@ public class TSMBackupStep extends JobStep { logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, missing 'archiveItem' input parameter."); } - sourceMediaFile = archiveItem.getMediaFile(); + sourceMediaFile = new File(archiveItem.getMediaFile()); if (sourceMediaFile == null) { logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paraméter 'mediaFile' értéke üres."); throw new NullPointerException("System is not configured properly, missing 'mediaFile' value in 'archiveItem' input parameter."); } - if (!sourceMediaFile.toFile().exists()) { - logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.toFile().getName()); - throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.toFile().getName())); + if (!sourceMediaFile.exists()) { + logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.getName()); + throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.getName())); } tsmStore = manager.getSystemStore(false); if (tsmStore == null) { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java index 4624113b..456908b0 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java @@ -1,5 +1,6 @@ package user.jobengine.server.steps; +import java.io.File; import java.io.IOException; import java.net.URL; import java.nio.file.Files; @@ -128,7 +129,7 @@ public class TranscodeSELENIOStep extends JobStep { // if (sourceStoreUri == null) // throw new NullPointerException("System is not configured properly, low-res system store SMB store URI definition missing."); - Path inputPath = Paths.get(globalSourcePath, archiveItem.getMediaFile().toFile().getName()); + Path inputPath = Paths.get(globalSourcePath, new File(archiveItem.getMediaFile()).getName()); String sourceFilePath = inputPath.toString(); // String outputPath = sourceStoreUri.getRootPath(); TranscodeRequest transcodeRequest = buildTranscodeRequest(projectFilePath, sourceFilePath); diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index fb11e316..3ae3c16a 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -465,7 +465,6 @@ public class OctopusDataMiner implements Runnable { try { ensureIndexes(); Date lastUpdateTime = getLastUpdateTime(); - setLastUpdateTime(new Date()); buildStoriesReferences(); @@ -488,6 +487,7 @@ public class OctopusDataMiner implements Runnable { storeStoryFolders(storyFolders, lastUpdateTime); } deleteOrphanStories(); + setLastUpdateTime(new Date()); } catch (Exception e) { logger.catching(e); throw e; @@ -515,7 +515,7 @@ public class OctopusDataMiner implements Runnable { logger.trace(ENTER); long rundownID = rundown.getLong(ID); String name = rundown.containsKey(NAME) ? rundown.getString(NAME) : null; - + logger.info("Checking rundown {} {}", name, rundown.get(SCHEDULED_START)); BasicDBObject rundownWithStories = queryRundown(rundownID); BasicDBList stories = asDBList(rundownWithStories, SLUGS); if (stories != null) diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java index 80db5c0a..aab159d4 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/TSMLister.java @@ -24,7 +24,7 @@ public class TSMLister implements IDirectoryLister { public TSMLister(StoreUri storeUri) throws Exception { client = new TSMBufferedClient(); - logger.info("TSMBufferedClient initialized!"); + logger.info("TSMBufferedClient created!"); client.connect(storeUri.getUserName(), storeUri.getPassword()); logger.info("TSMBufferedClient connected!"); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java index aa1336d9..cec5021b 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java @@ -357,22 +357,13 @@ public class JobRuntime extends Job implements IJobRuntime { ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); ObjectOutputStream out; out = new ObjectOutputStream(byteOut); - - // for (Object obj : parameters.values()) { - // logger.info("Writing: " + obj.getClass()); - // out.writeObject(obj); - // } - // out.writeObject(parameters); byte[] convertedData = byteOut.toByteArray(); jobParameters.setId(getId()); jobParameters.setData(convertedData); jobParameters.add(); - - // EntityBaseDAO dao = (EntityBaseDAO) ItemManager.getInstance().getBaseDAO(JobParameters.class); - // dao.add(jobParameters); } catch (Exception e) { - logger.error(e); + logger.catching(e); } } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java index 7b3ccd76..5b807c62 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java @@ -2,7 +2,6 @@ package user.jobengine.server.steps; import java.io.File; import java.io.Serializable; -import java.nio.file.Path; public class ArchiveItem implements Serializable { private static final long serialVersionUID = -7278747969491719357L; @@ -12,11 +11,10 @@ public class ArchiveItem implements Serializable { private String mediaHouseId; private String mediaTitle; private String mediaDescription; + private String mediaFile = null; + private String catchedFile = null; - private Path mediaFile = null; - private Path catchedFile = null; - - public Path getCatchedFile() { + public String getCatchedFile() { return catchedFile; } @@ -36,7 +34,7 @@ public class ArchiveItem implements Serializable { return mediaDescription; } - public Path getMediaFile() { + public String getMediaFile() { return mediaFile; } @@ -51,14 +49,14 @@ public class ArchiveItem implements Serializable { public boolean removeCatchedFile() { boolean result = false; if (catchedFile != null) { - File file = catchedFile.toFile(); + File file = new File(catchedFile); if (file.exists()) result = file.delete(); } return result; } - public void setCatchedFile(Path catchedFile) { + public void setCatchedFile(String catchedFile) { this.catchedFile = catchedFile; } @@ -78,7 +76,7 @@ public class ArchiveItem implements Serializable { this.mediaDescription = mediaDescription; } - public void setMediaFile(Path mediaFile) { + public void setMediaFile(String mediaFile) { this.mediaFile = mediaFile; }