From 525517cc98d065af7eb7d0e7fc151ce48a33e29d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 28 Aug 2018 11:22:43 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31246 --- client/AudioRecorder/AudioRecorder.csproj | 30 +---- client/AudioRecorder/AudioRecorderSettings.cs | 1 + .../Configuration/audiorecorder.en | 9 ++ .../Configuration/audiorecorder.json | 4 + client/AudioRecorder/MetadataSelectorForm.cs | 8 +- .../Properties/Settings.Designer.cs | 26 ---- .../Properties/Settings.settings | 7 - client/AudioRecorder/Resources.Designer.cs | 29 +++- client/AudioRecorder/Resources.resx | 9 ++ client/DxPlay/Configuration/dxplay.json | 2 +- .../{metadataprovider.en => planair.en} | 0 client/DxPlay/DxPlay.csproj | 2 +- .../Configuration/ConfigurationInfo.cs | 1 - client/MetadataSelector/MetadataIDSelector.cs | 8 ++ .../MetadataSelector/MetadataSelector.csproj | 9 ++ .../Properties/Resources.Designer.cs | 48 +------ .../Properties/Resources.resx | 16 ++- .../NativeOctopusIDSelector.cs | 39 ++++-- .../Properties/Resources.Designer.cs | 126 ++---------------- .../Properties/Resources.resx | 42 +----- client/PasswordEncrypter/Program.cs | 6 +- client/PlanAIRClient/TrafficIDSelector.cs | 1 - 22 files changed, 141 insertions(+), 282 deletions(-) create mode 100644 client/AudioRecorder/Configuration/audiorecorder.en delete mode 100644 client/AudioRecorder/Properties/Settings.Designer.cs delete mode 100644 client/AudioRecorder/Properties/Settings.settings rename client/DxPlay/Configuration/{metadataprovider.en => planair.en} (100%) rename client/{AudioRecorder => MetadataSelector}/Properties/Resources.Designer.cs (61%) rename client/{AudioRecorder => MetadataSelector}/Properties/Resources.resx (87%) diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj index aa436763..5afd109f 100644 --- a/client/AudioRecorder/AudioRecorder.csproj +++ b/client/AudioRecorder/AudioRecorder.csproj @@ -37,7 +37,7 @@ true full false - bin\Debug\ + ..\bin\AudioRecorder\Debug\ DEBUG;TRACE prompt 4 @@ -48,7 +48,7 @@ AnyCPU pdbonly true - bin\Release\ + ..\bin\AudioRecorder\Release\ TRACE prompt 4 @@ -76,7 +76,7 @@ true - bin\x64\Debug\ + ..\bin\x64\AudioRecorder\Debug\ DEBUG;TRACE full x64 @@ -84,7 +84,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + ..\bin\x64\AudioRecorder\Release\ TRACE true pdbonly @@ -166,16 +166,6 @@ MainForm.cs - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - ResXFileCodeGenerator Resources.Designer.cs @@ -183,6 +173,9 @@ Always + + Always + Designer PreserveNewest @@ -190,15 +183,6 @@ Designer - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - Always diff --git a/client/AudioRecorder/AudioRecorderSettings.cs b/client/AudioRecorder/AudioRecorderSettings.cs index 8319a080..e03dd926 100644 --- a/client/AudioRecorder/AudioRecorderSettings.cs +++ b/client/AudioRecorder/AudioRecorderSettings.cs @@ -7,6 +7,7 @@ namespace AudioRecorder { public int PeekMeterStep { get; set; } public Uri WorkingDirectory { get; set; } public MetadataProvider[] Metadatas { get; set; } + public UISettings UISettings { get; set; } public Target OctopusTarget { get; set; } public Target TrafficTarget { get; set; } } diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en new file mode 100644 index 00000000..f43a5d8a --- /dev/null +++ b/client/AudioRecorder/Configuration/audiorecorder.en @@ -0,0 +1,9 @@ +{ + "RUNDOWN": "Rundown", + "FOLDER": "Story folder", + "CHOOSE": "Choose an item", + "SELECTORTITLE": "Choose an ID", + "SELECTEDID": "Selected ID", + "CANCEL": "Cancel", + "DONE": "Done" +} diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json index 573a01de..91daa4d8 100644 --- a/client/AudioRecorder/Configuration/audiorecorder.json +++ b/client/AudioRecorder/Configuration/audiorecorder.json @@ -16,9 +16,13 @@ "timeout": 1000 } }, + "uiSettings": { + "uiFileName": "audiorecorder.en" + }, "metadatas": [ { "$type": "NativeOctopusMetadata", + "uiFileName": "audiorecorder.en", "server": { "address": " http://10.10.1.11/api/v1/", "userName": "mam", diff --git a/client/AudioRecorder/MetadataSelectorForm.cs b/client/AudioRecorder/MetadataSelectorForm.cs index 935e7b0d..2606de1a 100644 --- a/client/AudioRecorder/MetadataSelectorForm.cs +++ b/client/AudioRecorder/MetadataSelectorForm.cs @@ -1,4 +1,5 @@ -using System; +using MaestroShared.Configuration; +using System; using System.Windows.Forms; namespace AudioRecorder { @@ -23,10 +24,15 @@ namespace AudioRecorder { public MetadataSelectorForm(AudioRecorderSettings settings) { InitializeComponent(); metadataIDSelector.Providers = settings.Metadatas; + metadataIDSelector.Settings = settings.UISettings; metadataIDSelector.OctopusIDSelector.IDChangedEvent += OctopusIDChangedEvent; metadataIDSelector.NativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent; metadataIDSelector.TrafficIDSelector.IDChangedEvent += TrafficIDChangedEvent; metadataIDSelector.MetadataIDText.TextChanged += OnMetadataIDChanged; + settings.UISettings = settings.UISettings ?? new UISettings(); + buttonCancel.Text = settings.UISettings.Resource("CANCEL", Resources.CANCEL); + buttonOK.Text = settings.UISettings.Resource("DONE", Resources.DONE); + Text = settings.UISettings.Resource("SELECTORTITLE", Resources.SELECTORTITLE); } private void OnMetadataIDChanged(object sender, EventArgs e) { diff --git a/client/AudioRecorder/Properties/Settings.Designer.cs b/client/AudioRecorder/Properties/Settings.Designer.cs deleted file mode 100644 index 6a3bb1f9..00000000 --- a/client/AudioRecorder/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace AudioRecorder.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/client/AudioRecorder/Properties/Settings.settings b/client/AudioRecorder/Properties/Settings.settings deleted file mode 100644 index abf36c5d..00000000 --- a/client/AudioRecorder/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/AudioRecorder/Resources.Designer.cs b/client/AudioRecorder/Resources.Designer.cs index 5d9a1445..a0a70c96 100644 --- a/client/AudioRecorder/Resources.Designer.cs +++ b/client/AudioRecorder/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace AudioRecorder { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -60,6 +60,24 @@ namespace AudioRecorder { } } + /// + /// Looks up a localized string similar to Mégsem. + /// + internal static string CANCEL { + get { + return ResourceManager.GetString("CANCEL", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rendben. + /// + internal static string DONE { + get { + return ResourceManager.GetString("DONE", resourceCulture); + } + } + /// /// Looks up a localized string similar to Felvétel. /// @@ -115,6 +133,15 @@ namespace AudioRecorder { } } + /// + /// Looks up a localized string similar to Azonosító kiválasztása. + /// + internal static string SELECTORTITLE { + get { + return ResourceManager.GetString("SELECTORTITLE", resourceCulture); + } + } + /// /// Looks up a localized string similar to Szunet. /// diff --git a/client/AudioRecorder/Resources.resx b/client/AudioRecorder/Resources.resx index 8adc74fd..143055a5 100644 --- a/client/AudioRecorder/Resources.resx +++ b/client/AudioRecorder/Resources.resx @@ -142,4 +142,13 @@ Válasszon mikrofont + + Mégsem + + + Rendben + + + Azonosító kiválasztása + \ No newline at end of file diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json index 2a4fe458..bf8f9710 100644 --- a/client/DxPlay/Configuration/dxplay.json +++ b/client/DxPlay/Configuration/dxplay.json @@ -7,7 +7,7 @@ }, "metadata": { "$type": "TrafficMetadata", - "uiFileName": "metadataprovider.en", + "uiFileName": "planair.en", "server": { "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;", "userName": "MAM", diff --git a/client/DxPlay/Configuration/metadataprovider.en b/client/DxPlay/Configuration/planair.en similarity index 100% rename from client/DxPlay/Configuration/metadataprovider.en rename to client/DxPlay/Configuration/planair.en diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index fddd9064..cc8d221e 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -235,7 +235,7 @@ - + Always diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index 67bee0e9..5e110301 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -179,7 +179,6 @@ namespace MaestroShared.Configuration { } public class NativeOctopusMetadata : MetadataProvider { - public ProjectSettings ProjectSettings { get; set; } } public class TrafficMetadata : MetadataProvider { diff --git a/client/MetadataSelector/MetadataIDSelector.cs b/client/MetadataSelector/MetadataIDSelector.cs index a576628b..ce2f3b1e 100644 --- a/client/MetadataSelector/MetadataIDSelector.cs +++ b/client/MetadataSelector/MetadataIDSelector.cs @@ -26,6 +26,8 @@ namespace MaestroShared.Controls { public OctopusIDSelector OctopusIDSelector { get => octopusIDSelector; } public NativeOctopusIDSelector NativeOctopusIDSelector { get => nativeOctopusIDSelector; } public TrafficIDSelector TrafficIDSelector { get => trafficIDSelector; } + public UISettings Settings { get; set; } + public MetadataProvider[] Providers { get => providers; set { providers = value; @@ -47,6 +49,12 @@ namespace MaestroShared.Controls { messageBus.Subscribe(OnMessage); } + protected override void OnLoad(EventArgs e) { + base.OnLoad(e); + Settings = Settings ?? new UISettings(); + labelSelectedMetadata.Text = Settings.Resource("SELECTEDID", MetadataSelector.Properties.Resources.SELECTEDID); + } + private void OnMessage(IMessage message) { if (message is MaestroMessage nm) MsgBox.Error(nm.Content); diff --git a/client/MetadataSelector/MetadataSelector.csproj b/client/MetadataSelector/MetadataSelector.csproj index 0f67f4e7..bf4d9ae3 100644 --- a/client/MetadataSelector/MetadataSelector.csproj +++ b/client/MetadataSelector/MetadataSelector.csproj @@ -69,11 +69,20 @@ MetadataIDSelector.cs + + True + True + Resources.resx + MetadataIDSelector.cs + + ResXFileCodeGenerator + Resources.Designer.cs + diff --git a/client/AudioRecorder/Properties/Resources.Designer.cs b/client/MetadataSelector/Properties/Resources.Designer.cs similarity index 61% rename from client/AudioRecorder/Properties/Resources.Designer.cs rename to client/MetadataSelector/Properties/Resources.Designer.cs index 496d662f..8910616a 100644 --- a/client/AudioRecorder/Properties/Resources.Designer.cs +++ b/client/MetadataSelector/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace AudioRecorder.Properties { +namespace MetadataSelector.Properties { using System; @@ -19,7 +19,7 @@ namespace AudioRecorder.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ namespace AudioRecorder.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioRecorder.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MetadataSelector.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -61,47 +61,11 @@ namespace AudioRecorder.Properties { } /// - /// Looks up a localized string similar to Felvétel. + /// Looks up a localized string similar to Kiválasztott metaadat. /// - internal static string FELVETEL { + internal static string SELECTEDID { get { - return ResourceManager.GetString("FELVETEL", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Leállítás. - /// - internal static string LEALLITAS { - get { - return ResourceManager.GetString("LEALLITAS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Lejátszás. - /// - internal static string LEJATSZAS { - get { - return ResourceManager.GetString("LEJATSZAS", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Szunet. - /// - internal static string SZUNET { - get { - return ResourceManager.GetString("SZUNET", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Válasszon mikrofont. - /// - internal static string VALASSZON_MIKROFONT { - get { - return ResourceManager.GetString("VALASSZON_MIKROFONT", resourceCulture); + return ResourceManager.GetString("SELECTEDID", resourceCulture); } } } diff --git a/client/AudioRecorder/Properties/Resources.resx b/client/MetadataSelector/Properties/Resources.resx similarity index 87% rename from client/AudioRecorder/Properties/Resources.resx rename to client/MetadataSelector/Properties/Resources.resx index ffecec85..3bfcba5a 100644 --- a/client/AudioRecorder/Properties/Resources.resx +++ b/client/MetadataSelector/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Kiválasztott metaadat + \ No newline at end of file diff --git a/client/NativeOctopusClient/NativeOctopusIDSelector.cs b/client/NativeOctopusClient/NativeOctopusIDSelector.cs index a26c8686..c152e05f 100644 --- a/client/NativeOctopusClient/NativeOctopusIDSelector.cs +++ b/client/NativeOctopusClient/NativeOctopusIDSelector.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Windows.Forms; using System.Collections.Generic; using System.Runtime.InteropServices; -using MaestroShared.Configuration; using MaestroShared.Commons; using MaestroShared.MessageBus; using NativeOctopusClient.Model; +using NativeOctopusClient.Properties; namespace NativeOctopusClient { public delegate void OnSelectedIDChanged(string id, string name, string text); @@ -62,9 +62,17 @@ namespace NativeOctopusClient { treeOctopus.NodeDoubleClick = OnNodeDoubleClick; } + protected override void OnLoad(EventArgs e) { + base.OnLoad(e); + rbRundown.Text = parameters?.Configuration?.Resource("RUNDOWN", Resources.RUNDOWN); + rbStoryFolder.Text = parameters?.Configuration?.Resource("FOLDER", Resources.FOLDER); + } + private void InitializeControls() { - rbRundown.Text = Properties.Resources.ADASTUKOR; - rbStoryFolder.Text = Properties.Resources.MAPPA; + if (rbRundown.Text == null) + rbRundown.Text = Resources.RUNDOWN; + if (rbStoryFolder.Text == null) + rbStoryFolder.Text = Resources.FOLDER; } public void ClearSelection() { @@ -185,6 +193,9 @@ namespace NativeOctopusClient { return; ClearSelection(); Cursor.Current = Cursors.WaitCursor; + var chooseText = parameters.Configuration.Resource("CHOOSE", Resources.CHOOSE); + if (chooseText == null) + chooseText = Resources.CHOOSE; if (rbRundown.Checked) { dtScheduled.Enabled = true; List rundownsResult = client.GetRundowns(dtScheduled.Value.Date)?.ToList(); @@ -194,7 +205,7 @@ namespace NativeOctopusClient { return; } List rundowns = new List(); - rundowns.Add(new Rundown() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET }); + rundowns.Add(new Rundown() { ID = ZERO, Name = chooseText }); rundowns.AddRange(rundownsResult); cbFolders.DataSource = rundowns; } else { @@ -206,7 +217,7 @@ namespace NativeOctopusClient { return; } List storyFolders = new List(); - storyFolders.Add(new StoryFolder() { ID = ZERO, Name = Properties.Resources.VALASSZON_ELEMET }); + storyFolders.Add(new StoryFolder() { ID = ZERO, Name = chooseText }); storyFolders.AddRange(storyFoldersResult); cbFolders.DataSource = storyFolders; } @@ -312,15 +323,15 @@ namespace NativeOctopusClient { } private void OnNodeDoubleClick(object sender, TreeNodeMouseClickEventArgs e) { - if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0) - return; - Story story = e.Node.Tag as Story; - if (story == null) - return; - ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings; - string id = story.ParentStoryID; - string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"); - EdiusProject.Open(projectConfiguration, id, text, parameters.UserName); + //if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0) + // return; + //Story story = e.Node.Tag as Story; + //if (story == null) + // return; + //ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings; + //string id = story.ParentStoryID; + //string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"); + //EdiusProject.Open(projectConfiguration, id, text, parameters.UserName); } private void noFocusCueButton1_Click(object sender, EventArgs e) { diff --git a/client/NativeOctopusClient/Properties/Resources.Designer.cs b/client/NativeOctopusClient/Properties/Resources.Designer.cs index 01733b0b..8687e97a 100644 --- a/client/NativeOctopusClient/Properties/Resources.Designer.cs +++ b/client/NativeOctopusClient/Properties/Resources.Designer.cs @@ -61,29 +61,20 @@ namespace NativeOctopusClient.Properties { } /// - /// Looks up a localized string similar to Adástükör. - /// - internal static string ADASTUKOR { - get { - return ResourceManager.GetString("ADASTUKOR", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Archive. + /// Looks up a localized string similar to Válasszon elemet. /// - internal static string ARCHIVE { + internal static string CHOOSE { get { - return ResourceManager.GetString("ARCHIVE", resourceCulture); + return ResourceManager.GetString("CHOOSE", resourceCulture); } } /// - /// Looks up a localized string similar to Global ID. + /// Looks up a localized string similar to Mappa. /// - internal static string GLOBAL_ID { + internal static string FOLDER { get { - return ResourceManager.GetString("GLOBAL_ID", resourceCulture); + return ResourceManager.GetString("FOLDER", resourceCulture); } } @@ -98,110 +89,11 @@ namespace NativeOctopusClient.Properties { } /// - /// Looks up a localized string similar to ID. - /// - internal static string ID { - get { - return ResourceManager.GetString("ID", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Keresés. - /// - internal static string KERESES { - get { - return ResourceManager.GetString("KERESES", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Keresés eredménye. - /// - internal static string KERESES_EREDMENYE { - get { - return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mappa. - /// - internal static string MAPPA { - get { - return ResourceManager.GetString("MAPPA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mégse. - /// - internal static string MEGSE { - get { - return ResourceManager.GetString("MEGSE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Módosítva. - /// - internal static string MODOSITVA { - get { - return ResourceManager.GetString("MODOSITVA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to MosID. - /// - internal static string MOS_ID { - get { - return ResourceManager.GetString("MOS_ID", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Név. - /// - internal static string NEV { - get { - return ResourceManager.GetString("NEV", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Objektum ID. - /// - internal static string OBJECT_ID { - get { - return ResourceManager.GetString("OBJECT_ID", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Objektum típusa. - /// - internal static string OBJECT_TYPE { - get { - return ResourceManager.GetString("OBJECT_TYPE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Nem lehet csatlakozni az octopus kiszolgálóhoz. - /// - internal static string OCTOPUS_KAPCSOLATI_HIBA { - get { - return ResourceManager.GetString("OCTOPUS_KAPCSOLATI_HIBA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Válasszon elemet. + /// Looks up a localized string similar to Adástükör. /// - internal static string VALASSZON_ELEMET { + internal static string RUNDOWN { get { - return ResourceManager.GetString("VALASSZON_ELEMET", resourceCulture); + return ResourceManager.GetString("RUNDOWN", resourceCulture); } } } diff --git a/client/NativeOctopusClient/Properties/Resources.resx b/client/NativeOctopusClient/Properties/Resources.resx index 0e1109a6..da2a1424 100644 --- a/client/NativeOctopusClient/Properties/Resources.resx +++ b/client/NativeOctopusClient/Properties/Resources.resx @@ -117,53 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Adástükör - - Archive - - - Global ID - ..\resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ID - - - Keresés - - - Keresés eredménye - - + Mappa - - Mégse - - - Módosítva - - - MosID - - - Név - - - Objektum ID - - - Objektum típusa - - - Nem lehet csatlakozni az octopus kiszolgálóhoz - - + Válasszon elemet \ No newline at end of file diff --git a/client/PasswordEncrypter/Program.cs b/client/PasswordEncrypter/Program.cs index 37cb21e6..e05ef495 100644 --- a/client/PasswordEncrypter/Program.cs +++ b/client/PasswordEncrypter/Program.cs @@ -6,16 +6,16 @@ namespace PasswordEncrypter { [STAThread] static void Main(string[] args) { - Console.WriteLine("Eredeti jelszó:"); + Console.WriteLine("Password:"); string password = Console.ReadLine(); - Console.WriteLine("Kódolt jelszó a vágólapon:"); + Console.WriteLine("Encrypted password (available on clipboard):"); string encryptedstring = StringCipher.Encrypt(password); Console.WriteLine(encryptedstring); Clipboard.SetText(encryptedstring); string originalstring = StringCipher.Decrypt(encryptedstring); - Console.WriteLine("Ellenőrzés:"); + Console.WriteLine("Restored password:"); Console.WriteLine(originalstring); Console.ReadLine(); } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 37f7a1d4..66d314c4 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -2,7 +2,6 @@ using System; using System.Linq; using System.Collections.Generic; -using LinkDotNet.MessageHandling.Contracts; using MaestroShared.Commons; using MaestroShared.Configuration; using System.Text.RegularExpressions; -- 2.54.0