git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index 50b5c352f6ece0b748706b44460188328ef2261c..1c46e15020f2b379daf160b9e6a9dd5df7f6090c 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -16,7 +16,7 @@ using Myriadbits.MXF;
 using MaestroShared.Metadata;\r
 \r
 namespace DxPlay {\r
-    \r
+\r
     internal class DxPlayer : ISampleGrabberCB, IDisposable {\r
 \r
         [DllImport("Kernel32.dll", EntryPoint = "RtlMoveMemory")]\r
@@ -73,6 +73,8 @@ namespace DxPlay {
             CloseInterfaces();\r
         }\r
 \r
+        Control playerWindow;\r
+\r
         // Play an avi file into a window.  Allow for snapshots.\r
         // (Control to show video in, Avi file to play\r
         public DxPlayer(Control hWin, ref MediaDescription mediaDesc) {\r
@@ -84,7 +86,9 @@ namespace DxPlay {
                 MediaDescription = mediaDesc;\r
                 Debug.WriteLine("SetupGraph");\r
                 // Set up the graph\r
-                SetupGraph(hWin);\r
+                playerWindow = hWin;\r
+\r
+                SetupGraph();\r
 \r
                 hWin.Hide();\r
                 hWin.Show();\r
@@ -217,16 +221,9 @@ namespace DxPlay {
             return (int)Math.Abs((double)refTime / AvgTimePerFrame);\r
         }\r
 \r
-        // Build the capture graph for grabber and renderer.</summary>\r
-        // (Control to show video in, Filename to play)\r
-        private void SetupGraph(Control hWin) {\r
+        private void SetupGraph() {\r
             int hr;\r
 \r
-            //if (MediaDescription != null) {\r
-            //    m_videoWidth = MediaDescription.Resolution.Width;\r
-            //    m_videoHeight = MediaDescription.Resolution.Height;\r
-            //}\r
-\r
             try {\r
                 IsError = false;\r
                 m_FilterGraph = new FilterGraph() as IFilterGraph2;\r
@@ -245,20 +242,19 @@ namespace DxPlay {
                 hr = m_FilterGraph.AddSourceFilter(MediaDescription.FileName, MediaDescription.FileName, out sourceFilter);\r
                 DsError.ThrowExceptionForHR(hr);\r
 \r
-                IBaseFilter splitter = null;\r
                 //Type typeFromClsid = Type.GetTypeFromCLSID(new Guid("CCE7BD95-3BC4-4cfb-9664-0BF83201BE09"));\r
                 //splitter = (IBaseFilter)Activator.CreateInstance(typeFromClsid);\r
                 //m_FilterGraph.AddFilter(splitter, "MXF Splitter");\r
                 //splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "Sony MXF Splitter");\r
 \r
-\r
-                splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
+                IBaseFilter splitter = LoadSplitter(graphBuilder);\r
                 if (splitter == null)\r
                     throw new Exception("No splitter!");\r
 \r
                 FilterGraphTools.ConnectFilters(graphBuilder, sourceFilter, "Output", splitter, "Input", true);\r
 \r
-                IBaseFilter videoDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Video Decoder");\r
+                IBaseFilter videoDecoder = LoadVideoDecoder(graphBuilder);\r
+\r
                 if (videoDecoder == null)\r
                     throw new Exception("No video decoder!");\r
 \r
@@ -282,7 +278,8 @@ namespace DxPlay {
                 FilterGraphTools.ConnectFilters(graphBuilder, sampGrabber, "Output", m_videoRenderer, "VMR Input0", true);\r
 \r
                 if (DsFindPin.ByName(splitter, "Audio") != null) {\r
-                    IBaseFilter audioDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Audio Decoder");\r
+                    IBaseFilter audioDecoder = null;\r
+                    audioDecoder = LoadAudioDecoder(graphBuilder);\r
                     if (audioDecoder == null)\r
                         throw new Exception("No audio decoder!");\r
 \r
@@ -292,9 +289,9 @@ namespace DxPlay {
 \r
                 SaveSizeInfo(sampGrabber as ISampleGrabber);\r
                 SetTimeCodes();\r
-                ConfigureVideoWindow(hWin);\r
+                ConfigureVideoWindow();\r
 \r
-                ILAVVideoSettings settings = (ILAVVideoSettings) videoDecoder;\r
+                ILAVVideoSettings settings = (ILAVVideoSettings)videoDecoder;\r
                 //settings.SetSWDeintMode(LAVSWDeintModes.SWDeintMode_None);\r
                 settings.SetSWDeintMode(LAVSWDeintModes.SWDeintMode_YADIF);\r
                 settings.SetSWDeintOutput(LAVDeintOutput.DeintOutput_FramePer2Field);\r
@@ -313,6 +310,40 @@ namespace DxPlay {
 #endif\r
         }\r
 \r
+        private static IBaseFilter LoadVideoDecoder(IGraphBuilder graphBuilder) {\r
+            IBaseFilter videoDecoder = null;\r
+            ILAVVideoSettings lavVideoSettings;\r
+            videoDecoder = FilterProvider.GetVideoFilter(out lavVideoSettings);\r
+            if (videoDecoder == null)\r
+                videoDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Video Decoder");\r
+            else\r
+                graphBuilder.AddFilter(videoDecoder, "LAV Video Decoder");\r
+            return videoDecoder;\r
+        }\r
+\r
+        private static IBaseFilter LoadAudioDecoder(IGraphBuilder graphBuilder) {\r
+            IBaseFilter audioDecoder = null;\r
+            ILAVAudioSettings lavAudioSettings;\r
+            ILAVAudioStatus lavAudioStatus;\r
+            audioDecoder = FilterProvider.GetAudioFilter(out lavAudioSettings, out lavAudioStatus);\r
+            if (audioDecoder == null)\r
+                audioDecoder = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Audio Decoder");\r
+            else\r
+                graphBuilder.AddFilter(audioDecoder, "LAV Audio Decoder");\r
+            return audioDecoder;\r
+        }\r
+\r
+        private static IBaseFilter LoadSplitter(IGraphBuilder graphBuilder) {\r
+            IBaseFilter splitter = null;\r
+            ILAVSplitterSettings lavSplitterSettings;\r
+            splitter = FilterProvider.GetSplitter(out lavSplitterSettings);\r
+            if (splitter == null)\r
+                splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
+            else\r
+                graphBuilder.AddFilter(splitter, "LAV Splitter");\r
+            return splitter;\r
+        }\r
+\r
         private void SetTimeCodes() {\r
             int hr;\r
             long duration;\r
@@ -331,14 +362,14 @@ namespace DxPlay {
 \r
 \r
         // Configure the video window\r
-        private void ConfigureVideoWindow(Control hWin) {\r
+        private void ConfigureVideoWindow() {\r
             int hr;\r
 \r
             // Set the output window\r
-            hr = m_videoWindow.put_Owner(hWin.Handle);\r
+            hr = m_videoWindow.put_Owner(playerWindow.Handle);\r
             DsError.ThrowExceptionForHR(hr);\r
 \r
-            hr = m_videoWindow.put_MessageDrain(hWin.Handle);\r
+            hr = m_videoWindow.put_MessageDrain(playerWindow.Handle);\r
             DsError.ThrowExceptionForHR(hr);\r
 \r
             // Set the window style\r
@@ -349,16 +380,16 @@ namespace DxPlay {
             hr = m_videoWindow.put_Visible(OABool.True);\r
             DsError.ThrowExceptionForHR(hr);\r
 \r
-            UpdateVideoWindow(hWin);\r
+            UpdateVideoWindow();\r
         }\r
 \r
-        public void UpdateVideoWindow(Control hWin) {\r
+        public void UpdateVideoWindow() {\r
             Size resolution = MediaDescription.Resolution;\r
             if (resolution.Width == 0 || resolution.Height == 0)\r
                 return;\r
             int hr;\r
             // Position the playing location\r
-            Rectangle rc = hWin.ClientRectangle;\r
+            Rectangle rc = playerWindow.ClientRectangle;\r
             double x = (double)resolution.Width / resolution.Height;\r
             double y = (double)rc.Right / rc.Bottom;\r
             int playerWidth = 0;\r

diff --git a/client/DxPlay/FilterGraphTools.cs b/client/DxPlay/FilterGraphTools.cs
index f3a47197124b9a67f9aa894e2597f580ba1e0fb8..13e6a84a77a5061b93c292561aa495014a1fec10 100644 (file)
--- a/client/DxPlay/FilterGraphTools.cs
+++ b/client/DxPlay/FilterGraphTools.cs
@@ -117,7 +117,7 @@ namespace DirectShowLib.Utils {
             DsDevice[] devices = DsDevice.GetDevicesOfCat(deviceCategory);\r
 \r
             for (int i = 0; i < devices.Length; i++) {\r
-                Debug.WriteLine("Found " + devices[i].Name);\r
+                //Debug.WriteLine("Found " + devices[i].Name);\r
                 if (string.IsNullOrEmpty(devices[i].Name)) //if the name is empty ignore the filter\r
                     continue;\r
                 else {\r

diff --git a/client/DxPlay/InterceptKeys.cs b/client/DxPlay/InterceptKeys.cs
index ab633d1f586235146013f8c657d3859c7886bd82..2873f27b52b940d40b18d21b6cbcbe3f0448f8d8 100644 (file)
--- a/client/DxPlay/InterceptKeys.cs
+++ b/client/DxPlay/InterceptKeys.cs
@@ -18,10 +18,10 @@ namespace DxPlay {
         }\r
 \r
         private static IntPtr SetHook(LowLevelKeyboardProc proc) {\r
-            using (Process curProcess = Process.GetCurrentProcess())\r
-            using (ProcessModule curModule = curProcess.MainModule) {\r
-                return SetWindowsHookEx(WH_KEYBOARD_LL, proc,\r
-                    GetModuleHandle(curModule.ModuleName), 0);\r
+            using (Process curProcess = Process.GetCurrentProcess()) {\r
+                using (ProcessModule curModule = curProcess.MainModule) {\r
+                    return SetWindowsHookEx(WH_KEYBOARD_LL, proc, GetModuleHandle(curModule.ModuleName), 0);\r
+                }\r
             }\r
         }\r
 \r
@@ -34,13 +34,8 @@ namespace DxPlay {
         private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam) {\r
             if (nCode >= 0 && wParam == (IntPtr)WM_KEYDOWN) {\r
                 int vkCode = Marshal.ReadInt32(lParam);\r
-                //Debug.WriteLine((Keys)vkCode);\r
-                //if (GlobalKeyEvent != null) {\r
-                //    if (GlobalKeyEvent.Invoke((Keys)vkCode))\r
-                //        return (IntPtr)1;\r
-                //}\r
                 GlobalKeyEvent?.Invoke((Keys)vkCode);\r
-\r
+                //Application.DoEvents();\r
             }\r
 \r
             return CallNextHookEx(_hookID, nCode, wParam, lParam);\r

diff --git a/client/DxPlay/LAVInterfaces.cs b/client/DxPlay/LAVInterfaces.cs
index 0608fc89d1424776265b0936f653dc3f6779ed29..173626563adfa885efcc5e915f40c419c1aa35e8 100644 (file)
--- a/client/DxPlay/LAVInterfaces.cs
+++ b/client/DxPlay/LAVInterfaces.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Reflection;\r
 using System.Runtime.InteropServices;\r
 using System.Security;\r
+using System.Windows.Forms;\r
 \r
 namespace DxPlay {\r
     #region "LAV COM classes"\r
@@ -781,8 +782,6 @@ namespace DxPlay {
 \r
                     if (oSettings != null)\r
                         Marshal.FinalReleaseComObject(oSettings);\r
-\r
-                    throw;\r
                 }\r
                 finally {\r
                     // even if nothing bad happens we need to clenup and give back to the original path\r
@@ -882,8 +881,6 @@ namespace DxPlay {
 \r
                     if (oSettings != null)\r
                         Marshal.FinalReleaseComObject(oSettings);\r
-\r
-                    throw;\r
                 }\r
                 finally {\r
                     // even if nothing bad happens we need to clenup and give back to the original path\r
@@ -915,7 +912,7 @@ namespace DxPlay {
                 string currentDir = Directory.GetCurrentDirectory();\r
                 // we have the filters in the subdirectory 'codecs' of the running app\r
                 string path = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), subDir);\r
-\r
+                MessageBox.Show(path);\r
                 try {\r
                     // we need to be in the filter directory since it will load a bunch \r
                     // of other dlls that are there, and they won't resolve otherwise\r
@@ -1054,8 +1051,6 @@ namespace DxPlay {
 \r
                     if (oSettings != null)\r
                         Marshal.FinalReleaseComObject(oSettings);\r
-\r
-                    throw;\r
                 }\r
                 finally {\r
                     // even if nothing bad happens we need to clenup and give back to the original path\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index c5f403db53c85f9665fd0b06613d75d238c28473..d90e7f91fe10b9b1f33191a36b408993ec37682f 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -147,7 +147,7 @@ namespace DxPlay {
 \r
         private void panel1_SizeChanged(object sender, EventArgs e) {\r
             if (m_play != null)\r
-                m_play.UpdateVideoWindow(pVideo);\r
+                m_play.UpdateVideoWindow();\r
         }\r
 \r
         private void trackBar1_MouseDown(object sender, MouseEventArgs e) {\r
@@ -248,6 +248,7 @@ namespace DxPlay {
                     result = true;\r
                     break;\r
                 case Keys.Left:\r
+                    Debug.WriteLine("Seeking...");\r
                     if (ModifierKeys.HasFlag(Keys.Control)) {\r
                         if (m_play.CurrentTC.ZeroBasedFrames > 4) {\r
                             m_play.Pause();\r

diff --git a/client/DxPlay/Program.cs b/client/DxPlay/Program.cs
index 4e91da205de3714a065244d167e0eb81ae7dc65d..15a345d3e1660268b21265d03cdbd3a35e5e8071 100644 (file)
--- a/client/DxPlay/Program.cs
+++ b/client/DxPlay/Program.cs
@@ -1,6 +1,7 @@
 using DxPlay;\r
 using System;\r
 using System.Diagnostics;\r
+using System.IO;\r
 using System.Windows.Forms;\r
 \r
 namespace Maestro {\r
@@ -13,7 +14,19 @@ namespace Maestro {
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);\r
             Application.EnableVisualStyles();\r
             Application.SetCompatibleTextRenderingDefault(false);\r
-            Application.Run(new PlayerForm());\r
+            PlayerForm playerForm = new PlayerForm();\r
+\r
+            String[] arguments = Environment.GetCommandLineArgs();\r
+            if (arguments.Length > 1) {\r
+                FileInfo fi = new FileInfo(arguments[1]);\r
+                if (fi.Exists) {\r
+                    playerForm.AutoStart = true;\r
+                    playerForm.Open(fi);\r
+                    if (playerForm.IsDisposed)\r
+                        return;\r
+                }\r
+            }\r
+            Application.Run(playerForm);\r
         }\r
 \r
         private static void MyHandler(object sender, UnhandledExceptionEventArgs e) {\r

diff --git a/client/Maestro/ArchiveMetadataForm.Designer.cs b/client/Maestro/ArchiveMetadataForm.Designer.cs
index cb23d5525b3e461f1964e7834a76338a4f1429ae..abc40b0207dae8cd51bf93f8a40c88ad4d54b664 100644 (file)
--- a/client/Maestro/ArchiveMetadataForm.Designer.cs
+++ b/client/Maestro/ArchiveMetadataForm.Designer.cs
@@ -104,61 +104,63 @@
             // \r
             this.textBox_itemID.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_itemID.Location = new System.Drawing.Point(11, 27);\r
-            this.textBox_itemID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_itemID.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_itemID.Name = "textBox_itemID";\r
             this.textBox_itemID.ReadOnly = true;\r
             this.textBox_itemID.Size = new System.Drawing.Size(660, 23);\r
             this.textBox_itemID.TabIndex = 6;\r
+            this.textBox_itemID.TabStop = false;\r
             // \r
             // textBox_itemTitle\r
             // \r
             this.textBox_itemTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_itemTitle.Location = new System.Drawing.Point(11, 75);\r
-            this.textBox_itemTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_itemTitle.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_itemTitle.Name = "textBox_itemTitle";\r
             this.textBox_itemTitle.Size = new System.Drawing.Size(660, 23);\r
-            this.textBox_itemTitle.TabIndex = 7;\r
+            this.textBox_itemTitle.TabIndex = 1;\r
             // \r
             // textBox_itemDescription\r
             // \r
             this.textBox_itemDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_itemDescription.Location = new System.Drawing.Point(11, 123);\r
-            this.textBox_itemDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_itemDescription.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_itemDescription.Multiline = true;\r
             this.textBox_itemDescription.Name = "textBox_itemDescription";\r
             this.textBox_itemDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
             this.textBox_itemDescription.Size = new System.Drawing.Size(660, 126);\r
-            this.textBox_itemDescription.TabIndex = 8;\r
+            this.textBox_itemDescription.TabIndex = 2;\r
             // \r
             // textBox_mediaID\r
             // \r
             this.textBox_mediaID.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_mediaID.Location = new System.Drawing.Point(11, 274);\r
-            this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_mediaID.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_mediaID.Name = "textBox_mediaID";\r
             this.textBox_mediaID.ReadOnly = true;\r
             this.textBox_mediaID.Size = new System.Drawing.Size(660, 23);\r
             this.textBox_mediaID.TabIndex = 9;\r
+            this.textBox_mediaID.TabStop = false;\r
             // \r
             // textBox_mediaTitle\r
             // \r
             this.textBox_mediaTitle.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_mediaTitle.Location = new System.Drawing.Point(11, 322);\r
-            this.textBox_mediaTitle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_mediaTitle.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_mediaTitle.Name = "textBox_mediaTitle";\r
             this.textBox_mediaTitle.Size = new System.Drawing.Size(660, 23);\r
-            this.textBox_mediaTitle.TabIndex = 10;\r
+            this.textBox_mediaTitle.TabIndex = 3;\r
             // \r
             // textBox_mediaDescription\r
             // \r
             this.textBox_mediaDescription.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.textBox_mediaDescription.Location = new System.Drawing.Point(11, 370);\r
-            this.textBox_mediaDescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.textBox_mediaDescription.Margin = new System.Windows.Forms.Padding(4);\r
             this.textBox_mediaDescription.Multiline = true;\r
             this.textBox_mediaDescription.Name = "textBox_mediaDescription";\r
             this.textBox_mediaDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;\r
             this.textBox_mediaDescription.Size = new System.Drawing.Size(660, 113);\r
-            this.textBox_mediaDescription.TabIndex = 11;\r
+            this.textBox_mediaDescription.TabIndex = 4;\r
             // \r
             // label_stuffTitle\r
             // \r
@@ -178,9 +180,9 @@
             this.groupBox1.Controls.Add(this.btnCancel);\r
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
             this.groupBox1.Location = new System.Drawing.Point(0, 486);\r
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);\r
             this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);\r
             this.groupBox1.Size = new System.Drawing.Size(682, 59);\r
             this.groupBox1.TabIndex = 1;\r
             this.groupBox1.TabStop = false;\r
@@ -189,10 +191,10 @@
             // \r
             this.btnOk.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.btnOk.Location = new System.Drawing.Point(574, 20);\r
-            this.btnOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.btnOk.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnOk.Name = "btnOk";\r
             this.btnOk.Size = new System.Drawing.Size(100, 28);\r
-            this.btnOk.TabIndex = 1;\r
+            this.btnOk.TabIndex = 5;\r
             this.btnOk.Text = "Rendben";\r
             this.btnOk.UseVisualStyleBackColor = true;\r
             this.btnOk.Click += new System.EventHandler(this.OnOkClick);\r
@@ -202,10 +204,10 @@
             this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
             this.btnCancel.Location = new System.Drawing.Point(468, 20);\r
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnCancel.Name = "btnCancel";\r
             this.btnCancel.Size = new System.Drawing.Size(100, 28);\r
-            this.btnCancel.TabIndex = 0;\r
+            this.btnCancel.TabIndex = 6;\r
             this.btnCancel.Text = "Mégsem";\r
             this.btnCancel.UseVisualStyleBackColor = true;\r
             this.btnCancel.Click += new System.EventHandler(this.OnCancelClick);\r
@@ -228,7 +230,7 @@
             this.tableLayoutPanel1.Controls.Add(this.label_stuffTitle, 0, 2);\r
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);\r
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
             this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);\r
             this.tableLayoutPanel1.RowCount = 12;\r
@@ -257,7 +259,7 @@
             this.Controls.Add(this.groupBox1);\r
             this.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.Icon = global::Maestro.Properties.Resources.AppIcon;\r
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);\r
+            this.Margin = new System.Windows.Forms.Padding(4);\r
             this.Name = "ArchiveMetadataForm";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Archiv adatok";\r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index e6d8a88ec82221e854ed3101a501432e33f94f41..448d676bbbce96f7a4ffbff8a7dca60c4bceff54 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -19,9 +19,29 @@
   "metadatas": [\r
     {\r
       "$type": "OctopusMetadata",\r
+      "disableStoryCheck": true,\r
       "server": {\r
         "address": "http://10.10.1.27/services/rest/octopus/",\r
         "timeout": 1000\r
+      },\r
+      "project": {\r
+        "templateRoot": {\r
+          "address": "file://10.10.1.100/BRAVOOS/.MAESTRO/PROJECT",\r
+          "userName": "mediacube",\r
+          "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+          "timeout": 1000\r
+        },\r
+        "projectRoot": {\r
+          "address": "file://10.10.1.100/BRAVOOS/OCTOPUS",\r
+          "userName": "mediacube",\r
+          "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+          "timeout": 1000\r
+        },\r
+        "templateName": "ALAPTIMELINE.ezp",\r
+        "projectName": "%ID%-%TEXT%.ezp",\r
+        "destinationFormat": "%IDROOT%-%TEXT%/PROJECT",\r
+        "disableProject": false,\r
+        "disableSourceOpen": false\r
       }\r
     },\r
     {\r
@@ -69,9 +89,9 @@
     {\r
       "label": "Octopus mappába küldés",\r
       "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%ID%-%SOURCENAME%",\r
       "tag": "Betöltés",\r
-      "subFolderFormat": "%IDROOT%",\r
+      "outputFormat": "%ID%",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
       "killDateDays": 7,\r
       "saveArchiveMetadata": false,\r
       "remote": {\r

diff --git a/client/Maestro/Configuration/configuration-playout-ingest.json b/client/Maestro/Configuration/configuration-playout-ingest.json
index aa818ef78d9a56e12fce43f666f94ee12d06375c..ddd13040318565787876b4f4db0d6b43d9a535d9 100644 (file)
--- a/client/Maestro/Configuration/configuration-playout-ingest.json
+++ b/client/Maestro/Configuration/configuration-playout-ingest.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Lebony betöltő",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r

diff --git a/client/Maestro/Configuration/global.json b/client/Maestro/Configuration/global.json
index 6c7a8f4d46d0dc9b55f1392d15aafe54ad095ff9..c2fc61183489ea64a87cf2932948c73628f94a16 100644 (file)
--- a/client/Maestro/Configuration/global.json
+++ b/client/Maestro/Configuration/global.json
@@ -1,4 +1,5 @@
 {\r
+  "minimizeToTray":  true,\r
   "userDomain": {\r
     "address": "intra.echotv.hu",\r
     "userName": "echotest",\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index d1554c333b7db380e3c6b178a0590a08d11e9a3f..3d557d7284fdac89d025708faa172853f578a04d 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -246,19 +246,19 @@
       <SubType>Form</SubType>\r
     </Compile>\r
     <None Include="Configuration\global.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-nexio-ingest.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-editor.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-nle.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-playout-ingest.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Connected Services\packages.config" />\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
@@ -288,16 +288,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-playout.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Resources\configuration-unc.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-sxs.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\configuration-studio.json">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -351,6 +351,8 @@
     <None Include="Resources\ic_playlist_add_check_black_24dp_1x_green1.png" />\r
     <None Include="Resources\ic_receipt_black_24dp_1x_green.png" />\r
     <None Include="Resources\ic_folder_open_black_24dp_1x.png" />\r
+    <None Include="Resources\ic_refresh_black_24dp_1x.jpg" />\r
+    <None Include="Resources\ic_refresh_black_24dp_1x.png" />\r
     <Content Include="Resources\play.ico" />\r
     <Content Include="TODO.txt" />\r
   </ItemGroup>\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 4b77ea2517bb4a83188fc4456bd0e2b4e81ac43e..1adb1e04f5c88c97430d7bbbe9390bcdb6e9e639 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -26,17 +26,17 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dgSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -159,32 +159,32 @@ namespace Maestro {
             this.dgSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dgSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;\r
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgSource.DataSource = this.bindingSource;\r
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgSource.DefaultCellStyle = dataGridViewCellStyle12;\r
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgSource.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.dgSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgSource.EnableHeadersVisualStyles = false;\r
             this.dgSource.Location = new System.Drawing.Point(10, 47);\r
             this.dgSource.Name = "dgSource";\r
             this.dgSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle13;\r
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
             this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgSource.Size = new System.Drawing.Size(330, 159);\r
@@ -706,15 +706,15 @@ namespace Maestro {
             this.columnOutput,\r
             this.columnKillDate});\r
             this.dgJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle16.NullValue = null;\r
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle16;\r
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle6.NullValue = null;\r
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle6;\r
             this.dgJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgJobs.EnableHeadersVisualStyles = false;\r
@@ -722,8 +722,8 @@ namespace Maestro {
             this.dgJobs.Location = new System.Drawing.Point(3, 3);\r
             this.dgJobs.Name = "dgJobs";\r
             this.dgJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle17;\r
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle7;\r
             this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgJobs.Size = new System.Drawing.Size(988, 90);\r
@@ -744,8 +744,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle14;\r
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnID.DefaultCellStyle = dataGridViewCellStyle4;\r
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
             this.columnID.Width = 44;\r
@@ -762,8 +762,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\r
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle15;\r
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle5;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
             this.columnStatus.Width = 66;\r
@@ -831,15 +831,15 @@ namespace Maestro {
             this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.dataGridViewTextBoxColumn1,\r
             this.dataGridViewTextBoxColumn2});\r
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle19.NullValue = null;\r
-            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle19;\r
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red;\r
+            dataGridViewCellStyle9.NullValue = null;\r
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red;\r
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9;\r
             this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgMessages.EnableHeadersVisualStyles = false;\r
@@ -848,8 +848,8 @@ namespace Maestro {
             this.dgMessages.Name = "dgMessages";\r
             this.dgMessages.ReadOnly = true;\r
             this.dgMessages.RowHeadersVisible = false;\r
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle20;\r
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
             this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgMessages.Size = new System.Drawing.Size(988, 90);\r
@@ -868,8 +868,8 @@ namespace Maestro {
             // \r
             this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
             this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle18;\r
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8;\r
             this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 48e4cacd6e588a9182e78fdb79debf4b8f32e17a..18a10c9ef0177a6142a44323ec94c4f3ed5efc8d 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -253,7 +253,9 @@ namespace Maestro {
                 return null;\r
             ArchiveMetadata result = new ArchiveMetadata();\r
             result.itemHouseId = ARCHIVEID_PREFIX + masterId.id.ToString();\r
+            result.itemTitle = result.itemHouseId;\r
             result.mediaHouseId = result.itemHouseId;\r
+            result.mediaTitle = result.mediaHouseId;\r
             return result;\r
         }\r
 \r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 12b915ac3db30c985a59fc178580b1dae7dde7b7..05abdfcb5f776d36aa701127510f0f86f3251df2 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -28,8 +28,10 @@ namespace Maestro {
             }\r
             set {\r
                 selectedSource = value;\r
-                if (selectedSource == null)\r
+                if (selectedSource == null) {\r
+                    selectedSourceItems.ForEach(i => i.IsChecked = false);\r
                     selectedSourceItems.Clear();\r
+                }\r
                 textSelectedSource.Text = selectedSource?.Name;\r
                 archiveMetadata = null;\r
                 segments = null;\r
@@ -291,27 +293,21 @@ namespace Maestro {
             if (t != MetadataType.MediaCube && t != MetadataType.None)\r
                 return nameWithoutExtension;\r
 \r
-            if (nameWithoutExtension.Contains("-")) {\r
+            if (nameWithoutExtension.Contains("-") || nameWithoutExtension.Contains("_")) {\r
                 int start = nameWithoutExtension.Length;\r
                 while (true) {\r
                     int p = nameWithoutExtension.LastIndexOf("-", start);\r
-                    if (p < 1)\r
-                        break;\r
-                    start = p - 1;\r
-                    string x = nameWithoutExtension.Substring(0, p);\r
-                    var z = GuessMetadataType(x);\r
-                    if (z != MetadataType.MediaCube && z != MetadataType.None)\r
-                        return x;\r
-                }\r
-            }\r
-            if (nameWithoutExtension.Contains("_")) {\r
-                int start = nameWithoutExtension.Length;\r
-                while (true) {\r
-                    int p = nameWithoutExtension.LastIndexOf("_", start);\r
-                    if (p < 1)\r
+                    int o = nameWithoutExtension.LastIndexOf("_", start);\r
+                    if (p < 1 && o < 1)\r
                         break;\r
-                    start = p - 1;\r
-                    string x = nameWithoutExtension.Substring(0, p);\r
+                    string x = null;\r
+                    if (p > o) {\r
+                        start = p - 1;\r
+                        x = nameWithoutExtension.Substring(0, p);\r
+                    } else {\r
+                        start = o - 1;\r
+                        x = nameWithoutExtension.Substring(0, o);\r
+                    }\r
                     var z = GuessMetadataType(x);\r
                     if (z != MetadataType.MediaCube && z != MetadataType.None)\r
                         return x;\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index c78a12e32dc0e2070dc2fb55a42951c6aca4d7fe..427a108b3d4a156a53fefdd0f2361eda1280dd8e 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -238,6 +238,7 @@ namespace Maestro {
             if (processorWorker == null)\r
                 CreateJobsQueueWorker();\r
             ActivateTab(0);\r
+            SelectedSource = null;\r
         }\r
 \r
 \r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index a2a0e145c6d85ec92fda6b69e3eed1dafe1d2279..40bfd2643fcaf0120e9207bc49eed80466d3c077 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -91,7 +91,8 @@ namespace Maestro {
             SetColor(groupMetadata, defaultColor);\r
             SetColor(groupTarget, defaultColor);\r
             SetColor(groupActions, defaultColor);\r
-            \r
+            ShowInTaskbar = !TrayApplicationContext.GlobalConfig.MinimizeToTray;\r
+\r
         }\r
 \r
         private void OnMessage(IMessage message) {\r
@@ -113,12 +114,16 @@ namespace Maestro {
 \r
         private void MaestroForm_Resize(object sender, EventArgs e) {\r
             if (WindowState == FormWindowState.Minimized) {\r
-                Visible = false;\r
+                if (TrayApplicationContext.GlobalConfig.MinimizeToTray)\r
+                    Visible = false;\r
             }\r
         }\r
 \r
         private void MaestroForm_FormClosing(object sender, FormClosingEventArgs e) {\r
-            Visible = false;\r
+            if (TrayApplicationContext.GlobalConfig.MinimizeToTray)\r
+                Visible = false;\r
+            else\r
+                WindowState = FormWindowState.Minimized;\r
             e.Cancel = true;\r
         }\r
 \r
@@ -236,12 +241,19 @@ namespace Maestro {
             switch (item.Status) {\r
                 case TargetProcessor.ERROR:\r
                     row.DefaultCellStyle.BackColor = MaestroColors.Red200;\r
+                    row.DefaultCellStyle.SelectionBackColor = MaestroColors.Red200;\r
                     break;\r
                 case TargetProcessor.REVOKED:\r
                     row.DefaultCellStyle.BackColor = MaestroColors.Orange200;\r
+                    row.DefaultCellStyle.SelectionBackColor = MaestroColors.Orange200;\r
                     break;\r
                 case TargetProcessor.READY:\r
                     row.DefaultCellStyle.BackColor = MaestroColors.BlueGray200;\r
+                    row.DefaultCellStyle.SelectionBackColor = MaestroColors.BlueGray200;\r
+                    break;\r
+                default:\r
+                    row.DefaultCellStyle.BackColor = Color.White;\r
+                    row.DefaultCellStyle.SelectionBackColor = Color.White;\r
                     break;\r
             }\r
         }\r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index ffe86623b7ee5d358592a5b6572fceb6fd5fb56d..14f8d31f6304889f369c27abce1fe012fae85655 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACU\r
-        BwAAAk1TRnQBSQFMAwEBAAFgAQABYAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
+        BwAAAk1TRnQBSQFMAwEBAAGQAQABkAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
         AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA\r
         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA\r
         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm\r
@@ -163,9 +163,6 @@
         AUADAAEQAwABAQEAAQEFAAGAFwAD/4EACw==\r
 </value>\r
   </data>\r
-  <metadata name="tsSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>951, 17</value>\r
-  </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="picClearFilter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
@@ -175,8 +172,8 @@
         3/jmkprcKEuYE8aOir3NRGolzAnzVFoPuyGPLs5GSj/4XULq1sxx1wAAAABJRU5ErkJggg==\r
 </value>\r
   </data>\r
-  <metadata name="tsMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>846, 17</value>\r
+  <metadata name="tsSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>951, 17</value>\r
   </metadata>\r
   <metadata name="tsMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>846, 17</value>\r

diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs
index 37e2f74f5e028f3a1182032e5173fa4848930da9..8e677d04ee67f28e04ea2c01c1f2cb4f779162e1 100644 (file)
--- a/client/Maestro/Program.cs
+++ b/client/Maestro/Program.cs
@@ -14,6 +14,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;\r
 using System.Security.AccessControl;\r
 using System.Security.Principal;\r
+using System.Text.RegularExpressions;\r
 using System.Threading;\r
 using System.Threading.Tasks;\r
 using System.Windows.Forms;\r
@@ -87,8 +88,11 @@ namespace Maestro {
         private IMessageBus messageBus = new MessageBus();\r
 \r
         public static string UserName { get; set; }\r
+        public static GlobalInfo GlobalConfig { get; internal set; }\r
 \r
         public TrayApplicationContext() {\r
+            //string x = Regex.Replace("xxx/yyy/1234-00_aaa", "_*$", "*");\r
+            //Debug.WriteLine(x);\r
         }\r
 \r
         private bool HasCommandlineParameter(string parameter) {\r
@@ -107,7 +111,7 @@ namespace Maestro {
             if (configFiles.Length == 0)\r
                 throw new Exception(CONFIG_ERROR);\r
 \r
-            CheckGlobalConfig(configFiles);\r
+            GlobalConfig = LoadGlobalConfig(configFiles);\r
             if (!HasCommandlineParameter(NOLOGIN))\r
                 CheckUser();\r
             CreateForms(configFiles);\r
@@ -128,10 +132,11 @@ namespace Maestro {
                 throw new Exception(CONFIG_ERROR);\r
         }\r
 \r
-        private void CheckGlobalConfig(string[] files) {\r
+        private GlobalInfo LoadGlobalConfig(string[] files) {\r
             string globalFile = Path.Combine(CONFIGURATION_FOLDER, GLOBAL_JSON);\r
             if (!files.Contains(globalFile))\r
                 throw new Exception(SYSCONFIG_ERROR);\r
+            return Loader.Get<GlobalInfo>(globalFile);\r
         }\r
 \r
         private bool IsDomainUser(string userName, string domainName) {\r
@@ -149,16 +154,15 @@ namespace Maestro {
 \r
         private void CheckUser() {\r
             string globalFile = Path.Combine(CONFIGURATION_FOLDER, GLOBAL_JSON);\r
-            GlobalInfo global = Loader.Get<GlobalInfo>(globalFile);\r
-            string domainName = global.UserDomain.Address.ToString();\r
+            string domainName = GlobalConfig.UserDomain.Address.ToString();\r
             if (String.IsNullOrEmpty(domainName))\r
                 throw new Exception(SYSCONFIG_ERROR);\r
             else {\r
                 string userName = WindowsIdentity.GetCurrent().Name;\r
                 if (IsDomainUser(userName, domainName))\r
                     return;\r
-                userName = global.UserDomain.UserName;\r
-                string password = global.UserDomain.Password;\r
+                userName = GlobalConfig.UserDomain.UserName;\r
+                string password = GlobalConfig.UserDomain.Password;\r
                 LoginForm loginForm = null;\r
                 try {\r
                     using (PrincipalContext pc = new PrincipalContext(ContextType.Domain, domainName)) {\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 9da19dff43a671bac9685994d9bca4d178adfaeb..c0bb94b1457432be024d1da2c256b8134cbd8971 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.4.2")]\r
-[assembly: AssemblyFileVersion("2.0.4.2")]\r
+[assembly: AssemblyVersion("2.0.4.5")]\r
+[assembly: AssemblyFileVersion("2.0.4.5")]\r

diff --git a/client/Maestro/Properties/Resources.Designer.cs b/client/Maestro/Properties/Resources.Designer.cs
index 027760f06f2e478b3aabf17fae3e7faa96b1c022..382c721ca1c802a952e3624e9de3cf7cbc71c00e 100644 (file)
--- a/client/Maestro/Properties/Resources.Designer.cs
+++ b/client/Maestro/Properties/Resources.Designer.cs
@@ -150,6 +150,16 @@ namespace Maestro.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        internal static System.Drawing.Bitmap ic_refresh_black_24dp_1x {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ic_refresh_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

diff --git a/client/Maestro/Properties/Resources.resx b/client/Maestro/Properties/Resources.resx
index 75f430b001e4339da9526737031322b97b1aafed..9ba30307af95d75c4a8e3450d11c106c846313d6 100644 (file)
--- a/client/Maestro/Properties/Resources.resx
+++ b/client/Maestro/Properties/Resources.resx
@@ -169,4 +169,7 @@
   <data name="ic_view_headline_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\ic_view_headline_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/Maestro/Resources/ic_refresh_black_24dp_1x.jpg b/client/Maestro/Resources/ic_refresh_black_24dp_1x.jpg
new file mode 100644 (file)
index 0000000..30f3121
Binary files /dev/null and b/client/Maestro/Resources/ic_refresh_black_24dp_1x.jpg differ

diff --git a/client/Maestro/Resources/ic_refresh_black_24dp_1x.png b/client/Maestro/Resources/ic_refresh_black_24dp_1x.png
new file mode 100644 (file)
index 0000000..c82efd5
Binary files /dev/null and b/client/Maestro/Resources/ic_refresh_black_24dp_1x.png differ

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 978f87b8b8afa672b9a3e8b17d28038fdfb878d3..1c5daf7996231fd8e3431b8619b3186c48cd2cdf 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -24,6 +24,7 @@ namespace MaestroShared.Configuration {
 \r
     public class GlobalInfo {\r
         public Connection UserDomain { get; set; }\r
+        public bool MinimizeToTray { get; set; }\r
     }\r
 \r
     public class ConfigurationInfo {\r
@@ -106,6 +107,16 @@ namespace MaestroShared.Configuration {
         public Connection Server { get; set; }\r
     }\r
 \r
+    public class Project {\r
+        public Connection TemplateRoot { get; set; }\r
+        public Connection ProjectRoot { get; set; }\r
+        public string TemplateName { get; set; }\r
+        public string ProjectName { get; set; }\r
+        public string DestinationFormat { get; set; }\r
+        public bool DisableProject { get; set; }\r
+        public bool DisableSourceOpen { get; set; }\r
+    }\r
+\r
     public class OctopusMetadata : MetadataProvider {\r
         public bool DisablePlaceHolderCheck { get; set; }\r
         public bool DisableStoryCheck { get; set; }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java
index 0e9ee5c4368fc01bb4b654a0acccb9a7cb095254..7b78de792eb5a5130064aa1274e62ab1409b2de3 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java
@@ -82,7 +82,8 @@ public class ArchiveListBuilderStep extends JobStep {
                try {\r
                        Files.newDirectoryStream(Paths.get(sourcePath)).forEach(p -> processPathItem(p, archiveList));\r
                } catch (Exception e) {\r
-                       logger.error("", e);\r
+                       logger.catching(e);\r
+                       logger.error(getMarker(), "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", e.getMessage());\r
                } finally {\r
                        if (directoryStream != null) {\r
                                try {\r