From b4dd300be09a398a28aeb2bffaa7214c5cf4a4c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 19 Sep 2018 09:10:27 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31284 --- client/DxPlay/Configuration/dxplay.en | 4 +- client/DxPlay/Configuration/dxplay.json | 2 +- client/DxPlay/DxPlay.csproj | 1 + client/DxPlay/Model/DxPlayModel.cs | 37 +++- client/DxPlay/PlayerForm.cs | 12 +- client/DxPlay/PlayerGraph.cs | 1 + client/DxPlay/Program.cs | 22 ++- .../DxPlay/Properties/Resources.Designer.cs | 9 + client/DxPlay/Properties/Resources.resx | 3 + client/Maestro/MaestroForm.Designer.cs | 185 ++++++++---------- client/Maestro/MaestroForm.resx | 2 +- client/Maestro/Properties/AssemblyInfo.cs | 4 +- client/PlanAIRClient/Resources.Designer.cs | 9 + client/PlanAIRClient/Resources.resx | 3 + client/PlanAIRClient/TrafficIDSelector.cs | 5 +- .../pages/searchitems.zul | 2 +- .../user/jobengine/zk/model/SearchModel.java | 4 +- 17 files changed, 182 insertions(+), 123 deletions(-) diff --git a/client/DxPlay/Configuration/dxplay.en b/client/DxPlay/Configuration/dxplay.en index f75ceb57..d3068b65 100644 --- a/client/DxPlay/Configuration/dxplay.en +++ b/client/DxPlay/Configuration/dxplay.en @@ -41,8 +41,10 @@ "ADVERTISEMENT": "Advertisement", "SEGMENTCOUNT": "Segment count", "TRAFFICID": "Traffic ID", + "IDNOTEXIST": "Specified ID not exists.", "ERRORCREATESEGMENT": "No space for mode segments.", "ERRORINVALIDTCIN": "TC IN must be before TC OUT.", "ERRORINVALIDTCOUT": "TC OUT must be after TC IN.", - "ERRORSEGMENTCOLLISION": "Segment overlaps are not allowed." + "ERRORSEGMENTCOLLISION": "Segment overlaps are not allowed.", + "ERRORTARGETEXISTS": "Target file already exists: {0}" } diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json index 0bb643a1..79950ec0 100644 --- a/client/DxPlay/Configuration/dxplay.json +++ b/client/DxPlay/Configuration/dxplay.json @@ -1,5 +1,5 @@ { - "targetDirectory": "DONE", + "targetDirectory": "c:\\videotmp", "uiFileName": "dxplay.en", "isMaximized": true, "player": { diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index 7f66a192..491bf692 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -158,6 +158,7 @@ ..\packages\LinkDotNet.MessageBus.Contracts.0.1.1\lib\LinkDotNet.MessageHandling.Contracts.dll + ..\packages\NLog.4.4.12\lib\net45\NLog.dll diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs index 80efe19a..c24c4465 100644 --- a/client/DxPlay/Model/DxPlayModel.cs +++ b/client/DxPlay/Model/DxPlayModel.cs @@ -11,6 +11,9 @@ using NLog; using System.IO; using MaestroShared.Targets; using System.Linq; +using Microsoft.VisualBasic.FileIO; +using DxPlay.Properties; +using MaestroShared.Commons; namespace DxPlay.Model { public class DxPlayModel : INotifyPropertyChanged { @@ -40,9 +43,11 @@ namespace DxPlay.Model { private void OnMessage(IMessage message) { if (message is TrafficAPIMessage) { TrafficAPIMessage msg = message as TrafficAPIMessage; - throw new Exception(msg.Content); + string errorMessage = string.Format(settings.Resource("ERRORTRAFFICCONNECT", Resources.ERRORTRAFFICCONNECT), settings?.Metadata?.Server?.Address?.OriginalString); + logger.Error(errorMessage); + MsgBox.Error(errorMessage); + //throw new Exception(msg.Content); } - //string msg = string.Format(settings.Resource("ERRORTRAFFICCONNECT", Resources.ERRORTRAFFICCONNECT), settings?.Metadata?.Server?.Address?.OriginalString); //MessageBox.Show(msg, "Connection error", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -137,13 +142,17 @@ namespace DxPlay.Model { if (CurrentFile == null || !CurrentFile.Exists) return; - string targetDirectory = Path.Combine(CurrentFile.DirectoryName, settings.TargetDirectory); - string targetPath = Path.Combine(CurrentFile.DirectoryName, settings.TargetDirectory, ID + ".MXF"); + string targetDirectory = settings.TargetDirectory; + string targetPath = Path.Combine(settings.TargetDirectory, ID + ".MXF"); + bool deleteTarget = false; try { + if (File.Exists(targetPath)) + throw new Exception(String.Format(settings.Resource("ERRORTARGETEXISTS", Resources.ERRORTARGETEXISTS), targetPath)); if (!Directory.Exists(targetDirectory)) Directory.CreateDirectory(targetDirectory); - File.Move(CurrentFile.FullName, targetPath); + deleteTarget = true; + FileSystem.CopyFile(CurrentFile.FullName, targetPath, UIOption.AllDialogs, UICancelOption.ThrowException); TargetUpdateTrafficMessage message = new TargetUpdateTrafficMessage { VariantID = VariantID, @@ -152,9 +161,25 @@ namespace DxPlay.Model { Segments = Segments.ToList() }; traffic.Update(message); + + SafeDelete(currentFile.FullName); + CurrentFile = null; + + } catch (Exception e) { - File.Move(targetPath, CurrentFile.FullName); + logger.Error(e); + if (deleteTarget) + SafeDelete(targetPath); throw e; + } + } + + private void SafeDelete(string targetPath) { + try { + if (File.Exists(targetPath)) + File.Delete(targetPath); + } catch (Exception e1) { + logger.Error(e1); } } } diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 02d5f39b..5306dd91 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -74,8 +74,6 @@ namespace DxPlay { mainSplit.DataBindings.Add(segmentEditorPanelBinding); txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never)); - trafficBrowser.IDChangedEvent += OnSelectedIDChanged; - model.InitializeTrafficIntegration(trafficBrowser); } private void OnSelectedIDChanged(string ID, int variantID, string text) { @@ -184,6 +182,8 @@ namespace DxPlay { Cueue(); if (model.IsMenuVisible) { + tabEditor.SelectedTab = tpMetadata; + trafficBrowser.ClearSelection(); openFileDialog.InitialDirectory = fileInfo.Directory.FullName; string id = fileInfo.Name.Replace(fileInfo.Extension, ""); try { @@ -280,6 +280,12 @@ namespace DxPlay { playerControls.Status.BackColor = BackColor; dgSegments.BackgroundColor = BackColor; trafficBrowser.BackColor = BackColor; + + //Csak standalone modban + if (Model.IsMenuVisible) { + trafficBrowser.IDChangedEvent += OnSelectedIDChanged; + model.InitializeTrafficIntegration(trafficBrowser); + } } private void PlayerForm_KeyDown(object sender, KeyEventArgs e) { @@ -585,8 +591,10 @@ namespace DxPlay { return; try { + m_play.Dispose(); model.Approve(); + trafficBrowser.ClearSelection(); } catch (Exception ex) { logger.Error(ex); MsgBox.Error(ex.Message); diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs index cd9c2e92..c9e38838 100644 --- a/client/DxPlay/PlayerGraph.cs +++ b/client/DxPlay/PlayerGraph.cs @@ -35,6 +35,7 @@ namespace DxPlay { IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, videoDecoder); SampleGrabber = (ISampleGrabber)sampleGrabber; IBaseFilter videoRenderer = AddRenderer(graphBuilder, sampleGrabber); + //IBaseFilter videoRenderer = AddSimpleRenderer(graphBuilder, sampleGrabber); if (DsFindPin.ByName(splitter, "Audio") != null) { IBaseFilter audioDecoder = AddAudioDecoder(graphBuilder, splitter); FilterGraphTools.RenderPin(graphBuilder, audioDecoder, "Output"); diff --git a/client/DxPlay/Program.cs b/client/DxPlay/Program.cs index 0a67593d..d885389d 100644 --- a/client/DxPlay/Program.cs +++ b/client/DxPlay/Program.cs @@ -1,4 +1,5 @@ using DxPlay; +using MaestroShared.Commons; using MaestroShared.Configuration; using NLog; using System; @@ -36,14 +37,19 @@ namespace Maestro { } private static void LoadSettings(PlayerForm playerForm) { - FileInfo dxPlayConfig = new FileInfo(ConfigurationSerializer.Combine(DXPLAY_FILE)); - if (dxPlayConfig.Exists) { - Type[] knownTypes = { typeof(TrafficMetadata) }; - var settings = ConfigurationSerializer.Load(dxPlayConfig.FullName, knownTypes); - settings.IsStandalone = true; - playerForm.Settings = settings; - if (settings.IsMaximized) - playerForm.WindowState = FormWindowState.Maximized; + try { + FileInfo dxPlayConfig = new FileInfo(ConfigurationSerializer.Combine(DXPLAY_FILE)); + if (dxPlayConfig.Exists) { + Type[] knownTypes = { typeof(TrafficMetadata) }; + var settings = ConfigurationSerializer.Load(dxPlayConfig.FullName, knownTypes); + settings.IsStandalone = true; + playerForm.Settings = settings; + if (settings.IsMaximized) + playerForm.WindowState = FormWindowState.Maximized; + } + } catch (Exception e) { + logger.Error(e); + MsgBox.Error(e.Message); } } diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs index c682d60c..2d64e198 100644 --- a/client/DxPlay/Properties/Resources.Designer.cs +++ b/client/DxPlay/Properties/Resources.Designer.cs @@ -151,6 +151,15 @@ namespace DxPlay.Properties { } } + /// + /// Looks up a localized string similar to A célállomány már létezik: {0}. + /// + internal static string ERRORTARGETEXISTS { + get { + return ResourceManager.GetString("ERRORTARGETEXISTS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0}. /// diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx index 76f6644a..6e14911e 100644 --- a/client/DxPlay/Properties/Resources.resx +++ b/client/DxPlay/Properties/Resources.resx @@ -226,4 +226,7 @@ ..\Resources\bs-user-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + A célállomány már létezik: {0} + \ No newline at end of file diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 77ebc050..ac61f892 100644 --- 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)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupSource = new System.Windows.Forms.GroupBox(); this.dgSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -77,6 +77,14 @@ namespace Maestro { this.tabSystem = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.dgJobs = new System.Windows.Forms.DataGridView(); + this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dgMessages = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewProgressColumn1 = new Maestro.Commons.DataGridViewProgressColumn(); + this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Progress = new Maestro.Commons.DataGridViewProgressColumn(); @@ -87,14 +95,6 @@ namespace Maestro { this.columnOutput = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnKillDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.dgMessages = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewProgressColumn1 = new Maestro.Commons.DataGridViewProgressColumn(); - this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.groupSource.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); @@ -727,8 +727,7 @@ namespace Maestro { this.dgJobs.AllowUserToOrderColumns = true; this.dgJobs.AllowUserToResizeRows = false; this.dgJobs.AutoGenerateColumns = false; - this.dgJobs.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; - this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; + this.dgJobs.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgJobs.BackgroundColor = System.Drawing.Color.White; this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -770,90 +769,6 @@ namespace Maestro { this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting); this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick); // - // columnLabel - // - this.columnLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnLabel.DataPropertyName = "Label"; - this.columnLabel.HeaderText = "Label"; - this.columnLabel.Name = "columnLabel"; - this.columnLabel.Width = 63; - // - // columnID - // - this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnID.DataPropertyName = "ID"; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnID.DefaultCellStyle = dataGridViewCellStyle4; - this.columnID.HeaderText = "ID"; - this.columnID.Name = "columnID"; - this.columnID.Width = 44; - // - // Progress - // - this.Progress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.Progress.DataPropertyName = "Progress"; - this.Progress.HeaderText = ""; - this.Progress.MinimumWidth = 100; - this.Progress.Name = "Progress"; - // - // columnStatus - // - this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnStatus.DataPropertyName = "Status"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnStatus.DefaultCellStyle = dataGridViewCellStyle5; - this.columnStatus.HeaderText = "Status"; - this.columnStatus.Name = "columnStatus"; - this.columnStatus.Width = 66; - // - // columnStarted - // - this.columnStarted.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - this.columnStarted.DataPropertyName = "Started"; - this.columnStarted.HeaderText = "Started"; - this.columnStarted.Name = "columnStarted"; - this.columnStarted.Width = 71; - // - // columnFinished - // - this.columnFinished.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - this.columnFinished.DataPropertyName = "Finished"; - this.columnFinished.HeaderText = "Finished"; - this.columnFinished.Name = "columnFinished"; - this.columnFinished.Width = 79; - // - // columnInput - // - this.columnInput.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnInput.DataPropertyName = "Input"; - this.columnInput.HeaderText = "Input"; - this.columnInput.Name = "columnInput"; - this.columnInput.Width = 59; - // - // columnOutput - // - this.columnOutput.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnOutput.DataPropertyName = "Output"; - this.columnOutput.HeaderText = "Output"; - this.columnOutput.Name = "columnOutput"; - this.columnOutput.Width = 68; - // - // columnKillDate - // - this.columnKillDate.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.columnKillDate.DataPropertyName = "KillDate"; - this.columnKillDate.HeaderText = "KillDate"; - this.columnKillDate.Name = "columnKillDate"; - this.columnKillDate.Width = 75; - // - // Message - // - this.Message.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.Message.DataPropertyName = "Message"; - this.Message.HeaderText = "Üzenet"; - this.Message.Name = "Message"; - this.Message.Width = 71; - // // tabPage2 // this.tabPage2.Controls.Add(this.dgMessages); @@ -936,6 +851,80 @@ namespace Maestro { // this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo); // + // columnLabel + // + this.columnLabel.DataPropertyName = "Label"; + this.columnLabel.HeaderText = "Label"; + this.columnLabel.Name = "columnLabel"; + this.columnLabel.Width = 63; + // + // columnID + // + this.columnID.DataPropertyName = "ID"; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnID.DefaultCellStyle = dataGridViewCellStyle4; + this.columnID.HeaderText = "ID"; + this.columnID.Name = "columnID"; + this.columnID.Width = 44; + // + // Progress + // + this.Progress.DataPropertyName = "Progress"; + this.Progress.HeaderText = ""; + this.Progress.MinimumWidth = 100; + this.Progress.Name = "Progress"; + // + // columnStatus + // + this.columnStatus.DataPropertyName = "Status"; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnStatus.DefaultCellStyle = dataGridViewCellStyle5; + this.columnStatus.HeaderText = "Status"; + this.columnStatus.Name = "columnStatus"; + this.columnStatus.Width = 66; + // + // columnStarted + // + this.columnStarted.DataPropertyName = "Started"; + this.columnStarted.HeaderText = "Started"; + this.columnStarted.Name = "columnStarted"; + this.columnStarted.Width = 71; + // + // columnFinished + // + this.columnFinished.DataPropertyName = "Finished"; + this.columnFinished.HeaderText = "Finished"; + this.columnFinished.Name = "columnFinished"; + this.columnFinished.Width = 79; + // + // columnInput + // + this.columnInput.DataPropertyName = "Input"; + this.columnInput.HeaderText = "Input"; + this.columnInput.Name = "columnInput"; + this.columnInput.Width = 59; + // + // columnOutput + // + this.columnOutput.DataPropertyName = "Output"; + this.columnOutput.HeaderText = "Output"; + this.columnOutput.Name = "columnOutput"; + this.columnOutput.Width = 68; + // + // columnKillDate + // + this.columnKillDate.DataPropertyName = "KillDate"; + this.columnKillDate.HeaderText = "KillDate"; + this.columnKillDate.Name = "columnKillDate"; + this.columnKillDate.Width = 75; + // + // Message + // + this.Message.DataPropertyName = "Message"; + this.Message.HeaderText = "Üzenet"; + this.Message.Name = "Message"; + this.Message.Width = 71; + // // MaestroForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1047,6 +1036,8 @@ namespace Maestro { private MaestroShared.Controls.DoubleClickTreeView treeFolders; private System.Windows.Forms.ImageList ilFolders; private System.Windows.Forms.CheckBox chkAutoScroll; + private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1; + private PictureBox picResetSearch; private DataGridViewTextBoxColumn columnLabel; private DataGridViewTextBoxColumn columnID; private Commons.DataGridViewProgressColumn Progress; @@ -1057,8 +1048,6 @@ namespace Maestro { private DataGridViewTextBoxColumn columnOutput; private DataGridViewTextBoxColumn columnKillDate; private DataGridViewTextBoxColumn Message; - private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1; - private PictureBox picResetSearch; } } diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx index 13a772d0..abe96545 100644 --- a/client/Maestro/MaestroForm.resx +++ b/client/Maestro/MaestroForm.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS - CAAAAk1TRnQBSQFMAgEBAgEAAXgBAQF4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYABAQGAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index c0e44fb6..4655203e 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.8.3")] -[assembly: AssemblyFileVersion("2.0.8.3")] +[assembly: AssemblyVersion("2.0.8.4")] +[assembly: AssemblyFileVersion("2.0.8.4")] diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs index 7c2ceb7a..4c678946 100644 --- a/client/PlanAIRClient/Resources.Designer.cs +++ b/client/PlanAIRClient/Resources.Designer.cs @@ -124,6 +124,15 @@ namespace TrafficClient { } } + /// + /// Looks up a localized string similar to Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra.. + /// + internal static string IDNOTEXISTS { + get { + return ResourceManager.GetString("IDNOTEXISTS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Műsor. /// diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx index 534f50ca..eb3cd1ca 100644 --- a/client/PlanAIRClient/Resources.resx +++ b/client/PlanAIRClient/Resources.resx @@ -166,4 +166,7 @@ Traffic ID + + Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra. + \ No newline at end of file diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 391782fb..85dc21cd 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -23,7 +23,6 @@ namespace TrafficClient { protected override void OnLoad(EventArgs e) { base.OnLoad(e); - InitializeTexts(); } @@ -44,6 +43,7 @@ namespace TrafficClient { var server = parameters.Configuration?.Server; if (server != null && server.Address != null) trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, parameters.Configuration?.FunctionName, value.MessageBus); + InitializeTexts(); RefreshResults(); } } @@ -203,7 +203,8 @@ namespace TrafficClient { private void SelectResult() { List result = trafficAPIBindingSource.DataSource as List; if (result == null || result.Count == 0) { - MsgBox.Info("Az azonosító jelenleg nem található a rendszerben. Kérem próbálja újra."); + TrafficMetadata metadata = parameters?.Configuration ?? new TrafficMetadata(); + MsgBox.Info(metadata.Resource("IDNOTEXISTS", Resources.IDNOTEXISTS)); } else { OnSelectionChanged(dgTraffic.Rows[0]); result[0].Selected = true; diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul index 9fd17f92..7bec3a48 100644 --- a/server/user.jobengine.osgi.server/pages/searchitems.zul +++ b/server/user.jobengine.osgi.server/pages/searchitems.zul @@ -185,7 +185,7 @@ + onClick="@command('select', selectedObject=each)" />
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 469c624e..faa0eafc 100644 --- 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); Hlayout hlayout = (Hlayout) detail.getChildren().get(0); if (highlight) { + selectedRowIndex = i; row.setStyle("background: #F1F8E9;"); hlayout.setStyle("border-bottom: 1px solid #C5E1A5; background: #F1F8E9;"); } else { @@ -517,7 +518,8 @@ public class SearchModel extends AsyncBaseModel { @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" }) public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) { Event event = ctx.getTriggerEvent(); - selectedRowIndex = ((Row) event.getTarget()).getIndex(); + //Nem mindig a row a target, ha a kepre kattintunk akkor az image + //selectedRowIndex = ((Row) event.getTarget()).getIndex(); highlight(this.selectedObject, false); setSelectedObject(selectedObject); highlight(this.selectedObject, true); -- 2.54.0