git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 8 Aug 2018 08:40:53 +0000 (08:40 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 8 Aug 2018 08:40:53 +0000 (08:40 +0000)
22 files changed:
client/DxPlay/Configuration/dxplay.json
client/DxPlay/Configuration/metadataprovider.en
client/DxPlay/Controls/Player.Designer.cs [deleted file]
client/DxPlay/Controls/Player.cs [deleted file]
client/DxPlay/DxPlay.csproj
client/DxPlay/PlayerForm.resx
client/DxPlay/Properties/Resources.Designer.cs [deleted file]
client/DxPlay/Properties/Resources.resx [deleted file]
client/DxPlay/Resources.Designer.cs [moved from client/DxPlay/StringResource.Designer.cs with 95% similarity]
client/DxPlay/Resources.resx [moved from client/DxPlay/StringResource.resx with 100% similarity]
client/DxPlay/Resources/Pause.png [deleted file]
client/DxPlay/Resources/Play.png [deleted file]
client/DxPlay/Resources/Stop.png [deleted file]
client/DxPlay/Resources/ic_pause_black_24dp_1x.png [deleted file]
client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png [deleted file]
client/DxPlay/Resources/ic_stop_black_24dp_1x.png [deleted file]
client/PlanAIRClient/Resources.Designer.cs
client/PlanAIRClient/Resources.resx
client/PlanAIRClient/TrafficAPI.cs
client/PlanAIRClient/TrafficIDSelector.cs
client/PlanAIRClient/TrafficIDSelectorColumns.cs
client/PlanAIRClient/TrafficLookupResultSelector.cs

index 9c4d6417146d49dd7ff9c2f2a49042f410e4b0b0..2a4fe458fd1a7fb26d18914d936cb4c48ee2fe2e 100644 (file)
@@ -12,7 +12,7 @@
       "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
       "userName": "MAM",\r
       "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
-      "timeout": 500\r
+      "timeout": 1000\r
     }\r
   }\r
 }\r
index 3f488e8cfe9f5077ecd4be04ca845502973994b8..da4788f7f5afaf936f76eb73860d1290ec6d87c3 100644 (file)
@@ -1,27 +1,17 @@
 {\r
-  "define-segment": "Define segment",\r
-  "break-segment": "Break segment",\r
-  "position-as-tcin": "Current position as TC in",\r
-  "position-as-tcout": "Current position as TC out",\r
-  "delete-segment": "Delete segment",\r
-  "segments": "Segments",\r
-  "no-input": "NO INPUT",\r
-  "start": "START",\r
-  "length": "LENGTH",\r
-  "tc-in": "TC in",\r
-  "tc-out": "TC out",\r
-  "optional": "Optional",\r
-  "comment": "Comment",\r
-  "starting": "STARTING",\r
-  "exiting": "EXITING",\r
-  "paused": "PAUSED",\r
-  "playing": "PLAYING",\r
-  "stopped": "STOPPED",\r
-  "completed": "COMPLETED",\r
-  "pause": "Pause",\r
-  "play": "Play",\r
-  "stop": "Stop",\r
-  "missing-traffic-configuration": "Missing PlanAir connection configuration.",\r
-  "error-traffic-connect": "Could not connect to PlanAir system, using: {0}",\r
-  "missing-traffic-variant": "Missing metadata for {0} in PlanAir system."\r
+  "TITLE": "Title",\r
+  "FIRSTBROADCASTDATE": "First broadcast",\r
+  "EPISODENUMBER": "Episode nr.",\r
+  "EPISODEID": "Episode ID",\r
+  "EPISODETITLE": "Episode title",\r
+  "PROBLEMATIC": "Problematic",\r
+  "SEARCH": "Search",\r
+  "SERACHRESULTS": "Searh results",\r
+  "NEXTBROADCASTDATE": "Next broadcast",\r
+  "CANCEL": "Cancel",\r
+  "MATERIAL": "Material",\r
+  "PROMOTION": "Promotion",\r
+  "ADVERTISEMENT": "Advertisement",\r
+  "SEGMENTCOUNT": "Segment count",\r
+  "TRAFFICID": "Traffic ID"\r
 }\r
diff --git a/client/DxPlay/Controls/Player.Designer.cs b/client/DxPlay/Controls/Player.Designer.cs
deleted file mode 100644 (file)
index 290f08b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace DxPlay.Controls {\r
-    partial class Player {\r
-        /// <summary> \r
-        /// Required designer variable.\r
-        /// </summary>\r
-        private System.ComponentModel.IContainer components = null;\r
-\r
-        /// <summary> \r
-        /// Clean up any resources being used.\r
-        /// </summary>\r
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>\r
-        protected override void Dispose(bool disposing) {\r
-            if (disposing && (components != null)) {\r
-                components.Dispose();\r
-            }\r
-            base.Dispose(disposing);\r
-        }\r
-\r
-        #region Component Designer generated code\r
-\r
-        /// <summary> \r
-        /// Required method for Designer support - do not modify \r
-        /// the contents of this method with the code editor.\r
-        /// </summary>\r
-        private void InitializeComponent() {\r
-            components = new System.ComponentModel.Container();\r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-        }\r
-\r
-        #endregion\r
-    }\r
-}\r
diff --git a/client/DxPlay/Controls/Player.cs b/client/DxPlay/Controls/Player.cs
deleted file mode 100644 (file)
index 20f30a0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Drawing;\r
-using System.Data;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Threading.Tasks;\r
-using System.Windows.Forms;\r
-\r
-namespace DxPlay.Controls {\r
-    public partial class Player : UserControl {\r
-        public Player() {\r
-            InitializeComponent();\r
-        }\r
-    }\r
-}\r
index bb3c41293e90b0bda219cb506e8a5e49e599319a..c7b2a8f37ac647ff72355dffb36d60497a7573c0 100644 (file)
     <Compile Include="Controls\BindableToolStripMenuItem .cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="Controls\Player.cs">\r
-      <SubType>UserControl</SubType>\r
-    </Compile>\r
-    <Compile Include="Controls\Player.Designer.cs">\r
-      <DependentUpon>Player.cs</DependentUpon>\r
-    </Compile>\r
     <Compile Include="Controls\PlayerControls.cs">\r
       <SubType>UserControl</SubType>\r
     </Compile>\r
     <Compile Include="NativeMethods.cs" />\r
     <Compile Include="PlayerGraph.cs" />\r
     <Compile Include="Program.cs" />\r
-    <Compile Include="Properties\Resources.Designer.cs">\r
-      <DependentUpon>Resources.resx</DependentUpon>\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-    </Compile>\r
     <Compile Include="SafeHandles.cs" />\r
     <Compile Include="SMTPETimeCode\Enums.cs" />\r
     <Compile Include="SMTPETimeCode\Extensions.cs" />\r
     <Compile Include="SMTPETimeCode\TimeCode.cs" />\r
-    <Compile Include="StringResource.Designer.cs">\r
+    <Compile Include="Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DesignTime>True</DesignTime>\r
-      <DependentUpon>StringResource.resx</DependentUpon>\r
+      <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
     <Compile Include="URCOMLoader.cs" />\r
     <Compile Include="VideoTrackBar.cs">\r
     <None Include="Resources\ic_stop_black_24dp_2x.png" />\r
     <None Include="Resources\ic_play_arrow_black_24dp_2x.png" />\r
     <None Include="Resources\ic_pause_black_24dp_2x.png" />\r
-    <None Include="Resources\ic_stop_black_24dp_1x.png" />\r
-    <None Include="Resources\ic_play_arrow_black_24dp_1x.png" />\r
-    <None Include="Resources\ic_pause_black_24dp_1x.png" />\r
     <EmbeddedResource Include="Controls\PlayerControls.resx">\r
       <DependentUpon>PlayerControls.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="StringResource.resx">\r
+    <EmbeddedResource Include="Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>StringResource.Designer.cs</LastGenOutput>\r
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r
     <None Include="nlog.config">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     <None Include="packages.config" />\r
     <None Include="Properties\app.manifest" />\r
     <None Include="Resources\lgs.jpg" />\r
-    <None Include="Resources\Play.png" />\r
-    <None Include="Resources\Stop.png" />\r
-    <None Include="Resources\Pause.png" />\r
-    <EmbeddedResource Include="Properties\Resources.resx">\r
-      <Generator>PublicResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
     <None Include="app.config" />\r
     <None Include="MediaInfo.dll">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
index 8c2e6ddd51d23a0f875c5da474a2ad37ffaebb95..b5dcd9baac8dfe212806e3a65736891840b2ed22 100644 (file)
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs
deleted file mode 100644 (file)
index 6321529..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated>\r
-//     This code was generated by a tool.\r
-//     Runtime Version:4.0.30319.42000\r
-//\r
-//     Changes to this file may cause incorrect behavior and will be lost if\r
-//     the code is regenerated.\r
-// </auto-generated>\r
-//------------------------------------------------------------------------------\r
-\r
-namespace DxPlay.Properties {\r
-    using System;\r
-    \r
-    \r
-    /// <summary>\r
-    ///   A strongly-typed resource class, for looking up localized strings, etc.\r
-    /// </summary>\r
-    // This class was auto-generated by the StronglyTypedResourceBuilder\r
-    // class via a tool like ResGen or Visual Studio.\r
-    // To add or remove a member, edit your .ResX file then rerun ResGen\r
-    // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    public class Resources {\r
-        \r
-        private static global::System.Resources.ResourceManager resourceMan;\r
-        \r
-        private static global::System.Globalization.CultureInfo resourceCulture;\r
-        \r
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal Resources() {\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Returns the cached ResourceManager instance used by this class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        public static global::System.Resources.ResourceManager ResourceManager {\r
-            get {\r
-                if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Properties.Resources", typeof(Resources).Assembly);\r
-                    resourceMan = temp;\r
-                }\r
-                return resourceMan;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Overrides the current thread's CurrentUICulture property for all\r
-        ///   resource lookups using this strongly typed resource class.\r
-        /// </summary>\r
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]\r
-        public static global::System.Globalization.CultureInfo Culture {\r
-            get {\r
-                return resourceCulture;\r
-            }\r
-            set {\r
-                resourceCulture = value;\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap ic_pause_black_24dp_2x {\r
-            get {\r
-                object obj = ResourceManager.GetObject("ic_pause_black_24dp_2x", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap ic_play_arrow_black_24dp_2x {\r
-            get {\r
-                object obj = ResourceManager.GetObject("ic_play_arrow_black_24dp_2x", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap ic_stop_black_24dp_2x {\r
-            get {\r
-                object obj = ResourceManager.GetObject("ic_stop_black_24dp_2x", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap lgs {\r
-            get {\r
-                object obj = ResourceManager.GetObject("lgs", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap Pause {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Pause", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap Play {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Play", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
-        /// </summary>\r
-        public static System.Drawing.Bitmap Stop {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Stop", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx
deleted file mode 100644 (file)
index 8ecd0b9..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<root>\r
-  <!-- \r
-    Microsoft ResX Schema \r
-    \r
-    Version 2.0\r
-    \r
-    The primary goals of this format is to allow a simple XML format \r
-    that is mostly human readable. The generation and parsing of the \r
-    various data types are done through the TypeConverter classes \r
-    associated with the data types.\r
-    \r
-    Example:\r
-    \r
-    ... ado.net/XML headers & schema ...\r
-    <resheader name="resmimetype">text/microsoft-resx</resheader>\r
-    <resheader name="version">2.0</resheader>\r
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>\r
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>\r
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>\r
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>\r
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">\r
-        <value>[base64 mime encoded serialized .NET Framework object]</value>\r
-    </data>\r
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>\r
-        <comment>This is a comment</comment>\r
-    </data>\r
-                \r
-    There are any number of "resheader" rows that contain simple \r
-    name/value pairs.\r
-    \r
-    Each data row contains a name, and value. The row also contains a \r
-    type or mimetype. Type corresponds to a .NET class that support \r
-    text/value conversion through the TypeConverter architecture. \r
-    Classes that don't support this are serialized and stored with the \r
-    mimetype set.\r
-    \r
-    The mimetype is used for serialized objects, and tells the \r
-    ResXResourceReader how to depersist the object. This is currently not \r
-    extensible. For a given mimetype the value must be set accordingly:\r
-    \r
-    Note - application/x-microsoft.net.object.binary.base64 is the format \r
-    that the ResXResourceWriter will generate, however the reader can \r
-    read any of the formats listed below.\r
-    \r
-    mimetype: application/x-microsoft.net.object.binary.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
-            : and then encoded with base64 encoding.\r
-    \r
-    mimetype: application/x-microsoft.net.object.soap.base64\r
-    value   : The object must be serialized with \r
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter\r
-            : and then encoded with base64 encoding.\r
-\r
-    mimetype: application/x-microsoft.net.object.bytearray.base64\r
-    value   : The object must be serialized into a byte array \r
-            : using a System.ComponentModel.TypeConverter\r
-            : and then encoded with base64 encoding.\r
-    -->\r
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
-    <xsd:element name="root" msdata:IsDataSet="true">\r
-      <xsd:complexType>\r
-        <xsd:choice maxOccurs="unbounded">\r
-          <xsd:element name="metadata">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" use="required" type="xsd:string" />\r
-              <xsd:attribute name="type" type="xsd:string" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="assembly">\r
-            <xsd:complexType>\r
-              <xsd:attribute name="alias" type="xsd:string" />\r
-              <xsd:attribute name="name" type="xsd:string" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="data">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
-              <xsd:attribute ref="xml:space" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-          <xsd:element name="resheader">\r
-            <xsd:complexType>\r
-              <xsd:sequence>\r
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
-              </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" use="required" />\r
-            </xsd:complexType>\r
-          </xsd:element>\r
-        </xsd:choice>\r
-      </xsd:complexType>\r
-    </xsd:element>\r
-  </xsd:schema>\r
-  <resheader name="resmimetype">\r
-    <value>text/microsoft-resx</value>\r
-  </resheader>\r
-  <resheader name="version">\r
-    <value>2.0</value>\r
-  </resheader>\r
-  <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <resheader name="writer">\r
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </resheader>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
-  <data name="lgs" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="ic_pause_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="ic_play_arrow_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="ic_stop_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-</root>
\ No newline at end of file
similarity index 95%
rename from client/DxPlay/StringResource.Designer.cs
rename to client/DxPlay/Resources.Designer.cs
index 306c84208f42f2272ab63ac2e58bbfc191f97932..a9138d0657491df73829f0122ca000b7c4e6e474 100644 (file)
@@ -22,14 +22,14 @@ namespace DxPlay {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    internal class StringResource {\r
+    internal class Resources {\r
         \r
         private static global::System.Resources.ResourceManager resourceMan;\r
         \r
         private static global::System.Globalization.CultureInfo resourceCulture;\r
         \r
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]\r
-        internal StringResource() {\r
+        internal Resources() {\r
         }\r
         \r
         /// <summary>\r
@@ -39,7 +39,7 @@ namespace DxPlay {
         internal static global::System.Resources.ResourceManager ResourceManager {\r
             get {\r
                 if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.StringResource", typeof(StringResource).Assembly);\r
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Resources", typeof(Resources).Assembly);\r
                     resourceMan = temp;\r
                 }\r
                 return resourceMan;\r
diff --git a/client/DxPlay/Resources/Pause.png b/client/DxPlay/Resources/Pause.png
deleted file mode 100644 (file)
index 983cab7..0000000
Binary files a/client/DxPlay/Resources/Pause.png and /dev/null differ
diff --git a/client/DxPlay/Resources/Play.png b/client/DxPlay/Resources/Play.png
deleted file mode 100644 (file)
index eb023d1..0000000
Binary files a/client/DxPlay/Resources/Play.png and /dev/null differ
diff --git a/client/DxPlay/Resources/Stop.png b/client/DxPlay/Resources/Stop.png
deleted file mode 100644 (file)
index 8490e75..0000000
Binary files a/client/DxPlay/Resources/Stop.png and /dev/null differ
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 (file)
index 6145664..0000000
Binary files a/client/DxPlay/Resources/ic_pause_black_24dp_1x.png and /dev/null differ
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 (file)
index d78c57b..0000000
Binary files a/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png and /dev/null differ
diff --git a/client/DxPlay/Resources/ic_stop_black_24dp_1x.png b/client/DxPlay/Resources/ic_stop_black_24dp_1x.png
deleted file mode 100644 (file)
index 0588f0b..0000000
Binary files a/client/DxPlay/Resources/ic_stop_black_24dp_1x.png and /dev/null differ
index f258c83ae971ae30bd5dc344b61ccab487088aeb..7c2ceb7a79989d8d6076698f4be2fba21f05a7b2 100644 (file)
@@ -61,56 +61,56 @@ namespace TrafficClient {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to m.\r
+        ///   Looks up a localized string similar to Reklám.\r
         /// </summary>\r
-        internal static string CIM {\r
+        internal static string ADVERTISEMENT {\r
             get {\r
-                return ResourceManager.GetString("CIM", resourceCulture);\r
+                return ResourceManager.GetString("ADVERTISEMENT", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Első adás.\r
+        ///   Looks up a localized string similar to Mégse.\r
         /// </summary>\r
-        internal static string ELSO_ADASNAP {\r
+        internal static string CANCEL {\r
             get {\r
-                return ResourceManager.GetString("ELSO_ADASNAP", resourceCulture);\r
+                return ResourceManager.GetString("CANCEL", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Epizódszám.\r
+        ///   Looks up a localized string similar to Epizód azonosító.\r
         /// </summary>\r
-        internal static string EPIZOD {\r
+        internal static string EPISODEID {\r
             get {\r
-                return ResourceManager.GetString("EPIZOD", resourceCulture);\r
+                return ResourceManager.GetString("EPISODEID", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Epizód azonosító.\r
+        ///   Looks up a localized string similar to Epizódszám.\r
         /// </summary>\r
-        internal static string EPIZOD_AZONOSITO {\r
+        internal static string EPISODENUMBER {\r
             get {\r
-                return ResourceManager.GetString("EPIZOD_AZONOSITO", resourceCulture);\r
+                return ResourceManager.GetString("EPISODENUMBER", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
         ///   Looks up a localized string similar to Epizodcím.\r
         /// </summary>\r
-        internal static string EPIZOD_CIM {\r
+        internal static string EPISODETITLE {\r
             get {\r
-                return ResourceManager.GetString("EPIZOD_CIM", resourceCulture);\r
+                return ResourceManager.GetString("EPISODETITLE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Hiányos.\r
+        ///   Looks up a localized string similar to Első adás.\r
         /// </summary>\r
-        internal static string HIANYOS {\r
+        internal static string FIRSTBROADCASTDATE {\r
             get {\r
-                return ResourceManager.GetString("HIANYOS", resourceCulture);\r
+                return ResourceManager.GetString("FIRSTBROADCASTDATE", resourceCulture);\r
             }\r
         }\r
         \r
@@ -125,83 +125,83 @@ namespace TrafficClient {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Keresés.\r
+        ///   Looks up a localized string similar to Műsor.\r
         /// </summary>\r
-        internal static string KERESES {\r
+        internal static string MATERIAL {\r
             get {\r
-                return ResourceManager.GetString("KERESES", resourceCulture);\r
+                return ResourceManager.GetString("MATERIAL", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Keresés eredménye.\r
+        ///   Looks up a localized string similar to Következő adás.\r
         /// </summary>\r
-        internal static string KERESES_EREDMENYE {\r
+        internal static string NEXTBROADCASTDATE {\r
             get {\r
-                return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture);\r
+                return ResourceManager.GetString("NEXTBROADCASTDATE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Következő adás.\r
+        ///   Looks up a localized string similar to Hiányos.\r
         /// </summary>\r
-        internal static string KOVETKEZO_ADASNAP {\r
+        internal static string PROBLEMATIC {\r
             get {\r
-                return ResourceManager.GetString("KOVETKEZO_ADASNAP", resourceCulture);\r
+                return ResourceManager.GetString("PROBLEMATIC", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Mégse.\r
+        ///   Looks up a localized string similar to Promó.\r
         /// </summary>\r
-        internal static string MEGSE {\r
+        internal static string PROMOTION {\r
             get {\r
-                return ResourceManager.GetString("MEGSE", resourceCulture);\r
+                return ResourceManager.GetString("PROMOTION", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Műsor.\r
+        ///   Looks up a localized string similar to Keresés.\r
         /// </summary>\r
-        internal static string MUSOR {\r
+        internal static string SEARCH {\r
             get {\r
-                return ResourceManager.GetString("MUSOR", resourceCulture);\r
+                return ResourceManager.GetString("SEARCH", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Promó.\r
+        ///   Looks up a localized string similar to Szegmensek.\r
         /// </summary>\r
-        internal static string PROMO {\r
+        internal static string SEGMENTCOUNT {\r
             get {\r
-                return ResourceManager.GetString("PROMO", resourceCulture);\r
+                return ResourceManager.GetString("SEGMENTCOUNT", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Reklám.\r
+        ///   Looks up a localized string similar to Keresés eredménye.\r
         /// </summary>\r
-        internal static string REKLAM {\r
+        internal static string SERACHRESULTS {\r
             get {\r
-                return ResourceManager.GetString("REKLAM", resourceCulture);\r
+                return ResourceManager.GetString("SERACHRESULTS", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szegmensek.\r
+        ///   Looks up a localized string similar to Cím.\r
         /// </summary>\r
-        internal static string SZEGMENS_SZAM {\r
+        internal static string TITLE {\r
             get {\r
-                return ResourceManager.GetString("SZEGMENS_SZAM", resourceCulture);\r
+                return ResourceManager.GetString("TITLE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
         ///   Looks up a localized string similar to Traffic ID.\r
         /// </summary>\r
-        internal static string TRAFFIC_ID {\r
+        internal static string TRAFFICID {\r
             get {\r
-                return ResourceManager.GetString("TRAFFIC_ID", resourceCulture);\r
+                return ResourceManager.GetString("TRAFFICID", resourceCulture);\r
             }\r
         }\r
     }\r
index 2b73b199d6cab1e285d27abb6322ff97bfa567d0..534f50cab3be54e5d034e18249e7f13ae018feae 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <data name="CIM" xml:space="preserve">\r
+  <data name="TITLE" xml:space="preserve">\r
     <value>Cím</value>\r
   </data>\r
-  <data name="ELSO_ADASNAP" xml:space="preserve">\r
+  <data name="FIRSTBROADCASTDATE" xml:space="preserve">\r
     <value>Első adás</value>\r
   </data>\r
-  <data name="EPIZOD" xml:space="preserve">\r
+  <data name="EPISODENUMBER" xml:space="preserve">\r
     <value>Epizódszám</value>\r
   </data>\r
-  <data name="EPIZOD_AZONOSITO" xml:space="preserve">\r
+  <data name="EPISODEID" xml:space="preserve">\r
     <value>Epizód azonosító</value>\r
   </data>\r
-  <data name="EPIZOD_CIM" xml:space="preserve">\r
+  <data name="EPISODETITLE" xml:space="preserve">\r
     <value>Epizodcím</value>\r
   </data>\r
-  <data name="HIANYOS" xml:space="preserve">\r
+  <data name="PROBLEMATIC" xml:space="preserve">\r
     <value>Hiányos</value>\r
   </data>\r
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
   <data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="KERESES" xml:space="preserve">\r
+  <data name="SEARCH" xml:space="preserve">\r
     <value>Keresés</value>\r
   </data>\r
-  <data name="KERESES_EREDMENYE" xml:space="preserve">\r
+  <data name="SERACHRESULTS" xml:space="preserve">\r
     <value>Keresés eredménye</value>\r
   </data>\r
-  <data name="KOVETKEZO_ADASNAP" xml:space="preserve">\r
+  <data name="NEXTBROADCASTDATE" xml:space="preserve">\r
     <value>Következő adás</value>\r
   </data>\r
-  <data name="MEGSE" xml:space="preserve">\r
+  <data name="CANCEL" xml:space="preserve">\r
     <value>Mégse</value>\r
   </data>\r
-  <data name="MUSOR" xml:space="preserve">\r
+  <data name="MATERIAL" xml:space="preserve">\r
     <value>Műsor</value>\r
   </data>\r
-  <data name="PROMO" xml:space="preserve">\r
+  <data name="PROMOTION" xml:space="preserve">\r
     <value>Promó</value>\r
   </data>\r
-  <data name="REKLAM" xml:space="preserve">\r
+  <data name="ADVERTISEMENT" xml:space="preserve">\r
     <value>Reklám</value>\r
   </data>\r
-  <data name="SZEGMENS_SZAM" xml:space="preserve">\r
+  <data name="SEGMENTCOUNT" xml:space="preserve">\r
     <value>Szegmensek</value>\r
   </data>\r
-  <data name="TRAFFIC_ID" xml:space="preserve">\r
+  <data name="TRAFFICID" xml:space="preserve">\r
     <value>Traffic ID</value>\r
   </data>\r
 </root>
\ No newline at end of file
index 583e261726da6c88c451b5ce3e1f413c5d499f82..17e3fb33a9f32d6e66d259e785e6b53d59f8751b 100644 (file)
@@ -9,18 +9,19 @@ using MaestroShared.Metadata;
 \r
 namespace TrafficClient {\r
     public class TrafficAPI {\r
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();\r
         private TrafficContext context = new TrafficContext();\r
         private string connectionString;\r
         private CliFSPReader cliFSPReader;\r
         private SqlConnection connection;\r
-        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private MaterialWorker materialWorker;\r
         private PromoWorker promoWorker;\r
         private ADWorker adWorker;\r
         private SegmentWorker segmentWorker;\r
 \r
         public TrafficAPI(string connString, string user, string password, int timeout, IMessageBus messageBus) {\r
-            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout / 1000);\r
+            var correctedTimeout = timeout < 1000 ? 1000 : timeout;\r
+            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, correctedTimeout / 1000);\r
             connection = new SqlConnection(connectionString);\r
             cliFSPReader = new CliFSPReader();\r
             materialWorker = new MaterialWorker(connection, cliFSPReader, messageBus);\r
index 40435e342904dd95c6f96a6ff9ec2cfc2ef5bdf1..c58c43660b6d37ab35dd2594bc02adcc1b5d74b1 100644 (file)
@@ -23,13 +23,13 @@ namespace TrafficClient {
         }\r
 \r
         private void InitializeTexts() {\r
-            chkProblematic.Text = Resources.HIANYOS;\r
+            chkProblematic.Text = Resources.PROBLEMATIC;\r
 \r
             dgTraffic.AutoGenerateColumns = false;\r
 \r
-            rbMaterial.Text = Resources.MUSOR;\r
-            rbPromo.Text = Resources.PROMO;\r
-            rbAD.Text = Resources.REKLAM;\r
+            rbMaterial.Text = Resources.MATERIAL;\r
+            rbPromo.Text = Resources.PROMOTION;\r
+            rbAD.Text = Resources.ADVERTISEMENT;\r
         }\r
 \r
         public TrafficParameters Parameters {\r
index 68ce4c0f1308de14e8badc8bde2c19cf4fb3b1dd..46573816c31b260928a8c31ed6dc819ddbccaeea 100644 (file)
@@ -13,7 +13,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "MediaID",\r
-                    HeaderText = Resources.TRAFFIC_ID,\r
+                    HeaderText = Resources.TRAFFICID,\r
                     Width = 100\r
                 },\r
                 new DataGridViewCheckBoxColumn() {\r
@@ -24,43 +24,43 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "Title",\r
-                    HeaderText = Resources.CIM,\r
+                    HeaderText = Resources.TITLE,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeNumber",\r
-                    HeaderText = Resources.EPIZOD,\r
+                    HeaderText = Resources.EPISODENUMBER,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeID",\r
-                    HeaderText = Resources.EPIZOD_AZONOSITO,\r
+                    HeaderText = Resources.EPISODEID,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "FirsBroadcastDate",\r
-                    HeaderText = Resources.ELSO_ADASNAP,\r
+                    HeaderText = Resources.FIRSTBROADCASTDATE,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "NextBroadcastDate",\r
-                    HeaderText = Resources.KOVETKEZO_ADASNAP,\r
+                    HeaderText = Resources.NEXTBROADCASTDATE,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "SegmentCount",\r
-                    HeaderText = Resources.SZEGMENS_SZAM,\r
+                    HeaderText = Resources.SEGMENTCOUNT,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeTitle",\r
-                    HeaderText = Resources.EPIZOD_CIM,\r
+                    HeaderText = Resources.EPISODETITLE,\r
                     Width = 100\r
                 },\r
             };\r
@@ -76,7 +76,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "MediaID",\r
-                    HeaderText = Resources.TRAFFIC_ID,\r
+                    HeaderText = Resources.TRAFFICID,\r
                     Width = 100\r
                 },\r
                 new DataGridViewCheckBoxColumn() {\r
@@ -87,19 +87,19 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "Title",\r
-                    HeaderText = Resources.CIM,\r
+                    HeaderText = Resources.TITLE,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeNumber",\r
-                    HeaderText = Resources.EPIZOD,\r
+                    HeaderText = Resources.EPISODENUMBER,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeTitle",\r
-                    HeaderText = Resources.EPIZOD_CIM,\r
+                    HeaderText = Resources.EPISODETITLE,\r
                     Width = 100\r
                 },\r
             };\r
@@ -115,7 +115,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "MediaID",\r
-                    HeaderText = Resources.TRAFFIC_ID,\r
+                    HeaderText = Resources.TRAFFICID,\r
                     Width = 100\r
                 },\r
                 new DataGridViewCheckBoxColumn() {\r
@@ -126,13 +126,13 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "Title",\r
-                    HeaderText = Resources.CIM,\r
+                    HeaderText = Resources.TITLE,\r
                     Width = 100\r
                 },\r
                 new DataGridViewTextBoxColumn() {\r
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                     DataPropertyName = "EpisodeTitle",\r
-                    HeaderText = Resources.EPIZOD_CIM,\r
+                    HeaderText = Resources.EPISODETITLE,\r
                     Width = 100\r
                 },\r
             };\r
index 9a0ebf3bcc162ed89fc6608f4b2bf421eb4ddbbc..2a05da2444859c10b8b4e0fe59c5573af209b962 100644 (file)
@@ -14,14 +14,14 @@ namespace TrafficClient {
         public TrafficLookupResultSelector(List<TrafficItem> elements, TraficMetadataSelected metadataSelected) : this() {\r
             this.elements = elements;\r
             this.metadataSelected = metadataSelected;\r
-            this.Text = Resources.KERESES_EREDMENYE;\r
-            buttonCancel.Text = Resources.MEGSE;\r
+            this.Text = Resources.SERACHRESULTS;\r
+            buttonCancel.Text = Resources.CANCEL;\r
             FillDataGridView();\r
         }\r
 \r
         public TrafficLookupResultSelector() {\r
             InitializeComponent();\r
-            this.Text = Resources.KERESES_EREDMENYE;\r
+            this.Text = Resources.SERACHRESULTS;\r
             SetColumns();\r
         }\r
 \r
@@ -31,17 +31,17 @@ namespace TrafficClient {
                     new DataGridViewTextBoxColumn() {\r
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "MediaID",\r
-                            HeaderText = Resources.TRAFFIC_ID\r
+                            HeaderText = Resources.TRAFFICID\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
                             DataPropertyName = "Title",\r
-                            HeaderText = Resources.CIM\r
+                            HeaderText = Resources.TITLE\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
                             DataPropertyName = "EpisodeTitle",\r
-                            HeaderText = Resources.EPIZOD_CIM\r
+                            HeaderText = Resources.EPISODETITLE\r
                     }\r
                 }\r
             );\r