git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 28 Aug 2018 11:22:43 +0000 (11:22 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 28 Aug 2018 11:22:43 +0000 (11:22 +0000)
22 files changed:
client/AudioRecorder/AudioRecorder.csproj
client/AudioRecorder/AudioRecorderSettings.cs
client/AudioRecorder/Configuration/audiorecorder.en [new file with mode: 0644]
client/AudioRecorder/Configuration/audiorecorder.json
client/AudioRecorder/MetadataSelectorForm.cs
client/AudioRecorder/Properties/Settings.Designer.cs [deleted file]
client/AudioRecorder/Properties/Settings.settings [deleted file]
client/AudioRecorder/Resources.Designer.cs
client/AudioRecorder/Resources.resx
client/DxPlay/Configuration/dxplay.json
client/DxPlay/Configuration/planair.en [moved from client/DxPlay/Configuration/metadataprovider.en with 100% similarity]
client/DxPlay/DxPlay.csproj
client/MaestroShared/Configuration/ConfigurationInfo.cs
client/MetadataSelector/MetadataIDSelector.cs
client/MetadataSelector/MetadataSelector.csproj
client/MetadataSelector/Properties/Resources.Designer.cs [moved from client/AudioRecorder/Properties/Resources.Designer.cs with 61% similarity]
client/MetadataSelector/Properties/Resources.resx [moved from client/AudioRecorder/Properties/Resources.resx with 87% similarity]
client/NativeOctopusClient/NativeOctopusIDSelector.cs
client/NativeOctopusClient/Properties/Resources.Designer.cs
client/NativeOctopusClient/Properties/Resources.resx
client/PasswordEncrypter/Program.cs
client/PlanAIRClient/TrafficIDSelector.cs

index aa4367631eeacc95520471cd6489a4f25030fba2..5afd109f6ba1f27f0f9f1c69836343d2c7b101c6 100644 (file)
@@ -37,7 +37,7 @@
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
+    <OutputPath>..\bin\AudioRecorder\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
@@ -48,7 +48,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>\r
     <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
+    <OutputPath>..\bin\AudioRecorder\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
@@ -76,7 +76,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
     <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <OutputPath>..\bin\x64\AudioRecorder\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <DebugType>full</DebugType>\r
     <PlatformTarget>x64</PlatformTarget>\r
@@ -84,7 +84,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
-    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <OutputPath>..\bin\x64\AudioRecorder\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <Optimize>true</Optimize>\r
     <DebugType>pdbonly</DebugType>\r
     <EmbeddedResource Include="MainForm.resx">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Properties\Resources.resx">\r
-      <Generator>ResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <Compile Include="Properties\Resources.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DependentUpon>Resources.resx</DependentUpon>\r
-      <DesignTime>True</DesignTime>\r
-    </Compile>\r
     <EmbeddedResource Include="Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     <None Include="Configuration\audiorecorder.json1">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\audiorecorder.en">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="nlog.config">\r
       <SubType>Designer</SubType>\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\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
-    </None>\r
-    <Compile Include="Properties\Settings.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DependentUpon>Settings.settings</DependentUpon>\r
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>\r
-    </Compile>\r
     <None Include="Configuration\audiorecorder.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
index 8319a0806decbfd87a40ecfdc961ea209f30c6c0..e03dd9264d9759ef74617847234100870d14b7cb 100644 (file)
@@ -7,6 +7,7 @@ namespace AudioRecorder {
         public int PeekMeterStep { get; set; }\r
         public Uri WorkingDirectory { get; set; }\r
         public MetadataProvider[] Metadatas { get; set; }\r
+        public UISettings UISettings { get; set; }\r
         public Target OctopusTarget { get; set; }\r
         public Target TrafficTarget { get; set; }\r
     }\r
diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en
new file mode 100644 (file)
index 0000000..f43a5d8
--- /dev/null
@@ -0,0 +1,9 @@
+{\r
+  "RUNDOWN": "Rundown",\r
+  "FOLDER": "Story folder",\r
+  "CHOOSE": "Choose an item",\r
+  "SELECTORTITLE": "Choose an ID",\r
+  "SELECTEDID": "Selected ID",\r
+  "CANCEL": "Cancel",\r
+  "DONE": "Done"\r
+}\r
index 573a01de24c96aaf74776cd17615ac3b1ec3868f..91daa4d8a5633e772506a7b4d1ba858dcaffd039 100644 (file)
       "timeout": 1000\r
     }\r
   },\r
+  "uiSettings": {\r
+    "uiFileName": "audiorecorder.en"\r
+  },\r
   "metadatas": [\r
     {\r
       "$type": "NativeOctopusMetadata",\r
+      "uiFileName": "audiorecorder.en",\r
       "server": {\r
         "address": " http://10.10.1.11/api/v1/",\r
         "userName": "mam",\r
index 935e7b0db8f6cafea99e7ca9e2dffd445c5d9f62..2606de1a725f5286e22a5fc4a682fd3fbc6ab185 100644 (file)
@@ -1,4 +1,5 @@
-using System;\r
+using MaestroShared.Configuration;\r
+using System;\r
 using System.Windows.Forms;\r
 \r
 namespace AudioRecorder {\r
@@ -23,10 +24,15 @@ namespace AudioRecorder {
         public MetadataSelectorForm(AudioRecorderSettings settings) {\r
             InitializeComponent();\r
             metadataIDSelector.Providers = settings.Metadatas;\r
+            metadataIDSelector.Settings = settings.UISettings;\r
             metadataIDSelector.OctopusIDSelector.IDChangedEvent += OctopusIDChangedEvent;\r
             metadataIDSelector.NativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent;\r
             metadataIDSelector.TrafficIDSelector.IDChangedEvent += TrafficIDChangedEvent;\r
             metadataIDSelector.MetadataIDText.TextChanged += OnMetadataIDChanged;\r
+            settings.UISettings = settings.UISettings ?? new UISettings();\r
+            buttonCancel.Text = settings.UISettings.Resource("CANCEL", Resources.CANCEL);\r
+            buttonOK.Text = settings.UISettings.Resource("DONE", Resources.DONE);\r
+            Text = settings.UISettings.Resource("SELECTORTITLE", Resources.SELECTORTITLE);\r
         }\r
 \r
         private void OnMetadataIDChanged(object sender, EventArgs e) {\r
diff --git a/client/AudioRecorder/Properties/Settings.Designer.cs b/client/AudioRecorder/Properties/Settings.Designer.cs
deleted file mode 100644 (file)
index 6a3bb1f..0000000
+++ /dev/null
@@ -1,26 +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 AudioRecorder.Properties {\r
-    \r
-    \r
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]\r
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {\r
-        \r
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));\r
-        \r
-        public static Settings Default {\r
-            get {\r
-                return defaultInstance;\r
-            }\r
-        }\r
-    }\r
-}\r
diff --git a/client/AudioRecorder/Properties/Settings.settings b/client/AudioRecorder/Properties/Settings.settings
deleted file mode 100644 (file)
index abf36c5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">\r
-  <Profiles>\r
-    <Profile Name="(Default)" />\r
-  </Profiles>\r
-  <Settings />\r
-</SettingsFile>\r
index 5d9a1445c4cf0868c81183c28ca5cce789327dd1..a0a70c96b3bcc0c4fed946f3057fdaa560f04d3c 100644 (file)
@@ -19,7 +19,7 @@ namespace AudioRecorder {
     // 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.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
@@ -60,6 +60,24 @@ namespace AudioRecorder {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Mégsem.\r
+        /// </summary>\r
+        internal static string CANCEL {\r
+            get {\r
+                return ResourceManager.GetString("CANCEL", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Rendben.\r
+        /// </summary>\r
+        internal static string DONE {\r
+            get {\r
+                return ResourceManager.GetString("DONE", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Felvétel.\r
         /// </summary>\r
@@ -115,6 +133,15 @@ namespace AudioRecorder {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Azonosító kiválasztása.\r
+        /// </summary>\r
+        internal static string SELECTORTITLE {\r
+            get {\r
+                return ResourceManager.GetString("SELECTORTITLE", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Szunet.\r
         /// </summary>\r
index 8adc74fdacf91ce1d17e0fa8509b2d819a17a12a..143055a5ec2d5e1d8fd849ba612682d5835ce024 100644 (file)
   <data name="VALASSZON_MIKROFONT" xml:space="preserve">\r
     <value>Válasszon mikrofont</value>\r
   </data>\r
+  <data name="CANCEL" xml:space="preserve">\r
+    <value>Mégsem</value>\r
+  </data>\r
+  <data name="DONE" xml:space="preserve">\r
+    <value>Rendben</value>\r
+  </data>\r
+  <data name="SELECTORTITLE" xml:space="preserve">\r
+    <value>Azonosító kiválasztása</value>\r
+  </data>\r
 </root>
\ No newline at end of file
index 2a4fe458fd1a7fb26d18914d936cb4c48ee2fe2e..bf8f97100708e61f876a8d8343ac20c73ce30127 100644 (file)
@@ -7,7 +7,7 @@
   },\r
   "metadata": {\r
     "$type": "TrafficMetadata",\r
-    "uiFileName": "metadataprovider.en",\r
+    "uiFileName": "planair.en",\r
     "server": {\r
       "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
       "userName": "MAM",\r
index fddd9064e6c25f1cdd791a3eda52eab8f8dc3a6f..cc8d221ef130b105bf5cd23e1fd2c64df7ff6dca 100644 (file)
     </Compile>\r
     <Content Include="DirectShowLib.dll" />\r
     <Content Include="maestro.ico" />\r
-    <None Include="Configuration\metadataprovider.en">\r
+    <None Include="Configuration\planair.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\dxplay.en">\r
index 67bee0e9b82d636b9cc78523e214529afa23f84e..5e1103014fbcc5d835d2f2dfbd8d3096bc0696ba 100644 (file)
@@ -179,7 +179,6 @@ namespace MaestroShared.Configuration {
     }\r
 \r
     public class NativeOctopusMetadata : MetadataProvider {\r
-        public ProjectSettings ProjectSettings { get; set; }\r
     }\r
 \r
     public class TrafficMetadata : MetadataProvider {\r
index a576628bf1b0ee4b33bc2ad1b8070af2ecb270a4..ce2f3b1e412fd883c602f43288aaaed62137b145 100644 (file)
@@ -26,6 +26,8 @@ namespace MaestroShared.Controls {
         public OctopusIDSelector OctopusIDSelector { get => octopusIDSelector; }\r
         public NativeOctopusIDSelector NativeOctopusIDSelector { get => nativeOctopusIDSelector; }\r
         public TrafficIDSelector TrafficIDSelector { get => trafficIDSelector; }\r
+        public UISettings Settings { get; set; }\r
+\r
         public MetadataProvider[] Providers { get => providers;\r
             set {\r
                 providers = value;\r
@@ -47,6 +49,12 @@ namespace MaestroShared.Controls {
             messageBus.Subscribe<MediaCubeMessage>(OnMessage);\r
         }\r
 \r
+        protected override void OnLoad(EventArgs e) {\r
+            base.OnLoad(e);\r
+            Settings = Settings ?? new UISettings();\r
+            labelSelectedMetadata.Text = Settings.Resource("SELECTEDID", MetadataSelector.Properties.Resources.SELECTEDID);\r
+        }\r
+\r
         private void OnMessage(IMessage message) {\r
             if (message is MaestroMessage nm)\r
                 MsgBox.Error(nm.Content);\r
index 0f67f4e7bc1a56c5858bbcb958d5a2f8a4563f0d..bf4d9ae31016763db4dbca72c4cc8d6e3d8c6e53 100644 (file)
       <DependentUpon>MetadataIDSelector.cs</DependentUpon>\r
     </Compile>\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="MetadataIDSelector.resx">\r
       <DependentUpon>MetadataIDSelector.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
     <ProjectReference Include="..\MaestroShared\MaestroShared.csproj">\r
similarity index 61%
rename from client/AudioRecorder/Properties/Resources.Designer.cs
rename to client/MetadataSelector/Properties/Resources.Designer.cs
index 496d662f2e0187074167664a27e0120cd9a3c826..8910616a315ed5cef785bee3ce57359388b2e133 100644 (file)
@@ -8,7 +8,7 @@
 // </auto-generated>\r
 //------------------------------------------------------------------------------\r
 \r
-namespace AudioRecorder.Properties {\r
+namespace MetadataSelector.Properties {\r
     using System;\r
     \r
     \r
@@ -19,7 +19,7 @@ namespace AudioRecorder.Properties {
     // 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.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
@@ -39,7 +39,7 @@ namespace AudioRecorder.Properties {
         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("AudioRecorder.Properties.Resources", typeof(Resources).Assembly);\r
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MetadataSelector.Properties.Resources", typeof(Resources).Assembly);\r
                     resourceMan = temp;\r
                 }\r
                 return resourceMan;\r
@@ -61,47 +61,11 @@ namespace AudioRecorder.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Felvétel.\r
+        ///   Looks up a localized string similar to Kiválasztott metaadat.\r
         /// </summary>\r
-        internal static string FELVETEL {\r
+        internal static string SELECTEDID {\r
             get {\r
-                return ResourceManager.GetString("FELVETEL", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Leállítás.\r
-        /// </summary>\r
-        internal static string LEALLITAS {\r
-            get {\r
-                return ResourceManager.GetString("LEALLITAS", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Lejátszás.\r
-        /// </summary>\r
-        internal static string LEJATSZAS {\r
-            get {\r
-                return ResourceManager.GetString("LEJATSZAS", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Szunet.\r
-        /// </summary>\r
-        internal static string SZUNET {\r
-            get {\r
-                return ResourceManager.GetString("SZUNET", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Válasszon mikrofont.\r
-        /// </summary>\r
-        internal static string VALASSZON_MIKROFONT {\r
-            get {\r
-                return ResourceManager.GetString("VALASSZON_MIKROFONT", resourceCulture);\r
+                return ResourceManager.GetString("SELECTEDID", resourceCulture);\r
             }\r
         }\r
     }\r
similarity index 87%
rename from client/AudioRecorder/Properties/Resources.resx
rename to client/MetadataSelector/Properties/Resources.resx
index ffecec851ab4deae63e81647b4655c7d1fe6dfd7..3bfcba5a9819b557ecc63780655568d51dbd9f46 100644 (file)
@@ -46,7 +46,7 @@
     \r
     mimetype: application/x-microsoft.net.object.binary.base64\r
     value   : The object must be serialized with \r
-            : System.Serialization.Formatters.Binary.BinaryFormatter\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
@@ -60,6 +60,7 @@
             : 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:sequence>\r
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
               </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" />\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: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" msdata:Ordinal="1" />\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
     <value>2.0</value>\r
   </resheader>\r
   <resheader name="reader">\r
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <data name="SELECTEDID" xml:space="preserve">\r
+    <value>Kiválasztott metaadat</value>\r
+  </data>\r
 </root>
\ No newline at end of file
index a26c8686c4f2391cb00afcff5192dd1dd2c10234..c152e05f48f812daf1a3b56531bea165ff50da21 100644 (file)
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Windows.Forms;\r
 using System.Collections.Generic;\r
 using System.Runtime.InteropServices;\r
-using MaestroShared.Configuration;\r
 using MaestroShared.Commons;\r
 using MaestroShared.MessageBus;\r
 using NativeOctopusClient.Model;\r
+using NativeOctopusClient.Properties;\r
 \r
 namespace NativeOctopusClient {\r
     public delegate void OnSelectedIDChanged(string id, string name, string text);\r
@@ -62,9 +62,17 @@ namespace NativeOctopusClient {
             treeOctopus.NodeDoubleClick = OnNodeDoubleClick;\r
         }\r
 \r
+        protected override void OnLoad(EventArgs e) {\r
+            base.OnLoad(e);\r
+            rbRundown.Text = parameters?.Configuration?.Resource("RUNDOWN", Resources.RUNDOWN);\r
+            rbStoryFolder.Text = parameters?.Configuration?.Resource("FOLDER", Resources.FOLDER);\r
+        }\r
+\r
         private void InitializeControls() {\r
-            rbRundown.Text = Properties.Resources.ADASTUKOR;\r
-            rbStoryFolder.Text = Properties.Resources.MAPPA;\r
+            if (rbRundown.Text == null)\r
+                rbRundown.Text = Resources.RUNDOWN;\r
+            if (rbStoryFolder.Text == null)\r
+                rbStoryFolder.Text = Resources.FOLDER;\r
         }\r
 \r
         public void ClearSelection() {\r
@@ -185,6 +193,9 @@ namespace NativeOctopusClient {
                 return;\r
             ClearSelection();\r
             Cursor.Current = Cursors.WaitCursor;\r
+            var chooseText = parameters.Configuration.Resource("CHOOSE", Resources.CHOOSE);\r
+            if (chooseText == null)\r
+                chooseText = Resources.CHOOSE;\r
             if (rbRundown.Checked) {\r
                 dtScheduled.Enabled = true;\r
                 List<Rundown> rundownsResult = client.GetRundowns(dtScheduled.Value.Date)?.ToList();\r
@@ -194,7 +205,7 @@ namespace NativeOctopusClient {
                     return;\r
                 }\r
                 List<Rundown> rundowns = new List<Rundown>();\r
-                rundowns.Add(new Rundown() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
+                rundowns.Add(new Rundown() { ID = ZERO, Name = chooseText });\r
                 rundowns.AddRange(rundownsResult);\r
                 cbFolders.DataSource = rundowns;\r
             } else {\r
@@ -206,7 +217,7 @@ namespace NativeOctopusClient {
                     return;\r
                 }\r
                 List<StoryFolder> storyFolders = new List<StoryFolder>();\r
-                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET });\r
+                storyFolders.Add(new StoryFolder() { ID = ZERO, Name = chooseText });\r
                 storyFolders.AddRange(storyFoldersResult);\r
                 cbFolders.DataSource = storyFolders;\r
             }\r
@@ -312,15 +323,15 @@ namespace NativeOctopusClient {
         }\r
 \r
         private void OnNodeDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {\r
-            if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0)\r
-                return;\r
-            Story story = e.Node.Tag as Story;\r
-            if (story == null)\r
-                return;\r
-            ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings;\r
-            string id = story.ParentStoryID;\r
-            string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}");\r
-            EdiusProject.Open(projectConfiguration, id, text, parameters.UserName);\r
+            //if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0)\r
+            //    return;\r
+            //Story story = e.Node.Tag as Story;\r
+            //if (story == null)\r
+            //    return;\r
+            //ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings;\r
+            //string id = story.ParentStoryID;\r
+            //string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}");\r
+            //EdiusProject.Open(projectConfiguration, id, text, parameters.UserName);\r
         }\r
 \r
         private void noFocusCueButton1_Click(object sender, EventArgs e) {\r
index 01733b0be8879b94cddb015aea4769f1d0f591ef..8687e97a41b9a42fe5833250b7797efb930f5e17 100644 (file)
@@ -61,29 +61,20 @@ namespace NativeOctopusClient.Properties {
         }\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
+        ///   Looks up a localized string similar to Válasszon elemet.\r
         /// </summary>\r
-        internal static string ARCHIVE {\r
+        internal static string CHOOSE {\r
             get {\r
-                return ResourceManager.GetString("ARCHIVE", resourceCulture);\r
+                return ResourceManager.GetString("CHOOSE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Global ID.\r
+        ///   Looks up a localized string similar to Mappa.\r
         /// </summary>\r
-        internal static string GLOBAL_ID {\r
+        internal static string FOLDER {\r
             get {\r
-                return ResourceManager.GetString("GLOBAL_ID", resourceCulture);\r
+                return ResourceManager.GetString("FOLDER", resourceCulture);\r
             }\r
         }\r
         \r
@@ -98,110 +89,11 @@ namespace NativeOctopusClient.Properties {
         }\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
+        ///   Looks up a localized string similar to Adástükör.\r
         /// </summary>\r
-        internal static string VALASSZON_ELEMET {\r
+        internal static string RUNDOWN {\r
             get {\r
-                return ResourceManager.GetString("VALASSZON_ELEMET", resourceCulture);\r
+                return ResourceManager.GetString("RUNDOWN", resourceCulture);\r
             }\r
         }\r
     }\r
index 0e1109a6e8632129d69bc2d0ed7edf75029ced5b..da2a1424f0f00c2292400bc185afb8e52fa3bd1a 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="ADASTUKOR" xml:space="preserve">\r
+  <data name="RUNDOWN" 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
+  <data name="FOLDER" 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
+  <data name="CHOOSE" xml:space="preserve">\r
     <value>Válasszon elemet</value>\r
   </data>\r
 </root>
\ No newline at end of file
index 37cb21e61ff6d155d5b4aa80b74f56f707a3dcbc..e05ef4952ddf3c54e1573c785caad7368c05b2cc 100644 (file)
@@ -6,16 +6,16 @@ namespace PasswordEncrypter {
 \r
         [STAThread]\r
         static void Main(string[] args) {\r
-            Console.WriteLine("Eredeti jelszó:");\r
+            Console.WriteLine("Password:");\r
             string password = Console.ReadLine();\r
 \r
-            Console.WriteLine("Kódolt jelszó a vágólapon:");\r
+            Console.WriteLine("Encrypted password (available on clipboard):");\r
             string encryptedstring = StringCipher.Encrypt(password);\r
             Console.WriteLine(encryptedstring);\r
             Clipboard.SetText(encryptedstring);\r
 \r
             string originalstring = StringCipher.Decrypt(encryptedstring);\r
-            Console.WriteLine("Ellenőrzés:");\r
+            Console.WriteLine("Restored password:");\r
             Console.WriteLine(originalstring);\r
             Console.ReadLine();\r
         }\r
index 37f7a1d43d746374d4f2e21deebd24adb57541e3..66d314c4f3239bdfe8864d634feadf2790c13b5b 100644 (file)
@@ -2,7 +2,6 @@
 using System;\r
 using System.Linq;\r
 using System.Collections.Generic;\r
-using LinkDotNet.MessageHandling.Contracts;\r
 using MaestroShared.Commons;\r
 using MaestroShared.Configuration;\r
 using System.Text.RegularExpressions;\r