- fully localized options window: added localization for options subcategory list;

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@83 c66351dc-e62f-0410-b875-e3a5c0b9693f

src/webimtray/WebIMTray/options/About.cs

@@ -21,8 +21,8 @@ namespace webImTray {
         public void apply() {
         }
 
-        public string getDescription() {
+        public string getDescription(ResourceManager resManager) {
-            return "About";
+            return resManager.GetString("about");
         }
 
         #endregion

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; 

src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs

@@ -38,8 +38,8 @@ namespace webImTray {
             modified = false;
         }
 
-        string OptionsPanel.getDescription() {
+        string OptionsPanel.getDescription(ResourceManager resManager) {
-            return "Connection";
+            return resManager.GetString("connection");
         }
 
         public event ModifiedEvent PanelModified;

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();
         }
     }
 }

src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs

@@ -62,8 +62,8 @@ namespace webImTray {
             modified = false;
         }
     
-        string OptionsPanel.getDescription() {
+        string OptionsPanel.getDescription(ResourceManager resManager) {
-            return "General";
+            return resManager.GetString("general");
         }
 
         public void updateUI(ResourceManager resManager) {

src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs

@@ -25,8 +25,8 @@ namespace webImTray {
         void OptionsPanel.initialize() {
         }
 
-        string OptionsPanel.getDescription() {
+        string OptionsPanel.getDescription(ResourceManager resManager) {
-            return "Sounds";
+            return resManager.GetString("sound");
         }
 
         public void updateUI(ResourceManager resManager) {

src/webimtray/WebIMTray/webImTray.en-US.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="about" xml:space="preserve">
+    <value>About</value>
+  </data>
   <data name="application" xml:space="preserve">
     <value>Application</value>
   </data>
@@ -138,6 +141,9 @@
   <data name="connection" xml:space="preserve">
     <value>Connection</value>
   </data>
+  <data name="connectionMI" xml:space="preserve">
+    <value>Connection</value>
+  </data>
   <data name="copyright" xml:space="preserve">
     <value>Copyright (c) 2006-2008 Web Messenger Creators Community</value>
   </data>
@@ -147,6 +153,9 @@
   <data name="forceRefresh" xml:space="preserve">
     <value>Force page update every</value>
   </data>
+  <data name="general" xml:space="preserve">
+    <value>General</value>
+  </data>
   <data name="hideWhenStarted" xml:space="preserve">
     <value>Hide window after start</value>
   </data>
@@ -192,6 +201,9 @@
   <data name="showUserPreferences" xml:space="preserve">
     <value>Click here to change your preferences online</value>
   </data>
+  <data name="sound" xml:space="preserve">
+    <value>Sound</value>
+  </data>
   <data name="url" xml:space="preserve">
     <value>http://www.webim.ru</value>
   </data>

src/webimtray/WebIMTray/webImTray.ru-RU.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="about" xml:space="preserve">
+    <value>О программе</value>
+  </data>
   <data name="application" xml:space="preserve">
     <value>Приложение</value>
   </data>
@@ -138,6 +141,9 @@
   <data name="connection" xml:space="preserve">
     <value>Соединение</value>
   </data>
+  <data name="connectionMI" xml:space="preserve">
+    <value>Связь</value>
+  </data>
   <data name="copyright" xml:space="preserve">
     <value>(c), Команда разработчиков Веб Мессенджер, 2006-08</value>
   </data>
@@ -147,6 +153,9 @@
   <data name="forceRefresh" xml:space="preserve">
     <value>Обновлять каждые</value>
   </data>
+  <data name="general" xml:space="preserve">
+    <value>Общие</value>
+  </data>
   <data name="hideWhenStarted" xml:space="preserve">
     <value>Прятать окно после запуска</value>
   </data>
@@ -192,6 +201,9 @@
   <data name="showUserPreferences" xml:space="preserve">
     <value>Изменить ваши настройки online</value>
   </data>
+  <data name="sound" xml:space="preserve">
+    <value>Звук</value>
+  </data>
   <data name="url" xml:space="preserve">
     <value>http://www.webim.ru</value>
   </data>