diff --git a/src/webimtray/WebIMTray/options/About.cs b/src/webimtray/WebIMTray/options/About.cs
index f93b2a31..0e7e0479 100644
--- a/src/webimtray/WebIMTray/options/About.cs
+++ b/src/webimtray/WebIMTray/options/About.cs
@@ -21,8 +21,8 @@ namespace webImTray {
public void apply() {
}
- public string getDescription() {
- return "About";
+ public string getDescription(ResourceManager resManager) {
+ return resManager.GetString("about");
}
#endregion
diff --git a/src/webimtray/WebIMTray/options/OptionPanel.cs b/src/webimtray/WebIMTray/options/OptionPanel.cs
index d52bf808..626cbff5 100644
--- a/src/webimtray/WebIMTray/options/OptionPanel.cs
+++ b/src/webimtray/WebIMTray/options/OptionPanel.cs
@@ -10,7 +10,7 @@ namespace webImTray {
interface OptionsPanel {
void initialize();
void apply();
- string getDescription();
+ string getDescription(ResourceManager resManager);
void updateUI(ResourceManager resManager);
event ModifiedEvent PanelModified;
diff --git a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs
index 12828a72..61d8dadb 100644
--- a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs
+++ b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs
@@ -38,8 +38,8 @@ namespace webImTray {
modified = false;
}
- string OptionsPanel.getDescription() {
- return "Connection";
+ string OptionsPanel.getDescription(ResourceManager resManager) {
+ return resManager.GetString("connection");
}
public event ModifiedEvent PanelModified;
diff --git a/src/webimtray/WebIMTray/options/OptionsDialog.cs b/src/webimtray/WebIMTray/options/OptionsDialog.cs
index 25a4a829..f54d902d 100644
--- a/src/webimtray/WebIMTray/options/OptionsDialog.cs
+++ b/src/webimtray/WebIMTray/options/OptionsDialog.cs
@@ -43,19 +43,24 @@ namespace webImTray {
container.Controls.Add((Control)currentPanel);
}
- private void optionsDialogLoaded(object sender, EventArgs e) {
+ private void updatePageSelector() {
bool inited = false;
-
+ pageSelector.Items.Clear();
foreach (OptionsPanel p in panels) {
- ListViewItem item = new ListViewItem(p.getDescription());
+ ListViewItem item = new ListViewItem(p.getDescription(resourceManager));
if (!inited) {
item.Selected = true;
changePanel(p);
inited = true;
}
+ pageSelector.Items.Add(item);
+ }
+ }
+ private void optionsDialogLoaded(object sender, EventArgs e) {
+ updatePageSelector();
+ foreach (OptionsPanel p in panels) {
p.PanelModified += new ModifiedEvent(panelModified);
p.initialize();
- pageSelector.Items.Add(item);
}
apply.Enabled = false;
}
@@ -66,7 +71,7 @@ namespace webImTray {
OptionsPanel getPanel(string s) {
foreach (OptionsPanel p in panels) {
- if (s.Equals(p.getDescription()))
+ if (s.Equals(p.getDescription(resourceManager)))
return p;
}
@@ -111,6 +116,7 @@ namespace webImTray {
currentInstance.cancel.Text = resourceManager.GetString("cancel");
currentInstance.apply.Text = resourceManager.GetString("apply");
currentInstance.Text = resourceManager.GetString("optionsTitle");
+ currentInstance.updatePageSelector();
}
}
}
\ No newline at end of file
diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs
index e92d9d7e..892e81ab 100644
--- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs
+++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs
@@ -62,8 +62,8 @@ namespace webImTray {
modified = false;
}
- string OptionsPanel.getDescription() {
- return "General";
+ string OptionsPanel.getDescription(ResourceManager resManager) {
+ return resManager.GetString("general");
}
public void updateUI(ResourceManager resManager) {
diff --git a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs
index 1f65314b..adbb4508 100644
--- a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs
+++ b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs
@@ -25,8 +25,8 @@ namespace webImTray {
void OptionsPanel.initialize() {
}
- string OptionsPanel.getDescription() {
- return "Sounds";
+ string OptionsPanel.getDescription(ResourceManager resManager) {
+ return resManager.GetString("sound");
}
public void updateUI(ResourceManager resManager) {
diff --git a/src/webimtray/WebIMTray/webImTray.en-US.resx b/src/webimtray/WebIMTray/webImTray.en-US.resx
index 5eadf1c9..b5e18662 100644
--- a/src/webimtray/WebIMTray/webImTray.en-US.resx
+++ b/src/webimtray/WebIMTray/webImTray.en-US.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ About
+
Application
@@ -138,6 +141,9 @@
Connection
+
+ Connection
+
Copyright (c) 2006-2008 Web Messenger Creators Community
@@ -147,6 +153,9 @@
Force page update every
+
+ General
+
Hide window after start
@@ -192,6 +201,9 @@
Click here to change your preferences online
+
+ Sound
+
http://www.webim.ru
diff --git a/src/webimtray/WebIMTray/webImTray.ru-RU.resx b/src/webimtray/WebIMTray/webImTray.ru-RU.resx
index 90851743..59c39934 100644
--- a/src/webimtray/WebIMTray/webImTray.ru-RU.resx
+++ b/src/webimtray/WebIMTray/webImTray.ru-RU.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ О программе
+
Приложение
@@ -138,6 +141,9 @@
Соединение
+
+ Связь
+
(c), Команда разработчиков Веб Мессенджер, 2006-08
@@ -147,6 +153,9 @@
Обновлять каждые
+
+ Общие
+
Прятать окно после запуска
@@ -192,6 +201,9 @@
Изменить ваши настройки online
+
+ Звук
+
http://www.webim.ru