From 8977b2d8733a030f9468b98657cef60545766aaf Mon Sep 17 00:00:00 2001 From: niksedk Date: Tue, 28 Dec 2010 11:51:16 +0000 Subject: [PATCH] Working on localization git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@207 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/Main.cs | 2 +- src/Forms/NetworkChat.cs | 7 +++++-- src/Logic/Networking/NikseWebServiceSession.cs | 9 ++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index e48352520..494399b3c 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -7378,7 +7378,7 @@ namespace Nikse.SubtitleEdit.Forms List updates = null; try { - updates = (List)_networkSession.GetUpdates(out message); + updates = _networkSession.GetUpdates(out message); } catch (Exception exception) { diff --git a/src/Forms/NetworkChat.cs b/src/Forms/NetworkChat.cs index b7d7bb031..a2f5f3be8 100644 --- a/src/Forms/NetworkChat.cs +++ b/src/Forms/NetworkChat.cs @@ -5,7 +5,7 @@ using Nikse.SubtitleEdit.Logic.Networking; namespace Nikse.SubtitleEdit.Forms { - public partial class NetworkChat : Form + public sealed partial class NetworkChat : Form { Logic.Networking.NikseWebServiceSession _networkSession; @@ -13,7 +13,10 @@ namespace Nikse.SubtitleEdit.Forms { InitializeComponent(); buttonSendChat.Text = Configuration.Settings.Language.NetworkChat.Send; - + listViewUsers.Columns[0].Text = Configuration.Settings.Language.General.UserName; + listViewUsers.Columns[1].Text = Configuration.Settings.Language.General.IP; + listViewChat.Columns[0].Text = Configuration.Settings.Language.General.UserName; + listViewChat.Columns[1].Text = Configuration.Settings.Language.General.Text; } internal void Initialize(Nikse.SubtitleEdit.Logic.Networking.NikseWebServiceSession networkSession) diff --git a/src/Logic/Networking/NikseWebServiceSession.cs b/src/Logic/Networking/NikseWebServiceSession.cs index 496ecf28a..43999e522 100644 --- a/src/Logic/Networking/NikseWebServiceSession.cs +++ b/src/Logic/Networking/NikseWebServiceSession.cs @@ -140,12 +140,15 @@ namespace Nikse.SubtitleEdit.Logic.Networking _timerWebService.Start(); } - public IEnumerable GetUpdates(out string message) - { + public List GetUpdates(out string message) + { + List list = new List(); DateTime newUpdateTime; var updates = _seWs.GetUpdates(SessionId, CurrentUser.UserName, _seWsLastUpdate, out message, out newUpdateTime); + foreach (var update in updates) + list.Add(update); _seWsLastUpdate = newUpdateTime; - return updates; + return list; } private void ReloadFromWs()