From 9ee2e7d45deb4d121f627220439b2e2cd3dc0c49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 8 Aug 2018 08:48:04 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31235 --- client/DxPlay/DxPlay.csproj | 14 +- client/DxPlay/DxPlayer.cs | 11 +- client/DxPlay/DxPlayerx.cs | 11 +- client/DxPlay/Integration/Traffic.cs | 5 +- client/DxPlay/Model/DxPlayModel.cs | 3 +- client/DxPlay/PlayerForm.cs | 33 +- .../DxPlay/Properties/Resources1.Designer.cs | 319 ------------------ client/DxPlay/Properties/Resources1.resx | 205 ----------- 8 files changed, 41 insertions(+), 560 deletions(-) delete mode 100644 client/DxPlay/Properties/Resources1.Designer.cs delete mode 100644 client/DxPlay/Properties/Resources1.resx diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index f5226af7..f6e2cfa3 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -211,15 +211,15 @@ + + True + True + Resources.resx + - - True - True - Resources1.resx - Component @@ -250,9 +250,9 @@ PlayerControls.cs - + ResXFileCodeGenerator - Resources1.Designer.cs + Resources.Designer.cs PreserveNewest diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs index f13bb1a8..c8dbab69 100644 --- a/client/DxPlay/DxPlayer.cs +++ b/client/DxPlay/DxPlayer.cs @@ -15,6 +15,7 @@ using Myriadbits.MXF; using MaestroShared.Metadata; using NLog; using MaestroShared.Configuration; +using DxPlay.Properties; namespace DxPlay { public delegate void DxPlayEvent(); @@ -57,11 +58,11 @@ namespace DxPlay { // Play an avi file into a window. Allow for snapshots. // (Control to show video in, Avi file to play public DxPlayer(Control hWin, ref MediaDescription mediaDesc, UISettings properties) { - stringValues.Add(GraphState.Exiting, properties.Resource("exiting", StringResource.KILEPES)); - stringValues.Add(GraphState.Paused, properties.Resource("paused", StringResource.SZUNETELTETETT)); - stringValues.Add(GraphState.Playing, properties.Resource("playing", StringResource.LEJATSZAS)); - stringValues.Add(GraphState.Stopped, properties.Resource("stopped", StringResource.MEGALLITVA)); - stringValues.Add(GraphState.Completed, properties.Resource("completed", StringResource.VEGE)); + stringValues.Add(GraphState.Exiting, properties.Resource("exiting", Resources.KILEPES)); + stringValues.Add(GraphState.Paused, properties.Resource("paused", Resources.SZUNETELTETETT)); + stringValues.Add(GraphState.Playing, properties.Resource("playing", Resources.LEJATSZAS)); + stringValues.Add(GraphState.Stopped, properties.Resource("stopped", Resources.MEGALLITVA)); + stringValues.Add(GraphState.Completed, properties.Resource("completed", Resources.VEGE)); State = GraphState.Stopped; try { int hr; diff --git a/client/DxPlay/DxPlayerx.cs b/client/DxPlay/DxPlayerx.cs index 79fed81d..f20725fb 100644 --- a/client/DxPlay/DxPlayerx.cs +++ b/client/DxPlay/DxPlayerx.cs @@ -15,6 +15,7 @@ using System.Collections.Generic; using Myriadbits.MXF; using MaestroShared.Metadata; using NLog; +using DxPlay.Properties; namespace DxPlay { @@ -126,11 +127,11 @@ namespace DxPlay { } private void FillTheHunStringvalues() { - stateHunStringValues.Add(GraphState.Exiting, StringResource.KILEPES); - stateHunStringValues.Add(GraphState.Paused, StringResource.SZUNETELTETETT); - stateHunStringValues.Add(GraphState.Playing, StringResource.LEJATSZAS); - stateHunStringValues.Add(GraphState.Stopped, StringResource.MEGALLITVA); - stateHunStringValues.Add(GraphState.Completed, StringResource.VEGE); + stateHunStringValues.Add(GraphState.Exiting, Resources.KILEPES); + stateHunStringValues.Add(GraphState.Paused, Resources.SZUNETELTETETT); + stateHunStringValues.Add(GraphState.Playing, Resources.LEJATSZAS); + stateHunStringValues.Add(GraphState.Stopped, Resources.MEGALLITVA); + stateHunStringValues.Add(GraphState.Completed, Resources.VEGE); } private void TcWorker_DoWork(object sender, DoWorkEventArgs e) { diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs index 680d77b0..f2bfd2ec 100644 --- a/client/DxPlay/Integration/Traffic.cs +++ b/client/DxPlay/Integration/Traffic.cs @@ -7,6 +7,7 @@ using System.Linq; using MaestroShared.Metadata; using System.Collections.Generic; using NLog; +using DxPlay.Properties; namespace DxPlay.Integration { public class Traffic { @@ -19,7 +20,7 @@ namespace DxPlay.Integration { public Traffic(DxPlaySettings settings, string id, IMessageBus messageBus) { connection = settings?.Metadata?.Server; if (connection == null) - throw new Exception(settings.Resource("missing-traffic-configuration", StringResource.MISSING_TRAFFIC_CONFIGURATION)); + throw new Exception(settings.Resource("missing-traffic-configuration", Resources.MISSING_TRAFFIC_CONFIGURATION)); Api = new TrafficAPI(connection.Address.OriginalString, connection.UserName, connection.Password, connection.Timeout, messageBus); this.settings = settings; this.id = id; @@ -33,7 +34,7 @@ namespace DxPlay.Integration { case MetadataType.TrafficMaterial: { var trafficItem = Api.GetMaterials(id, false).FirstOrDefault(); if (trafficItem == null) - throw new Exception(string.Format(settings.Resource("missing-traffic-variant", StringResource.MISSING_TRAFFIC_VARIANT), id)); + throw new Exception(string.Format(settings.Resource("missing-traffic-variant", Resources.MISSING_TRAFFIC_VARIANT), id)); result = Api.GetMaterialSegments(trafficItem.VariantID); break; } diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs index ebaf9eb5..ea78f644 100644 --- a/client/DxPlay/Model/DxPlayModel.cs +++ b/client/DxPlay/Model/DxPlayModel.cs @@ -7,6 +7,7 @@ using System.Runtime.CompilerServices; using LinkDotNet.MessageHandling; using LinkDotNet.MessageHandling.Contracts; using TrafficClient; +using DxPlay.Properties; namespace DxPlay.Model { public class DxPlayModel { @@ -23,7 +24,7 @@ namespace DxPlay.Model { } private void OnMessage(IMessage message) { - string msg = string.Format(settings.Resource("error-traffic-connect", StringResource.ERROR_TRAFFIC_CONNECT), settings?.Metadata?.Server?.Address?.OriginalString); + string msg = string.Format(settings.Resource("error-traffic-connect", Resources.ERROR_TRAFFIC_CONNECT), settings?.Metadata?.Server?.Address?.OriginalString); throw new Exception(msg); //MessageBox.Show(msg, "Connection error", MessageBoxButtons.OK, MessageBoxIcon.Error); } diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 46a651de..5a9f246d 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -7,6 +7,7 @@ using NLog; using DxPlay.Model; using TrafficClient; using MaestroShared.Commons; +using DxPlay.Properties; namespace DxPlay { @@ -84,20 +85,20 @@ namespace DxPlay { private void InitializeTexts() { - defineOneSegmentToolStripMenuItem.Text = Settings.Resource("define-segment", StringResource.SZEGMENS_DEFINIALASA); - splitSegmentAtCurrentPositionToolStripMenuItem.Text = Settings.Resource("break-segment", StringResource.SZEGMENS_SZETVAGASA); - actualPositionToIntroToolStripMenuItem.Text = Settings.Resource("position-as-tcin", StringResource.AKTUALIS_POZICIO_BELEPO); - actualPositionToOutroToolStripMenuItem.Text = Settings.Resource("position-as-tcout", StringResource.AKTUALIS_POZICIO_KILEPO); - deleteSegmentToolStripMenuItem.Text = Settings.Resource("delete-segment", StringResource.SZEGMENS_TORLESE); - menuButtonSegmentActions.Text = Settings.Resource("segments", StringResource.SZEGMENSEK); + defineOneSegmentToolStripMenuItem.Text = Settings.Resource("define-segment", Resources.SZEGMENS_DEFINIALASA); + splitSegmentAtCurrentPositionToolStripMenuItem.Text = Settings.Resource("break-segment", Resources.SZEGMENS_SZETVAGASA); + actualPositionToIntroToolStripMenuItem.Text = Settings.Resource("position-as-tcin", Resources.AKTUALIS_POZICIO_BELEPO); + actualPositionToOutroToolStripMenuItem.Text = Settings.Resource("position-as-tcout", Resources.AKTUALIS_POZICIO_KILEPO); + deleteSegmentToolStripMenuItem.Text = Settings.Resource("delete-segment", Resources.SZEGMENS_TORLESE); + menuButtonSegmentActions.Text = Settings.Resource("segments", Resources.SZEGMENSEK); ToolTip tt = new ToolTip(); - tt.SetToolTip(playerControls.Pause, Settings.Resource("pause", StringResource.SZUNET)); - tt.SetToolTip(playerControls.Play, Settings.Resource("play", StringResource.LEJATSZAS)); - tt.SetToolTip(playerControls.Stop, Settings.Resource("stop", StringResource.LEALLITAS)); - playerControls.Status.Text = Settings.Resource("no-input", StringResource.NINCS_BEMENET); - playerControls.Start.Text = Settings.Resource("start", StringResource.INDULASI_PONT); - playerControls.Duration.Text = Settings.Resource("length", StringResource.HOSSZ); + tt.SetToolTip(playerControls.Pause, Settings.Resource("pause", Resources.SZUNET)); + tt.SetToolTip(playerControls.Play, Settings.Resource("play", Resources.LEJATSZAS)); + tt.SetToolTip(playerControls.Stop, Settings.Resource("stop", Resources.LEALLITAS)); + playerControls.Status.Text = Settings.Resource("no-input", Resources.NINCS_BEMENET); + playerControls.Start.Text = Settings.Resource("start", Resources.INDULASI_PONT); + playerControls.Duration.Text = Settings.Resource("length", Resources.HOSSZ); } private void Cueue() { @@ -473,18 +474,18 @@ namespace DxPlay { int index = e.Column.Index; switch (index) { case 0: - e.Column.HeaderText = Settings.Resource("tc-in", StringResource.BELEPO); + e.Column.HeaderText = Settings.Resource("tc-in", Resources.BELEPO); e.Column.ReadOnly = true; break; case 1: - e.Column.HeaderText = Settings.Resource("tc-out", StringResource.KILEPO); + e.Column.HeaderText = Settings.Resource("tc-out", Resources.KILEPO); e.Column.ReadOnly = true; break; case 2: - e.Column.HeaderText = Settings.Resource("optional", StringResource.ELHAGYHATO); + e.Column.HeaderText = Settings.Resource("optional", Resources.ELHAGYHATO); break; case 3: - e.Column.HeaderText = Settings.Resource("comment", StringResource.MEGJEGYZES); + e.Column.HeaderText = Settings.Resource("comment", Resources.MEGJEGYZES); break; } } diff --git a/client/DxPlay/Properties/Resources1.Designer.cs b/client/DxPlay/Properties/Resources1.Designer.cs deleted file mode 100644 index f312469c..00000000 --- a/client/DxPlay/Properties/Resources1.Designer.cs +++ /dev/null @@ -1,319 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace DxPlay.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources1 { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources1() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Properties.Resources1", typeof(Resources1).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Aktuális pozíció belépőként. - /// - internal static string AKTUALIS_POZICIO_BELEPO { - get { - return ResourceManager.GetString("AKTUALIS_POZICIO_BELEPO", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Aktuális pozíció kilépőként. - /// - internal static string AKTUALIS_POZICIO_KILEPO { - get { - return ResourceManager.GetString("AKTUALIS_POZICIO_KILEPO", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Belépő. - /// - internal static string BELEPO { - get { - return ResourceManager.GetString("BELEPO", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Elhagyható. - /// - internal static string ELHAGYHATO { - get { - return ResourceManager.GetString("ELHAGYHATO", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0}. - /// - internal static string ERROR_TRAFFIC_CONNECT { - get { - return ResourceManager.GetString("ERROR_TRAFFIC_CONNECT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Hossz. - /// - internal static string HOSSZ { - get { - return ResourceManager.GetString("HOSSZ", resourceCulture); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ic_pause_black_24dp_2x { - get { - object obj = ResourceManager.GetObject("ic_pause_black_24dp_2x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ic_play_arrow_black_24dp_2x { - get { - object obj = ResourceManager.GetObject("ic_play_arrow_black_24dp_2x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ic_stop_black_24dp_2x { - get { - object obj = ResourceManager.GetObject("ic_stop_black_24dp_2x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized string similar to Indítás. - /// - internal static string INDITAS { - get { - return ResourceManager.GetString("INDITAS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kezdés. - /// - internal static string INDULASI_PONT { - get { - return ResourceManager.GetString("INDULASI_PONT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kilépés. - /// - internal static string KILEPES { - get { - return ResourceManager.GetString("KILEPES", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kilépő. - /// - internal static string KILEPO { - get { - return ResourceManager.GetString("KILEPO", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Leállítás. - /// - internal static string LEALLITAS { - get { - return ResourceManager.GetString("LEALLITAS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Lejátszás. - /// - internal static string LEJATSZAS { - get { - return ResourceManager.GetString("LEJATSZAS", resourceCulture); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap lgs { - get { - object obj = ResourceManager.GetObject("lgs", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized string similar to Megállítva. - /// - internal static string MEGALLITVA { - get { - return ResourceManager.GetString("MEGALLITVA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Megjegyzés. - /// - internal static string MEGJEGYZES { - get { - return ResourceManager.GetString("MEGJEGYZES", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Nem található a PlanAir rendszer kapcsolódási információja a dxplay.json állományban.. - /// - internal static string MISSING_TRAFFIC_CONFIGURATION { - get { - return ResourceManager.GetString("MISSING_TRAFFIC_CONFIGURATION", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Nem található az {0} azonosító a PlanAir rendszerben.. - /// - internal static string MISSING_TRAFFIC_VARIANT { - get { - return ResourceManager.GetString("MISSING_TRAFFIC_VARIANT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to NINCS BEMENET. - /// - internal static string NINCS_BEMENET { - get { - return ResourceManager.GetString("NINCS_BEMENET", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szegmens definiálása. - /// - internal static string SZEGMENS_DEFINIALASA { - get { - return ResourceManager.GetString("SZEGMENS_DEFINIALASA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szegmens szétvágása. - /// - internal static string SZEGMENS_SZETVAGASA { - get { - return ResourceManager.GetString("SZEGMENS_SZETVAGASA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szegmens törlése. - /// - internal static string SZEGMENS_TORLESE { - get { - return ResourceManager.GetString("SZEGMENS_TORLESE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szegmensek. - /// - internal static string SZEGMENSEK { - get { - return ResourceManager.GetString("SZEGMENSEK", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szünet. - /// - internal static string SZUNET { - get { - return ResourceManager.GetString("SZUNET", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szüneteltetett. - /// - internal static string SZUNETELTETETT { - get { - return ResourceManager.GetString("SZUNETELTETETT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Vége. - /// - internal static string VEGE { - get { - return ResourceManager.GetString("VEGE", resourceCulture); - } - } - } -} diff --git a/client/DxPlay/Properties/Resources1.resx b/client/DxPlay/Properties/Resources1.resx deleted file mode 100644 index 81837fff..00000000 --- a/client/DxPlay/Properties/Resources1.resx +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Aktuális pozíció belépőként - - - Aktuális pozíció kilépőként - - - Belépő - - - Elhagyható - - - Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0} - - - Hossz - - - - ..\resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Indítás - - - Kezdés - - - Kilépés - - - Kilépő - - - Leállítás - - - Lejátszás - - - ..\resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Megállítva - - - Megjegyzés - - - Nem található a PlanAir rendszer kapcsolódási információja a dxplay.json állományban. - - - Nem található az {0} azonosító a PlanAir rendszerben. - - - NINCS BEMENET - - - Szegmensek - - - Szegmens definiálása - - - Szegmens szétvágása - - - Szegmens törlése - - - Szünet - - - Szüneteltetett - - - Vége - - \ No newline at end of file -- 2.54.0