git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 13 Aug 2018 15:01:58 +0000 (15:01 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 13 Aug 2018 15:01:58 +0000 (15:01 +0000)
18 files changed:
client/AudioRecorder/AudioRecorder.csproj
client/DxPlay/DxPlay.csproj
client/Maestro/Maestro.csproj
client/MaestroShared/Controls/CheckableTreeView.cs
client/NativeOctopusClient/NativeOctopusClient.csproj
client/NativeOctopusClient/OctopusAPI.cs
client/NativeOctopusClient/OctopusIDSelector.Designer.cs
client/NativeOctopusClient/OctopusIDSelector.cs
client/NativeOctopusClient/OctopusParameters.cs
client/NativeOctopusClient/Properties/Resources.Designer.cs [new file with mode: 0644]
client/NativeOctopusClient/Properties/Resources.resx [moved from client/OctopusClient/Resources.resx with 95% similarity]
client/NativeOctopusClient/Resources/ic_refresh_black_24dp_1x.png [new file with mode: 0644]
client/OctopusClient/OctopusClient.csproj
client/OctopusClient/OctopusIDSelector.Designer.cs
client/OctopusClient/OctopusIDSelector.cs
client/OctopusClient/OctopusLookupResultSelector.cs
client/OctopusClient/Properties/Resources.Designer.cs [new file with mode: 0644]
client/OctopusClient/Properties/Resources.resx [new file with mode: 0644]

index 5a1fbc4fc1bb3aa59325a013a41922bfb1f9a80e..2f615a27670627b2614e024e0ffcc390a87b4717 100644 (file)
       <Generator>ResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r
-    <None Include="packages.config" />\r
+    <None Include="packages.config">\r
+      <SubType>Designer</SubType>\r
+    </None>\r
     <None Include="Properties\Settings.settings">\r
       <Generator>SettingsSingleFileGenerator</Generator>\r
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>\r
index 9d122fdd8ecf179d0bf3e78bd42ca81de1674782..fddd9064e6c25f1cdd791a3eda52eab8f8dc3a6f 100644 (file)
     <None Include="Configuration\dxplay.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="packages.config" />\r
+    <None Include="packages.config">\r
+      <SubType>Designer</SubType>\r
+    </None>\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
index 831c007350c7b4a2051d6235de458369c690cc21..6ec0cb725375b7fc9690dfdda215441d2d2672f0 100644 (file)
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
       <SubType>Designer</SubType>\r
     </None>\r
-    <None Include="packages.config" />\r
+    <None Include="packages.config">\r
+      <SubType>Designer</SubType>\r
+    </None>\r
     <None Include="Properties\app.manifest" />\r
     <None Include="Properties\DataSources\ArchiveMetadataForm.datasource" />\r
     <None Include="Properties\DataSources\LoginForm.datasource" />\r
index 4e48c46c2be0e1a6c0a56c961130d14c59259a26..0bf8889edd1ed2ef74f6a6c8e788d1fa793c35bc 100644 (file)
@@ -1,15 +1,13 @@
-using System;\r
-using System.Drawing;\r
+using System.Drawing;\r
 using System.Windows.Forms;\r
 \r
 namespace MaestroShared.Controls {\r
-    class CheckableTreeView : DoubleClickTreeView {\r
-        private readonly bool[] disableCheckBoxLevels;\r
+    public class CheckableTreeView : DoubleClickTreeView {\r
+        public bool[] DisableCheckBoxLevels { get; set; }\r
 \r
-        public CheckableTreeView(bool[] disableCheckBoxLevels) {\r
+        public CheckableTreeView() {\r
             DrawMode = TreeViewDrawMode.OwnerDrawText;\r
             DrawNode += OnDrawNode;\r
-            this.disableCheckBoxLevels = disableCheckBoxLevels;\r
         }\r
 \r
         void OnDrawNode(object sender, DrawTreeNodeEventArgs e) {\r
@@ -19,7 +17,7 @@ namespace MaestroShared.Controls {
                     e.Graphics.FillRectangle(brush, e.Bounds.X, e.Bounds.Y, e.Bounds.Width, e.Bounds.Height);\r
                 }\r
                 bool disableHack = false;\r
-                if (disableCheckBoxLevels.Length > e.Node.Level && disableCheckBoxLevels[e.Node.Level])\r
+                if (DisableCheckBoxLevels != null && DisableCheckBoxLevels.Length > e.Node.Level && DisableCheckBoxLevels[e.Node.Level])\r
                     disableHack = true;\r
 \r
                 if (!disableHack) {\r
index be1748a89d26fe98b38b27df4cfb42b84de219ed..f3622f1a287d7e0cb99c7f531b9c99051ca01be0 100644 (file)
@@ -48,6 +48,8 @@
     </Reference>\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r
+    <Reference Include="System.Drawing" />\r
+    <Reference Include="System.Windows.Forms" />\r
     <Reference Include="System.Xml.Linq" />\r
     <Reference Include="System.Data.DataSetExtensions" />\r
     <Reference Include="Microsoft.CSharp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="OctopusAPI.cs" />\r
-    <Compile Include="OctopusIDSelector.cs" />\r
+    <Compile Include="OctopusIDSelector.cs">\r
+      <SubType>UserControl</SubType>\r
+    </Compile>\r
     <Compile Include="OctopusIDSelector.Designer.cs">\r
       <DependentUpon>OctopusIDSelector.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="OctopusParameters.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="Properties\Resources.Designer.cs">\r
+      <AutoGen>True</AutoGen>\r
+      <DesignTime>True</DesignTime>\r
+      <DependentUpon>Resources.resx</DependentUpon>\r
+    </Compile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <EmbeddedResource Include="OctopusIDSelector.resx">\r
       <DependentUpon>OctopusIDSelector.cs</DependentUpon>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="Properties\Resources.resx">\r
+      <Generator>ResXFileCodeGenerator</Generator>\r
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
+    </EmbeddedResource>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="packages.config" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\MaestroShared\MaestroShared.csproj">\r
+      <Project>{d4417174-f21e-4ce2-ae5c-8eb30c9a9625}</Project>\r
+      <Name>MaestroShared</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ic_refresh_black_24dp_1x.png" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
 </Project>
\ No newline at end of file
index aaff347a7da8dcac5ea89e749d75516eae7cec61..f66972f5db168ab6c4625d3951d099581f39f366 100644 (file)
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Globalization;\r
 using System.Linq;\r
 \r
-namespace OctopusClient {\r
+namespace NativeOctopusClient {\r
 \r
     public class Rundown {\r
         public string ID { get; set; }\r
index 28d70a9ef84f4a7a6c567753f728784ef5975cd6..87fa1d11d9e036274930bb2212c4226e8cafe1cd 100644 (file)
@@ -1,6 +1,6 @@
 using MaestroShared.Controls;\r
 \r
-namespace OctopusClient {\r
+namespace NativeOctopusClient {\r
     partial class OctopusIDSelector {\r
         /// <summary> \r
         /// Required designer variable.\r
@@ -34,7 +34,7 @@ namespace OctopusClient {
             this.rbStoryFolder = new System.Windows.Forms.RadioButton();\r
             this.txtFilter = new System.Windows.Forms.TextBox();\r
             this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton();\r
-            this.treeOctopus = new OctopusClient.CheckableTreeView();\r
+            this.treeOctopus = new CheckableTreeView();\r
             this.pSearch.SuspendLayout();\r
             this.pFolderType.SuspendLayout();\r
             this.SuspendLayout();\r
@@ -157,7 +157,7 @@ namespace OctopusClient {
             // \r
             this.noFocusCueButton1.FlatAppearance.BorderSize = 0;\r
             this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.noFocusCueButton1.Image = global::OctopusClient.Resources.ic_refresh_black_24dp_1x;\r
+            this.noFocusCueButton1.Image = global::NativeOctopusClient.Properties.Resources.ic_refresh_black_24dp_1x;\r
             this.noFocusCueButton1.Location = new System.Drawing.Point(279, 48);\r
             this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(0);\r
             this.noFocusCueButton1.Name = "noFocusCueButton1";\r
@@ -171,7 +171,6 @@ namespace OctopusClient {
             this.treeOctopus.BackColor = System.Drawing.Color.White;\r
             this.treeOctopus.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.treeOctopus.CheckBoxes = true;\r
-            this.treeOctopus.DisableCheckBoxLevels = null;\r
             this.treeOctopus.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.treeOctopus.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText;\r
             this.treeOctopus.Location = new System.Drawing.Point(0, 77);\r
index ff66331e56b9178ce2b48673d75184ad0539fb0c..2dca42d21e2f982c4aba8470e8ef91d168ae75f7 100644 (file)
@@ -8,7 +8,7 @@ using LinkDotNet.MessageHandling.Contracts;
 using MaestroShared.Configuration;\r
 using MaestroShared.Commons;\r
 \r
-namespace OctopusClient {\r
+namespace NativeOctopusClient {\r
     public delegate void OnSelectedIDChanged(string id, string name, string text);\r
 \r
     public partial class OctopusIDSelector : UserControl {\r
@@ -63,8 +63,8 @@ namespace OctopusClient {
         }\r
 \r
         private void InitializeControls() {\r
-            rbRundown.Text = Resources.ADASTUKOR;\r
-            rbStoryFolder.Text = Resources.MAPPA;\r
+            rbRundown.Text = Properties.Resources.ADASTUKOR;\r
+            rbStoryFolder.Text = Properties.Resources.MAPPA;\r
         }\r
 \r
         public void ClearSelection() {\r
@@ -316,7 +316,7 @@ namespace OctopusClient {
                     return;\r
                 }\r
                 List<Rundown> rundowns = new List<Rundown>();\r
-                rundowns.Add(new Rundown() { ID = ZERO, Name = Resources.VALASSZON_ELEMET });\r
+                rundowns.Add(new Rundown() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
                 rundowns.AddRange(rundownsResult);\r
                 cbFolders.DataSource = rundowns;\r
             } else {\r
@@ -328,7 +328,7 @@ namespace OctopusClient {
                     return;\r
                 }\r
                 List<StoryFolder> storyFolders = new List<StoryFolder>();\r
-                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Resources.VALASSZON_ELEMET });\r
+                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
                 storyFolders.AddRange(storyFoldersResult);\r
                 cbFolders.DataSource = storyFolders;\r
             }\r
index 797d287b0248724954603fb973c75e719f0842c3..9d77963a19773e9ed12c0e26f64f641ff62dfae5 100644 (file)
@@ -1,7 +1,7 @@
 using LinkDotNet.MessageHandling.Contracts;\r
 using MaestroShared.Configuration;\r
 \r
-namespace OctopusClient {\r
+namespace NativeOctopusClient {\r
     public class OctopusParameters {\r
         public OctopusMetadata Configuration { get; set; }\r
         public string UserName { get; set; }\r
diff --git a/client/NativeOctopusClient/Properties/Resources.Designer.cs b/client/NativeOctopusClient/Properties/Resources.Designer.cs
new file mode 100644 (file)
index 0000000..01733b0
--- /dev/null
@@ -0,0 +1,208 @@
+//------------------------------------------------------------------------------\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 NativeOctopusClient.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", "15.0.0.0")]\r
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\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 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
+        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("NativeOctopusClient.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
+        internal 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 string similar to Adástükör.\r
+        /// </summary>\r
+        internal static string ADASTUKOR {\r
+            get {\r
+                return ResourceManager.GetString("ADASTUKOR", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Archive.\r
+        /// </summary>\r
+        internal static string ARCHIVE {\r
+            get {\r
+                return ResourceManager.GetString("ARCHIVE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Global ID.\r
+        /// </summary>\r
+        internal static string GLOBAL_ID {\r
+            get {\r
+                return ResourceManager.GetString("GLOBAL_ID", resourceCulture);\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_refresh_black_24dp_1x {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to ID.\r
+        /// </summary>\r
+        internal static string ID {\r
+            get {\r
+                return ResourceManager.GetString("ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Keresés.\r
+        /// </summary>\r
+        internal static string KERESES {\r
+            get {\r
+                return ResourceManager.GetString("KERESES", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Keresés eredménye.\r
+        /// </summary>\r
+        internal static string KERESES_EREDMENYE {\r
+            get {\r
+                return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Mappa.\r
+        /// </summary>\r
+        internal static string MAPPA {\r
+            get {\r
+                return ResourceManager.GetString("MAPPA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Mégse.\r
+        /// </summary>\r
+        internal static string MEGSE {\r
+            get {\r
+                return ResourceManager.GetString("MEGSE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Módosítva.\r
+        /// </summary>\r
+        internal static string MODOSITVA {\r
+            get {\r
+                return ResourceManager.GetString("MODOSITVA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to MosID.\r
+        /// </summary>\r
+        internal static string MOS_ID {\r
+            get {\r
+                return ResourceManager.GetString("MOS_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Név.\r
+        /// </summary>\r
+        internal static string NEV {\r
+            get {\r
+                return ResourceManager.GetString("NEV", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum ID.\r
+        /// </summary>\r
+        internal static string OBJECT_ID {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum típusa.\r
+        /// </summary>\r
+        internal static string OBJECT_TYPE {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_TYPE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Nem lehet csatlakozni az octopus kiszolgálóhoz.\r
+        /// </summary>\r
+        internal static string OCTOPUS_KAPCSOLATI_HIBA {\r
+            get {\r
+                return ResourceManager.GetString("OCTOPUS_KAPCSOLATI_HIBA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Válasszon elemet.\r
+        /// </summary>\r
+        internal static string VALASSZON_ELEMET {\r
+            get {\r
+                return ResourceManager.GetString("VALASSZON_ELEMET", resourceCulture);\r
+            }\r
+        }\r
+    }\r
+}\r
similarity index 95%
rename from client/OctopusClient/Resources.resx
rename to client/NativeOctopusClient/Properties/Resources.resx
index 6b1de8e927cb8eca98e567c3447b2dafde6e87bf..0e1109a6e8632129d69bc2d0ed7edf75029ced5b 100644 (file)
   </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
+    <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="ID" xml:space="preserve">\r
     <value>ID</value>\r
diff --git a/client/NativeOctopusClient/Resources/ic_refresh_black_24dp_1x.png b/client/NativeOctopusClient/Resources/ic_refresh_black_24dp_1x.png
new file mode 100644 (file)
index 0000000..c82efd5
Binary files /dev/null and b/client/NativeOctopusClient/Resources/ic_refresh_black_24dp_1x.png differ
index 14c3ef62272e314d0a870eece015784a04a41937..0e1dba6733995b034a2485d94748c9d851f13dd3 100644 (file)
     </Compile>\r
     <Compile Include="OctopusParameters.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Resources.Designer.cs">\r
+    <Compile Include="OctopusLookupResultSelector.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="Properties\Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DesignTime>True</DesignTime>\r
       <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
-    <Compile Include="OctopusLookupResultSelector.cs">\r
-      <SubType>Form</SubType>\r
-    </Compile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <EmbeddedResource Include="OctopusIDSelector.resx">\r
       <DependentUpon>OctopusIDSelector.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources.resx">\r
+    <EmbeddedResource Include="Properties\Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
+      <SubType>Designer</SubType>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="OctopusLookupResultSelector.resx">\r
index 28d70a9ef84f4a7a6c567753f728784ef5975cd6..00139a7999309175fa2f2a37b87743fc745ab941 100644 (file)
@@ -157,7 +157,7 @@ namespace OctopusClient {
             // \r
             this.noFocusCueButton1.FlatAppearance.BorderSize = 0;\r
             this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.noFocusCueButton1.Image = global::OctopusClient.Resources.ic_refresh_black_24dp_1x;\r
+            this.noFocusCueButton1.Image = global::OctopusClient.Properties.Resources.ic_refresh_black_24dp_1x;\r
             this.noFocusCueButton1.Location = new System.Drawing.Point(279, 48);\r
             this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(0);\r
             this.noFocusCueButton1.Name = "noFocusCueButton1";\r
index ff66331e56b9178ce2b48673d75184ad0539fb0c..92cf8f8c84dff7e814749724baade4f063d912d9 100644 (file)
@@ -63,8 +63,8 @@ namespace OctopusClient {
         }\r
 \r
         private void InitializeControls() {\r
-            rbRundown.Text = Resources.ADASTUKOR;\r
-            rbStoryFolder.Text = Resources.MAPPA;\r
+            rbRundown.Text = Properties.Resources.ADASTUKOR;\r
+            rbStoryFolder.Text = Properties.Resources.MAPPA;\r
         }\r
 \r
         public void ClearSelection() {\r
@@ -316,7 +316,7 @@ namespace OctopusClient {
                     return;\r
                 }\r
                 List<Rundown> rundowns = new List<Rundown>();\r
-                rundowns.Add(new Rundown() { ID = ZERO, Name = Resources.VALASSZON_ELEMET });\r
+                rundowns.Add(new Rundown() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
                 rundowns.AddRange(rundownsResult);\r
                 cbFolders.DataSource = rundowns;\r
             } else {\r
@@ -328,7 +328,7 @@ namespace OctopusClient {
                     return;\r
                 }\r
                 List<StoryFolder> storyFolders = new List<StoryFolder>();\r
-                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Resources.VALASSZON_ELEMET });\r
+                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
                 storyFolders.AddRange(storyFoldersResult);\r
                 cbFolders.DataSource = storyFolders;\r
             }\r
index c7785c96bf6f2e9528814039867729573fae8e1d..e278da8397a0bd9e35f3c5d532b92bc44513c0c7 100644 (file)
@@ -43,12 +43,12 @@ namespace OctopusClient {
                     new DataGridViewTextBoxColumn() {\r
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "ID",\r
-                            HeaderText = Resources.ID\r
+                            HeaderText = Properties.Resources.ID\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "Name",\r
-                            HeaderText = Resources.NEV\r
+                            HeaderText = Properties.Resources.NEV\r
                     }\r
                 }\r
                 );\r
@@ -60,30 +60,30 @@ namespace OctopusClient {
                     new DataGridViewTextBoxColumn() {\r
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "ID",\r
-                            HeaderText = Resources.ID\r
+                            HeaderText = Properties.Resources.ID\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "MosID",\r
-                            HeaderText = Resources.MOS_ID\r
+                            HeaderText = Properties.Resources.MOS_ID\r
                     },new DataGridViewTextBoxColumn() {\r
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
                             DataPropertyName = "ObjID",\r
-                            HeaderText = Resources.OBJECT_ID\r
+                            HeaderText = Properties.Resources.OBJECT_ID\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
                             DataPropertyName = "ObjectType",\r
-                            HeaderText = Resources.OBJECT_TYPE\r
+                            HeaderText = Properties.Resources.OBJECT_TYPE\r
                     },new DataGridViewTextBoxColumn() {\r
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "Modified",\r
-                            HeaderText = Resources.MODOSITVA\r
+                            HeaderText = Properties.Resources.MODOSITVA\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "GlobalID",\r
-                            HeaderText = Resources.GLOBAL_ID\r
+                            HeaderText = Properties.Resources.GLOBAL_ID\r
                     }\r
                  }\r
                  );\r
@@ -91,8 +91,8 @@ namespace OctopusClient {
 \r
 \r
         private void InitializeControlTexts() {\r
-            buttonCancel.Text = Resources.MEGSE;\r
-            this.Text = Resources.KERESES_EREDMENYE;\r
+            buttonCancel.Text = Properties.Resources.MEGSE;\r
+            this.Text = Properties.Resources.KERESES_EREDMENYE;\r
         }\r
 \r
         private void InitializeComponent() {\r
diff --git a/client/OctopusClient/Properties/Resources.Designer.cs b/client/OctopusClient/Properties/Resources.Designer.cs
new file mode 100644 (file)
index 0000000..abf4206
--- /dev/null
@@ -0,0 +1,208 @@
+//------------------------------------------------------------------------------\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 OctopusClient.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", "15.0.0.0")]\r
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\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 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
+        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("OctopusClient.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
+        internal 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 string similar to Adástükör.\r
+        /// </summary>\r
+        internal static string ADASTUKOR {\r
+            get {\r
+                return ResourceManager.GetString("ADASTUKOR", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Archive.\r
+        /// </summary>\r
+        internal static string ARCHIVE {\r
+            get {\r
+                return ResourceManager.GetString("ARCHIVE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Global ID.\r
+        /// </summary>\r
+        internal static string GLOBAL_ID {\r
+            get {\r
+                return ResourceManager.GetString("GLOBAL_ID", resourceCulture);\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_refresh_black_24dp_1x {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to ID.\r
+        /// </summary>\r
+        internal static string ID {\r
+            get {\r
+                return ResourceManager.GetString("ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Keresés.\r
+        /// </summary>\r
+        internal static string KERESES {\r
+            get {\r
+                return ResourceManager.GetString("KERESES", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Keresés eredménye.\r
+        /// </summary>\r
+        internal static string KERESES_EREDMENYE {\r
+            get {\r
+                return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Mappa.\r
+        /// </summary>\r
+        internal static string MAPPA {\r
+            get {\r
+                return ResourceManager.GetString("MAPPA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Mégse.\r
+        /// </summary>\r
+        internal static string MEGSE {\r
+            get {\r
+                return ResourceManager.GetString("MEGSE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Módosítva.\r
+        /// </summary>\r
+        internal static string MODOSITVA {\r
+            get {\r
+                return ResourceManager.GetString("MODOSITVA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to MosID.\r
+        /// </summary>\r
+        internal static string MOS_ID {\r
+            get {\r
+                return ResourceManager.GetString("MOS_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Név.\r
+        /// </summary>\r
+        internal static string NEV {\r
+            get {\r
+                return ResourceManager.GetString("NEV", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum ID.\r
+        /// </summary>\r
+        internal static string OBJECT_ID {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum típusa.\r
+        /// </summary>\r
+        internal static string OBJECT_TYPE {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_TYPE", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Nem lehet csatlakozni az octopus kiszolgálóhoz.\r
+        /// </summary>\r
+        internal static string OCTOPUS_KAPCSOLATI_HIBA {\r
+            get {\r
+                return ResourceManager.GetString("OCTOPUS_KAPCSOLATI_HIBA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Válasszon elemet.\r
+        /// </summary>\r
+        internal static string VALASSZON_ELEMET {\r
+            get {\r
+                return ResourceManager.GetString("VALASSZON_ELEMET", resourceCulture);\r
+            }\r
+        }\r
+    }\r
+}\r
diff --git a/client/OctopusClient/Properties/Resources.resx b/client/OctopusClient/Properties/Resources.resx
new file mode 100644 (file)
index 0000000..0e1109a
--- /dev/null
@@ -0,0 +1,169 @@
+<?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
+  <data name="ADASTUKOR" xml:space="preserve">\r
+    <value>Adástükör</value>\r
+  </data>\r
+  <data name="ARCHIVE" xml:space="preserve">\r
+    <value>Archive</value>\r
+  </data>\r
+  <data name="GLOBAL_ID" xml:space="preserve">\r
+    <value>Global ID</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="ID" xml:space="preserve">\r
+    <value>ID</value>\r
+  </data>\r
+  <data name="KERESES" xml:space="preserve">\r
+    <value>Keresés</value>\r
+  </data>\r
+  <data name="KERESES_EREDMENYE" xml:space="preserve">\r
+    <value>Keresés eredménye</value>\r
+  </data>\r
+  <data name="MAPPA" xml:space="preserve">\r
+    <value>Mappa</value>\r
+  </data>\r
+  <data name="MEGSE" xml:space="preserve">\r
+    <value>Mégse</value>\r
+  </data>\r
+  <data name="MODOSITVA" xml:space="preserve">\r
+    <value>Módosítva</value>\r
+  </data>\r
+  <data name="MOS_ID" xml:space="preserve">\r
+    <value>MosID</value>\r
+  </data>\r
+  <data name="NEV" xml:space="preserve">\r
+    <value>Név</value>\r
+  </data>\r
+  <data name="OBJECT_ID" xml:space="preserve">\r
+    <value>Objektum ID</value>\r
+  </data>\r
+  <data name="OBJECT_TYPE" xml:space="preserve">\r
+    <value>Objektum típusa</value>\r
+  </data>\r
+  <data name="OCTOPUS_KAPCSOLATI_HIBA" xml:space="preserve">\r
+    <value>Nem lehet csatlakozni az octopus kiszolgálóhoz</value>\r
+  </data>\r
+  <data name="VALASSZON_ELEMET" xml:space="preserve">\r
+    <value>Válasszon elemet</value>\r
+  </data>\r
+</root>
\ No newline at end of file