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

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index c7b2a8f37ac647ff72355dffb36d60497a7573c0..f5226af7c354d697eab9aaf800ab96ea45a255b8 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -215,10 +215,10 @@
     <Compile Include="SMTPETimeCode\Enums.cs" />\r
     <Compile Include="SMTPETimeCode\Extensions.cs" />\r
     <Compile Include="SMTPETimeCode\TimeCode.cs" />\r
-    <Compile Include="Resources.Designer.cs">\r
+    <Compile Include="Properties\Resources1.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DesignTime>True</DesignTime>\r
-      <DependentUpon>Resources.resx</DependentUpon>\r
+      <DependentUpon>Resources1.resx</DependentUpon>\r
     </Compile>\r
     <Compile Include="URCOMLoader.cs" />\r
     <Compile Include="VideoTrackBar.cs">\r
@@ -250,9 +250,9 @@
     <EmbeddedResource Include="Controls\PlayerControls.resx">\r
       <DependentUpon>PlayerControls.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources.resx">\r
+    <EmbeddedResource Include="Properties\Resources1.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
+      <LastGenOutput>Resources1.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r
     <None Include="nlog.config">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r

diff --git a/client/DxPlay/Resources.Designer.cs b/client/DxPlay/Properties/Resources1.Designer.cs
similarity index 82%
rename from client/DxPlay/Resources.Designer.cs
rename to client/DxPlay/Properties/Resources1.Designer.cs
index a9138d0657491df73829f0122ca000b7c4e6e474..f312469c347d7f44435c36a7d94fe1862440c588 100644 (file)
--- a/client/DxPlay/Resources.Designer.cs
+++ b/client/DxPlay/Properties/Resources1.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>\r
 //------------------------------------------------------------------------------\r
 \r
-namespace DxPlay {\r
+namespace DxPlay.Properties {\r
     using System;\r
     \r
     \r
@@ -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 Resources {\r
+    internal class Resources1 {\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
+        internal Resources1() {\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.Resources", typeof(Resources).Assembly);\r
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Properties.Resources1", typeof(Resources1).Assembly);\r
                     resourceMan = temp;\r
                 }\r
                 return resourceMan;\r
@@ -114,6 +114,36 @@ namespace DxPlay {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        internal 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
+        internal 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
+        internal 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 string similar to Indítás.\r
         /// </summary>\r
@@ -168,6 +198,16 @@ namespace DxPlay {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        internal 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 string similar to Megállítva.\r
         /// </summary>\r

diff --git a/client/DxPlay/Resources.resx b/client/DxPlay/Properties/Resources1.resx
similarity index 85%
rename from client/DxPlay/Resources.resx
rename to client/DxPlay/Properties/Resources1.resx
index 18c76f4a60035dbc169037dfbd3d089b7ad7ff97..81837fff43f2f347aa466092fe2063a183414f74 100644 (file)
--- a/client/DxPlay/Resources.resx
+++ b/client/DxPlay/Properties/Resources1.resx
@@ -135,6 +135,16 @@
   <data name="HOSSZ" xml:space="preserve">\r
     <value>Hossz</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_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
   <data name="INDITAS" xml:space="preserve">\r
     <value>Indítás</value>\r
   </data>\r
@@ -153,6 +163,9 @@
   <data name="LEJATSZAS" xml:space="preserve">\r
     <value>Lejátszás</value>\r
   </data>\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="MEGALLITVA" xml:space="preserve">\r
     <value>Megállítva</value>\r
   </data>\r