From d16f20df67892c4969a58d15f1a1d5ea21d1bd1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 8 Aug 2018 08:40:53 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31233 --- client/DxPlay/Configuration/dxplay.json | 2 +- .../DxPlay/Configuration/metadataprovider.en | 40 ++--- client/DxPlay/Controls/Player.Designer.cs | 32 ---- client/DxPlay/Controls/Player.cs | 17 --- client/DxPlay/DxPlay.csproj | 30 +--- client/DxPlay/PlayerForm.resx | 2 +- .../DxPlay/Properties/Resources.Designer.cs | 133 ---------------- client/DxPlay/Properties/Resources.resx | 142 ------------------ ...urce.Designer.cs => Resources.Designer.cs} | 6 +- .../{StringResource.resx => Resources.resx} | 0 client/DxPlay/Resources/Pause.png | Bin 250 -> 0 bytes client/DxPlay/Resources/Play.png | Bin 437 -> 0 bytes client/DxPlay/Resources/Stop.png | Bin 238 -> 0 bytes .../Resources/ic_pause_black_24dp_1x.png | Bin 81 -> 0 bytes .../Resources/ic_play_arrow_black_24dp_1x.png | Bin 150 -> 0 bytes .../Resources/ic_stop_black_24dp_1x.png | Bin 82 -> 0 bytes client/PlanAIRClient/Resources.Designer.cs | 86 +++++------ client/PlanAIRClient/Resources.resx | 30 ++-- client/PlanAIRClient/TrafficAPI.cs | 5 +- client/PlanAIRClient/TrafficIDSelector.cs | 8 +- .../PlanAIRClient/TrafficIDSelectorColumns.cs | 30 ++-- .../TrafficLookupResultSelector.cs | 12 +- 22 files changed, 110 insertions(+), 465 deletions(-) delete mode 100644 client/DxPlay/Controls/Player.Designer.cs delete mode 100644 client/DxPlay/Controls/Player.cs delete mode 100644 client/DxPlay/Properties/Resources.Designer.cs delete mode 100644 client/DxPlay/Properties/Resources.resx rename client/DxPlay/{StringResource.Designer.cs => Resources.Designer.cs} (95%) rename client/DxPlay/{StringResource.resx => Resources.resx} (100%) delete mode 100644 client/DxPlay/Resources/Pause.png delete mode 100644 client/DxPlay/Resources/Play.png delete mode 100644 client/DxPlay/Resources/Stop.png delete mode 100644 client/DxPlay/Resources/ic_pause_black_24dp_1x.png delete mode 100644 client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png delete mode 100644 client/DxPlay/Resources/ic_stop_black_24dp_1x.png diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json index 9c4d6417..2a4fe458 100644 --- a/client/DxPlay/Configuration/dxplay.json +++ b/client/DxPlay/Configuration/dxplay.json @@ -12,7 +12,7 @@ "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;", "userName": "MAM", "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", - "timeout": 500 + "timeout": 1000 } } } diff --git a/client/DxPlay/Configuration/metadataprovider.en b/client/DxPlay/Configuration/metadataprovider.en index 3f488e8c..da4788f7 100644 --- a/client/DxPlay/Configuration/metadataprovider.en +++ b/client/DxPlay/Configuration/metadataprovider.en @@ -1,27 +1,17 @@ { - "define-segment": "Define segment", - "break-segment": "Break segment", - "position-as-tcin": "Current position as TC in", - "position-as-tcout": "Current position as TC out", - "delete-segment": "Delete segment", - "segments": "Segments", - "no-input": "NO INPUT", - "start": "START", - "length": "LENGTH", - "tc-in": "TC in", - "tc-out": "TC out", - "optional": "Optional", - "comment": "Comment", - "starting": "STARTING", - "exiting": "EXITING", - "paused": "PAUSED", - "playing": "PLAYING", - "stopped": "STOPPED", - "completed": "COMPLETED", - "pause": "Pause", - "play": "Play", - "stop": "Stop", - "missing-traffic-configuration": "Missing PlanAir connection configuration.", - "error-traffic-connect": "Could not connect to PlanAir system, using: {0}", - "missing-traffic-variant": "Missing metadata for {0} in PlanAir system." + "TITLE": "Title", + "FIRSTBROADCASTDATE": "First broadcast", + "EPISODENUMBER": "Episode nr.", + "EPISODEID": "Episode ID", + "EPISODETITLE": "Episode title", + "PROBLEMATIC": "Problematic", + "SEARCH": "Search", + "SERACHRESULTS": "Searh results", + "NEXTBROADCASTDATE": "Next broadcast", + "CANCEL": "Cancel", + "MATERIAL": "Material", + "PROMOTION": "Promotion", + "ADVERTISEMENT": "Advertisement", + "SEGMENTCOUNT": "Segment count", + "TRAFFICID": "Traffic ID" } diff --git a/client/DxPlay/Controls/Player.Designer.cs b/client/DxPlay/Controls/Player.Designer.cs deleted file mode 100644 index 290f08be..00000000 --- a/client/DxPlay/Controls/Player.Designer.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace DxPlay.Controls { - partial class Player { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - } - - #endregion - } -} diff --git a/client/DxPlay/Controls/Player.cs b/client/DxPlay/Controls/Player.cs deleted file mode 100644 index 20f30a01..00000000 --- a/client/DxPlay/Controls/Player.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace DxPlay.Controls { - public partial class Player : UserControl { - public Player() { - InitializeComponent(); - } - } -} diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index bb3c4129..c7b2a8f3 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -185,12 +185,6 @@ Component - - UserControl - - - Player.cs - UserControl @@ -217,19 +211,14 @@ - - Resources.resx - True - True - - + True True - StringResource.resx + Resources.resx @@ -258,15 +247,12 @@ - - - PlayerControls.cs - + ResXFileCodeGenerator - StringResource.Designer.cs + Resources.Designer.cs PreserveNewest @@ -274,14 +260,6 @@ - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - Designer - PreserveNewest diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx index 8c2e6ddd..b5dcd9ba 100644 --- a/client/DxPlay/PlayerForm.resx +++ b/client/DxPlay/PlayerForm.resx @@ -176,7 +176,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo - CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs deleted file mode 100644 index 6321529e..00000000 --- a/client/DxPlay/Properties/Resources.Designer.cs +++ /dev/null @@ -1,133 +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", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Properties.Resources", typeof(Resources).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)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public 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. - /// - public 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. - /// - public 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 resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap lgs { - get { - object obj = ResourceManager.GetObject("lgs", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Pause { - get { - object obj = ResourceManager.GetObject("Pause", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Play { - get { - object obj = ResourceManager.GetObject("Play", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Stop { - get { - object obj = ResourceManager.GetObject("Stop", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx deleted file mode 100644 index 8ecd0b9f..00000000 --- a/client/DxPlay/Properties/Resources.resx +++ /dev/null @@ -1,142 +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 - - - - ..\Resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\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 - - \ No newline at end of file diff --git a/client/DxPlay/StringResource.Designer.cs b/client/DxPlay/Resources.Designer.cs similarity index 95% rename from client/DxPlay/StringResource.Designer.cs rename to client/DxPlay/Resources.Designer.cs index 306c8420..a9138d06 100644 --- a/client/DxPlay/StringResource.Designer.cs +++ b/client/DxPlay/Resources.Designer.cs @@ -22,14 +22,14 @@ namespace DxPlay { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class StringResource { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal StringResource() { + internal Resources() { } /// @@ -39,7 +39,7 @@ namespace DxPlay { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.StringResource", typeof(StringResource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/client/DxPlay/StringResource.resx b/client/DxPlay/Resources.resx similarity index 100% rename from client/DxPlay/StringResource.resx rename to client/DxPlay/Resources.resx diff --git a/client/DxPlay/Resources/Pause.png b/client/DxPlay/Resources/Pause.png deleted file mode 100644 index 983cab7ad06f5efee06ed5fc49495caa7e1168c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmVMfB$^`^Z}P36xiB(U%Gt# z|NsA&E?>8`_r@d01fj&lrFC^Q7#J9Ibu`4prSS-|z%BXz|39XSF$I}O^)$kUfB*hr zN@EHlG`#)HjHv-r5TW78D=dD%6hzYSnh}cz3_*m3$FH&2fGJ3_4I~FERKttskKjUZ zHdaBXjgnIGO3IoNl5#JeKe~7K`txTGaS4(P08-0jmv&atEdT%j07*qoM6N<$f>E?$ AKL7v# diff --git a/client/DxPlay/Resources/Play.png b/client/DxPlay/Resources/Play.png deleted file mode 100644 index eb023d1d6dd23479cbb41db4f26ef175ed96c1a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmV;m0ZRUfP)RUTMka%A3vEG82*2F{|37TEp6k_ z5FZGijg8gBSl`ap@*e}o&!7K({rd6k>t`$)!eAO8KtO=s(cV%=NBh?w)?dH=eERh6 z&!69@HUxWP+Abq4>FQ!9DJjFm!uRXf@3(JWU~v+g7`w zh{T&uO!xwyMJOR9^UT>xS1z4`YIySMKmPdIxqj;PYv&jk7+@M+GvZSE{@$uxyAPi` zd+Y|XhR3h5+i+!f)zPB|Zr{4}u}ld|9;!Sg9q;2z4q$mQxxxDnkxEr=82Q% z&z?SX@9uRh{%2rd`1b7!od5Vp-llWMuU$RM@E^M)Sr`}??%lmEdc2UCnd#iw6L)T3 f`TFG(p5OuigN2)YqB{>N00000NkvXXu0mjfQBBkz diff --git a/client/DxPlay/Resources/Stop.png b/client/DxPlay/Resources/Stop.png deleted file mode 100644 index 8490e75c807d7d664ac270fd7bf61d24922aa970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmVOAB0$N09M3kTnZwg^H^GX3`@P4kqU^ih1iPAyP<+NHdD%Qhf#RfwVhy{fRW(;2qu+8VwoTkz_tDK_ev%S8~#affk%5YK?lqM o!r4;B>uI>q(`Avj_p5CqKC@IbnO8kP)Bpeg07*qoM6N<$f@(Hi4*&oF diff --git a/client/DxPlay/Resources/ic_pause_black_24dp_1x.png b/client/DxPlay/Resources/ic_pause_black_24dp_1x.png deleted file mode 100644 index 6145664b4ba3f2b0009bd20d8226e6468746e658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#UPHSi(^OyW3mM6e?@`0_61UI graf5_FBur5Cge|CzdJOZfq{X+)78&qol`;+0ES)@KL7v# diff --git a/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png b/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png deleted file mode 100644 index d78c57bad52392dfa75a54f08d4b42e0a95ef7a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#v7RoDAr*|t42^*s`W(AV zc>hb<8Kf8(Oj^Lm!*84+w3d;p-pIsYgWz&T#`T5~!pj*M{~P+GKTux4$ZVI&v1DOe zJgTe~DWM4fo%s{3 diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs index f258c83a..7c2ceb7a 100644 --- a/client/PlanAIRClient/Resources.Designer.cs +++ b/client/PlanAIRClient/Resources.Designer.cs @@ -61,56 +61,56 @@ namespace TrafficClient { } /// - /// Looks up a localized string similar to Cím. + /// Looks up a localized string similar to Reklám. /// - internal static string CIM { + internal static string ADVERTISEMENT { get { - return ResourceManager.GetString("CIM", resourceCulture); + return ResourceManager.GetString("ADVERTISEMENT", resourceCulture); } } /// - /// Looks up a localized string similar to Első adás. + /// Looks up a localized string similar to Mégse. /// - internal static string ELSO_ADASNAP { + internal static string CANCEL { get { - return ResourceManager.GetString("ELSO_ADASNAP", resourceCulture); + return ResourceManager.GetString("CANCEL", resourceCulture); } } /// - /// Looks up a localized string similar to Epizódszám. + /// Looks up a localized string similar to Epizód azonosító. /// - internal static string EPIZOD { + internal static string EPISODEID { get { - return ResourceManager.GetString("EPIZOD", resourceCulture); + return ResourceManager.GetString("EPISODEID", resourceCulture); } } /// - /// Looks up a localized string similar to Epizód azonosító. + /// Looks up a localized string similar to Epizódszám. /// - internal static string EPIZOD_AZONOSITO { + internal static string EPISODENUMBER { get { - return ResourceManager.GetString("EPIZOD_AZONOSITO", resourceCulture); + return ResourceManager.GetString("EPISODENUMBER", resourceCulture); } } /// /// Looks up a localized string similar to Epizodcím. /// - internal static string EPIZOD_CIM { + internal static string EPISODETITLE { get { - return ResourceManager.GetString("EPIZOD_CIM", resourceCulture); + return ResourceManager.GetString("EPISODETITLE", resourceCulture); } } /// - /// Looks up a localized string similar to Hiányos. + /// Looks up a localized string similar to Első adás. /// - internal static string HIANYOS { + internal static string FIRSTBROADCASTDATE { get { - return ResourceManager.GetString("HIANYOS", resourceCulture); + return ResourceManager.GetString("FIRSTBROADCASTDATE", resourceCulture); } } @@ -125,83 +125,83 @@ namespace TrafficClient { } /// - /// Looks up a localized string similar to Keresés. + /// Looks up a localized string similar to Műsor. /// - internal static string KERESES { + internal static string MATERIAL { get { - return ResourceManager.GetString("KERESES", resourceCulture); + return ResourceManager.GetString("MATERIAL", resourceCulture); } } /// - /// Looks up a localized string similar to Keresés eredménye. + /// Looks up a localized string similar to Következő adás. /// - internal static string KERESES_EREDMENYE { + internal static string NEXTBROADCASTDATE { get { - return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture); + return ResourceManager.GetString("NEXTBROADCASTDATE", resourceCulture); } } /// - /// Looks up a localized string similar to Következő adás. + /// Looks up a localized string similar to Hiányos. /// - internal static string KOVETKEZO_ADASNAP { + internal static string PROBLEMATIC { get { - return ResourceManager.GetString("KOVETKEZO_ADASNAP", resourceCulture); + return ResourceManager.GetString("PROBLEMATIC", resourceCulture); } } /// - /// Looks up a localized string similar to Mégse. + /// Looks up a localized string similar to Promó. /// - internal static string MEGSE { + internal static string PROMOTION { get { - return ResourceManager.GetString("MEGSE", resourceCulture); + return ResourceManager.GetString("PROMOTION", resourceCulture); } } /// - /// Looks up a localized string similar to Műsor. + /// Looks up a localized string similar to Keresés. /// - internal static string MUSOR { + internal static string SEARCH { get { - return ResourceManager.GetString("MUSOR", resourceCulture); + return ResourceManager.GetString("SEARCH", resourceCulture); } } /// - /// Looks up a localized string similar to Promó. + /// Looks up a localized string similar to Szegmensek. /// - internal static string PROMO { + internal static string SEGMENTCOUNT { get { - return ResourceManager.GetString("PROMO", resourceCulture); + return ResourceManager.GetString("SEGMENTCOUNT", resourceCulture); } } /// - /// Looks up a localized string similar to Reklám. + /// Looks up a localized string similar to Keresés eredménye. /// - internal static string REKLAM { + internal static string SERACHRESULTS { get { - return ResourceManager.GetString("REKLAM", resourceCulture); + return ResourceManager.GetString("SERACHRESULTS", resourceCulture); } } /// - /// Looks up a localized string similar to Szegmensek. + /// Looks up a localized string similar to Cím. /// - internal static string SZEGMENS_SZAM { + internal static string TITLE { get { - return ResourceManager.GetString("SZEGMENS_SZAM", resourceCulture); + return ResourceManager.GetString("TITLE", resourceCulture); } } /// /// Looks up a localized string similar to Traffic ID. /// - internal static string TRAFFIC_ID { + internal static string TRAFFICID { get { - return ResourceManager.GetString("TRAFFIC_ID", resourceCulture); + return ResourceManager.GetString("TRAFFICID", resourceCulture); } } } diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx index 2b73b199..534f50ca 100644 --- a/client/PlanAIRClient/Resources.resx +++ b/client/PlanAIRClient/Resources.resx @@ -117,53 +117,53 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Cím - + Első adás - + Epizódszám - + Epizód azonosító - + Epizodcím - + Hiányos Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Keresés - + Keresés eredménye - + Következő adás - + Mégse - + Műsor - + Promó - + Reklám - + Szegmensek - + Traffic ID \ No newline at end of file diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index 583e2617..17e3fb33 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -9,18 +9,19 @@ using MaestroShared.Metadata; namespace TrafficClient { public class TrafficAPI { + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private TrafficContext context = new TrafficContext(); private string connectionString; private CliFSPReader cliFSPReader; private SqlConnection connection; - private static Logger logger = LogManager.GetCurrentClassLogger(); private MaterialWorker materialWorker; private PromoWorker promoWorker; private ADWorker adWorker; private SegmentWorker segmentWorker; public TrafficAPI(string connString, string user, string password, int timeout, IMessageBus messageBus) { - connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout / 1000); + var correctedTimeout = timeout < 1000 ? 1000 : timeout; + connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, correctedTimeout / 1000); connection = new SqlConnection(connectionString); cliFSPReader = new CliFSPReader(); materialWorker = new MaterialWorker(connection, cliFSPReader, messageBus); diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 40435e34..c58c4366 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -23,13 +23,13 @@ namespace TrafficClient { } private void InitializeTexts() { - chkProblematic.Text = Resources.HIANYOS; + chkProblematic.Text = Resources.PROBLEMATIC; dgTraffic.AutoGenerateColumns = false; - rbMaterial.Text = Resources.MUSOR; - rbPromo.Text = Resources.PROMO; - rbAD.Text = Resources.REKLAM; + rbMaterial.Text = Resources.MATERIAL; + rbPromo.Text = Resources.PROMOTION; + rbAD.Text = Resources.ADVERTISEMENT; } public TrafficParameters Parameters { diff --git a/client/PlanAIRClient/TrafficIDSelectorColumns.cs b/client/PlanAIRClient/TrafficIDSelectorColumns.cs index 68ce4c0f..46573816 100644 --- a/client/PlanAIRClient/TrafficIDSelectorColumns.cs +++ b/client/PlanAIRClient/TrafficIDSelectorColumns.cs @@ -13,7 +13,7 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "MediaID", - HeaderText = Resources.TRAFFIC_ID, + HeaderText = Resources.TRAFFICID, Width = 100 }, new DataGridViewCheckBoxColumn() { @@ -24,43 +24,43 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "Title", - HeaderText = Resources.CIM, + HeaderText = Resources.TITLE, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeNumber", - HeaderText = Resources.EPIZOD, + HeaderText = Resources.EPISODENUMBER, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeID", - HeaderText = Resources.EPIZOD_AZONOSITO, + HeaderText = Resources.EPISODEID, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "FirsBroadcastDate", - HeaderText = Resources.ELSO_ADASNAP, + HeaderText = Resources.FIRSTBROADCASTDATE, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "NextBroadcastDate", - HeaderText = Resources.KOVETKEZO_ADASNAP, + HeaderText = Resources.NEXTBROADCASTDATE, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "SegmentCount", - HeaderText = Resources.SZEGMENS_SZAM, + HeaderText = Resources.SEGMENTCOUNT, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeTitle", - HeaderText = Resources.EPIZOD_CIM, + HeaderText = Resources.EPISODETITLE, Width = 100 }, }; @@ -76,7 +76,7 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "MediaID", - HeaderText = Resources.TRAFFIC_ID, + HeaderText = Resources.TRAFFICID, Width = 100 }, new DataGridViewCheckBoxColumn() { @@ -87,19 +87,19 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "Title", - HeaderText = Resources.CIM, + HeaderText = Resources.TITLE, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeNumber", - HeaderText = Resources.EPIZOD, + HeaderText = Resources.EPISODENUMBER, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeTitle", - HeaderText = Resources.EPIZOD_CIM, + HeaderText = Resources.EPISODETITLE, Width = 100 }, }; @@ -115,7 +115,7 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "MediaID", - HeaderText = Resources.TRAFFIC_ID, + HeaderText = Resources.TRAFFICID, Width = 100 }, new DataGridViewCheckBoxColumn() { @@ -126,13 +126,13 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "Title", - HeaderText = Resources.CIM, + HeaderText = Resources.TITLE, Width = 100 }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.None, DataPropertyName = "EpisodeTitle", - HeaderText = Resources.EPIZOD_CIM, + HeaderText = Resources.EPISODETITLE, Width = 100 }, }; diff --git a/client/PlanAIRClient/TrafficLookupResultSelector.cs b/client/PlanAIRClient/TrafficLookupResultSelector.cs index 9a0ebf3b..2a05da24 100644 --- a/client/PlanAIRClient/TrafficLookupResultSelector.cs +++ b/client/PlanAIRClient/TrafficLookupResultSelector.cs @@ -14,14 +14,14 @@ namespace TrafficClient { public TrafficLookupResultSelector(List elements, TraficMetadataSelected metadataSelected) : this() { this.elements = elements; this.metadataSelected = metadataSelected; - this.Text = Resources.KERESES_EREDMENYE; - buttonCancel.Text = Resources.MEGSE; + this.Text = Resources.SERACHRESULTS; + buttonCancel.Text = Resources.CANCEL; FillDataGridView(); } public TrafficLookupResultSelector() { InitializeComponent(); - this.Text = Resources.KERESES_EREDMENYE; + this.Text = Resources.SERACHRESULTS; SetColumns(); } @@ -31,17 +31,17 @@ namespace TrafficClient { new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill, DataPropertyName = "MediaID", - HeaderText = Resources.TRAFFIC_ID + HeaderText = Resources.TRAFFICID }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader, DataPropertyName = "Title", - HeaderText = Resources.CIM + HeaderText = Resources.TITLE }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader, DataPropertyName = "EpisodeTitle", - HeaderText = Resources.EPIZOD_CIM + HeaderText = Resources.EPISODETITLE } } ); -- 2.54.0