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

diff --git a/client/DxPlay/Configuration/dxplay.en b/client/DxPlay/Configuration/dxplay.en
index f75ceb57a8d3604ff35e212fbe0a1efe1d5a62f2..d3068b65aee6fafe25ae9d84d781fb83a8e9f1e0 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.en
+++ b/client/DxPlay/Configuration/dxplay.en
@@ -41,8 +41,10 @@
   "ADVERTISEMENT": "Advertisement",\r
   "SEGMENTCOUNT": "Segment count",\r
   "TRAFFICID": "Traffic ID",\r
+  "IDNOTEXIST": "Specified ID not exists.",\r
   "ERRORCREATESEGMENT": "No space for mode segments.",\r
   "ERRORINVALIDTCIN": "TC IN must be before TC OUT.",\r
   "ERRORINVALIDTCOUT": "TC OUT must be after TC IN.",\r
-  "ERRORSEGMENTCOLLISION": "Segment overlaps are not allowed."\r
+  "ERRORSEGMENTCOLLISION": "Segment overlaps are not allowed.",\r
+  "ERRORTARGETEXISTS": "Target file already exists: {0}"\r
 }\r

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json
index 0bb643a17830c48c873adfdb29d742e81cf78aaa..79950ec010790393210731684862d430ed855873 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.json
+++ b/client/DxPlay/Configuration/dxplay.json
@@ -1,5 +1,5 @@
 {\r
-  "targetDirectory": "DONE",\r
+  "targetDirectory": "c:\\videotmp",\r
   "uiFileName": "dxplay.en",\r
   "isMaximized": true,\r
   "player": {\r

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 7f66a192db2deff02162f294f695ef83fa084435..491bf692c016ec66358ba656523c6d35db08ec4b 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -158,6 +158,7 @@
     <Reference Include="LinkDotNet.MessageHandling.Contracts, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
       <HintPath>..\packages\LinkDotNet.MessageBus.Contracts.0.1.1\lib\LinkDotNet.MessageHandling.Contracts.dll</HintPath>\r
     </Reference>\r
+    <Reference Include="Microsoft.VisualBasic" />\r
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">\r
       <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>\r
     </Reference>\r

diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs
index 80efe19abadeea7448c6e9472798be556a253186..c24c4465a18f35be204c32f03e2797e8081f7c89 100644 (file)
--- a/client/DxPlay/Model/DxPlayModel.cs
+++ b/client/DxPlay/Model/DxPlayModel.cs
@@ -11,6 +11,9 @@ using NLog;
 using System.IO;\r
 using MaestroShared.Targets;\r
 using System.Linq;\r
+using Microsoft.VisualBasic.FileIO;\r
+using DxPlay.Properties;\r
+using MaestroShared.Commons;\r
 \r
 namespace DxPlay.Model {\r
     public class DxPlayModel : INotifyPropertyChanged {\r
@@ -40,9 +43,11 @@ namespace DxPlay.Model {
         private void OnMessage(IMessage message) {\r
             if (message is TrafficAPIMessage) {\r
                 TrafficAPIMessage msg = message as TrafficAPIMessage;\r
-                throw new Exception(msg.Content);\r
+                string errorMessage = string.Format(settings.Resource("ERRORTRAFFICCONNECT", Resources.ERRORTRAFFICCONNECT), settings?.Metadata?.Server?.Address?.OriginalString);\r
+                logger.Error(errorMessage);\r
+                MsgBox.Error(errorMessage);\r
+                //throw new Exception(msg.Content);\r
             }\r
-            //string msg = string.Format(settings.Resource("ERRORTRAFFICCONNECT", Resources.ERRORTRAFFICCONNECT), settings?.Metadata?.Server?.Address?.OriginalString);\r
             //MessageBox.Show(msg, "Connection error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
         }\r
 \r
@@ -137,13 +142,17 @@ namespace DxPlay.Model {
             if (CurrentFile == null || !CurrentFile.Exists)\r
                 return;\r
 \r
-            string targetDirectory = Path.Combine(CurrentFile.DirectoryName, settings.TargetDirectory);\r
-            string targetPath = Path.Combine(CurrentFile.DirectoryName, settings.TargetDirectory, ID + ".MXF");\r
+            string targetDirectory = settings.TargetDirectory;\r
+            string targetPath = Path.Combine(settings.TargetDirectory, ID + ".MXF");\r
+            bool deleteTarget = false;\r
             try {\r
+                if (File.Exists(targetPath))\r
+                    throw new Exception(String.Format(settings.Resource("ERRORTARGETEXISTS", Resources.ERRORTARGETEXISTS), targetPath));\r
                 if (!Directory.Exists(targetDirectory))\r
                     Directory.CreateDirectory(targetDirectory);\r
 \r
-                File.Move(CurrentFile.FullName, targetPath);\r
+                deleteTarget = true;\r
+                FileSystem.CopyFile(CurrentFile.FullName, targetPath, UIOption.AllDialogs, UICancelOption.ThrowException);\r
 \r
                 TargetUpdateTrafficMessage message = new TargetUpdateTrafficMessage {\r
                     VariantID = VariantID,\r
@@ -152,9 +161,25 @@ namespace DxPlay.Model {
                     Segments = Segments.ToList()\r
                 };\r
                 traffic.Update(message);\r
+\r
+                SafeDelete(currentFile.FullName);\r
+                CurrentFile = null;\r
+\r
+\r
             } catch (Exception e) {\r
-                File.Move(targetPath, CurrentFile.FullName);\r
+                logger.Error(e);\r
+                if (deleteTarget)\r
+                    SafeDelete(targetPath);\r
                 throw e;\r
+            } \r
+        }\r
+\r
+        private void SafeDelete(string targetPath) {\r
+            try {\r
+                if (File.Exists(targetPath))\r
+                    File.Delete(targetPath);\r
+            } catch (Exception e1) {\r
+                logger.Error(e1);\r
             }\r
         }\r
     }\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 02d5f39bb5a2a25542180455dba11122e7fe69d4..5306dd916a3aa5ac66a1703e3157cfb7b51fc2b6 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -74,8 +74,6 @@ namespace DxPlay {
             mainSplit.DataBindings.Add(segmentEditorPanelBinding);\r
             txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never));\r
 \r
-            trafficBrowser.IDChangedEvent += OnSelectedIDChanged;\r
-            model.InitializeTrafficIntegration(trafficBrowser);\r
         }\r
 \r
         private void OnSelectedIDChanged(string ID, int variantID, string text) {\r
@@ -184,6 +182,8 @@ namespace DxPlay {
             Cueue();\r
 \r
             if (model.IsMenuVisible) {\r
+                tabEditor.SelectedTab = tpMetadata;\r
+                trafficBrowser.ClearSelection();\r
                 openFileDialog.InitialDirectory = fileInfo.Directory.FullName;\r
                 string id = fileInfo.Name.Replace(fileInfo.Extension, "");\r
                 try {\r
@@ -280,6 +280,12 @@ namespace DxPlay {
             playerControls.Status.BackColor = BackColor;\r
             dgSegments.BackgroundColor = BackColor;\r
             trafficBrowser.BackColor = BackColor;\r
+\r
+            //Csak standalone modban\r
+            if (Model.IsMenuVisible) {\r
+                trafficBrowser.IDChangedEvent += OnSelectedIDChanged;\r
+                model.InitializeTrafficIntegration(trafficBrowser);\r
+            }\r
         }\r
 \r
         private void PlayerForm_KeyDown(object sender, KeyEventArgs e) {\r
@@ -585,8 +591,10 @@ namespace DxPlay {
                 return;\r
 \r
             try {\r
+                \r
                 m_play.Dispose();\r
                 model.Approve();\r
+                trafficBrowser.ClearSelection();\r
             } catch (Exception ex) {\r
                 logger.Error(ex);\r
                 MsgBox.Error(ex.Message);\r

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index cd9c2e9273ea4821ca39c808da2f97ad59b83b76..c9e388383123004ebe5178f1859e825501d23064 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -35,6 +35,7 @@ namespace DxPlay {
                 IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, videoDecoder);\r
                 SampleGrabber = (ISampleGrabber)sampleGrabber;\r
                 IBaseFilter videoRenderer = AddRenderer(graphBuilder, sampleGrabber);\r
+                //IBaseFilter videoRenderer = AddSimpleRenderer(graphBuilder, sampleGrabber);\r
                 if (DsFindPin.ByName(splitter, "Audio") != null) {\r
                     IBaseFilter audioDecoder = AddAudioDecoder(graphBuilder, splitter);\r
                     FilterGraphTools.RenderPin(graphBuilder, audioDecoder, "Output");\r

diff --git a/client/DxPlay/Program.cs b/client/DxPlay/Program.cs
index 0a67593da9c88fb095c6a659b1494da9ffa44418..d885389dc5392ec8c3af384350de7e8cecea8022 100644 (file)
--- a/client/DxPlay/Program.cs
+++ b/client/DxPlay/Program.cs
@@ -1,4 +1,5 @@
 using DxPlay;\r
+using MaestroShared.Commons;\r
 using MaestroShared.Configuration;\r
 using NLog;\r
 using System;\r
@@ -36,14 +37,19 @@ namespace Maestro {
         }\r
 \r
         private static void LoadSettings(PlayerForm playerForm) {\r
-            FileInfo dxPlayConfig = new FileInfo(ConfigurationSerializer.Combine(DXPLAY_FILE));\r
-            if (dxPlayConfig.Exists) {\r
-                Type[] knownTypes = { typeof(TrafficMetadata) };\r
-                var settings = ConfigurationSerializer.Load<DxPlaySettings>(dxPlayConfig.FullName, knownTypes);\r
-                settings.IsStandalone = true;\r
-                playerForm.Settings = settings;\r
-                if (settings.IsMaximized)\r
-                    playerForm.WindowState = FormWindowState.Maximized;\r
+            try {\r
+                FileInfo dxPlayConfig = new FileInfo(ConfigurationSerializer.Combine(DXPLAY_FILE));\r
+                if (dxPlayConfig.Exists) {\r
+                    Type[] knownTypes = { typeof(TrafficMetadata) };\r
+                    var settings = ConfigurationSerializer.Load<DxPlaySettings>(dxPlayConfig.FullName, knownTypes);\r
+                    settings.IsStandalone = true;\r
+                    playerForm.Settings = settings;\r
+                    if (settings.IsMaximized)\r
+                        playerForm.WindowState = FormWindowState.Maximized;\r
+                }\r
+            } catch (Exception e) {\r
+                logger.Error(e);\r
+                MsgBox.Error(e.Message);\r
             }\r
         }\r
 \r

diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs
index c682d60cc6061c14130720db1db50632aebe2286..2d64e198952aad29496818490857ca491939d6d5 100644 (file)
--- a/client/DxPlay/Properties/Resources.Designer.cs
+++ b/client/DxPlay/Properties/Resources.Designer.cs
@@ -151,6 +151,15 @@ namespace DxPlay.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to A célállomány már létezik: {0}.\r
+        /// </summary>\r
+        internal static string ERRORTARGETEXISTS {\r
+            get {\r
+                return ResourceManager.GetString("ERRORTARGETEXISTS", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0}.\r
         /// </summary>\r

diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx
index 76f6644ab6b0abf5ed06b928a30a98c1f2f2a52b..6e14911e4923aaa362b50c4c78db739040981c54 100644 (file)
--- a/client/DxPlay/Properties/Resources.resx
+++ b/client/DxPlay/Properties/Resources.resx
@@ -226,4 +226,7 @@
   <data name="bs-user-logo" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\bs-user-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="ERRORTARGETEXISTS" xml:space="preserve">\r
+    <value>A célállomány már létezik: {0}</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 77ebc05072af87e06ca5098050c7ce7892b6cc16..ac61f89210e64591bf18cabba624f6c5ba3fc18c 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -32,11 +32,11 @@ namespace Maestro {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\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
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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
@@ -77,6 +77,14 @@ namespace Maestro {
             this.tabSystem = new System.Windows.Forms.TabControl();\r
             this.tabPage1 = new System.Windows.Forms.TabPage();\r
             this.dgJobs = new System.Windows.Forms.DataGridView();\r
+            this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components);\r
+            this.tabPage2 = new System.Windows.Forms.TabPage();\r
+            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.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.Progress = new Maestro.Commons.DataGridViewProgressColumn();\r
@@ -87,14 +95,6 @@ namespace Maestro {
             this.columnOutput = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnKillDate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components);\r
-            this.tabPage2 = new System.Windows.Forms.TabPage();\r
-            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
             ((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
@@ -727,8 +727,7 @@ namespace Maestro {
             this.dgJobs.AllowUserToOrderColumns = true;\r
             this.dgJobs.AllowUserToResizeRows = false;\r
             this.dgJobs.AutoGenerateColumns = false;\r
-            this.dgJobs.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
-            this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
+            this.dgJobs.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;\r
             this.dgJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
@@ -770,90 +769,6 @@ namespace Maestro {
             this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting);\r
             this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick);\r
             // \r
-            // columnLabel\r
-            // \r
-            this.columnLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnLabel.DataPropertyName = "Label";\r
-            this.columnLabel.HeaderText = "Label";\r
-            this.columnLabel.Name = "columnLabel";\r
-            this.columnLabel.Width = 63;\r
-            // \r
-            // columnID\r
-            // \r
-            this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle4;\r
-            this.columnID.HeaderText = "ID";\r
-            this.columnID.Name = "columnID";\r
-            this.columnID.Width = 44;\r
-            // \r
-            // Progress\r
-            // \r
-            this.Progress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;\r
-            this.Progress.DataPropertyName = "Progress";\r
-            this.Progress.HeaderText = "";\r
-            this.Progress.MinimumWidth = 100;\r
-            this.Progress.Name = "Progress";\r
-            // \r
-            // columnStatus\r
-            // \r
-            this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnStatus.DataPropertyName = "Status";\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
-            // \r
-            // columnStarted\r
-            // \r
-            this.columnStarted.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;\r
-            this.columnStarted.DataPropertyName = "Started";\r
-            this.columnStarted.HeaderText = "Started";\r
-            this.columnStarted.Name = "columnStarted";\r
-            this.columnStarted.Width = 71;\r
-            // \r
-            // columnFinished\r
-            // \r
-            this.columnFinished.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;\r
-            this.columnFinished.DataPropertyName = "Finished";\r
-            this.columnFinished.HeaderText = "Finished";\r
-            this.columnFinished.Name = "columnFinished";\r
-            this.columnFinished.Width = 79;\r
-            // \r
-            // columnInput\r
-            // \r
-            this.columnInput.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnInput.DataPropertyName = "Input";\r
-            this.columnInput.HeaderText = "Input";\r
-            this.columnInput.Name = "columnInput";\r
-            this.columnInput.Width = 59;\r
-            // \r
-            // columnOutput\r
-            // \r
-            this.columnOutput.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnOutput.DataPropertyName = "Output";\r
-            this.columnOutput.HeaderText = "Output";\r
-            this.columnOutput.Name = "columnOutput";\r
-            this.columnOutput.Width = 68;\r
-            // \r
-            // columnKillDate\r
-            // \r
-            this.columnKillDate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.columnKillDate.DataPropertyName = "KillDate";\r
-            this.columnKillDate.HeaderText = "KillDate";\r
-            this.columnKillDate.Name = "columnKillDate";\r
-            this.columnKillDate.Width = 75;\r
-            // \r
-            // Message\r
-            // \r
-            this.Message.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
-            this.Message.DataPropertyName = "Message";\r
-            this.Message.HeaderText = "Üzenet";\r
-            this.Message.Name = "Message";\r
-            this.Message.Width = 71;\r
-            // \r
             // tabPage2\r
             // \r
             this.tabPage2.Controls.Add(this.dgMessages);\r
@@ -936,6 +851,80 @@ namespace Maestro {
             // \r
             this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
             // \r
+            // columnLabel\r
+            // \r
+            this.columnLabel.DataPropertyName = "Label";\r
+            this.columnLabel.HeaderText = "Label";\r
+            this.columnLabel.Name = "columnLabel";\r
+            this.columnLabel.Width = 63;\r
+            // \r
+            // columnID\r
+            // \r
+            this.columnID.DataPropertyName = "ID";\r
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnID.DefaultCellStyle = dataGridViewCellStyle4;\r
+            this.columnID.HeaderText = "ID";\r
+            this.columnID.Name = "columnID";\r
+            this.columnID.Width = 44;\r
+            // \r
+            // Progress\r
+            // \r
+            this.Progress.DataPropertyName = "Progress";\r
+            this.Progress.HeaderText = "";\r
+            this.Progress.MinimumWidth = 100;\r
+            this.Progress.Name = "Progress";\r
+            // \r
+            // columnStatus\r
+            // \r
+            this.columnStatus.DataPropertyName = "Status";\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
+            // \r
+            // columnStarted\r
+            // \r
+            this.columnStarted.DataPropertyName = "Started";\r
+            this.columnStarted.HeaderText = "Started";\r
+            this.columnStarted.Name = "columnStarted";\r
+            this.columnStarted.Width = 71;\r
+            // \r
+            // columnFinished\r
+            // \r
+            this.columnFinished.DataPropertyName = "Finished";\r
+            this.columnFinished.HeaderText = "Finished";\r
+            this.columnFinished.Name = "columnFinished";\r
+            this.columnFinished.Width = 79;\r
+            // \r
+            // columnInput\r
+            // \r
+            this.columnInput.DataPropertyName = "Input";\r
+            this.columnInput.HeaderText = "Input";\r
+            this.columnInput.Name = "columnInput";\r
+            this.columnInput.Width = 59;\r
+            // \r
+            // columnOutput\r
+            // \r
+            this.columnOutput.DataPropertyName = "Output";\r
+            this.columnOutput.HeaderText = "Output";\r
+            this.columnOutput.Name = "columnOutput";\r
+            this.columnOutput.Width = 68;\r
+            // \r
+            // columnKillDate\r
+            // \r
+            this.columnKillDate.DataPropertyName = "KillDate";\r
+            this.columnKillDate.HeaderText = "KillDate";\r
+            this.columnKillDate.Name = "columnKillDate";\r
+            this.columnKillDate.Width = 75;\r
+            // \r
+            // Message\r
+            // \r
+            this.Message.DataPropertyName = "Message";\r
+            this.Message.HeaderText = "Üzenet";\r
+            this.Message.Name = "Message";\r
+            this.Message.Width = 71;\r
+            // \r
             // MaestroForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -1047,6 +1036,8 @@ namespace Maestro {
         private MaestroShared.Controls.DoubleClickTreeView treeFolders;\r
         private System.Windows.Forms.ImageList ilFolders;\r
         private System.Windows.Forms.CheckBox chkAutoScroll;\r
+        private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
+        private PictureBox picResetSearch;\r
         private DataGridViewTextBoxColumn columnLabel;\r
         private DataGridViewTextBoxColumn columnID;\r
         private Commons.DataGridViewProgressColumn Progress;\r
@@ -1057,8 +1048,6 @@ namespace Maestro {
         private DataGridViewTextBoxColumn columnOutput;\r
         private DataGridViewTextBoxColumn columnKillDate;\r
         private DataGridViewTextBoxColumn Message;\r
-        private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
-        private PictureBox picResetSearch;\r
     }\r
 }\r
 \r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index 13a772d0210605067f10be930c1f3d50bcc17f8f..abe965452bb444d0680a5c45f851a16f0ea27b74 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAXgBAQF4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index c0e44fb6889c1e2b0a43e18962788613b59d58ce..4655203e0dd1af647837d862334a1db8568442b3 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.8.3")]\r
-[assembly: AssemblyFileVersion("2.0.8.3")]\r
+[assembly: AssemblyVersion("2.0.8.4")]\r
+[assembly: AssemblyFileVersion("2.0.8.4")]\r

diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs
index 7c2ceb7a79989d8d6076698f4be2fba21f05a7b2..4c678946b4b17742f4ee4b20b96ca2a06f8423a2 100644 (file)
--- a/client/PlanAIRClient/Resources.Designer.cs
+++ b/client/PlanAIRClient/Resources.Designer.cs
@@ -124,6 +124,15 @@ namespace TrafficClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra..\r
+        /// </summary>\r
+        internal static string IDNOTEXISTS {\r
+            get {\r
+                return ResourceManager.GetString("IDNOTEXISTS", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Műsor.\r
         /// </summary>\r

diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx
index 534f50cab3be54e5d034e18249e7f13ae018feae..eb3cd1cac0e634f94e64de2f97561ed66a109cfe 100644 (file)
--- a/client/PlanAIRClient/Resources.resx
+++ b/client/PlanAIRClient/Resources.resx
@@ -166,4 +166,7 @@
   <data name="TRAFFICID" xml:space="preserve">\r
     <value>Traffic ID</value>\r
   </data>\r
+  <data name="IDNOTEXISTS" xml:space="preserve">\r
+    <value>Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra.</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 391782fb29e7cdfff8cc8440481ff32c2a76e4dd..85dc21cdd9b2e5ba8b34e485b2199704476296b3 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -23,7 +23,6 @@ namespace TrafficClient {
 \r
         protected override void OnLoad(EventArgs e) {\r
             base.OnLoad(e);\r
-            InitializeTexts();\r
         }\r
 \r
 \r
@@ -44,6 +43,7 @@ namespace TrafficClient {
                 var server = parameters.Configuration?.Server;\r
                 if (server != null && server.Address != null)\r
                     trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, parameters.Configuration?.FunctionName, value.MessageBus);\r
+                InitializeTexts();\r
                 RefreshResults();\r
             }\r
         }\r
@@ -203,7 +203,8 @@ namespace TrafficClient {
         private void SelectResult() {\r
             List<TrafficItem> result = trafficAPIBindingSource.DataSource as List<TrafficItem>;\r
             if (result == null || result.Count == 0) {\r
-                MsgBox.Info("Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra.");\r
+                TrafficMetadata metadata = parameters?.Configuration ?? new TrafficMetadata();\r
+                MsgBox.Info(metadata.Resource("IDNOTEXISTS", Resources.IDNOTEXISTS));\r
             } else {\r
                 OnSelectionChanged(dgTraffic.Rows[0]);\r
                 result[0].Selected = true;\r

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 9fd17f922cf590768dca5afcd5294fd2f17d6ae3..7bec3a4887e4e283487bb8ff9a865e55953a56f8 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -185,7 +185,7 @@
                                                                                        <hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;">\r
                                                                                                <image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg"\r
                                                                                                        content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')"\r
-                                                                                                       onClick="@command('selectMediaArchive', selectedObject=each)" />\r
+                                                                                                       onClick="@command('select', selectedObject=each)" />\r
                                                                                                <div sclass="details">\r
                                                                                                        <hlayout>\r
                                                                                                                <div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}">\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 469c624e1e147d42b21dc23d068bf4d4f7914e2f..faa0eafc75fddb30d9874fbe38c6048f02445442 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -435,6 +435,7 @@ public class SearchModel extends AsyncBaseModel {
                                Detail detail = (Detail) row.getChildren().get(0);\r
                                Hlayout hlayout = (Hlayout) detail.getChildren().get(0);\r
                                if (highlight) {\r
+                                       selectedRowIndex = i;\r
                                        row.setStyle("background: #F1F8E9;");\r
                                        hlayout.setStyle("border-bottom: 1px solid #C5E1A5; background: #F1F8E9;");\r
                                } else {\r
@@ -517,7 +518,8 @@ public class SearchModel extends AsyncBaseModel {
        @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })\r
        public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
                Event event = ctx.getTriggerEvent();\r
-               selectedRowIndex = ((Row) event.getTarget()).getIndex();\r
+               //Nem mindig a row a target, ha a kepre kattintunk akkor az image\r
+               //selectedRowIndex = ((Row) event.getTarget()).getIndex();\r
                highlight(this.selectedObject, false);\r
                setSelectedObject(selectedObject);\r
                highlight(this.selectedObject, true);\r