<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup>\r
- <ApplicationIcon>\r
- </ApplicationIcon>\r
+ <ApplicationIcon>maestro.ico</ApplicationIcon>\r
</PropertyGroup>\r
<PropertyGroup />\r
<ItemGroup>\r
}\r
}\r
\r
- /// <summary>\r
- /// Looks up a localized resource of type System.Drawing.Bitmap.\r
- /// </summary>\r
- public static System.Drawing.Bitmap ic_pause_black_24dp_1x {\r
- get {\r
- object obj = ResourceManager.GetObject("ic_pause_black_24dp_1x", resourceCulture);\r
- return ((System.Drawing.Bitmap)(obj));\r
- }\r
- }\r
- \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
}\r
}\r
\r
- /// <summary>\r
- /// Looks up a localized resource of type System.Drawing.Bitmap.\r
- /// </summary>\r
- public static System.Drawing.Bitmap ic_play_arrow_black_24dp_1x {\r
- get {\r
- object obj = ResourceManager.GetObject("ic_play_arrow_black_24dp_1x", resourceCulture);\r
- return ((System.Drawing.Bitmap)(obj));\r
- }\r
- }\r
- \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
}\r
}\r
\r
- /// <summary>\r
- /// Looks up a localized resource of type System.Drawing.Bitmap.\r
- /// </summary>\r
- public static System.Drawing.Bitmap ic_stop_black_24dp_1x {\r
- get {\r
- object obj = ResourceManager.GetObject("ic_stop_black_24dp_1x", resourceCulture);\r
- return ((System.Drawing.Bitmap)(obj));\r
- }\r
- }\r
- \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
<data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <data name="ic_pause_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
- <value>..\Resources\ic_pause_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
- </data>\r
<data name="ic_pause_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <data name="ic_play_arrow_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
- <value>..\Resources\ic_play_arrow_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
- </data>\r
<data name="ic_play_arrow_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <data name="ic_stop_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
- <value>..\Resources\ic_stop_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
- </data>\r
<data name="ic_stop_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
</Reference>\r
<Reference Include="System.Core" />\r
<Reference Include="System.Data" />\r
+ <Reference Include="System.Drawing" />\r
<Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
<HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>\r
</Reference>\r
using MaestroShared.Commons;\r
using MaestroShared.Targets;\r
using MaestroShared.Target;\r
+using System.Drawing;\r
\r
namespace IntegrationTests {\r
public sealed class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid {\r
string connectionString = "SERVER=" + server + ";" + "DATABASE=" +\r
database + ";" + "UID=" + uid + ";" + "PASSWORD=" + password + ";Convert Zero Datetime=true;";\r
\r
- \r
+\r
MySqlConnection connection = new MySqlConnection(connectionString);\r
try {\r
connection.Open();\r
sb.Clear();\r
}\r
}\r
+\r
+ [TestMethod]\r
+ public void png2ico() {\r
+\r
+ using (FileStream stream = File.OpenWrite(@"C:\temp\test.ico")) {\r
+ Bitmap bitmap = (Bitmap)Image.FromFile(@"c:\_documents\icons\web\ic_play_arrow_black_24dp_1x.png");\r
+\r
+ //ColorMap[] colorMap = new ColorMap[1];\r
+ //colorMap[0] = new ColorMap();\r
+ //colorMap[0].OldColor = Color.Black;\r
+ //colorMap[0].NewColor = Color.Blue;\r
+ //ImageAttributes attr = new ImageAttributes();\r
+ //attr.SetRemapTable(colorMap);\r
+\r
+ Bitmap resized = new Bitmap(bitmap, new Size(16, 16));\r
+ Icon.FromHandle(resized.GetHicon()).Save(stream);\r
+ }\r
+ }\r
}\r
- }
\ No newline at end of file
+}
\ No newline at end of file
// label_stuffID\r
// \r
this.label_stuffID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
- this.label_stuffID.Location = new System.Drawing.Point(8, 5);\r
+ this.label_stuffID.AutoSize = true;\r
+ this.label_stuffID.Location = new System.Drawing.Point(11, 6);\r
+ this.label_stuffID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_stuffID.Name = "label_stuffID";\r
- this.label_stuffID.Size = new System.Drawing.Size(87, 13);\r
+ this.label_stuffID.Size = new System.Drawing.Size(113, 17);\r
this.label_stuffID.TabIndex = 0;\r
this.label_stuffID.Text = "Anyag azonosító";\r
// \r
// label_stuffDescription\r
// \r
this.label_stuffDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
- this.label_stuffDescription.Location = new System.Drawing.Point(8, 83);\r
+ this.label_stuffDescription.AutoSize = true;\r
+ this.label_stuffDescription.Location = new System.Drawing.Point(11, 102);\r
+ this.label_stuffDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_stuffDescription.Name = "label_stuffDescription";\r
- this.label_stuffDescription.Size = new System.Drawing.Size(66, 13);\r
+ this.label_stuffDescription.Size = new System.Drawing.Size(86, 17);\r
this.label_stuffDescription.TabIndex = 2;\r
this.label_stuffDescription.Text = "Anyag leírás";\r
// \r
// label_mediaID\r
// \r
this.label_mediaID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
- this.label_mediaID.Location = new System.Drawing.Point(8, 205);\r
+ this.label_mediaID.AutoSize = true;\r
+ this.label_mediaID.Location = new System.Drawing.Point(11, 253);\r
+ this.label_mediaID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_mediaID.Name = "label_mediaID";\r
- this.label_mediaID.Size = new System.Drawing.Size(86, 13);\r
+ this.label_mediaID.Size = new System.Drawing.Size(111, 17);\r
this.label_mediaID.TabIndex = 3;\r
this.label_mediaID.Text = "Média azonosító";\r
// \r
// label_mediaTitle\r
// \r
this.label_mediaTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
- this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.label_mediaTitle.Location = new System.Drawing.Point(8, 244);\r
+ this.label_mediaTitle.AutoSize = true;\r
+ this.label_mediaTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.label_mediaTitle.Location = new System.Drawing.Point(11, 301);\r
+ this.label_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_mediaTitle.Name = "label_mediaTitle";\r
- this.label_mediaTitle.Size = new System.Drawing.Size(57, 13);\r
+ this.label_mediaTitle.Size = new System.Drawing.Size(80, 17);\r
this.label_mediaTitle.TabIndex = 4;\r
this.label_mediaTitle.Text = "Média cím";\r
// \r
// \r
this.label_mediaDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
this.label_mediaDescription.AutoSize = true;\r
- this.label_mediaDescription.Location = new System.Drawing.Point(8, 283);\r
+ this.label_mediaDescription.Location = new System.Drawing.Point(11, 349);\r
+ this.label_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_mediaDescription.Name = "label_mediaDescription";\r
- this.label_mediaDescription.Size = new System.Drawing.Size(65, 13);\r
+ this.label_mediaDescription.Size = new System.Drawing.Size(84, 17);\r
this.label_mediaDescription.TabIndex = 5;\r
this.label_mediaDescription.Text = "Média leírás";\r
// \r
// textBox_itemID\r
// \r
this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_itemID.Location = new System.Drawing.Point(8, 21);\r
+ this.textBox_itemID.Location = new System.Drawing.Point(11, 27);\r
+ this.textBox_itemID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_itemID.Name = "textBox_itemID";\r
this.textBox_itemID.ReadOnly = true;\r
- this.textBox_itemID.Size = new System.Drawing.Size(532, 20);\r
+ this.textBox_itemID.Size = new System.Drawing.Size(660, 23);\r
this.textBox_itemID.TabIndex = 6;\r
// \r
// textBox_itemTitle\r
// \r
this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_itemTitle.Location = new System.Drawing.Point(8, 60);\r
+ this.textBox_itemTitle.Location = new System.Drawing.Point(11, 75);\r
+ this.textBox_itemTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_itemTitle.Name = "textBox_itemTitle";\r
- this.textBox_itemTitle.Size = new System.Drawing.Size(532, 20);\r
+ this.textBox_itemTitle.Size = new System.Drawing.Size(660, 23);\r
this.textBox_itemTitle.TabIndex = 7;\r
// \r
// textBox_itemDescription\r
// \r
this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_itemDescription.Location = new System.Drawing.Point(8, 99);\r
+ this.textBox_itemDescription.Location = new System.Drawing.Point(11, 123);\r
+ this.textBox_itemDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_itemDescription.Multiline = true;\r
this.textBox_itemDescription.Name = "textBox_itemDescription";\r
this.textBox_itemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
- this.textBox_itemDescription.Size = new System.Drawing.Size(532, 103);\r
+ this.textBox_itemDescription.Size = new System.Drawing.Size(660, 126);\r
this.textBox_itemDescription.TabIndex = 8;\r
// \r
// textBox_mediaID\r
// \r
this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_mediaID.Location = new System.Drawing.Point(8, 221);\r
+ this.textBox_mediaID.Location = new System.Drawing.Point(11, 274);\r
+ this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_mediaID.Name = "textBox_mediaID";\r
this.textBox_mediaID.ReadOnly = true;\r
- this.textBox_mediaID.Size = new System.Drawing.Size(532, 20);\r
+ this.textBox_mediaID.Size = new System.Drawing.Size(660, 23);\r
this.textBox_mediaID.TabIndex = 9;\r
// \r
// textBox_mediaTitle\r
// \r
this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_mediaTitle.Location = new System.Drawing.Point(8, 260);\r
+ this.textBox_mediaTitle.Location = new System.Drawing.Point(11, 322);\r
+ this.textBox_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_mediaTitle.Name = "textBox_mediaTitle";\r
- this.textBox_mediaTitle.Size = new System.Drawing.Size(532, 20);\r
+ this.textBox_mediaTitle.Size = new System.Drawing.Size(660, 23);\r
this.textBox_mediaTitle.TabIndex = 10;\r
// \r
// textBox_mediaDescription\r
// \r
this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.textBox_mediaDescription.Location = new System.Drawing.Point(8, 299);\r
+ this.textBox_mediaDescription.Location = new System.Drawing.Point(11, 370);\r
+ this.textBox_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.textBox_mediaDescription.Multiline = true;\r
this.textBox_mediaDescription.Name = "textBox_mediaDescription";\r
this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
- this.textBox_mediaDescription.Size = new System.Drawing.Size(532, 216);\r
+ this.textBox_mediaDescription.Size = new System.Drawing.Size(660, 113);\r
this.textBox_mediaDescription.TabIndex = 11;\r
// \r
// label_stuffTitle\r
// \r
this.label_stuffTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
- this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.label_stuffTitle.Location = new System.Drawing.Point(8, 44);\r
+ this.label_stuffTitle.AutoSize = true;\r
+ this.label_stuffTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.label_stuffTitle.Location = new System.Drawing.Point(11, 54);\r
+ this.label_stuffTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
this.label_stuffTitle.Name = "label_stuffTitle";\r
- this.label_stuffTitle.Size = new System.Drawing.Size(58, 13);\r
+ this.label_stuffTitle.Size = new System.Drawing.Size(82, 17);\r
this.label_stuffTitle.TabIndex = 1;\r
this.label_stuffTitle.Text = "Anyag cím";\r
// \r
this.groupBox1.Controls.Add(this.btnOk);\r
this.groupBox1.Controls.Add(this.btnCancel);\r
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
- this.groupBox1.Location = new System.Drawing.Point(0, 523);\r
+ this.groupBox1.Location = new System.Drawing.Point(0, 486);\r
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.groupBox1.Name = "groupBox1";\r
- this.groupBox1.Size = new System.Drawing.Size(548, 48);\r
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+ this.groupBox1.Size = new System.Drawing.Size(682, 59);\r
this.groupBox1.TabIndex = 1;\r
this.groupBox1.TabStop = false;\r
// \r
// btnOk\r
// \r
this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
- this.btnOk.Location = new System.Drawing.Point(467, 16);\r
+ this.btnOk.Location = new System.Drawing.Point(574, 20);\r
+ this.btnOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.btnOk.Name = "btnOk";\r
- this.btnOk.Size = new System.Drawing.Size(75, 23);\r
+ this.btnOk.Size = new System.Drawing.Size(100, 28);\r
this.btnOk.TabIndex = 1;\r
this.btnOk.Text = "Rendben";\r
this.btnOk.UseVisualStyleBackColor = true;\r
// \r
this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
- this.btnCancel.Location = new System.Drawing.Point(388, 16);\r
+ this.btnCancel.Location = new System.Drawing.Point(468, 20);\r
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.btnCancel.Name = "btnCancel";\r
- this.btnCancel.Size = new System.Drawing.Size(75, 23);\r
+ this.btnCancel.Size = new System.Drawing.Size(100, 28);\r
this.btnCancel.TabIndex = 0;\r
this.btnCancel.Text = "Mégsem";\r
this.btnCancel.UseVisualStyleBackColor = true;\r
this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 2);\r
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
- this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);\r
+ this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);\r
this.tableLayoutPanel1.RowCount = 12;\r
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.tableLayoutPanel1.Size = new System.Drawing.Size(548, 523);\r
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(682, 486);\r
this.tableLayoutPanel1.TabIndex = 3;\r
// \r
// ArchiveMetadataForm\r
// \r
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);\r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
this.CancelButton = this.btnCancel;\r
- this.ClientSize = new System.Drawing.Size(548, 571);\r
+ this.ClientSize = new System.Drawing.Size(682, 545);\r
this.Controls.Add(this.tableLayoutPanel1);\r
this.Controls.Add(this.groupBox1);\r
+ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.Icon = global::Maestro.Properties.Resources.AppIcon;\r
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
this.Name = "ArchiveMetadataForm";\r
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
this.Text = "Archiv adatok";\r
this.groupBox1.ResumeLayout(false);\r
this.tableLayoutPanel1.ResumeLayout(false);\r
using System.Windows.Forms;\r
-using Maestro.Metadata;\r
using MaestroShared.Metadata;\r
\r
namespace Maestro {\r
\r
private ArchiveMetadata model;\r
\r
- public ArchiveMetadataForm(ArchiveMetadata model) : this() {\r
+ public ArchiveMetadataForm(ref ArchiveMetadata model) : this() {\r
this.model = model;\r
textBox_itemID.Text = model.itemHouseId;\r
textBox_itemTitle.Text = model.itemTitle;\r
{\r
"title": "Lebony betöltő",\r
- "active": false,\r
+ "active": true,\r
"startInTray": false,\r
"enableCustomMetadataId": true,\r
"player": {\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="Resources\installforge-installer-project.ifp" />\r
- <None Include="Resources\Pause.ico" />\r
- <None Include="Resources\Play.ico" />\r
- <None Include="Resources\Stop.ico" />\r
<None Include="Resources\mediacube_logo_small.ico" />\r
<None Include="maestro.ico" />\r
<None Include="Resources\ic_clear_black_24dp_1x.png" />\r
<None Include="Resources\ic_search_black_24dp_1x.png" />\r
<None Include="Resources\ic_playlist_add_check_black_24dp_1x.png" />\r
<None Include="Resources\mediacube_logo_v2_half_hard_edge.png" />\r
+ <None Include="Resources\ic_pause_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_list_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_play_arrow_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_stop_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_settings_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_view_headline_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_toc_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_note_add_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_reorder_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_play_circle_outline_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_subject_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_receipt_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_playlist_add_check_black_24dp_2x.png" />\r
+ <None Include="Resources\ic_receipt_black_24dp_2x.png" />\r
+ <None Include="Resources\ic_playlist_add_check_black_24dp_1x_green1.png" />\r
+ <None Include="Resources\ic_receipt_black_24dp_1x_green.png" />\r
+ <None Include="Resources\ic_folder_open_black_24dp_1x.png" />\r
+ <Content Include="Resources\play.ico" />\r
<Content Include="TODO.txt" />\r
</ItemGroup>\r
<ItemGroup>\r
/// </summary>\r
private void InitializeComponent() {\r
this.components = new System.ComponentModel.Container();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
this.groupSource = new System.Windows.Forms.GroupBox();\r
this.dgSource = new System.Windows.Forms.DataGridView();\r
this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
+ this.treeFolders = new System.Windows.Forms.TreeView();\r
+ this.ilFolders = new System.Windows.Forms.ImageList(this.components);\r
this.pSourceFilter = new System.Windows.Forms.TableLayoutPanel();\r
this.txtSourceFilter = new System.Windows.Forms.TextBox();\r
this.picClearFilter = new System.Windows.Forms.PictureBox();\r
- this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
+ this.pSourceDisplay = new System.Windows.Forms.TableLayoutPanel();\r
+ this.tsSource = new System.Windows.Forms.ToolStrip();\r
+ this.btnShowFolders = new System.Windows.Forms.ToolStripButton();\r
this.textSelectedSource = new System.Windows.Forms.TextBox();\r
this.label1 = new System.Windows.Forms.Label();\r
this.btnLookupBySource = new System.Windows.Forms.Button();\r
- this.ctxmActions = new System.Windows.Forms.ContextMenuStrip(this.components);\r
- this.ctxiDefineSegments = new System.Windows.Forms.ToolStripMenuItem();\r
- this.ctxiModifyArchiveMetadata = new System.Windows.Forms.ToolStripMenuItem();\r
this.scOperations = new System.Windows.Forms.SplitContainer();\r
this.scRightOperations = new System.Windows.Forms.SplitContainer();\r
this.groupMetadata = new System.Windows.Forms.GroupBox();\r
this.octopusIDSelector = new OctopusClient.OctopusIDSelector();\r
this.tpTraffic = new System.Windows.Forms.TabPage();\r
this.trafficIDSelector = new TrafficClient.TrafficIDSelector();\r
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+ this.pMetadataDisplay = new System.Windows.Forms.TableLayoutPanel();\r
this.btnLookupMetadata = new System.Windows.Forms.Button();\r
- this.mbActions = new Maestro.MenuButton();\r
this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
this.textSelectedMetadata = new System.Windows.Forms.TextBox();\r
+ this.tsMetadata = new System.Windows.Forms.ToolStrip();\r
+ this.btnEditMetadata = new System.Windows.Forms.ToolStripButton();\r
+ this.btnDefineSegments = new System.Windows.Forms.ToolStripButton();\r
this.groupTarget = new System.Windows.Forms.GroupBox();\r
this.panelActions = new System.Windows.Forms.TableLayoutPanel();\r
this.pExecute = new System.Windows.Forms.Panel();\r
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
this.pSourceFilter.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).BeginInit();\r
- this.tableLayoutPanel2.SuspendLayout();\r
- this.ctxmActions.SuspendLayout();\r
+ this.pSourceDisplay.SuspendLayout();\r
+ this.tsSource.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.scOperations)).BeginInit();\r
this.scOperations.Panel1.SuspendLayout();\r
this.scOperations.Panel2.SuspendLayout();\r
this.tabMetadata.SuspendLayout();\r
this.tpOctopus.SuspendLayout();\r
this.tpTraffic.SuspendLayout();\r
- this.tableLayoutPanel1.SuspendLayout();\r
+ this.pMetadataDisplay.SuspendLayout();\r
+ this.tsMetadata.SuspendLayout();\r
this.groupTarget.SuspendLayout();\r
this.pExecute.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();\r
// \r
this.groupSource.BackColor = System.Drawing.Color.Transparent;\r
this.groupSource.Controls.Add(this.dgSource);\r
+ this.groupSource.Controls.Add(this.treeFolders);\r
this.groupSource.Controls.Add(this.pSourceFilter);\r
- this.groupSource.Controls.Add(this.tableLayoutPanel2);\r
+ this.groupSource.Controls.Add(this.pSourceDisplay);\r
this.groupSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.groupSource.Location = new System.Drawing.Point(0, 0);\r
this.groupSource.Name = "groupSource";\r
this.dgSource.BackgroundColor = System.Drawing.Color.White;\r
this.dgSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
this.dgSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
- dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
- this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;\r
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+ this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
this.dgSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
this.dgSource.DataSource = this.bindingSource;\r
- dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;\r
- dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black;\r
- dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgSource.DefaultCellStyle = dataGridViewCellStyle16;\r
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgSource.DefaultCellStyle = dataGridViewCellStyle2;\r
this.dgSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.dgSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
this.dgSource.EnableHeadersVisualStyles = false;\r
this.dgSource.Location = new System.Drawing.Point(10, 47);\r
this.dgSource.Name = "dgSource";\r
this.dgSource.RowHeadersVisible = false;\r
- dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle17;\r
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgSource.Size = new System.Drawing.Size(330, 352);\r
+ this.dgSource.Size = new System.Drawing.Size(330, 159);\r
this.dgSource.TabIndex = 0;\r
this.dgSource.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.sourceGridView_CellContentClick);\r
this.dgSource.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellEnter);\r
this.dgSource.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridSource_CellPainting);\r
this.dgSource.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridSource_KeyDown);\r
// \r
+ // treeFolders\r
+ // \r
+ this.treeFolders.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+ this.treeFolders.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.treeFolders.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.treeFolders.ImageIndex = 0;\r
+ this.treeFolders.ImageList = this.ilFolders;\r
+ this.treeFolders.Location = new System.Drawing.Point(10, 206);\r
+ this.treeFolders.Name = "treeFolders";\r
+ this.treeFolders.SelectedImageIndex = 0;\r
+ this.treeFolders.Size = new System.Drawing.Size(330, 161);\r
+ this.treeFolders.TabIndex = 18;\r
+ this.treeFolders.Visible = false;\r
+ // \r
+ // ilFolders\r
+ // \r
+ this.ilFolders.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilFolders.ImageStream")));\r
+ this.ilFolders.TransparentColor = System.Drawing.Color.Transparent;\r
+ this.ilFolders.Images.SetKeyName(0, "ic_folder_open_black_24dp_1x.png");\r
+ // \r
// pSourceFilter\r
// \r
this.pSourceFilter.AutoSize = true;\r
this.picClearFilter.TabStop = false;\r
this.picClearFilter.Click += new System.EventHandler(this.picClearFilter_Click);\r
// \r
- // tableLayoutPanel2\r
- // \r
- this.tableLayoutPanel2.ColumnCount = 2;\r
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
- this.tableLayoutPanel2.Controls.Add(this.textSelectedSource, 0, 1);\r
- this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0);\r
- this.tableLayoutPanel2.Controls.Add(this.btnLookupBySource, 1, 1);\r
- this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
- this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 399);\r
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);\r
- this.tableLayoutPanel2.Name = "tableLayoutPanel2";\r
- this.tableLayoutPanel2.RowCount = 2;\r
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.tableLayoutPanel2.Size = new System.Drawing.Size(330, 62);\r
- this.tableLayoutPanel2.TabIndex = 12;\r
+ // pSourceDisplay\r
+ // \r
+ this.pSourceDisplay.ColumnCount = 2;\r
+ this.pSourceDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+ this.pSourceDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+ this.pSourceDisplay.Controls.Add(this.tsSource, 0, 0);\r
+ this.pSourceDisplay.Controls.Add(this.textSelectedSource, 0, 2);\r
+ this.pSourceDisplay.Controls.Add(this.label1, 0, 1);\r
+ this.pSourceDisplay.Controls.Add(this.btnLookupBySource, 1, 2);\r
+ this.pSourceDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.pSourceDisplay.Location = new System.Drawing.Point(10, 367);\r
+ this.pSourceDisplay.Margin = new System.Windows.Forms.Padding(0);\r
+ this.pSourceDisplay.Name = "pSourceDisplay";\r
+ this.pSourceDisplay.RowCount = 3;\r
+ this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));\r
+ this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));\r
+ this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));\r
+ this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.pSourceDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.pSourceDisplay.Size = new System.Drawing.Size(330, 94);\r
+ this.pSourceDisplay.TabIndex = 12;\r
+ // \r
+ // tsSource\r
+ // \r
+ this.pSourceDisplay.SetColumnSpan(this.tsSource, 2);\r
+ this.tsSource.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
+ this.tsSource.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+ this.btnShowFolders});\r
+ this.tsSource.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;\r
+ this.tsSource.Location = new System.Drawing.Point(0, 0);\r
+ this.tsSource.Name = "tsSource";\r
+ this.tsSource.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
+ this.tsSource.RightToLeft = System.Windows.Forms.RightToLeft.Yes;\r
+ this.tsSource.Size = new System.Drawing.Size(330, 30);\r
+ this.tsSource.TabIndex = 18;\r
+ // \r
+ // btnShowFolders\r
+ // \r
+ this.btnShowFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;\r
+ this.btnShowFolders.Image = global::Maestro.Properties.Resources.ic_folder_open_black_24dp_1x;\r
+ this.btnShowFolders.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+ this.btnShowFolders.ImageTransparentColor = System.Drawing.Color.GreenYellow;\r
+ this.btnShowFolders.Name = "btnShowFolders";\r
+ this.btnShowFolders.Size = new System.Drawing.Size(28, 28);\r
+ this.btnShowFolders.ToolTipText = "Mappák";\r
+ this.btnShowFolders.Click += new System.EventHandler(this.OnShowFolders);\r
// \r
// textSelectedSource\r
// \r
this.textSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
this.textSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.textSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.textSelectedSource.Location = new System.Drawing.Point(3, 28);\r
+ this.textSelectedSource.Location = new System.Drawing.Point(3, 63);\r
this.textSelectedSource.Name = "textSelectedSource";\r
this.textSelectedSource.ReadOnly = true;\r
this.textSelectedSource.Size = new System.Drawing.Size(288, 26);\r
// label1\r
// \r
this.label1.AutoSize = true;\r
- this.tableLayoutPanel2.SetColumnSpan(this.label1, 2);\r
+ this.pSourceDisplay.SetColumnSpan(this.label1, 2);\r
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.label1.Location = new System.Drawing.Point(3, 0);\r
+ this.label1.Location = new System.Drawing.Point(3, 30);\r
this.label1.Name = "label1";\r
this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);\r
- this.label1.Size = new System.Drawing.Size(324, 25);\r
+ this.label1.Size = new System.Drawing.Size(324, 30);\r
this.label1.TabIndex = 13;\r
this.label1.Text = "Selected source";\r
// \r
this.btnLookupBySource.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
this.btnLookupBySource.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);\r
this.btnLookupBySource.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x;\r
- this.btnLookupBySource.Location = new System.Drawing.Point(297, 28);\r
+ this.btnLookupBySource.Location = new System.Drawing.Point(297, 63);\r
this.btnLookupBySource.Name = "btnLookupBySource";\r
this.btnLookupBySource.Size = new System.Drawing.Size(30, 26);\r
this.btnLookupBySource.TabIndex = 14;\r
this.btnLookupBySource.UseVisualStyleBackColor = false;\r
this.btnLookupBySource.Click += new System.EventHandler(this.OnLookupBySource);\r
// \r
- // ctxmActions\r
- // \r
- this.ctxmActions.ImageScalingSize = new System.Drawing.Size(19, 19);\r
- this.ctxmActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
- this.ctxiDefineSegments,\r
- this.ctxiModifyArchiveMetadata});\r
- this.ctxmActions.Name = "contextMenuMetadataActions";\r
- this.ctxmActions.Size = new System.Drawing.Size(207, 48);\r
- // \r
- // ctxiDefineSegments\r
- // \r
- this.ctxiDefineSegments.Name = "ctxiDefineSegments";\r
- this.ctxiDefineSegments.Size = new System.Drawing.Size(206, 22);\r
- this.ctxiDefineSegments.Text = "Define segments";\r
- this.ctxiDefineSegments.Click += new System.EventHandler(this.OnDefineSegmentsClick);\r
- // \r
- // ctxiModifyArchiveMetadata\r
- // \r
- this.ctxiModifyArchiveMetadata.Name = "ctxiModifyArchiveMetadata";\r
- this.ctxiModifyArchiveMetadata.Size = new System.Drawing.Size(206, 22);\r
- this.ctxiModifyArchiveMetadata.Text = "Modify archive metadata";\r
- this.ctxiModifyArchiveMetadata.Click += new System.EventHandler(this.OnArchiveMetadataClick);\r
- // \r
// scOperations\r
// \r
this.scOperations.BackColor = System.Drawing.SystemColors.Control;\r
// \r
this.groupMetadata.BackColor = System.Drawing.Color.Transparent;\r
this.groupMetadata.Controls.Add(this.tabMetadata);\r
- this.groupMetadata.Controls.Add(this.tableLayoutPanel1);\r
+ this.groupMetadata.Controls.Add(this.pMetadataDisplay);\r
this.groupMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.groupMetadata.Location = new System.Drawing.Point(0, 0);\r
this.groupMetadata.Name = "groupMetadata";\r
this.tabMetadata.Location = new System.Drawing.Point(10, 23);\r
this.tabMetadata.Name = "tabMetadata";\r
this.tabMetadata.SelectedIndex = 0;\r
- this.tabMetadata.Size = new System.Drawing.Size(330, 376);\r
+ this.tabMetadata.Size = new System.Drawing.Size(330, 347);\r
this.tabMetadata.TabIndex = 1;\r
// \r
// tpOctopus\r
// \r
+ this.tpOctopus.BackColor = System.Drawing.Color.Transparent;\r
this.tpOctopus.Controls.Add(this.octopusIDSelector);\r
this.tpOctopus.Location = new System.Drawing.Point(4, 24);\r
this.tpOctopus.Name = "tpOctopus";\r
this.tpOctopus.Padding = new System.Windows.Forms.Padding(3);\r
- this.tpOctopus.Size = new System.Drawing.Size(322, 348);\r
+ this.tpOctopus.Size = new System.Drawing.Size(322, 319);\r
this.tpOctopus.TabIndex = 0;\r
this.tpOctopus.Text = "Octopus";\r
- this.tpOctopus.UseVisualStyleBackColor = true;\r
// \r
// octopusIDSelector\r
// \r
- this.octopusIDSelector.BackColor = System.Drawing.Color.White;\r
+ this.octopusIDSelector.BackColor = System.Drawing.Color.Transparent;\r
this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.octopusIDSelector.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.octopusIDSelector.IDChangedEvent = null;\r
this.octopusIDSelector.Margin = new System.Windows.Forms.Padding(0);\r
this.octopusIDSelector.MinimumSize = new System.Drawing.Size(200, 300);\r
this.octopusIDSelector.Name = "octopusIDSelector";\r
- this.octopusIDSelector.Size = new System.Drawing.Size(316, 342);\r
+ this.octopusIDSelector.Size = new System.Drawing.Size(316, 313);\r
this.octopusIDSelector.TabIndex = 1;\r
// \r
// tpTraffic\r
// \r
+ this.tpTraffic.BackColor = System.Drawing.Color.Transparent;\r
this.tpTraffic.Controls.Add(this.trafficIDSelector);\r
this.tpTraffic.Location = new System.Drawing.Point(4, 24);\r
this.tpTraffic.Name = "tpTraffic";\r
this.tpTraffic.Padding = new System.Windows.Forms.Padding(3);\r
- this.tpTraffic.Size = new System.Drawing.Size(322, 348);\r
+ this.tpTraffic.Size = new System.Drawing.Size(322, 319);\r
this.tpTraffic.TabIndex = 1;\r
this.tpTraffic.Text = "Traffic";\r
- this.tpTraffic.UseVisualStyleBackColor = true;\r
// \r
// trafficIDSelector\r
// \r
this.trafficIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.trafficIDSelector.IDChangedEvent = null;\r
this.trafficIDSelector.Location = new System.Drawing.Point(3, 3);\r
- this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(4);\r
+ this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(0);\r
this.trafficIDSelector.Name = "trafficIDSelector";\r
- this.trafficIDSelector.Padding = new System.Windows.Forms.Padding(6);\r
- this.trafficIDSelector.Size = new System.Drawing.Size(316, 342);\r
+ this.trafficIDSelector.Size = new System.Drawing.Size(316, 313);\r
this.trafficIDSelector.TabIndex = 0;\r
// \r
- // tableLayoutPanel1\r
- // \r
- this.tableLayoutPanel1.ColumnCount = 2;\r
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
- this.tableLayoutPanel1.Controls.Add(this.btnLookupMetadata, 0, 1);\r
- this.tableLayoutPanel1.Controls.Add(this.mbActions, 0, 0);\r
- this.tableLayoutPanel1.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
- this.tableLayoutPanel1.Controls.Add(this.textSelectedMetadata, 0, 1);\r
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
- this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 399);\r
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);\r
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
- this.tableLayoutPanel1.RowCount = 2;\r
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.tableLayoutPanel1.Size = new System.Drawing.Size(330, 62);\r
- this.tableLayoutPanel1.TabIndex = 4;\r
+ // pMetadataDisplay\r
+ // \r
+ this.pMetadataDisplay.ColumnCount = 2;\r
+ this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+ this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+ this.pMetadataDisplay.Controls.Add(this.btnLookupMetadata, 1, 2);\r
+ this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 1);\r
+ this.pMetadataDisplay.Controls.Add(this.textSelectedMetadata, 0, 2);\r
+ this.pMetadataDisplay.Controls.Add(this.tsMetadata, 0, 0);\r
+ this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+ this.pMetadataDisplay.Location = new System.Drawing.Point(10, 370);\r
+ this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0);\r
+ this.pMetadataDisplay.Name = "pMetadataDisplay";\r
+ this.pMetadataDisplay.RowCount = 3;\r
+ this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+ this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+ this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+ this.pMetadataDisplay.Size = new System.Drawing.Size(330, 91);\r
+ this.pMetadataDisplay.TabIndex = 4;\r
// \r
// btnLookupMetadata\r
// \r
this.btnLookupMetadata.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
this.btnLookupMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);\r
this.btnLookupMetadata.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x;\r
- this.btnLookupMetadata.Location = new System.Drawing.Point(297, 29);\r
+ this.btnLookupMetadata.Location = new System.Drawing.Point(297, 59);\r
this.btnLookupMetadata.Name = "btnLookupMetadata";\r
this.btnLookupMetadata.Size = new System.Drawing.Size(30, 26);\r
this.btnLookupMetadata.TabIndex = 16;\r
this.btnLookupMetadata.UseVisualStyleBackColor = false;\r
this.btnLookupMetadata.Click += new System.EventHandler(this.OnLookupByMetadata);\r
// \r
- // mbActions\r
- // \r
- this.mbActions.BackColor = System.Drawing.Color.Transparent;\r
- this.mbActions.Cursor = System.Windows.Forms.Cursors.Hand;\r
- this.mbActions.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.mbActions.FlatAppearance.BorderSize = 0;\r
- this.mbActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
- this.mbActions.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.mbActions.Image = global::Maestro.Properties.Resources.ic_playlist_add_check_black_24dp_1x;\r
- this.mbActions.Location = new System.Drawing.Point(297, 0);\r
- this.mbActions.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);\r
- this.mbActions.Menu = this.ctxmActions;\r
- this.mbActions.Name = "mbActions";\r
- this.mbActions.Size = new System.Drawing.Size(30, 26);\r
- this.mbActions.TabIndex = 15;\r
- this.mbActions.UseVisualStyleBackColor = false;\r
- // \r
// labelSelectedMetadata\r
// \r
this.labelSelectedMetadata.AutoSize = true;\r
this.labelSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.labelSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0);\r
+ this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 31);\r
this.labelSelectedMetadata.Name = "labelSelectedMetadata";\r
this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);\r
- this.labelSelectedMetadata.Size = new System.Drawing.Size(288, 26);\r
+ this.labelSelectedMetadata.Size = new System.Drawing.Size(288, 25);\r
this.labelSelectedMetadata.TabIndex = 13;\r
this.labelSelectedMetadata.Text = "Selected metadata";\r
// \r
this.textSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
this.textSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.textSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.textSelectedMetadata.Location = new System.Drawing.Point(3, 29);\r
+ this.textSelectedMetadata.Location = new System.Drawing.Point(3, 59);\r
this.textSelectedMetadata.Name = "textSelectedMetadata";\r
this.textSelectedMetadata.Size = new System.Drawing.Size(288, 26);\r
this.textSelectedMetadata.TabIndex = 12;\r
this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnMetadataIDChanged);\r
// \r
+ // tsMetadata\r
+ // \r
+ this.pMetadataDisplay.SetColumnSpan(this.tsMetadata, 2);\r
+ this.tsMetadata.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
+ this.tsMetadata.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+ this.btnEditMetadata,\r
+ this.btnDefineSegments});\r
+ this.tsMetadata.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;\r
+ this.tsMetadata.Location = new System.Drawing.Point(0, 0);\r
+ this.tsMetadata.Name = "tsMetadata";\r
+ this.tsMetadata.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
+ this.tsMetadata.RightToLeft = System.Windows.Forms.RightToLeft.Yes;\r
+ this.tsMetadata.Size = new System.Drawing.Size(330, 31);\r
+ this.tsMetadata.TabIndex = 17;\r
+ // \r
+ // btnEditMetadata\r
+ // \r
+ this.btnEditMetadata.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;\r
+ this.btnEditMetadata.Image = global::Maestro.Properties.Resources.ic_receipt_black_24dp_1x;\r
+ this.btnEditMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+ this.btnEditMetadata.ImageTransparentColor = System.Drawing.Color.GreenYellow;\r
+ this.btnEditMetadata.Name = "btnEditMetadata";\r
+ this.btnEditMetadata.Size = new System.Drawing.Size(28, 28);\r
+ this.btnEditMetadata.Text = "toolStripButton2";\r
+ this.btnEditMetadata.ToolTipText = "Metaadat";\r
+ this.btnEditMetadata.Click += new System.EventHandler(this.OnEditMetadata);\r
+ // \r
+ // btnDefineSegments\r
+ // \r
+ this.btnDefineSegments.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;\r
+ this.btnDefineSegments.Image = global::Maestro.Properties.Resources.ic_playlist_add_check_black_24dp_1x;\r
+ this.btnDefineSegments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+ this.btnDefineSegments.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+ this.btnDefineSegments.Name = "btnDefineSegments";\r
+ this.btnDefineSegments.Size = new System.Drawing.Size(28, 28);\r
+ this.btnDefineSegments.Text = "toolStripButton3";\r
+ this.btnDefineSegments.ToolTipText = "Szegmensek";\r
+ this.btnDefineSegments.Click += new System.EventHandler(this.OnDefineSegments);\r
+ // \r
// groupTarget\r
// \r
this.groupTarget.BackColor = System.Drawing.Color.Transparent;\r
this.tabSystem.Controls.Add(this.tabPage1);\r
this.tabSystem.Controls.Add(this.tabPage2);\r
this.tabSystem.Dock = System.Windows.Forms.DockStyle.Fill;\r
+ this.tabSystem.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.tabSystem.Location = new System.Drawing.Point(10, 23);\r
this.tabSystem.Name = "tabSystem";\r
this.tabSystem.SelectedIndex = 0;\r
// tabPage1\r
// \r
this.tabPage1.Controls.Add(this.dgJobs);\r
- this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
+ this.tabPage1.Location = new System.Drawing.Point(4, 24);\r
this.tabPage1.Name = "tabPage1";\r
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);\r
- this.tabPage1.Size = new System.Drawing.Size(994, 98);\r
+ this.tabPage1.Size = new System.Drawing.Size(994, 96);\r
this.tabPage1.TabIndex = 0;\r
this.tabPage1.Text = global::Maestro.StringResources.FOLYAMATOK;\r
this.tabPage1.UseVisualStyleBackColor = true;\r
this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
this.dgJobs.BackgroundColor = System.Drawing.Color.White;\r
this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
- dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
- this.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;\r
this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
this.columnLabel,\r
this.columnOutput,\r
this.columnKillDate});\r
this.dgJobs.DataSource = this.bindingSourceJobs;\r
- dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText;\r
- dataGridViewCellStyle21.NullValue = null;\r
- dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black;\r
- dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgJobs.DefaultCellStyle = dataGridViewCellStyle21;\r
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;\r
+ dataGridViewCellStyle6.NullValue = null;\r
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black;\r
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgJobs.DefaultCellStyle = dataGridViewCellStyle6;\r
this.dgJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.dgJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
this.dgJobs.EnableHeadersVisualStyles = false;\r
this.dgJobs.GridColor = System.Drawing.Color.White;\r
this.dgJobs.Location = new System.Drawing.Point(3, 3);\r
this.dgJobs.Name = "dgJobs";\r
- dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
- this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle22;\r
this.dgJobs.RowHeadersVisible = false;\r
- dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle23;\r
+ dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle7;\r
this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgJobs.Size = new System.Drawing.Size(988, 92);\r
+ this.dgJobs.Size = new System.Drawing.Size(988, 90);\r
this.dgJobs.TabIndex = 0;\r
this.dgJobs.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridJobs_CellEnter);\r
this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick);\r
// \r
this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
this.columnID.DataPropertyName = "ID";\r
- dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.columnID.DefaultCellStyle = dataGridViewCellStyle19;\r
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.columnID.DefaultCellStyle = dataGridViewCellStyle4;\r
this.columnID.HeaderText = "ID";\r
this.columnID.Name = "columnID";\r
this.columnID.Width = 44;\r
// \r
this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
this.columnStatus.DataPropertyName = "Status";\r
- dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.columnStatus.DefaultCellStyle = dataGridViewCellStyle20;\r
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.columnStatus.DefaultCellStyle = dataGridViewCellStyle5;\r
this.columnStatus.HeaderText = "Status";\r
this.columnStatus.Name = "columnStatus";\r
this.columnStatus.Width = 66;\r
// tabPage2\r
// \r
this.tabPage2.Controls.Add(this.dgMessages);\r
- this.tabPage2.Location = new System.Drawing.Point(4, 22);\r
+ this.tabPage2.Location = new System.Drawing.Point(4, 24);\r
this.tabPage2.Name = "tabPage2";\r
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
- this.tabPage2.Size = new System.Drawing.Size(994, 98);\r
+ this.tabPage2.Size = new System.Drawing.Size(994, 96);\r
this.tabPage2.TabIndex = 1;\r
this.tabPage2.Text = global::Maestro.StringResources.UZENETEK;\r
this.tabPage2.UseVisualStyleBackColor = true;\r
this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
this.dgMessages.BackgroundColor = System.Drawing.Color.White;\r
this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
- dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
- this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24;\r
this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
this.dataGridViewTextBoxColumn1,\r
this.dataGridViewTextBoxColumn2});\r
- dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Red;\r
- dataGridViewCellStyle26.NullValue = null;\r
- dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle26.SelectionForeColor = System.Drawing.Color.Red;\r
- dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgMessages.DefaultCellStyle = dataGridViewCellStyle26;\r
+ dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red;\r
+ dataGridViewCellStyle9.NullValue = null;\r
+ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red;\r
+ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9;\r
this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
this.dgMessages.EnableHeadersVisualStyles = false;\r
this.dgMessages.Location = new System.Drawing.Point(3, 3);\r
this.dgMessages.Name = "dgMessages";\r
this.dgMessages.ReadOnly = true;\r
- dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
- this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle27;\r
this.dgMessages.RowHeadersVisible = false;\r
- dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle28;\r
+ dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgMessages.Size = new System.Drawing.Size(988, 92);\r
+ this.dgMessages.Size = new System.Drawing.Size(988, 90);\r
this.dgMessages.TabIndex = 1;\r
// \r
// dataGridViewTextBoxColumn1\r
// \r
this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
- dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle25;\r
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8;\r
this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
this.pSourceFilter.ResumeLayout(false);\r
this.pSourceFilter.PerformLayout();\r
((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).EndInit();\r
- this.tableLayoutPanel2.ResumeLayout(false);\r
- this.tableLayoutPanel2.PerformLayout();\r
- this.ctxmActions.ResumeLayout(false);\r
+ this.pSourceDisplay.ResumeLayout(false);\r
+ this.pSourceDisplay.PerformLayout();\r
+ this.tsSource.ResumeLayout(false);\r
+ this.tsSource.PerformLayout();\r
this.scOperations.Panel1.ResumeLayout(false);\r
this.scOperations.Panel2.ResumeLayout(false);\r
((System.ComponentModel.ISupportInitialize)(this.scOperations)).EndInit();\r
this.tpOctopus.ResumeLayout(false);\r
this.tpTraffic.ResumeLayout(false);\r
this.tpTraffic.PerformLayout();\r
- this.tableLayoutPanel1.ResumeLayout(false);\r
- this.tableLayoutPanel1.PerformLayout();\r
+ this.pMetadataDisplay.ResumeLayout(false);\r
+ this.pMetadataDisplay.PerformLayout();\r
+ this.tsMetadata.ResumeLayout(false);\r
+ this.tsMetadata.PerformLayout();\r
this.groupTarget.ResumeLayout(false);\r
this.pExecute.ResumeLayout(false);\r
this.scMain.Panel1.ResumeLayout(false);\r
private System.Windows.Forms.TabPage tpTraffic;\r
private System.Windows.Forms.BindingSource metadataInfoBindingSource;\r
private System.Windows.Forms.Panel pExecute;\r
- private System.Windows.Forms.ContextMenuStrip ctxmActions;\r
- private System.Windows.Forms.ToolStripMenuItem ctxiDefineSegments;\r
- private System.Windows.Forms.ToolStripMenuItem ctxiModifyArchiveMetadata;\r
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;\r
+ private System.Windows.Forms.TableLayoutPanel pSourceDisplay;\r
private System.Windows.Forms.Label label1;\r
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
+ private System.Windows.Forms.TableLayoutPanel pMetadataDisplay;\r
private TrafficClient.TrafficIDSelector trafficIDSelector;\r
private System.Windows.Forms.Button btnLookupBySource;\r
private System.Windows.Forms.TabControl tabSystem;\r
private System.Windows.Forms.TableLayoutPanel pSourceFilter;\r
private System.Windows.Forms.TextBox txtSourceFilter;\r
private System.Windows.Forms.PictureBox picClearFilter;\r
- private MenuButton mbActions;\r
private System.Windows.Forms.Button btnLookupMetadata;\r
+ private System.Windows.Forms.ToolStrip tsMetadata;\r
+ private System.Windows.Forms.ToolStripButton btnEditMetadata;\r
+ private System.Windows.Forms.ToolStripButton btnDefineSegments;\r
+ private System.Windows.Forms.ToolStrip tsSource;\r
+ private System.Windows.Forms.ToolStripButton btnShowFolders;\r
+ private System.Windows.Forms.TreeView treeFolders;\r
+ private System.Windows.Forms.ImageList ilFolders;\r
}\r
}\r
\r
mediaCubeApi = new MediaCubeApi(metadata.Server.Address.ToString(), metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout, errorMessageBus);\r
}\r
\r
- private void OnArchiveMetadataClick(object sender, EventArgs e) {\r
+ private void OnEditMetadata(object sender, EventArgs e) {\r
if (archiveMetadata == null)\r
archiveMetadata = GetArchiveMetadata();\r
\r
return;\r
}\r
\r
- ArchiveMetadataForm form = new ArchiveMetadataForm(archiveMetadata);\r
+ ArchiveMetadataForm form = new ArchiveMetadataForm(ref archiveMetadata);\r
DialogResult result = form.ShowDialog();\r
- if (result == DialogResult.OK && String.IsNullOrEmpty(textSelectedMetadata.Text))\r
+\r
+ if (result == DialogResult.OK && String.IsNullOrEmpty(textSelectedMetadata.Text)) {\r
+ ArchiveMetadata saved = archiveMetadata;\r
textSelectedMetadata.Text = archiveMetadata.itemHouseId;\r
+ archiveMetadata = saved;\r
+ SelectedMetadata.MetadataText = archiveMetadata.itemTitle;\r
+ }\r
+ UpdateEditArchiveMetadataStatus();\r
}\r
\r
private MetadataType GuessMetadataType(string id) {\r
return MetadataType.MediaCube;\r
}\r
\r
- private void OnDefineSegmentsClick(object sender, EventArgs e) {\r
+ private void OnDefineSegments(object sender, EventArgs e) {\r
if (SelectedSource?.FileInfo == null)\r
return;\r
Cursor = Cursors.WaitCursor;\r
Cursor = Cursors.Default;\r
player.ShowDialog();\r
CreateSegments(movieSegments);\r
+ UpdateDefineSegmentsStatus();\r
+ }\r
+\r
+ private void UpdateDefineSegmentsStatus() {\r
+ if(segments == null || segments.Count == 0)\r
+ btnDefineSegments.Image = Properties.Resources.ic_playlist_add_check_black_24dp_1x;\r
+ else\r
+ btnDefineSegments.Image = Properties.Resources.ic_playlist_add_check_black_24dp_1x_green;\r
+ }\r
+\r
+ private void UpdateEditArchiveMetadataStatus() {\r
+ if (archiveMetadata == null || !archiveMetadata.IsFilled)\r
+ btnEditMetadata.Image = Properties.Resources.ic_receipt_black_24dp_1x;\r
+ else\r
+ btnEditMetadata.Image = Properties.Resources.ic_receipt_black_24dp_1x_green;\r
}\r
\r
private void CreateSegments(BindingList<MovieSegment> movieSegments) {\r
config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
if (config == null)\r
return;\r
- if (!octopusIDSelector.LookupByPlaceHolder(id))\r
- MessageBox.Show("Nincs találat.");\r
+ octopusIDSelector.LookupByPlaceHolder(id);\r
break;\r
case MetadataType.OctopusStory:\r
config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
if (config == null)\r
return;\r
- if (!octopusIDSelector.LookupByStory(id))\r
- MessageBox.Show("Nincs találat.");\r
+ octopusIDSelector.LookupByStory(id);\r
break;\r
}\r
}\r
\r
private void UpdateEditArchiveMetadataEnabled() {\r
- ctxiModifyArchiveMetadata.Enabled = SelectedSource != null;\r
+ btnEditMetadata.Enabled = SelectedSource != null;\r
+ UpdateEditArchiveMetadataStatus();\r
}\r
\r
private void UpdateDefineSegmentEnabled() {\r
- ctxiDefineSegments.Enabled =\r
+ btnDefineSegments.Enabled =\r
Configuration.Player != null &&\r
Configuration.Player.SegmentEditor &&\r
SelectedSource != null &&\r
SelectedSource.FileInfo != null &&\r
SelectedMetadata != null &&\r
validTypes.ToList().Contains(SelectedMetadata.Kind);\r
+ UpdateDefineSegmentsStatus();\r
}\r
\r
private void UpdateLookupByMetadataEnabled() {\r
using MaestroShared.Metadata;\r
using System;\r
using System.Collections.Generic;\r
+using System.Diagnostics;\r
using System.Drawing;\r
using System.IO;\r
using System.Linq;\r
formTooltip.SetToolTip(groupSource, remoteAddress?.ToString());\r
\r
if (Configuration?.Source is UNCSource) {\r
+ btnShowFolders.Enabled = true;\r
logger.Debug("UNC source initialization");\r
source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, Configuration.Source.Filter);\r
logger.Debug("UNC source created");\r
}\r
if (Configuration?.Source is NEXIOSource) {\r
+ btnShowFolders.Enabled = false;\r
logger.Debug("NEXIO source initialization");\r
source = new NexioRESTSource(this, MessageBus, Configuration.Source.Filter);\r
logger.Debug("NEXIO source created");\r
dgSource.Columns.AddRange(source.Columns);\r
}\r
\r
+ private string GetLastSegment(string path) {\r
+ Uri uri = new Uri(path);\r
+ return uri.Segments[uri.Segments.Length - 1];\r
+ }\r
+\r
+ private void ShowFolders() {\r
+ dgSource.Visible = false;\r
+ treeFolders.Visible = true;\r
+ treeFolders.Dock = DockStyle.Fill;\r
+ FileSystemSource source = bindingSource.DataSource as FileSystemSource;\r
+ if (source == null) {\r
+ HideFolders();\r
+ btnShowFolders.CheckState = CheckState.Unchecked;\r
+ }\r
+ Uri address = Configuration.Source.Local.Address;\r
+ string[] folders = Directory.GetDirectories(address.LocalPath);\r
+ TreeNode rootNode = treeFolders.Nodes.Add(GetLastSegment(Configuration.Source.Local.Address.ToString()));\r
+ foreach (var folder in folders) {\r
+ TreeNode folderNode = rootNode.Nodes.Add(GetLastSegment(folder));\r
+ folderNode.Nodes.Add("..");\r
+ folderNode.ImageIndex = 0;\r
+ \r
+ }\r
+ }\r
+\r
+ private void HideFolders() {\r
+ dgSource.Visible = true;\r
+ treeFolders.Visible = false;\r
+ treeFolders.Nodes.Clear();\r
+ }\r
+\r
+ private void OnShowFolders(object sender, EventArgs e) {\r
+ if (btnShowFolders.CheckState == CheckState.Checked) {\r
+ HideFolders();\r
+ btnShowFolders.CheckState = CheckState.Unchecked;\r
+ } else {\r
+ ShowFolders();\r
+ btnShowFolders.CheckState = CheckState.Checked;\r
+ }\r
+ }\r
+\r
private void dataGridSource_CellMouseEnter(object sender, DataGridViewCellEventArgs e) {\r
if (e.RowIndex > -1 && IsPlayColumn(e.ColumnIndex))\r
dgSource.Cursor = Cursors.Hand;\r
if (selectedrows == null)\r
return;\r
if (e.ColumnIndex == 0) {\r
- \r
+\r
UpdateCheckStates(selectedrows);\r
return;\r
}\r
catch (Exception ex) {\r
MessageBox.Show(ex.Message);\r
}\r
- \r
+\r
dgSource.Enabled = true;\r
}\r
}\r
else\r
item.IsChecked = checkedCount == selectedRows.Count ? false : true;\r
\r
- if (item.IsChecked)\r
- selectedSourceRows.Add(row);\r
- else\r
- selectedSourceRows.Remove(row);\r
+ if (item.IsChecked) {\r
+ if (!selectedSourceRows.Contains(row)) {\r
+ selectedSourceRows.Add(row);\r
+ Debug.WriteLine("Added " + AsISourceItem(row).Name);\r
+ }\r
+ } else {\r
+ if (selectedSourceRows.Contains(row)) {\r
+ selectedSourceRows.Remove(row);\r
+ Debug.WriteLine("Removed " + AsISourceItem(row).Name);\r
+ }\r
+ }\r
}\r
SetSelectedSource();\r
}\r
string selectionPrefix = null;\r
string selectedNames = String.Empty;\r
foreach (DataGridViewRow actual in selectedSourceRows) {\r
- string name = (actual.DataBoundItem as ISourceItem).Name;\r
+ string name = (actual.DataBoundItem as ISourceItem)?.Name;\r
+ if (String.IsNullOrEmpty(name))\r
+ continue;\r
selectedNames += name + " ";\r
string currentPrefix = GetPrefix(name);\r
if (selectionPrefix == null)\r
private bool EnsureMetadata(Target target) {\r
if ((target.SaveArchiveMetadata || target.SaveMorpheusMetadata || target.NexioServer) && (archiveMetadata == null || !archiveMetadata.IsFilled)) {\r
archiveMetadata = GetArchiveMetadata();\r
+ UpdateEditArchiveMetadataStatus();\r
if (archiveMetadata == null) {\r
MessageBox.Show(String.Format("A {0} folyamat nem futtatható kísérő adatok nélkül.", target.Label));\r
return false;\r
public IMessageBus MessageBus { get; set; }\r
private IMessageBus errorMessageBus = new MessageBus();\r
private ToolTip formTooltip = new ToolTip();\r
-\r
private ConfigurationInfo configuration;\r
+\r
+ private static readonly Color highlightColor = Color.White;\r
+ private static readonly Color defaultColor = SystemColors.Control;\r
+\r
+\r
public ConfigurationInfo Configuration {\r
get { return configuration; }\r
set {\r
//columnProgress.HeaderText = StringResources.ALLAPOT;\r
columnStatus.HeaderText = StringResources.STATUSZ;\r
columnLabel.HeaderText = StringResources.CIM;\r
- ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA;\r
- ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK;\r
+ //ctxiDefineSegments.Text = StringResources.SZEGMENS_LETREHOZASA;\r
+ //ctxiModifyArchiveMetadata.Text = StringResources.ARCHIV_METAADATOK;\r
}\r
\r
private void InitializeComponents() {\r
InitializeTarget();\r
InitializeJobs();\r
InitializeControlTexts();\r
+\r
+ SetColor(groupMetadata, defaultColor);\r
+ SetColor(groupTarget, defaultColor);\r
+ SetColor(groupActions, defaultColor);\r
+ \r
}\r
\r
private void OnMessage(IMessage message) {\r
\r
private void groupBox_Enter(object sender, EventArgs e) {\r
Control control = sender as Control;\r
- control.Font = new Font(control.Font, FontStyle.Regular);\r
- control.BackColor = Color.White;\r
+ control.Font = new Font(control.Font, FontStyle.Bold);\r
+ SetColor(control, highlightColor);\r
+ }\r
+\r
+ private void SetColor(Control control, Color color) {\r
+ if (textSelectedSource.Equals(control) || textSelectedMetadata.Equals(control) || btnExecute.Equals(control))\r
+ return;\r
+ if (control is DataGridView) {\r
+ DataGridView dataGridView = control as DataGridView;\r
+ dataGridView.BackgroundColor = color;\r
+ dataGridView.DefaultCellStyle.BackColor = color;\r
+ } else\r
+ if (control is DateTimePicker) {\r
+ DateTimePicker dateTimePicker = control as DateTimePicker;\r
+ dateTimePicker.CalendarMonthBackground = color;\r
+ } else\r
+ control.BackColor = color;\r
+ if (control.HasChildren) {\r
+ foreach (Control child in control.Controls) {\r
+ SetColor(child, color);\r
+ }\r
+ }\r
}\r
\r
private void groupBox_Leave(object sender, EventArgs e) {\r
else\r
control = sender as Control;\r
control.Font = new Font(control.Font, FontStyle.Regular);\r
- control.BackColor = Color.Transparent;\r
+ SetColor(control, defaultColor);\r
}\r
\r
private void MaestroForm_FormClosed(object sender, FormClosedEventArgs e) {\r
<metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
<value>17, 17</value>\r
</metadata>\r
+ <metadata name="ilFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <value>1049, 17</value>\r
+ </metadata>\r
+ <data name="ilFolders.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
+ <value>\r
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc\r
+ BwAAAk1TRnQBSQFMAwEBAAEQAQABEAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
+ AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA\r
+ AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA\r
+ AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm\r
+ AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ\r
+ AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm\r
+ AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz\r
+ AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm\r
+ AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm\r
+ AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA\r
+ ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm\r
+ AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm\r
+ ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm\r
+ AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA\r
+ AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ\r
+ AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz\r
+ AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/\r
+ AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA\r
+ AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM\r
+ AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm\r
+ ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ\r
+ AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/\r
+ ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM\r
+ ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm\r
+ AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM\r
+ AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA\r
+ AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA\r
+ ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7\r
+ Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/+CAAH/AQcK7wEHAfQyAAEH\r
+ DAABETIAAe8LAAHvMwAB7wsAAe8zAAHvCwAB7zMAAe8LAAHvMwAB7wsAAe8zAAHvCwAB7zMAAe8BAArv\r
+ AW0BDjIAAe8LAAEOAfEyAAHxAQ4EAAHv+AABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA\r
+ FwAD/wEAAv8GAAL/BgABgAEBBgABgAEBBgABnwH5BgABnwH5BgABnwH5BgABnwH5BgABnwH5BgABnwH5\r
+ BgABgAEBBgABgAEBBgABgAH/BgAC/wYAAv8GAAL/BgAL\r
+</value>\r
+ </data>\r
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
<data name="picClearFilter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
<value>\r
3/jmkprcKEuYE8aOir3NRGolzAnzVFoPuyGPLs5GSj/4XULq1sxx1wAAAABJRU5ErkJggg==\r
</value>\r
</data>\r
- <metadata name="ctxmActions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
- <value>512, 17</value>\r
+ <metadata name="tsSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <value>951, 17</value>\r
+ </metadata>\r
+ <metadata name="tsMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <value>846, 17</value>\r
</metadata>\r
<metadata name="columnLabel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
<value>True</value>\r
public static string UserName { get; set; }\r
\r
public TrayApplicationContext() {\r
- string str = Regex.Replace("Aéá.ú-óüöA", "[^0-9A-Za-z-._]", "_");\r
- Debug.WriteLine(str);\r
}\r
\r
private bool HasCommandlineParameter(string parameter) {\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.1")]\r
-[assembly: AssemblyFileVersion("2.0.1")]\r
+[assembly: AssemblyVersion("2.0.2.1")]\r
+[assembly: AssemblyFileVersion("2.0.2.1")]\r
}\r
}\r
\r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_folder_open_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_folder_open_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_list_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_list_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_note_add_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_note_add_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
}\r
}\r
\r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_playlist_add_check_black_24dp_1x_green {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_playlist_add_check_black_24dp_1x_green", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_receipt_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_receipt_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_receipt_black_24dp_1x_green {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_receipt_black_24dp_1x_green", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_reorder_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_reorder_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
- internal static System.Drawing.Bitmap mediacube_logo_v2_half_hard_edge {\r
+ internal static System.Drawing.Bitmap ic_settings_black_24dp_1x {\r
get {\r
- object obj = ResourceManager.GetObject("mediacube_logo_v2_half_hard_edge", resourceCulture);\r
+ object obj = ResourceManager.GetObject("ic_settings_black_24dp_1x", resourceCulture);\r
return ((System.Drawing.Bitmap)(obj));\r
}\r
}\r
\r
/// <summary>\r
- /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
- internal static System.Drawing.Icon Pause {\r
+ internal static System.Drawing.Bitmap ic_subject_black_24dp_1x {\r
get {\r
- object obj = ResourceManager.GetObject("Pause", resourceCulture);\r
- return ((System.Drawing.Icon)(obj));\r
+ object obj = ResourceManager.GetObject("ic_subject_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
}\r
}\r
\r
/// <summary>\r
- /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
- internal static System.Drawing.Icon Play {\r
+ internal static System.Drawing.Bitmap ic_toc_black_24dp_1x {\r
get {\r
- object obj = ResourceManager.GetObject("Play", resourceCulture);\r
- return ((System.Drawing.Icon)(obj));\r
+ object obj = ResourceManager.GetObject("ic_toc_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_view_headline_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_view_headline_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap mediacube_logo_v2_half_hard_edge {\r
+ get {\r
+ object obj = ResourceManager.GetObject("mediacube_logo_v2_half_hard_edge", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
}\r
}\r
\r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).\r
/// </summary>\r
- internal static System.Drawing.Icon Stop {\r
+ internal static System.Drawing.Icon Play {\r
get {\r
- object obj = ResourceManager.GetObject("Stop", resourceCulture);\r
+ object obj = ResourceManager.GetObject("Play", resourceCulture);\r
return ((System.Drawing.Icon)(obj));\r
}\r
}\r
<data name="ic_clear_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_clear_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
- <value>..\Resources\Pause.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
- </data>\r
<data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\Play.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
- <value>..\Resources\Stop.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
- </data>\r
<data name="ic_search_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_search_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
<data name="mediacube_logo_v2_half_hard_edge" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\mediacube_logo_v2_half_hard_edge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
+ <data name="ic_folder_open_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_folder_open_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_list_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_list_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_note_add_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_note_add_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_playlist_add_check_black_24dp_1x_green" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_playlist_add_check_black_24dp_1x_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_receipt_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_receipt_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_receipt_black_24dp_1x_green" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_receipt_black_24dp_1x_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_reorder_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_reorder_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_settings_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_settings_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_subject_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_subject_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_toc_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_toc_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
+ <data name="ic_view_headline_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_view_headline_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
</root>
\ No newline at end of file
private List<FileSourceItem> cache;\r
private BackgroundWorker pathWatcherWorker = new BackgroundWorker();\r
private string path;\r
+ private string rootPath;\r
FileSystemWatcher watcher;\r
\r
public DataGridViewColumn[] Columns {\r
}\r
\r
public ListSortDescriptionCollection SortDescriptions => null;\r
+\r
public ListSortDirection SortDirection { get; set; }\r
public PropertyDescriptor SortProperty { get; set; }\r
public bool SupportsAdvancedSorting => false;\r
}\r
\r
public void Startup(Uri address) {\r
- string path = address.LocalPath;\r
- this.path = path;\r
+ path = address.LocalPath;\r
+ rootPath = path;\r
pathWatcherWorker.RunWorkerAsync();\r
}\r
\r
Status = INPROGRESS;\r
//DateTime started = DateTime.Now;\r
string currentFile = GetOutputFilePath(workingDir, OutputName);\r
- if (FileExists(currentFile) && parameters.TargetConfig.DisableFileVersioning)\r
- DeleteFile(currentFile);\r
+ if (FileExists(currentFile) && parameters.TargetConfig.DisableFileVersioning) {\r
+ if (parameters.TargetConfig.NexioServer) {\r
+ 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."));\r
+ } else \r
+ DeleteFile(currentFile);\r
+ }\r
UploadFile();\r
//logger.Info("Spend (s):" + (DateTime.Now - started).TotalSeconds);\r
ExecuteCompleted();\r
string result = text\r
.Replace(PATTERN_ID, ID)\r
.Replace(PATTERN_IDROOT, idRoot)\r
- .Replace(PATTERN_TEXT, HYPHEN + RemoveDiacritics(parameters.MetadataText))\r
.Replace(PATTERN_SOURCENAME, Path.GetFileNameWithoutExtension(InputName))\r
.Replace(PATTERN_TIMESTAMP, DateTime.Now.ToString(DATETIME_FORMAT, CultureInfo.InvariantCulture))\r
.Replace(PATTERN_DATESTAMP, DateTime.Now.ToString(DATE_FORMAT_NODOTS, CultureInfo.InvariantCulture));\r
+\r
+ if (!String.IsNullOrEmpty(parameters.MetadataText))\r
+ result = result.Replace(PATTERN_TEXT, HYPHEN + RemoveDiacritics(parameters.MetadataText));\r
+\r
// replace hungarian and special characters\r
result = Regex.Replace(result, NORMALIZE_TEXT_PATTERN, UNDERSCORE);\r
if (result.Length > 100)\r
// \r
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
- this.BackColor = System.Drawing.Color.White;\r
+ this.BackColor = System.Drawing.Color.Transparent;\r
this.Controls.Add(this.treeOctopus);\r
this.Controls.Add(this.pSeparator);\r
this.Controls.Add(this.pSearch);\r
private OctopusAPI client;\r
public OnSelectedIDChanged IDChangedEvent { get; set; }\r
private OctopusConfiguration configuration;\r
+ private bool refreshDisabled;\r
\r
public OctopusConfiguration Configuration {\r
set {\r
continue;\r
foreach (MosObject mosObject in mosObjects) {\r
TreeNode placeHolderNode = storyNode.Nodes.Add(mosObject.ObjID, String.Format($"{mosObject.ObjID}"));\r
- placeHolderNode.Tag = mosObject.ID;\r
+ placeHolderNode.Tag = story;\r
if (configuration.DisablePlaceHolderCheck)\r
HideCheckBox(treeOctopus, placeHolderNode);\r
else {\r
\r
if (selectedNode.Checked) {\r
Story story = selectedNode.Tag as Story;\r
- string text = String.Format($"{story.Name}_{story.Format}");\r
+ string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}");\r
IDChangedEvent?.Invoke(story.ParentStoryID, selectedNode.Name, text);\r
} else\r
IDChangedEvent?.Invoke(null, null, null);\r
var rundown = client.GetRundownsByStoryID(storyId)?.FirstOrDefault();\r
if (rundown == null) {\r
var storyFolder = client.GetStoryFoldersByStoryID(storyId)?.FirstOrDefault();\r
- if (storyFolder == null)\r
- return false;\r
- rbStoryFolder.Checked = true;\r
- RefreshFolders();\r
- List<StoryFolder> storyFolders = cbFolders.DataSource as List<StoryFolder>;\r
- if (storyFolders == null)\r
- return false;\r
- var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault();\r
- if (folderToSelect == null)\r
- return false;\r
- lookupStoryId = storyId;\r
- cbFolders.SelectedItem = folderToSelect;\r
+ if (storyFolder != null) {\r
+ rbStoryFolder.Checked = true;\r
+ List<StoryFolder> storyFolders = cbFolders.DataSource as List<StoryFolder>;\r
+ if (storyFolders != null) {\r
+ var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault();\r
+ if (folderToSelect != null) {\r
+ lookupStoryId = storyId;\r
+ cbFolders.SelectedItem = folderToSelect;\r
+ }\r
+ }\r
+ }\r
} else {\r
- rbRundown.Checked = true;\r
+ refreshDisabled = true;\r
dtScheduled.Value = rundown.Start;\r
- RefreshFolders();\r
+ refreshDisabled = false;\r
+ rbRundown.Checked = true;\r
List<Rundown> rundowns = cbFolders.DataSource as List<Rundown>;\r
- if (rundowns == null)\r
- return false;\r
- var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault();\r
- if (rundownToSelect == null)\r
- return false;\r
- lookupStoryId = storyId;\r
- cbFolders.SelectedItem = rundownToSelect;\r
+ if (rundowns != null) {\r
+ var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault();\r
+ if (rundownToSelect != null) {\r
+ lookupStoryId = storyId;\r
+ cbFolders.SelectedItem = rundownToSelect;\r
+ }\r
+ }\r
}\r
txtFilter.Text = lookupStoryId;\r
lookupStoryId = null;\r
+ if (selectedNode == null)\r
+ MessageBox.Show("Nincs találat.");\r
return selectedNode != null;\r
}\r
\r
var rundown = client.GetRundownsByPlaceHolderId(placeHolderId)?.FirstOrDefault();\r
if (rundown == null) {\r
var storyFolder = client.GetStoryFoldersByPlaceHolderId(placeHolderId)?.FirstOrDefault();\r
- if (storyFolder == null)\r
- return false;\r
- rbStoryFolder.Checked = true;\r
- RefreshFolders();\r
- List<StoryFolder> storyFolders = cbFolders.DataSource as List<StoryFolder>;\r
- if (storyFolders == null)\r
- return false;\r
- var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault();\r
- if (folderToSelect == null)\r
- return false;\r
- lookupPlaceHolderId = placeHolderId;\r
- cbFolders.SelectedItem = folderToSelect;\r
+ if (storyFolder != null) {\r
+ rbStoryFolder.Checked = true;\r
+ List<StoryFolder> storyFolders = cbFolders.DataSource as List<StoryFolder>;\r
+ if (storyFolders != null) {\r
+ var folderToSelect = storyFolders.Where(f => f.ID.Equals(storyFolder.ID)).FirstOrDefault();\r
+ if (folderToSelect != null) {\r
+ lookupPlaceHolderId = placeHolderId;\r
+ cbFolders.SelectedItem = folderToSelect;\r
+ }\r
+ }\r
+ }\r
+ \r
} else {\r
- rbRundown.Checked = true;\r
+ refreshDisabled = true;\r
dtScheduled.Value = rundown.Start;\r
- RefreshFolders();\r
+ refreshDisabled = false;\r
+ rbRundown.Checked = true;\r
List<Rundown> rundowns = cbFolders.DataSource as List<Rundown>;\r
- if (rundowns == null)\r
- return false;\r
- var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault();\r
- if (rundownToSelect == null)\r
- return false;\r
- lookupPlaceHolderId = placeHolderId;\r
- cbFolders.SelectedItem = rundownToSelect;\r
+ if (rundowns != null) {\r
+ var rundownToSelect = rundowns.Where(f => f.ID.Equals(rundown.ID)).FirstOrDefault();\r
+ if (rundownToSelect != null) {\r
+ lookupPlaceHolderId = placeHolderId;\r
+ cbFolders.SelectedItem = rundownToSelect;\r
+ }\r
+ }\r
+ \r
}\r
txtFilter.Text = lookupPlaceHolderId;\r
lookupPlaceHolderId = null;\r
+ if (selectedNode == null)\r
+ MessageBox.Show("Nincs találat.");\r
return selectedNode != null;\r
}\r
\r
}\r
\r
private void RefreshFolders() {\r
+ if (refreshDisabled)\r
+ return;\r
ClearSelection();\r
Cursor.Current = Cursors.WaitCursor;\r
if (rbRundown.Checked) {\r
<Prefer32Bit>true</Prefer32Bit>\r
</PropertyGroup>\r
<PropertyGroup>\r
- <ApplicationIcon>\r
- </ApplicationIcon>\r
+ <ApplicationIcon>maestro.ico</ApplicationIcon>\r
</PropertyGroup>\r
<ItemGroup>\r
<Reference Include="System" />\r
<None Include="App.config" />\r
</ItemGroup>\r
<ItemGroup>\r
- <Content Include="mediacube_logo_small_yellow.ico" />\r
+ <Content Include="maestro.ico" />\r
</ItemGroup>\r
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
</Project>
\ No newline at end of file
private void InitializeComponent()\r
{\r
this.components = new System.ComponentModel.Container();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
this.dtScheduled = new System.Windows.Forms.DateTimePicker();\r
this.txtFilter = new System.Windows.Forms.TextBox();\r
// pSearch\r
// \r
this.pSearch.AutoSize = true;\r
+ this.pSearch.BackColor = System.Drawing.Color.Transparent;\r
this.pSearch.ColumnCount = 2;\r
this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
this.dgTraffic.BackgroundColor = System.Drawing.Color.White;\r
this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;\r
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;\r
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;\r
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
this.dgTraffic.DataSource = this.trafficAPIBindingSource;\r
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
- dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;\r
- dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black;\r
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle8;\r
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;\r
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black;\r
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle5;\r
this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
this.dgTraffic.EnableHeadersVisualStyles = false;\r
- this.dgTraffic.Location = new System.Drawing.Point(0, 72);\r
+ this.dgTraffic.Location = new System.Drawing.Point(0, 78);\r
this.dgTraffic.Margin = new System.Windows.Forms.Padding(0);\r
this.dgTraffic.MultiSelect = false;\r
this.dgTraffic.Name = "dgTraffic";\r
this.dgTraffic.RowHeadersVisible = false;\r
- dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
- this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle9;\r
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+ this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6;\r
this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgTraffic.Size = new System.Drawing.Size(300, 328);\r
+ this.dgTraffic.Size = new System.Drawing.Size(300, 322);\r
this.dgTraffic.TabIndex = 0;\r
this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r
this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
this.AutoSize = true;\r
- this.BackColor = System.Drawing.Color.White;\r
- this.Controls.Add(this.pSeparator);\r
+ this.BackColor = System.Drawing.Color.Transparent;\r
this.Controls.Add(this.dgTraffic);\r
+ this.Controls.Add(this.pSeparator);\r
this.Controls.Add(this.pSearch);\r
this.Name = "TrafficIDSelector";\r
this.Size = new System.Drawing.Size(300, 400);\r
<Filters>\r
<MarkerFilter marker="MEDIACUBE" onMatch="DENY" onMismatch="NEUTRAL" />\r
</Filters>\r
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M %msg (%F:%L)%n %throwable" />\r
+ <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %level %logger{1}.%M %msg (%F:%L)%n %throwable" />\r
<Policies>\r
<TimeBasedTriggeringPolicy />\r
</Policies>\r
result.setMediaTitle(getMetadata(dbObject, MEDIA_TITLE));\r
result.setMediaDescription(getMetadata(dbObject, MEDIA_DESCRIPTION));\r
\r
- result.setMediaFile(mediaFilePath);\r
- result.setCatchedFile(catchedFilePath);\r
+ result.setMediaFile(mediaFilePath.toString());\r
+ result.setCatchedFile(catchedFilePath.toString());\r
\r
} catch (IOException e) {\r
logger.catching(e);\r
package user.jobengine.server.steps;\r
\r
+import java.io.File;\r
+\r
import org.apache.logging.log4j.LogManager;\r
import org.apache.logging.log4j.Logger;\r
\r
} catch (Exception e) {\r
logger.catching(e);\r
if (!archiveItem.removeCatchedFile())\r
- logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", archiveItem.getMediaFile().toFile().getName());\r
+ logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", new File(archiveItem.getMediaFile()).getName());\r
\r
throw e;\r
\r
package user.jobengine.server.steps;\r
\r
+import java.io.File;\r
import java.io.IOException;\r
-import java.nio.file.Path;\r
import java.sql.Timestamp;\r
import java.util.Date;\r
\r
public class TSMBackupStep extends JobStep {\r
private static final Logger logger = LogManager.getLogger();\r
private IItemManager manager;\r
- private Path sourceMediaFile;\r
+ private File sourceMediaFile;\r
private Store tsmStore;\r
private StoreUri targetUri;\r
private FileType fileType;\r
public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
try {\r
setAndCheck(archiveItem, mediaCubeMedia, jobEngine);\r
+ File sourceMediaFile = new File(archiveItem.getMediaFile());\r
\r
StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, sourceMediaFile.getParent().toString());\r
\r
evt.setCancel(!canContinue());\r
}\r
});\r
- String sourceFileName = sourceMediaFile.toFile().getName();\r
+ String sourceFileName = sourceMediaFile.getName();\r
RemoteFile remoteFile = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName);\r
\r
saveMetadata(mediaCubeMedia, sourceFileName);\r
- logger.info(getMarker(), "Az '{}' állomány archiválása sikeres.", archiveItem.getMediaFile().toFile().getName());\r
+ logger.info(getMarker(), "Az '{}' állomány archiválása sikeres.", sourceMediaFile.getName());\r
\r
if (killDateDays > 0) {\r
- KillDateFile killDateFile = new KillDateFile(sourceMediaFile.getParent().toString(), sourceMediaFile.getFileName().toString());\r
+ KillDateFile killDateFile = new KillDateFile(sourceMediaFile.getParent().toString(), sourceMediaFile.getName().toString());\r
killDateFile.create(killDateDays, getMarker());\r
}\r
} catch (Exception e) {\r
logger.catching(e);\r
- logger.error(getMarker(), "Az '{}' állomány archiválása sikertelen. A rendszer hibaüzenete: {}", archiveItem.getMediaFile().toFile().getName(),\r
- e.getMessage());\r
+ logger.error(getMarker(), "Az '{}' állomány archiválása sikertelen. A rendszer hibaüzenete: {}", sourceMediaFile.getName(), e.getMessage());\r
if (!archiveItem.removeCatchedFile())\r
logger.error(getMarker(),\r
"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!",\r
- archiveItem.getMediaFile().toFile().getName());\r
+ sourceMediaFile.getName());\r
throw e;\r
}\r
return null;\r
logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paramétere üres.");\r
throw new NullPointerException("System is not configured properly, missing 'archiveItem' input parameter.");\r
}\r
- sourceMediaFile = archiveItem.getMediaFile();\r
+ sourceMediaFile = new File(archiveItem.getMediaFile());\r
if (sourceMediaFile == null) {\r
logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paraméter 'mediaFile' értéke üres.");\r
throw new NullPointerException("System is not configured properly, missing 'mediaFile' value in 'archiveItem' input parameter.");\r
}\r
- if (!sourceMediaFile.toFile().exists()) {\r
- logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.toFile().getName());\r
- throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.toFile().getName()));\r
+ if (!sourceMediaFile.exists()) {\r
+ logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.getName());\r
+ throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.getName()));\r
}\r
tsmStore = manager.getSystemStore(false);\r
if (tsmStore == null) {\r
package user.jobengine.server.steps;\r
\r
+import java.io.File;\r
import java.io.IOException;\r
import java.net.URL;\r
import java.nio.file.Files;\r
// if (sourceStoreUri == null)\r
// throw new NullPointerException("System is not configured properly, low-res system store SMB store URI definition missing.");\r
\r
- Path inputPath = Paths.get(globalSourcePath, archiveItem.getMediaFile().toFile().getName());\r
+ Path inputPath = Paths.get(globalSourcePath, new File(archiveItem.getMediaFile()).getName());\r
String sourceFilePath = inputPath.toString();\r
// String outputPath = sourceStoreUri.getRootPath();\r
TranscodeRequest transcodeRequest = buildTranscodeRequest(projectFilePath, sourceFilePath);\r
try {\r
ensureIndexes();\r
Date lastUpdateTime = getLastUpdateTime();\r
- setLastUpdateTime(new Date());\r
\r
buildStoriesReferences();\r
\r
storeStoryFolders(storyFolders, lastUpdateTime);\r
}\r
deleteOrphanStories();\r
+ setLastUpdateTime(new Date());\r
} catch (Exception e) {\r
logger.catching(e);\r
throw e;\r
logger.trace(ENTER);\r
long rundownID = rundown.getLong(ID);\r
String name = rundown.containsKey(NAME) ? rundown.getString(NAME) : null;\r
-\r
+ logger.info("Checking rundown {} {}", name, rundown.get(SCHEDULED_START));\r
BasicDBObject rundownWithStories = queryRundown(rundownID);\r
BasicDBList stories = asDBList(rundownWithStories, SLUGS);\r
if (stories != null)\r
\r
public TSMLister(StoreUri storeUri) throws Exception {\r
client = new TSMBufferedClient();\r
- logger.info("TSMBufferedClient initialized!");\r
+ logger.info("TSMBufferedClient created!");\r
client.connect(storeUri.getUserName(), storeUri.getPassword());\r
logger.info("TSMBufferedClient connected!");\r
}\r
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);
}
}
\r
import java.io.File;\r
import java.io.Serializable;\r
-import java.nio.file.Path;\r
\r
public class ArchiveItem implements Serializable {\r
private static final long serialVersionUID = -7278747969491719357L;\r
private String mediaHouseId;\r
private String mediaTitle;\r
private String mediaDescription;\r
+ private String mediaFile = null;\r
+ private String catchedFile = null;\r
\r
- private Path mediaFile = null;\r
- private Path catchedFile = null;\r
-\r
- public Path getCatchedFile() {\r
+ public String getCatchedFile() {\r
return catchedFile;\r
}\r
\r
return mediaDescription;\r
}\r
\r
- public Path getMediaFile() {\r
+ public String getMediaFile() {\r
return mediaFile;\r
}\r
\r
public boolean removeCatchedFile() {\r
boolean result = false;\r
if (catchedFile != null) {\r
- File file = catchedFile.toFile();\r
+ File file = new File(catchedFile);\r
if (file.exists())\r
result = file.delete();\r
}\r
return result;\r
}\r
\r
- public void setCatchedFile(Path catchedFile) {\r
+ public void setCatchedFile(String catchedFile) {\r
this.catchedFile = catchedFile;\r
}\r
\r
this.mediaDescription = mediaDescription;\r
}\r
\r
- public void setMediaFile(Path mediaFile) {\r
+ public void setMediaFile(String mediaFile) {\r
this.mediaFile = mediaFile;\r
}\r
\r
https://git.useribm.hu / mediacube.git / commitdiff
