git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 5 Dec 2017 09:57:00 +0000 (09:57 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 5 Dec 2017 09:57:00 +0000 (09:57 +0000)
32 files changed:
client/AudioRecorder/AudioRecorder.csproj
client/AudioRecorder/Form1.Designer.cs [deleted file]
client/AudioRecorder/Form1.cs [deleted file]
client/Maestro/Configuration/-configuration-grafika.json [moved from client/Maestro/Configuration/configuration-grafika.json with 100% similarity]
client/Maestro/Configuration/configuration-archive.json [moved from client/Maestro/Configuration/-configuration-archive.json with 100% similarity]
client/Maestro/Configuration/configuration-sxs.json [moved from client/Maestro/Configuration/-configuration-sxs.json with 100% similarity]
client/Maestro/Maestro.csproj
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Metadata.cs
client/Maestro/MaestroForm.Source.cs
client/Maestro/MaestroForm.Target.cs
client/Maestro/MaestroForm.resx
client/Maestro/Properties/AssemblyInfo.cs
client/MaestroShared/Configuration/ConfigurationInfo.cs
client/MaestroShared/MaestroShared.csproj
client/MaestroShared/Metadata/ArchiveMetadata.cs
client/MaestroShared/Properties/Resources.Designer.cs
client/MaestroShared/Properties/Resources.resx
client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x.png [new file with mode: 0644]
client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x_green1.png [new file with mode: 0644]
client/MaestroShared/Resources/ic_receipt_black_24dp_1x.png [new file with mode: 0644]
client/MaestroShared/Resources/ic_receipt_black_24dp_1x_green.png [new file with mode: 0644]
client/MaestroShared/Resources/ic_search_black_24dp_1x.png [new file with mode: 0644]
client/MediaCube.sln
client/MetadataSelector/MetadataIDSelector.Designer.cs [new file with mode: 0644]
client/MetadataSelector/MetadataIDSelector.cs [new file with mode: 0644]
client/MetadataSelector/MetadataIDSelector.resx [moved from client/AudioRecorder/Form1.resx with 85% similarity]
client/MetadataSelector/MetadataSelector.csproj [new file with mode: 0644]
client/MetadataSelector/Properties/AssemblyInfo.cs [new file with mode: 0644]
client/OctopusClient/OctopusIDSelector.Designer.cs
client/PlanAIRClient/TrafficIDSelector.Designer.cs
client/PlanAIRClient/TrafficIDSelector.cs

index 13438689cafe99134821cf44744456bf1b405e51..409678afd685f4b53281b8caea06bee79362ee26 100644 (file)
     <Compile Include="OctopusIDSelectorForm.Designer.cs">\r
       <DependentUpon>OctopusIDSelectorForm.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Form1.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
-    <Compile Include="Form1.Designer.cs">\r
-      <DependentUpon>Form1.cs</DependentUpon>\r
-    </Compile>\r
     <Compile Include="IMainForm.cs" />\r
     <Compile Include="KnownTypesBinder.cs" />\r
     <Compile Include="MainForm.cs">\r
     <EmbeddedResource Include="OctopusIDSelectorForm.resx">\r
       <DependentUpon>OctopusIDSelectorForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Form1.resx">\r
-      <DependentUpon>Form1.cs</DependentUpon>\r
-    </EmbeddedResource>\r
     <EmbeddedResource Include="MainForm.resx">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
       <Project>{d4417174-f21e-4ce2-ae5c-8eb30c9a9625}</Project>\r
       <Name>MaestroShared</Name>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\MetadataSelector\MetadataSelector.csproj">\r
+      <Project>{8cb8266d-2229-47e2-b06d-54fde82cbdc4}</Project>\r
+      <Name>MetadataSelector</Name>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\OctopusClient\OctopusClient.csproj">\r
       <Project>{8cc7c930-9dbf-487b-aed5-776937a649d5}</Project>\r
       <Name>OctopusClient</Name>\r
diff --git a/client/AudioRecorder/Form1.Designer.cs b/client/AudioRecorder/Form1.Designer.cs
deleted file mode 100644 (file)
index 7f4d80d..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-namespace AudioRecorder {\r
-    partial class Form1 {\r
-        /// <summary>\r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary>\r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing) {\r
-            if (disposing && (components != null)) {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Windows Form Designer generated code\r
-\r
-        /// <summary>\r
-        /// Required method for Designer support - do not modify\r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent() {\r
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
-            this.checkBox1 = new System.Windows.Forms.CheckBox();\r
-            this.checkBox2 = new System.Windows.Forms.CheckBox();\r
-            this.checkBox3 = new System.Windows.Forms.CheckBox();\r
-            this.textBox1 = new System.Windows.Forms.TextBox();\r
-            this.flowLayoutPanel1.SuspendLayout();\r
-            this.SuspendLayout();\r
-            // \r
-            // flowLayoutPanel1\r
-            // \r
-            this.flowLayoutPanel1.Controls.Add(this.checkBox1);\r
-            this.flowLayoutPanel1.Controls.Add(this.checkBox2);\r
-            this.flowLayoutPanel1.Controls.Add(this.checkBox3);\r
-            this.flowLayoutPanel1.Controls.Add(this.textBox1);\r
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(305, 100);\r
-            this.flowLayoutPanel1.TabIndex = 0;\r
-            // \r
-            // checkBox1\r
-            // \r
-            this.checkBox1.Appearance = System.Windows.Forms.Appearance.Button;\r
-            this.checkBox1.AutoSize = true;\r
-            this.checkBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.checkBox1.Location = new System.Drawing.Point(3, 3);\r
-            this.checkBox1.Name = "checkBox1";\r
-            this.checkBox1.Size = new System.Drawing.Size(71, 23);\r
-            this.checkBox1.TabIndex = 0;\r
-            this.checkBox1.Text = "checkBox1";\r
-            this.checkBox1.UseVisualStyleBackColor = true;\r
-            // \r
-            // checkBox2\r
-            // \r
-            this.checkBox2.Appearance = System.Windows.Forms.Appearance.Button;\r
-            this.checkBox2.AutoSize = true;\r
-            this.checkBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.checkBox2.Location = new System.Drawing.Point(80, 3);\r
-            this.checkBox2.Name = "checkBox2";\r
-            this.checkBox2.Size = new System.Drawing.Size(71, 23);\r
-            this.checkBox2.TabIndex = 1;\r
-            this.checkBox2.Text = "checkBox2";\r
-            this.checkBox2.UseVisualStyleBackColor = true;\r
-            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);\r
-            // \r
-            // checkBox3\r
-            // \r
-            this.checkBox3.Appearance = System.Windows.Forms.Appearance.Button;\r
-            this.checkBox3.AutoSize = true;\r
-            this.checkBox3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.flowLayoutPanel1.SetFlowBreak(this.checkBox3, true);\r
-            this.checkBox3.Location = new System.Drawing.Point(157, 3);\r
-            this.checkBox3.Name = "checkBox3";\r
-            this.checkBox3.Size = new System.Drawing.Size(71, 23);\r
-            this.checkBox3.TabIndex = 2;\r
-            this.checkBox3.Text = "checkBox3";\r
-            this.checkBox3.UseVisualStyleBackColor = true;\r
-            // \r
-            // textBox1\r
-            // \r
-            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.textBox1.Location = new System.Drawing.Point(3, 32);\r
-            this.textBox1.Name = "textBox1";\r
-            this.textBox1.Size = new System.Drawing.Size(243, 20);\r
-            this.textBox1.TabIndex = 3;\r
-            // \r
-            // Form1\r
-            // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(305, 346);\r
-            this.Controls.Add(this.flowLayoutPanel1);\r
-            this.Name = "Form1";\r
-            this.Text = "Form1";\r
-            this.flowLayoutPanel1.ResumeLayout(false);\r
-            this.flowLayoutPanel1.PerformLayout();\r
-            this.ResumeLayout(false);\r
-\r
-        }\r
-\r
-        #endregion\r
-\r
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;\r
-        private System.Windows.Forms.CheckBox checkBox1;\r
-        private System.Windows.Forms.CheckBox checkBox2;\r
-        private System.Windows.Forms.CheckBox checkBox3;\r
-        private System.Windows.Forms.TextBox textBox1;\r
-    }\r
-}
\ No newline at end of file
diff --git a/client/AudioRecorder/Form1.cs b/client/AudioRecorder/Form1.cs
deleted file mode 100644 (file)
index 071752d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading.Tasks;\r
-using System.Windows.Forms;\r
-\r
-namespace AudioRecorder {\r
-    public partial class Form1 : Form {\r
-        public Form1() {\r
-            InitializeComponent();\r
-        }\r
-\r
-        private void checkBox2_CheckedChanged(object sender, EventArgs e) {\r
-\r
-        }\r
-    }\r
-}\r
index 139ee95d167b11c436baad49f4558e1c2066eca6..c55cd4e60edbc8bdfed3fb1148b9cda97abcfedf 100644 (file)
     <None Include="Configuration\-ACTIVE-configuration-nle.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\-configuration-archive.json">\r
+    <None Include="Configuration\configuration-archive.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\-configuration-sxs-tibi.json">\r
     <None Include="Configuration\-ACTIVE-configuration-promo.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\configuration-grafika.json">\r
+    <None Include="Configuration\-configuration-grafika.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\global.json">\r
     <None Include="Resources\configuration-unc.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\-configuration-sxs.json">\r
+    <None Include="Configuration\configuration-sxs.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\-configuration-studio.json">\r
index 01de42aaeabe2a5051772262163ede34308b4cfb..9229c050d00cd6f1a9972c7ae88fe3140dde99fc 100644 (file)
@@ -61,12 +61,12 @@ namespace Maestro {
             this.tpTraffic = new System.Windows.Forms.TabPage();\r
             this.trafficIDSelector = new TrafficClient.TrafficIDSelector();\r
             this.pMetadataDisplay = new System.Windows.Forms.TableLayoutPanel();\r
-            this.btnLookupMetadata = new System.Windows.Forms.Button();\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.btnLookupMetadata = new System.Windows.Forms.Button();\r
+            this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
+            this.textSelectedMetadata = new System.Windows.Forms.TextBox();\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
@@ -92,6 +92,7 @@ namespace Maestro {
             this.dgMessages = new System.Windows.Forms.DataGridView();\r
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.dataGridViewProgressColumn1 = new Maestro.Commons.DataGridViewProgressColumn();\r
             this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.groupSource.SuspendLayout();\r
@@ -476,10 +477,10 @@ namespace Maestro {
             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.tsMetadata, 0, 0);\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
@@ -491,6 +492,45 @@ namespace Maestro {
             this.pMetadataDisplay.Size = new System.Drawing.Size(330, 91);\r
             this.pMetadataDisplay.TabIndex = 4;\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
             // btnLookupMetadata\r
             // \r
             this.btnLookupMetadata.BackColor = System.Drawing.Color.Transparent;\r
@@ -531,46 +571,7 @@ namespace Maestro {
             this.textSelectedMetadata.Size = new System.Drawing.Size(288, 26);\r
             this.textSelectedMetadata.TabIndex = 12;\r
             this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnMetadataIDChanged);\r
-            this.textSelectedMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textSelectedMetadata_KeyDown);\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
+            this.textSelectedMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnSelectedMetadataKeyDown);\r
             // \r
             // groupTarget\r
             // \r
@@ -901,6 +902,14 @@ namespace Maestro {
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
             // \r
+            // dataGridViewProgressColumn1\r
+            // \r
+            this.dataGridViewProgressColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;\r
+            this.dataGridViewProgressColumn1.DataPropertyName = "Progress";\r
+            this.dataGridViewProgressColumn1.HeaderText = "";\r
+            this.dataGridViewProgressColumn1.MinimumWidth = 100;\r
+            this.dataGridViewProgressColumn1.Name = "dataGridViewProgressColumn1";\r
+            // \r
             // systemMessageBindingSource\r
             // \r
             this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
@@ -1029,6 +1038,7 @@ namespace Maestro {
         private DataGridViewTextBoxColumn columnOutput;\r
         private DataGridViewTextBoxColumn columnKillDate;\r
         private DataGridViewTextBoxColumn Message;\r
+        private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
     }\r
 }\r
 \r
index 73e069b6bb5c71e2cf3be4c427f6d93285fa1599..18f2f45c9e04f05bb00bf66b33aa3dc7d2c9c05d 100644 (file)
@@ -44,6 +44,14 @@ namespace Maestro {
             }\r
         }\r
 \r
+        public ArchiveMetadata ArchiveMetadata {\r
+            get => archiveMetadata;\r
+            set {\r
+                archiveMetadata = value;\r
+                btnEditMetadata.ToolTipText = archiveMetadata == null ? "Metaadat" :archiveMetadata.ToString();    \r
+            }\r
+        }\r
+\r
         private void InitializeMetadata() {\r
             InitializeOctopusSelector();\r
             InitializeTrafficSelector();\r
@@ -95,12 +103,12 @@ namespace Maestro {
         }\r
 \r
         private void OnEditMetadata(object sender, EventArgs e) {\r
-            if (archiveMetadata == null)\r
-                archiveMetadata = GetArchiveMetadata();\r
+            if (ArchiveMetadata == null)\r
+                ArchiveMetadata = GetArchiveMetadata();\r
 \r
             //if (archiveMetadata == null || !archiveMetadata.IsFilled) {\r
             //MC metaadta esetén nincs cím\r
-            if (archiveMetadata == null) {\r
+            if (ArchiveMetadata == null) {\r
                 MessageBox.Show("Nem található archív metaadat!");\r
                 return;\r
             }\r
@@ -110,13 +118,13 @@ namespace Maestro {
             DialogResult result = form.ShowDialog();\r
 \r
             if (result == DialogResult.OK && String.IsNullOrEmpty(textSelectedMetadata.Text)) {\r
-                ArchiveMetadata saved = archiveMetadata;\r
+                ArchiveMetadata saved = ArchiveMetadata;\r
                 if (String.IsNullOrEmpty(textSelectedMetadata.Text))\r
-                    textSelectedMetadata.Text = archiveMetadata.mediaHouseId;\r
+                    textSelectedMetadata.Text = ArchiveMetadata.mediaHouseId;\r
                 else\r
-                    textSelectedMetadata.Text = archiveMetadata.itemHouseId;\r
-                archiveMetadata = saved;\r
-                SelectedMetadata.MetadataText = archiveMetadata.itemTitle;\r
+                    textSelectedMetadata.Text = ArchiveMetadata.itemHouseId;\r
+                ArchiveMetadata = saved;\r
+                SelectedMetadata.MetadataText = ArchiveMetadata.itemTitle;\r
             }\r
             UpdateEditArchiveMetadataStatus();\r
         }\r
@@ -162,10 +170,10 @@ namespace Maestro {
             if (movieSegments == null)\r
                 movieSegments = new BindingList<MovieSegment>();\r
             bool readOnly = true;\r
-            if (archiveMetadata == null)\r
+            if (ArchiveMetadata == null)\r
                 MsgBox.Error("A metaadatok nem elérhetők, a szegmens definiálás nem engedélyezett.");\r
             else {\r
-                readOnly = archiveMetadata.ok;\r
+                readOnly = ArchiveMetadata.ok;\r
                 MsgBox.Warning("Az anyag már el van fogadva, a szegmens módosítás nem kerül mentésre. A szegmensek módosításához vissza kell vonni az anyag elfogadását az adástervező rendszerben.");\r
             }\r
             OpenFile(SelectedSource.FileInfo, true, readOnly);\r
@@ -181,14 +189,14 @@ namespace Maestro {
         }\r
 \r
         private void UpdateDefineSegmentsStatus() {\r
-            if(movieSegments == null || movieSegments.Count == 0)\r
+            if (movieSegments == null || movieSegments.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
+            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
@@ -334,23 +342,25 @@ namespace Maestro {
                 }\r
             }\r
 \r
-            switch (SelectedMetadata?.Kind) {\r
-                case MetadataType.OctopusStory:\r
-                case MetadataType.OctopusPlaceHolder:\r
-                    archiveMetadata = GetArchiveMetadata();\r
-                    break;\r
-                case MetadataType.TrafficAD:\r
-                case MetadataType.TrafficMaterial:\r
-                case MetadataType.TrafficPromo:\r
-                    archiveMetadata = GetArchiveMetadata();\r
-                    movieSegments = null;\r
-                    movieSegments = QuerySegments();\r
-                    break;\r
-                default:\r
-                    movieSegments = null;\r
-                    archiveMetadata = null;\r
-                    break;\r
-            }\r
+            //switch (SelectedMetadata?.Kind) {\r
+            //    case MetadataType.OctopusStory:\r
+            //    case MetadataType.OctopusPlaceHolder:\r
+            //        ArchiveMetadata = GetArchiveMetadata();\r
+            //        break;\r
+            //    case MetadataType.TrafficAD:\r
+            //    case MetadataType.TrafficMaterial:\r
+            //    case MetadataType.TrafficPromo:\r
+            //        ArchiveMetadata = GetArchiveMetadata();\r
+            //        movieSegments = null;\r
+            //        movieSegments = QuerySegments();\r
+            //        break;\r
+            //    default:\r
+            //        movieSegments = null;\r
+            //        ArchiveMetadata = null;\r
+            //        break;\r
+            //}\r
+            movieSegments = null;\r
+            ArchiveMetadata = null;\r
 \r
             UpdateProcessorButtonsEnabled();\r
             UpdateDefineSegmentEnabled();\r
@@ -360,8 +370,8 @@ namespace Maestro {
 \r
         private void OnOctopusIDSelected(string id, string name, string text) {\r
             trafficIDSelector.ClearSelection();\r
-            archiveMetadata = null;\r
             if (id == null) {\r
+                ArchiveMetadata = null;\r
                 SelectedMetadata = null;\r
                 return;\r
             }\r
@@ -376,8 +386,8 @@ namespace Maestro {
 \r
         private void OnTrafficIDSelected(string id, int variantID, string text) {\r
             octopusIDSelector.ClearSelection();\r
-            archiveMetadata = null;\r
             if (id == null) {\r
+                ArchiveMetadata = null;\r
                 SelectedMetadata = null;\r
                 return;\r
             }\r
@@ -485,7 +495,7 @@ namespace Maestro {
             btnLookupMetadata.Enabled = metadataType != MetadataType.None && metadataType != MetadataType.MediaCube;\r
         }\r
 \r
-        private void textSelectedMetadata_KeyDown(object sender, KeyEventArgs e) {\r
+        private void OnSelectedMetadataKeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode != Keys.Return || !btnLookupMetadata.Enabled)\r
                 return;\r
             Lookup(SelectedMetadata.ID);\r
index 4657a1f2b676bbe81314e7351f9ecc097a05d63b..42eb5ef948c46b97327a4b9b1716362d8b79ef9e 100644 (file)
@@ -28,13 +28,14 @@ namespace Maestro {
                 return selectedSource;\r
             }\r
             set {\r
+                if (selectedSource != null)\r
+                    ArchiveMetadata = null;\r
                 selectedSource = value;\r
                 if (selectedSource == null) {\r
                     selectedSourceItems.ForEach(i => i.IsChecked = false);\r
                     selectedSourceItems.Clear();\r
                 }\r
                 textSelectedSource.Text = selectedSource?.Name;\r
-                archiveMetadata = null;\r
                 movieSegments = null;\r
                 UpdateProcessorButtonsEnabled();\r
                 UpdateDefineSegmentEnabled();\r
index 1b4871552f1c969b4f42e78cc2b18515178e42a6..1174a290346682370409cab146cd7103e59d3780 100644 (file)
@@ -89,7 +89,14 @@ namespace Maestro {
                     result = null;\r
                     break;\r
                 }\r
-                TargetProcessorParameter processorParameter = CreateProcessorParameter(target, sourceItem, createDate);\r
+                TargetProcessorParameter processorParameter = null;\r
+                try {\r
+                    processorParameter = CreateProcessorParameter(target, sourceItem, createDate);\r
+                }\r
+                catch (Exception e) {\r
+                    result = null;\r
+                    break;\r
+                }\r
                 ITargetProcessor processor = TargetProcessor.Create(target.Processor);\r
                 processor.Initialize(this, processorParameter);\r
                 if (result == null)\r
@@ -134,10 +141,16 @@ namespace Maestro {
         }\r
 \r
         private bool EnsureMetadata(Target target) {\r
-            if ((target.SaveArchiveMetadata || target.SaveMorpheusMetadata || target.NexioServer) && (archiveMetadata == null || !archiveMetadata.IsFilled)) {\r
-                archiveMetadata = GetArchiveMetadata();\r
+            bool force = true.Equals(target.OutputFormat?.Contains("%"));\r
+            force |= true.Equals(target.SubFolderFormat?.Contains("%"));\r
+            force |= true.Equals(target.SuccessEmailPattern?.Contains("%")) && target.SendEmailOnSuccess;\r
+            force |= true.Equals(target.ErrorEmailPattern?.Contains("%")) && target.SendEmailOnError;\r
+            force |= target.SuccessEmailPattern == null ? false : target.SuccessEmailPattern.Contains("%");\r
+            force |= target.SaveArchiveMetadata || target.SaveMorpheusMetadata || target.NexioServer;\r
+            if (force && (ArchiveMetadata == null || !ArchiveMetadata.IsFilled)) {\r
+                ArchiveMetadata = GetArchiveMetadata();\r
                 UpdateEditArchiveMetadataStatus();\r
-                if (archiveMetadata == null) {\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
                 }\r
@@ -148,22 +161,22 @@ namespace Maestro {
         private TargetProcessorParameter CreateProcessorParameter(Target target, ISourceItem sourceItem, DateTime createDate) {\r
             FileSystemSource source = bindingSource.DataSource as FileSystemSource;\r
 \r
-            TargetProcessorParameter result = new TargetProcessorParameter() {\r
-                SourcePathOverride = (source == null || source.Path.Equals(Configuration.Source.Local.Address.LocalPath)) ? null : source.Path,\r
-                MediaCubeApi = mediaCubeApi,\r
-                SourceConfig = Configuration.Source,\r
-                TargetConfig = target,\r
-                ID = textSelectedMetadata.Text,\r
-                MetadataText = SelectedMetadata?.MetadataText,\r
-                InputFileName = sourceItem.Name,\r
-                MovieSegments = movieSegments == null ? null : movieSegments.ToList(), \r
-                ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadata),\r
-                VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID,\r
-                MetadataKind = selectedMetadata == null ? MetadataType.None : selectedMetadata.Kind,\r
-                UserName = TrayApplicationContext.UserName,\r
-                MessageBus = MessageBus,\r
-                CreateDate = createDate\r
-            };\r
+            TargetProcessorParameter result = new TargetProcessorParameter();\r
+            result.SourcePathOverride = (source == null || source.Path.Equals(Configuration.Source.Local.Address.LocalPath)) ? null : source.Path;\r
+            result.MediaCubeApi = mediaCubeApi;\r
+            result.SourceConfig = Configuration.Source;\r
+            result.TargetConfig = target;\r
+            result.ID = textSelectedMetadata.Text;\r
+            result.MetadataText = SelectedMetadata?.MetadataText;\r
+            result.InputFileName = sourceItem.Name;\r
+            result.MovieSegments = movieSegments == null ? null : movieSegments.ToList();\r
+            result.ArchiveMetadata = ArchiveMetadata.DeepClone(ArchiveMetadata);\r
+            result.VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID;\r
+            result.MetadataKind = selectedMetadata == null ? MetadataType.None : selectedMetadata.Kind;\r
+            result.UserName = TrayApplicationContext.UserName;\r
+            result.MessageBus = MessageBus;\r
+            result.CreateDate = createDate;\r
+\r
             result.ArchiveMetadata.userName = result.UserName;\r
             if (SelectedMetadata.Kind == MetadataType.MediaCube && result.ArchiveMetadata != null) {\r
                 result.ArchiveMetadata.itemHouseId = PatternNameMaker.Get(result.ArchiveMetadata.itemHouseId, result.ID, result.InputFileName, null, null, result.MetadataText);\r
index aad7e19c92d9e7eb8227470436a736b62c21f13d..851c96f8405c1eb738b2bbca4031c98cd26c4577 100644 (file)
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
index d4db9ec847f82a18e3227636ca275913c8a96826..ab744b7ec71a3b5cb9a949c3753ab23d8c619922 100644 (file)
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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.6.3")]\r
-[assembly: AssemblyFileVersion("2.0.6.3")]\r
+[assembly: AssemblyVersion("2.0.6.4")]\r
+[assembly: AssemblyFileVersion("2.0.6.4")]\r
index 379ff1054c38b3a8f07e415bf10fa6eb28125bd0..419cfea6147df54f6811eb05096e6d8e3c1fb087 100644 (file)
@@ -69,7 +69,6 @@ namespace MaestroShared.Configuration {
         public string Label { get; set; }\r
         public string Processor { get; set; }\r
         public string OutputFormat { get; set; }\r
-        public bool FileNameOverride { get; set; }\r
         public int KillDateDays { get; set; }\r
         public Connection Remote { get; set; }\r
         public bool SaveSegments { get; set; }\r
index 3e9f52866be194a8e0c7d8661a0aa4030fac2291..2fce5a6ac8bf8a6e862553399d92ec892fcb7f8e 100644 (file)
   <ItemGroup>\r
     <None Include="Resources\ic_fiber_manual_record_black_24dp_2x.png" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_playlist_add_check_black_24dp_1x.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_playlist_add_check_black_24dp_1x_green1.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_receipt_black_24dp_1x.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_receipt_black_24dp_1x_green.png" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_search_black_24dp_1x.png" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
 </Project>
\ No newline at end of file
index bacae55d1234ea409e562e81d302142419deecb2..fb4585e46502978123b22cd1a68bc64a66ca2663 100644 (file)
@@ -19,7 +19,7 @@ namespace MaestroShared.Metadata {
         public string userName { get; set; }\r
 \r
         public override string ToString() {\r
-            return JsonConvert.SerializeObject(this);\r
+            return JsonConvert.SerializeObject(this, Formatting.Indented);\r
             //return String.Format("{{\n \"Anyag azonosító\": \"{0}\",\n, \"Anyag cím\": \"{1}\",\n \"Anyag leírása\": \"{2}\",\n \"Média azonosító\": \"{3}\",\n \"Média cím\": \"{4}\",\n \"Média leírás\": \"{5}\"  \n}}",\r
             //    StuffID, StuffTitle, StuffDescription, MediaID, MediaTitle, MediaDescription);\r
         }\r
index fdfa5f1db5e7fb905c6f02281589aaa00d44a6ad..e2bf6c44ab351aa99f83fa2e4790524923916fac 100644 (file)
@@ -19,7 +19,7 @@ namespace MaestroShared.Properties {
     // class via a tool like ResGen or Visual Studio.\r
     // To add or remove a member, edit your .ResX file then rerun ResGen\r
     // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
     public class Resources {\r
@@ -120,6 +120,56 @@ namespace MaestroShared.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        public static System.Drawing.Bitmap ic_playlist_add_check_black_24dp_1x {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ic_playlist_add_check_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
+        public 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
+        public 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
+        public 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
+        public static System.Drawing.Bitmap ic_search_black_24dp_1x {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ic_search_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
index 895f6dbd2a0075b42a7cb918664b6c12ba22a5bb..d084ffe4f5e6d0ef3db33526d27066ba10c0b1cb 100644 (file)
   <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_playlist_add_check_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\ic_playlist_add_check_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_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_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_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="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
diff --git a/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x.png b/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x.png
new file mode 100644 (file)
index 0000000..4164907
Binary files /dev/null and b/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x.png differ
diff --git a/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x_green1.png b/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x_green1.png
new file mode 100644 (file)
index 0000000..e072964
Binary files /dev/null and b/client/MaestroShared/Resources/ic_playlist_add_check_black_24dp_1x_green1.png differ
diff --git a/client/MaestroShared/Resources/ic_receipt_black_24dp_1x.png b/client/MaestroShared/Resources/ic_receipt_black_24dp_1x.png
new file mode 100644 (file)
index 0000000..5d68f94
Binary files /dev/null and b/client/MaestroShared/Resources/ic_receipt_black_24dp_1x.png differ
diff --git a/client/MaestroShared/Resources/ic_receipt_black_24dp_1x_green.png b/client/MaestroShared/Resources/ic_receipt_black_24dp_1x_green.png
new file mode 100644 (file)
index 0000000..b65ca5a
Binary files /dev/null and b/client/MaestroShared/Resources/ic_receipt_black_24dp_1x_green.png differ
diff --git a/client/MaestroShared/Resources/ic_search_black_24dp_1x.png b/client/MaestroShared/Resources/ic_search_black_24dp_1x.png
new file mode 100644 (file)
index 0000000..6b16343
Binary files /dev/null and b/client/MaestroShared/Resources/ic_search_black_24dp_1x.png differ
index dd22d6c8c44a2894c5bc4d1dce451b04529b79c6..806f4aaf40a88cc73cfa39201230b608319218fb 100644 (file)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio 15\r
-VisualStudioVersion = 15.0.26430.15\r
+VisualStudioVersion = 15.0.27004.2010\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxPlay", "DxPlay\DxPlay.csproj", "{0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}"\r
 EndProject\r
@@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MXFFileParser", "MXFFilePar
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaestroShared", "MaestroShared\MaestroShared.csproj", "{D4417174-F21E-4CE2-AE5C-8EB30C9A9625}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetadataSelector", "MetadataSelector\MetadataSelector.csproj", "{8CB8266D-2229-47E2-B06D-54FDE82CBDC4}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -152,12 +154,27 @@ Global
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.Build.0 = Release|x64\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.ActiveCfg = Release|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.Build.0 = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.ActiveCfg = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.ActiveCfg = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
        EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+               SolutionGuid = {8F7E7365-1678-4775-B9E4-B3993FC028E2}\r
+       EndGlobalSection\r
        GlobalSection(TeamFoundationVersionControl) = preSolution\r
-               SccNumberOfProjects = 11\r
+               SccNumberOfProjects = 12\r
                SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}\r
                SccTeamFoundationServer = https://tfs.userrendszerhaz.hu/tfs/defaultcollection\r
                SccLocalPath0 = .\r
@@ -191,5 +208,8 @@ Global
                SccProjectUniqueName10 = MaestroShared\\MaestroShared.csproj\r
                SccProjectName10 = MaestroShared\r
                SccLocalPath10 = MaestroShared\r
+               SccProjectUniqueName11 = MetadataSelector\\MetadataSelector.csproj\r
+               SccProjectName11 = MetadataSelector\r
+               SccLocalPath11 = MetadataSelector\r
        EndGlobalSection\r
 EndGlobal\r
diff --git a/client/MetadataSelector/MetadataIDSelector.Designer.cs b/client/MetadataSelector/MetadataIDSelector.Designer.cs
new file mode 100644 (file)
index 0000000..e1e1961
--- /dev/null
@@ -0,0 +1,189 @@
+namespace MaestroShared.Controls {\r
+    partial class MetadataSelector {\r
+        /// <summary> \r
+        /// Required designer variable.\r
+        /// </summary>\r
+        private System.ComponentModel.IContainer components = null;\r
+\r
+        /// <summary> \r
+        /// Clean up any resources being used.\r
+        /// </summary>\r
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
+        protected override void Dispose(bool disposing) {\r
+            if (disposing && (components != null)) {\r
+                components.Dispose();\r
+            }\r
+            base.Dispose(disposing);\r
+        }\r
+\r
+        #region Component Designer generated code\r
+\r
+        /// <summary> \r
+        /// Required method for Designer support - do not modify \r
+        /// the contents of this method with the code editor.\r
+        /// </summary>\r
+        private void InitializeComponent() {\r
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MetadataSelector));\r
+            this.tabMetadata = new System.Windows.Forms.TabControl();\r
+            this.tpOctopus = new System.Windows.Forms.TabPage();\r
+            this.octopusIDSelector = new OctopusClient.OctopusIDSelector();\r
+            this.tpTraffic = new System.Windows.Forms.TabPage();\r
+            this.trafficIDSelector = new TrafficClient.TrafficIDSelector();\r
+            this.pMetadataDisplay = new System.Windows.Forms.TableLayoutPanel();\r
+            this.btnLookupMetadata = new System.Windows.Forms.Button();\r
+            this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
+            this.textSelectedMetadata = new System.Windows.Forms.TextBox();\r
+            this.tabMetadata.SuspendLayout();\r
+            this.tpOctopus.SuspendLayout();\r
+            this.tpTraffic.SuspendLayout();\r
+            this.pMetadataDisplay.SuspendLayout();\r
+            this.SuspendLayout();\r
+            // \r
+            // tabMetadata\r
+            // \r
+            this.tabMetadata.Controls.Add(this.tpOctopus);\r
+            this.tabMetadata.Controls.Add(this.tpTraffic);\r
+            this.tabMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.tabMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.tabMetadata.Location = new System.Drawing.Point(0, 0);\r
+            this.tabMetadata.Name = "tabMetadata";\r
+            this.tabMetadata.SelectedIndex = 0;\r
+            this.tabMetadata.Size = new System.Drawing.Size(373, 456);\r
+            this.tabMetadata.TabIndex = 3;\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(365, 428);\r
+            this.tpOctopus.TabIndex = 0;\r
+            this.tpOctopus.Text = "Octopus";\r
+            // \r
+            // octopusIDSelector\r
+            // \r
+            this.octopusIDSelector.BackColor = System.Drawing.Color.Transparent;\r
+            this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.octopusIDSelector.IDChangedEvent = null;\r
+            this.octopusIDSelector.Location = new System.Drawing.Point(3, 3);\r
+            this.octopusIDSelector.Name = "octopusIDSelector";\r
+            this.octopusIDSelector.Size = new System.Drawing.Size(359, 422);\r
+            this.octopusIDSelector.TabIndex = 0;\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(365, 428);\r
+            this.tpTraffic.TabIndex = 1;\r
+            this.tpTraffic.Text = "Traffic";\r
+            // \r
+            // trafficIDSelector\r
+            // \r
+            this.trafficIDSelector.AutoSize = true;\r
+            this.trafficIDSelector.BackColor = System.Drawing.Color.Transparent;\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.Name = "trafficIDSelector";\r
+            this.trafficIDSelector.Size = new System.Drawing.Size(359, 422);\r
+            this.trafficIDSelector.TabIndex = 0;\r
+            // \r
+            // pMetadataDisplay\r
+            // \r
+            this.pMetadataDisplay.AutoSize = true;\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, 1);\r
+            this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
+            this.pMetadataDisplay.Controls.Add(this.textSelectedMetadata, 0, 1);\r
+            this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+            this.pMetadataDisplay.Location = new System.Drawing.Point(0, 456);\r
+            this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0);\r
+            this.pMetadataDisplay.Name = "pMetadataDisplay";\r
+            this.pMetadataDisplay.RowCount = 2;\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(373, 57);\r
+            this.pMetadataDisplay.TabIndex = 5;\r
+            // \r
+            // btnLookupMetadata\r
+            // \r
+            this.btnLookupMetadata.BackColor = System.Drawing.Color.Transparent;\r
+            this.btnLookupMetadata.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.btnLookupMetadata.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.btnLookupMetadata.Enabled = false;\r
+            this.btnLookupMetadata.FlatAppearance.BorderSize = 0;\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 = ((System.Drawing.Image)(resources.GetObject("btnLookupMetadata.Image")));\r
+            this.btnLookupMetadata.Location = new System.Drawing.Point(340, 28);\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
+            // 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.Name = "labelSelectedMetadata";\r
+            this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);\r
+            this.labelSelectedMetadata.Size = new System.Drawing.Size(331, 25);\r
+            this.labelSelectedMetadata.TabIndex = 13;\r
+            this.labelSelectedMetadata.Text = "Kiválasztott metaadat";\r
+            // \r
+            // textSelectedMetadata\r
+            // \r
+            this.textSelectedMetadata.BackColor = System.Drawing.SystemColors.ActiveCaption;\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, 28);\r
+            this.textSelectedMetadata.Name = "textSelectedMetadata";\r
+            this.textSelectedMetadata.Size = new System.Drawing.Size(331, 26);\r
+            this.textSelectedMetadata.TabIndex = 12;\r
+            this.textSelectedMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textSelectedMetadata_KeyDown);\r
+            // \r
+            // MetadataSelector\r
+            // \r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+            this.Controls.Add(this.tabMetadata);\r
+            this.Controls.Add(this.pMetadataDisplay);\r
+            this.Margin = new System.Windows.Forms.Padding(0);\r
+            this.Name = "MetadataSelector";\r
+            this.Size = new System.Drawing.Size(373, 513);\r
+            this.tabMetadata.ResumeLayout(false);\r
+            this.tpOctopus.ResumeLayout(false);\r
+            this.tpTraffic.ResumeLayout(false);\r
+            this.tpTraffic.PerformLayout();\r
+            this.pMetadataDisplay.ResumeLayout(false);\r
+            this.pMetadataDisplay.PerformLayout();\r
+            this.ResumeLayout(false);\r
+            this.PerformLayout();\r
+\r
+        }\r
+\r
+        #endregion\r
+\r
+        private System.Windows.Forms.TabControl tabMetadata;\r
+        private System.Windows.Forms.TabPage tpOctopus;\r
+        private System.Windows.Forms.TabPage tpTraffic;\r
+        private System.Windows.Forms.TableLayoutPanel pMetadataDisplay;\r
+        private System.Windows.Forms.Button btnLookupMetadata;\r
+        private System.Windows.Forms.Label labelSelectedMetadata;\r
+        private System.Windows.Forms.TextBox textSelectedMetadata;\r
+        private OctopusClient.OctopusIDSelector octopusIDSelector;\r
+        private TrafficClient.TrafficIDSelector trafficIDSelector;\r
+    }\r
+}\r
diff --git a/client/MetadataSelector/MetadataIDSelector.cs b/client/MetadataSelector/MetadataIDSelector.cs
new file mode 100644 (file)
index 0000000..fd57e01
--- /dev/null
@@ -0,0 +1,129 @@
+using MaestroShared.Configuration;\r
+using MaestroShared.Metadata;\r
+using OctopusClient;\r
+using System;\r
+using System.Linq;\r
+using System.Text.RegularExpressions;\r
+using System.Windows.Forms;\r
+using TrafficClient;\r
+\r
+namespace MaestroShared.Controls {\r
+    public partial class MetadataSelector : UserControl {\r
+        private const string REGEXP_TRAFFICMATERIALID = "^M{1}[0-9]{6}[A-Z]{1}$";\r
+        private const string REGEXP_TRAFFICADID = "^R{1}[0-9]{6}[A-Z]{1}$";\r
+        private const string REGEXP_TRAFFICPROMOID = "^P{1}[0-9]{6}[A-Z]{1}$";\r
+        private const string REGEXP_OCTOPUSSTORYID = "^[0-9]+$";\r
+        private const string REGEXP_OCTOPUSPLACEHOLDERID = "^[0-9]+_[0-9]+$";\r
+        private const string REGEXP_OCTOPUSPLACEHOLDERVERSIONEDID = "^[0-9]+_[0-9]+-[0-9]{3}$";\r
+\r
+        public MetadataProvider[] Providers { get; set; }\r
+        public TextBox MetadataIDText { get => textSelectedMetadata; }\r
+        public OctopusIDSelector OctopusIDSelector { get => octopusIDSelector; }\r
+        public TrafficIDSelector TrafficIDSelector { get => trafficIDSelector; }\r
+\r
+        public MetadataSelector() {\r
+            InitializeComponent();\r
+        }\r
+        //OnMetadataIDChanged\r
+\r
+        private void OnLookupByMetadata(object sender, EventArgs e) {\r
+            Lookup(textSelectedMetadata.Text);\r
+        }\r
+\r
+        public T GetMetadataProvider<T>() {\r
+            MetadataProvider provider = Providers?.Where(m => { return m is T; }).FirstOrDefault();\r
+            T result = default(T);\r
+            try {\r
+                result = (T)Convert.ChangeType(provider, typeof(T));\r
+            }\r
+            finally { }\r
+            return result;\r
+        }\r
+\r
+        private void Lookup(string id) {\r
+            MetadataProvider config = null;\r
+            MetadataType metadataType = GuessMetadataType(id);\r
+            switch (metadataType) {\r
+                case MetadataType.TrafficMaterial:\r
+                    config = GetMetadataProvider<TrafficMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
+                    trafficIDSelector.LookupByMaterialID(id);\r
+                    break;\r
+                case MetadataType.TrafficPromo:\r
+                    config = GetMetadataProvider<TrafficMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
+                    trafficIDSelector.LookupByPromoID(id);\r
+                    break;\r
+                case MetadataType.TrafficAD:\r
+                    config = GetMetadataProvider<TrafficMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
+                    trafficIDSelector.LookupByADID(id);\r
+                    break;\r
+                case MetadataType.OctopusPlaceHolder:\r
+                    config = GetMetadataProvider<OctopusMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    tabMetadata.SelectedIndex = 0;\r
+                    octopusIDSelector.LookupByPlaceHolder(id);\r
+                    break;\r
+                case MetadataType.OctopusStory:\r
+                    config = GetMetadataProvider<OctopusMetadata>();\r
+                    if (config == null)\r
+                        return;\r
+                    tabMetadata.SelectedIndex = 0;\r
+                    octopusIDSelector.LookupByStory(id);\r
+                    break;\r
+            }\r
+        }\r
+\r
+        private void UpdateLookupByMetadataEnabled() {\r
+            MetadataType metadataType = GuessMetadataType(textSelectedMetadata.Text);\r
+            btnLookupMetadata.Enabled = metadataType != MetadataType.None && metadataType != MetadataType.MediaCube;\r
+        }\r
+\r
+        private void textSelectedMetadata_KeyDown(object sender, KeyEventArgs e) {\r
+            if (e.KeyCode != Keys.Return || !btnLookupMetadata.Enabled)\r
+                return;\r
+            Lookup(textSelectedMetadata.Text);\r
+        }\r
+\r
+        private MetadataType GuessMetadataType(string id) {\r
+            if (String.IsNullOrEmpty(id))\r
+                return MetadataType.None;\r
+            Match match = null;\r
+\r
+            match = Regex.Match(id, REGEXP_TRAFFICMATERIALID);\r
+            if (match.Success)\r
+                return MetadataType.TrafficMaterial;\r
+\r
+            match = Regex.Match(id, REGEXP_TRAFFICPROMOID);\r
+            if (match.Success)\r
+                return MetadataType.TrafficPromo;\r
+\r
+            match = Regex.Match(id, REGEXP_TRAFFICADID);\r
+            if (match.Success)\r
+                return MetadataType.TrafficAD;\r
+\r
+            match = Regex.Match(id, REGEXP_OCTOPUSSTORYID);\r
+            if (match.Success)\r
+                return MetadataType.OctopusStory;\r
+\r
+            match = Regex.Match(id, REGEXP_OCTOPUSPLACEHOLDERID);\r
+            if (match.Success)\r
+                return MetadataType.OctopusPlaceHolder;\r
+\r
+            match = Regex.Match(id, REGEXP_OCTOPUSPLACEHOLDERVERSIONEDID);\r
+            if (match.Success)\r
+                return MetadataType.OctopusPlaceHolder;\r
+\r
+            return MetadataType.MediaCube;\r
+        }\r
+\r
+    }\r
+}\r
similarity index 85%
rename from client/AudioRecorder/Form1.resx
rename to client/MetadataSelector/MetadataIDSelector.resx
index 29dcb1b3a353ba227f65e11fbe3d6f0766e84292..7ca6282c703462fcb24aa269045c49d6389b26d9 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="btnLookupMetadata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAQlJREFUSEvt\r
+        k00OAUEQRic4B+EMxEZC4laEe1jYi58j+VlijRXhex21m+lJjYyFeMnLpCfVVTPV1cmfTxjKjTzLx/u5\r
+        lgP5ETU5l8+IM0lcISz5RY5kXVZkQ47lVVoRN7TFkrd5kUJHWpE+LzzQczby5TEmkrhVWDngINlIW2I0\r
+        JXHHsHLAtLCRnseoSuLuYeXA/oADjdGSxJ3CygFzzkamJcZUErcMKwdcIjYyJUxLGl15k8T1eOGF+bYi\r
+        TAsHSs9pC19uyReyENxQK5IlyXkeZN55ZcIlYs4ZRaaFA6Xn1haSU2QvCxeJQVKSU2Qn8+5OIShC8q8V\r
+        2cpSipCUIqUVABKXlvxnSZIXKVlUzExD9aQAAAAASUVORK5CYII=\r
+</value>\r
+  </data>\r
 </root>
\ No newline at end of file
diff --git a/client/MetadataSelector/MetadataSelector.csproj b/client/MetadataSelector/MetadataSelector.csproj
new file mode 100644 (file)
index 0000000..f02fadc
--- /dev/null
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProjectGuid>{8CB8266D-2229-47E2-B06D-54FDE82CBDC4}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>MetadataSelector</RootNamespace>\r
+    <AssemblyName>MetadataSelector</AssemblyName>\r
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+    <SccProjectName>SAK</SccProjectName>\r
+    <SccLocalPath>SAK</SccLocalPath>\r
+    <SccAuxPath>SAK</SccAuxPath>\r
+    <SccProvider>SAK</SccProvider>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="LinkDotNet.MessageHandling.Contracts">\r
+      <HintPath>..\packages\LinkDotNet.MessageBus.Contracts.0.1.1\lib\LinkDotNet.MessageHandling.Contracts.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="Newtonsoft.Json">\r
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="NLog">\r
+      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="RestSharp">\r
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Core" />\r
+    <Reference Include="System.Data.Linq" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Windows.Forms" />\r
+    <Reference Include="System.Xml.Linq" />\r
+    <Reference Include="System.Data.DataSetExtensions" />\r
+    <Reference Include="Microsoft.CSharp" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Net.Http" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="MetadataIDSelector.cs">\r
+      <SubType>UserControl</SubType>\r
+    </Compile>\r
+    <Compile Include="MetadataIDSelector.Designer.cs">\r
+      <DependentUpon>MetadataIDSelector.cs</DependentUpon>\r
+    </Compile>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="MetadataIDSelector.resx">\r
+      <DependentUpon>MetadataIDSelector.cs</DependentUpon>\r
+    </EmbeddedResource>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\MaestroShared\MaestroShared.csproj">\r
+      <Project>{d4417174-f21e-4ce2-ae5c-8eb30c9a9625}</Project>\r
+      <Name>MaestroShared</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\OctopusClient\OctopusClient.csproj">\r
+      <Project>{8CC7C930-9DBF-487B-AED5-776937A649D5}</Project>\r
+      <Name>OctopusClient</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\PlanAIRClient\TrafficClient.csproj">\r
+      <Project>{A7A21311-CB0E-465F-8AD6-829FAF093F00}</Project>\r
+      <Name>TrafficClient</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+</Project>
\ No newline at end of file
diff --git a/client/MetadataSelector/Properties/AssemblyInfo.cs b/client/MetadataSelector/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..0595330
--- /dev/null
@@ -0,0 +1,36 @@
+using System.Reflection;\r
+using System.Runtime.CompilerServices;\r
+using System.Runtime.InteropServices;\r
+\r
+// General Information about an assembly is controlled through the following\r
+// set of attributes. Change these attribute values to modify the information\r
+// associated with an assembly.\r
+[assembly: AssemblyTitle("MetadataSelector")]\r
+[assembly: AssemblyDescription("")]\r
+[assembly: AssemblyConfiguration("")]\r
+[assembly: AssemblyCompany("")]\r
+[assembly: AssemblyProduct("MetadataSelector")]\r
+[assembly: AssemblyCopyright("Copyright ©  2017")]\r
+[assembly: AssemblyTrademark("")]\r
+[assembly: AssemblyCulture("")]\r
+\r
+// Setting ComVisible to false makes the types in this assembly not visible\r
+// to COM components.  If you need to access a type in this assembly from\r
+// COM, set the ComVisible attribute to true on that type.\r
+[assembly: ComVisible(false)]\r
+\r
+// The following GUID is for the ID of the typelib if this project is exposed to COM\r
+[assembly: Guid("8cb8266d-2229-47e2-b06d-54fde82cbdc4")]\r
+\r
+// Version information for an assembly consists of the following four values:\r
+//\r
+//      Major Version\r
+//      Minor Version\r
+//      Build Number\r
+//      Revision\r
+//\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("1.0.0.0")]\r
+[assembly: AssemblyFileVersion("1.0.0.0")]\r
index 17c36687d67dea78c30bc2fada992d01991d6105..c18ea6e7c0b63b6b11b54fd0343623146c79eb2b 100644 (file)
@@ -25,9 +25,8 @@ namespace OctopusClient {
         /// the contents of this method with the code editor.\r
         /// </summary>\r
         private void InitializeComponent() {\r
-            this.treeOctopus = new CheckableTreeView();\r
             this.pSeparator = new System.Windows.Forms.Panel();\r
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.pSearch = new System.Windows.Forms.TableLayoutPanel();\r
             this.cbFolders = new System.Windows.Forms.ComboBox();\r
             this.dtScheduled = new System.Windows.Forms.DateTimePicker();\r
             this.pFolderType = new System.Windows.Forms.FlowLayoutPanel();\r
@@ -35,54 +34,43 @@ namespace OctopusClient {
             this.rbStoryFolder = new System.Windows.Forms.RadioButton();\r
             this.txtFilter = new System.Windows.Forms.TextBox();\r
             this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton();\r
-            this.tableLayoutPanel1.SuspendLayout();\r
+            this.treeOctopus = new OctopusClient.CheckableTreeView();\r
+            this.pSearch.SuspendLayout();\r
             this.pFolderType.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
-            // treeOctopus\r
-            // \r
-            this.treeOctopus.BackColor = System.Drawing.Color.White;\r
-            this.treeOctopus.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            this.treeOctopus.CheckBoxes = true;\r
-            this.treeOctopus.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.treeOctopus.Location = new System.Drawing.Point(0, 80);\r
-            this.treeOctopus.Margin = new System.Windows.Forms.Padding(0);\r
-            this.treeOctopus.Name = "treeOctopus";\r
-            this.treeOctopus.Size = new System.Drawing.Size(300, 320);\r
-            this.treeOctopus.TabIndex = 5;\r
-            this.treeOctopus.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeOctopus_NodeMouseClick);\r
-            this.treeOctopus.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeOctopus_NodeMouseDoubleClick);\r
-            this.treeOctopus.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
-            // \r
             // pSeparator\r
             // \r
             this.pSeparator.BackColor = System.Drawing.Color.White;\r
             this.pSeparator.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.pSeparator.Location = new System.Drawing.Point(0, 74);\r
+            this.pSeparator.Location = new System.Drawing.Point(0, 71);\r
             this.pSeparator.Name = "pSeparator";\r
             this.pSeparator.Size = new System.Drawing.Size(300, 6);\r
             this.pSeparator.TabIndex = 12;\r
             // \r
-            // tableLayoutPanel1\r
-            // \r
-            this.tableLayoutPanel1.ColumnCount = 3;\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\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.cbFolders, 1, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.dtScheduled, 0, 2);\r
-            this.tableLayoutPanel1.Controls.Add(this.pFolderType, 0, 1);\r
-            this.tableLayoutPanel1.Controls.Add(this.txtFilter, 0, 0);\r
-            this.tableLayoutPanel1.Controls.Add(this.noFocusCueButton1, 2, 2);\r
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
-            this.tableLayoutPanel1.RowCount = 3;\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(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(300, 74);\r
-            this.tableLayoutPanel1.TabIndex = 13;\r
+            // pSearch\r
+            // \r
+            this.pSearch.AutoSize = true;\r
+            this.pSearch.ColumnCount = 3;\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.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+            this.pSearch.Controls.Add(this.cbFolders, 1, 2);\r
+            this.pSearch.Controls.Add(this.dtScheduled, 0, 2);\r
+            this.pSearch.Controls.Add(this.pFolderType, 0, 1);\r
+            this.pSearch.Controls.Add(this.txtFilter, 0, 0);\r
+            this.pSearch.Controls.Add(this.noFocusCueButton1, 2, 2);\r
+            this.pSearch.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.pSearch.Location = new System.Drawing.Point(0, 0);\r
+            this.pSearch.Margin = new System.Windows.Forms.Padding(0);\r
+            this.pSearch.Name = "pSearch";\r
+            this.pSearch.Padding = new System.Windows.Forms.Padding(3);\r
+            this.pSearch.RowCount = 3;\r
+            this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+            this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+            this.pSearch.Size = new System.Drawing.Size(300, 71);\r
+            this.pSearch.TabIndex = 13;\r
             // \r
             // cbFolders\r
             // \r
@@ -91,10 +79,10 @@ namespace OctopusClient {
             this.cbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.cbFolders.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.cbFolders.FormattingEnabled = true;\r
-            this.cbFolders.Location = new System.Drawing.Point(83, 49);\r
+            this.cbFolders.Location = new System.Drawing.Point(86, 49);\r
             this.cbFolders.Margin = new System.Windows.Forms.Padding(1);\r
             this.cbFolders.Name = "cbFolders";\r
-            this.cbFolders.Size = new System.Drawing.Size(193, 21);\r
+            this.cbFolders.Size = new System.Drawing.Size(190, 21);\r
             this.cbFolders.TabIndex = 5;\r
             this.cbFolders.SelectedValueChanged += new System.EventHandler(this.OnSelectedFolderChanged);\r
             // \r
@@ -102,7 +90,7 @@ namespace OctopusClient {
             // \r
             this.dtScheduled.CustomFormat = " ";\r
             this.dtScheduled.Format = System.Windows.Forms.DateTimePickerFormat.Short;\r
-            this.dtScheduled.Location = new System.Drawing.Point(1, 49);\r
+            this.dtScheduled.Location = new System.Drawing.Point(4, 49);\r
             this.dtScheduled.Margin = new System.Windows.Forms.Padding(1);\r
             this.dtScheduled.Name = "dtScheduled";\r
             this.dtScheduled.Size = new System.Drawing.Size(80, 20);\r
@@ -111,14 +99,15 @@ namespace OctopusClient {
             // \r
             // pFolderType\r
             // \r
-            this.tableLayoutPanel1.SetColumnSpan(this.pFolderType, 3);\r
+            this.pFolderType.AutoSize = true;\r
+            this.pSearch.SetColumnSpan(this.pFolderType, 3);\r
             this.pFolderType.Controls.Add(this.rbRundown);\r
             this.pFolderType.Controls.Add(this.rbStoryFolder);\r
             this.pFolderType.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.pFolderType.Location = new System.Drawing.Point(0, 22);\r
+            this.pFolderType.Location = new System.Drawing.Point(3, 25);\r
             this.pFolderType.Margin = new System.Windows.Forms.Padding(0);\r
             this.pFolderType.Name = "pFolderType";\r
-            this.pFolderType.Size = new System.Drawing.Size(300, 26);\r
+            this.pFolderType.Size = new System.Drawing.Size(294, 23);\r
             this.pFolderType.TabIndex = 3;\r
             // \r
             // rbRundown\r
@@ -143,7 +132,7 @@ namespace OctopusClient {
             this.rbStoryFolder.Appearance = System.Windows.Forms.Appearance.Button;\r
             this.rbStoryFolder.AutoSize = true;\r
             this.rbStoryFolder.Dock = System.Windows.Forms.DockStyle.Left;\r
-            this.rbStoryFolder.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.rbStoryFolder.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.rbStoryFolder.Location = new System.Drawing.Point(63, 0);\r
             this.rbStoryFolder.Margin = new System.Windows.Forms.Padding(0);\r
             this.rbStoryFolder.Name = "rbStoryFolder";\r
@@ -154,12 +143,12 @@ namespace OctopusClient {
             // \r
             // txtFilter\r
             // \r
-            this.tableLayoutPanel1.SetColumnSpan(this.txtFilter, 3);\r
+            this.pSearch.SetColumnSpan(this.txtFilter, 3);\r
             this.txtFilter.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.txtFilter.Location = new System.Drawing.Point(1, 1);\r
+            this.txtFilter.Location = new System.Drawing.Point(4, 4);\r
             this.txtFilter.Margin = new System.Windows.Forms.Padding(1);\r
             this.txtFilter.Name = "txtFilter";\r
-            this.txtFilter.Size = new System.Drawing.Size(298, 20);\r
+            this.txtFilter.Size = new System.Drawing.Size(292, 20);\r
             this.txtFilter.TabIndex = 1;\r
             this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnFilterKeyDown);\r
             // \r
@@ -171,11 +160,28 @@ namespace OctopusClient {
             this.noFocusCueButton1.Location = new System.Drawing.Point(278, 49);\r
             this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(1);\r
             this.noFocusCueButton1.Name = "noFocusCueButton1";\r
-            this.noFocusCueButton1.Size = new System.Drawing.Size(21, 21);\r
+            this.noFocusCueButton1.Size = new System.Drawing.Size(18, 18);\r
             this.noFocusCueButton1.TabIndex = 6;\r
             this.noFocusCueButton1.UseVisualStyleBackColor = true;\r
             this.noFocusCueButton1.Click += new System.EventHandler(this.noFocusCueButton1_Click);\r
             // \r
+            // treeOctopus\r
+            // \r
+            this.treeOctopus.BackColor = System.Drawing.Color.White;\r
+            this.treeOctopus.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.treeOctopus.CheckBoxes = true;\r
+            this.treeOctopus.DisableCheckBoxLevels = null;\r
+            this.treeOctopus.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.treeOctopus.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText;\r
+            this.treeOctopus.Location = new System.Drawing.Point(0, 77);\r
+            this.treeOctopus.Margin = new System.Windows.Forms.Padding(0);\r
+            this.treeOctopus.Name = "treeOctopus";\r
+            this.treeOctopus.Size = new System.Drawing.Size(300, 323);\r
+            this.treeOctopus.TabIndex = 5;\r
+            this.treeOctopus.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeOctopus_NodeMouseClick);\r
+            this.treeOctopus.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeOctopus_NodeMouseDoubleClick);\r
+            this.treeOctopus.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
+            // \r
             // OctopusIDSelector\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -183,21 +189,22 @@ namespace OctopusClient {
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.treeOctopus);\r
             this.Controls.Add(this.pSeparator);\r
-            this.Controls.Add(this.tableLayoutPanel1);\r
+            this.Controls.Add(this.pSearch);\r
             this.Name = "OctopusIDSelector";\r
             this.Size = new System.Drawing.Size(300, 400);\r
-            this.tableLayoutPanel1.ResumeLayout(false);\r
-            this.tableLayoutPanel1.PerformLayout();\r
+            this.pSearch.ResumeLayout(false);\r
+            this.pSearch.PerformLayout();\r
             this.pFolderType.ResumeLayout(false);\r
             this.pFolderType.PerformLayout();\r
             this.ResumeLayout(false);\r
+            this.PerformLayout();\r
 \r
         }\r
 \r
         #endregion\r
         private CheckableTreeView treeOctopus;\r
         private System.Windows.Forms.Panel pSeparator;\r
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
+        private System.Windows.Forms.TableLayoutPanel pSearch;\r
         private System.Windows.Forms.ComboBox cbFolders;\r
         private System.Windows.Forms.DateTimePicker dtScheduled;\r
         private System.Windows.Forms.FlowLayoutPanel pFolderType;\r
index b9f8ec04720e9dc32fedda1c6e19404f929bb5ed..aedababa28dde3ed689b75cf95845357046703f2 100644 (file)
@@ -29,9 +29,9 @@
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\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
+            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
             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
             this.rbPromo = new System.Windows.Forms.RadioButton();\r
             this.rbAD = new System.Windows.Forms.RadioButton();\r
             this.pSearch = new System.Windows.Forms.TableLayoutPanel();\r
-            this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton();\r
             this.chkProblematic = new System.Windows.Forms.CheckBox();\r
             this.dgTraffic = new System.Windows.Forms.DataGridView();\r
             this.pSeparator = new System.Windows.Forms.Panel();\r
+            this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton();\r
             ((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).BeginInit();\r
             this.pFolderType.SuspendLayout();\r
             this.pSearch.SuspendLayout();\r
@@ -54,7 +54,7 @@
             // \r
             this.dtScheduled.CustomFormat = " ";\r
             this.dtScheduled.Format = System.Windows.Forms.DateTimePickerFormat.Short;\r
-            this.dtScheduled.Location = new System.Drawing.Point(4, 48);\r
+            this.dtScheduled.Location = new System.Drawing.Point(96, 49);\r
             this.dtScheduled.Margin = new System.Windows.Forms.Padding(1);\r
             this.dtScheduled.Name = "dtScheduled";\r
             this.dtScheduled.ShowCheckBox = true;\r
             this.txtFilter.Location = new System.Drawing.Point(4, 4);\r
             this.txtFilter.Margin = new System.Windows.Forms.Padding(1);\r
             this.txtFilter.Name = "txtFilter";\r
-            this.txtFilter.Size = new System.Drawing.Size(324, 20);\r
+            this.txtFilter.Size = new System.Drawing.Size(292, 20);\r
             this.txtFilter.TabIndex = 0;\r
             this.txtFilter.TextChanged += new System.EventHandler(this.txtFilter_TextChanged);\r
             this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown);\r
             // \r
             // pFolderType\r
             // \r
+            this.pFolderType.AutoSize = true;\r
             this.pSearch.SetColumnSpan(this.pFolderType, 3);\r
             this.pFolderType.Controls.Add(this.rbMaterial);\r
             this.pFolderType.Controls.Add(this.rbPromo);\r
@@ -84,7 +85,7 @@
             this.pFolderType.Location = new System.Drawing.Point(3, 25);\r
             this.pFolderType.Margin = new System.Windows.Forms.Padding(0);\r
             this.pFolderType.Name = "pFolderType";\r
-            this.pFolderType.Size = new System.Drawing.Size(326, 22);\r
+            this.pFolderType.Size = new System.Drawing.Size(294, 23);\r
             this.pFolderType.TabIndex = 2;\r
             // \r
             // rbMaterial\r
             this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
             this.pSearch.Controls.Add(this.noFocusCueButton1, 2, 2);\r
-            this.pSearch.Controls.Add(this.chkProblematic, 1, 2);\r
+            this.pSearch.Controls.Add(this.chkProblematic, 0, 1);\r
             this.pSearch.Controls.Add(this.pFolderType, 0, 1);\r
             this.pSearch.Controls.Add(this.txtFilter, 0, 0);\r
-            this.pSearch.Controls.Add(this.dtScheduled, 0, 2);\r
+            this.pSearch.Controls.Add(this.dtScheduled, 1, 2);\r
             this.pSearch.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.pSearch.Location = new System.Drawing.Point(0, 0);\r
             this.pSearch.Margin = new System.Windows.Forms.Padding(0);\r
             this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-            this.pSearch.Size = new System.Drawing.Size(332, 73);\r
+            this.pSearch.Size = new System.Drawing.Size(300, 73);\r
             this.pSearch.TabIndex = 10;\r
-            this.pSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanelSearch_Paint);\r
-            // \r
-            // noFocusCueButton1\r
-            // \r
-            this.noFocusCueButton1.FlatAppearance.BorderSize = 0;\r
-            this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.noFocusCueButton1.Image = global::TrafficClient.Resources.ic_refresh_black_24dp_1x;\r
-            this.noFocusCueButton1.Location = new System.Drawing.Point(310, 48);\r
-            this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(1);\r
-            this.noFocusCueButton1.Name = "noFocusCueButton1";\r
-            this.noFocusCueButton1.Size = new System.Drawing.Size(18, 21);\r
-            this.noFocusCueButton1.TabIndex = 8;\r
-            this.noFocusCueButton1.UseVisualStyleBackColor = true;\r
-            this.noFocusCueButton1.Click += new System.EventHandler(this.OnRefresh);\r
+            this.pSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.OnSearchPanelPaint);\r
             // \r
             // chkProblematic\r
             // \r
             this.chkProblematic.AutoSize = true;\r
             this.chkProblematic.Checked = true;\r
             this.chkProblematic.CheckState = System.Windows.Forms.CheckState.Checked;\r
-            this.chkProblematic.Location = new System.Drawing.Point(99, 50);\r
+            this.chkProblematic.Location = new System.Drawing.Point(4, 51);\r
             this.chkProblematic.Margin = new System.Windows.Forms.Padding(1, 3, 1, 1);\r
             this.chkProblematic.Name = "chkProblematic";\r
             this.chkProblematic.Size = new System.Drawing.Size(90, 17);\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
-            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
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, 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.False;\r
+            this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgTraffic.DataSource = this.trafficAPIBindingSource;\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
+            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);\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.dgTraffic.DefaultCellStyle = dataGridViewCellStyle2;\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.MultiSelect = false;\r
             this.dgTraffic.Name = "dgTraffic";\r
             this.dgTraffic.RowHeadersVisible = false;\r
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6;\r
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3;\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(332, 321);\r
+            this.dgTraffic.Size = new System.Drawing.Size(300, 321);\r
             this.dgTraffic.TabIndex = 0;\r
             this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellContentClick);\r
             this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellDoubleClick);\r
             this.pSeparator.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.pSeparator.Location = new System.Drawing.Point(0, 73);\r
             this.pSeparator.Name = "pSeparator";\r
-            this.pSeparator.Size = new System.Drawing.Size(332, 6);\r
+            this.pSeparator.Size = new System.Drawing.Size(300, 6);\r
             this.pSeparator.TabIndex = 13;\r
             // \r
+            // noFocusCueButton1\r
+            // \r
+            this.noFocusCueButton1.FlatAppearance.BorderSize = 0;\r
+            this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.noFocusCueButton1.Image = global::TrafficClient.Resources.ic_refresh_black_24dp_1x;\r
+            this.noFocusCueButton1.Location = new System.Drawing.Point(278, 49);\r
+            this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(1);\r
+            this.noFocusCueButton1.Name = "noFocusCueButton1";\r
+            this.noFocusCueButton1.Size = new System.Drawing.Size(18, 18);\r
+            this.noFocusCueButton1.TabIndex = 8;\r
+            this.noFocusCueButton1.UseVisualStyleBackColor = true;\r
+            // \r
             // TrafficIDSelector\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.Controls.Add(this.pSeparator);\r
             this.Controls.Add(this.pSearch);\r
             this.Name = "TrafficIDSelector";\r
-            this.Size = new System.Drawing.Size(332, 400);\r
+            this.Size = new System.Drawing.Size(300, 400);\r
             ((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).EndInit();\r
             this.pFolderType.ResumeLayout(false);\r
             this.pFolderType.PerformLayout();\r
index 0ac82bde1335dd459ae14b63fbf844c12229246d..bafefa4d217d644c32a1156c5c0dbcff3b118d14 100644 (file)
@@ -165,7 +165,7 @@ namespace TrafficClient {
             trafficAPIBindingSource.DataSource = null;\r
         }\r
 \r
-        private void tableLayoutPanelSearch_Paint(object sender, PaintEventArgs e) {\r
+        private void OnSearchPanelPaint(object sender, PaintEventArgs e) {\r
             ControlPaint.DrawBorder(e.Graphics, e.ClipRectangle, Color.LightGray, ButtonBorderStyle.Solid); // dotted border\r
         }\r
 \r