diff --git a/src/webimtray/WebIMTray/App.Designer.cs b/src/webimtray/WebIMTray/App.Designer.cs index 571070be..82827d5c 100644 --- a/src/webimtray/WebIMTray/App.Designer.cs +++ b/src/webimtray/WebIMTray/App.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.832 +// Runtime Version:2.0.50727.1433 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/webimtray/WebIMTray/Main.Designer.cs b/src/webimtray/WebIMTray/Main.Designer.cs index 8bbf7ff1..c80dfe99 100644 --- a/src/webimtray/WebIMTray/Main.Designer.cs +++ b/src/webimtray/WebIMTray/Main.Designer.cs @@ -123,6 +123,12 @@ namespace webImTray { this.GotFocus += new System.EventHandler(this.gotFocus); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Client_FormClosing); this.Resize += new System.EventHandler(this.FormResize); + + this.optionsMenuItem.Text = "Options"; + this.refreshToolStripMenuItem.Text = "Refresh"; + this.optionsToolStripMenuItem.Text = "Options.."; + this.exitToolStripMenuItem.Text = "Exit"; + this.notifyMenu.ResumeLayout(false); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); diff --git a/src/webimtray/WebIMTray/Main.cs b/src/webimtray/WebIMTray/Main.cs index f77e55e4..4204e1c0 100644 --- a/src/webimtray/WebIMTray/Main.cs +++ b/src/webimtray/WebIMTray/Main.cs @@ -38,21 +38,7 @@ namespace webImTray { setupReloadTimer(); // Restore previously set locale - if (!Options.RussianLocale) { - Thread.CurrentThread.CurrentUICulture = Options.englishCulture; - } else { - Thread.CurrentThread.CurrentUICulture = Options.russianCulture; - } - // Update localized controls - updateLocalizedControls(); - } - - private void updateLocalizedControls() { - // Update localized controls - optionsMenuItem.Text = Options.resourceManager.GetString("optionsMenuItem"); - refreshToolStripMenuItem.Text = Options.resourceManager.GetString("refreshMenuItem"); - optionsToolStripMenuItem.Text = Options.resourceManager.GetString("trayOptions"); - exitToolStripMenuItem.Text = Options.resourceManager.GetString("trayExit"); + // TODO Thread.CurrentThread.CurrentUICulture = } void navigateThere() { @@ -105,7 +91,7 @@ namespace webImTray { void webBrowser1_DocumentTitleChanged(object sender, EventArgs e) { string s = webBrowser1.DocumentTitle; if (s == null || s.Length == 0) { - s = "Web Messenger [loading]"; + s = "Mibew Messenger [loading]"; this.notifyIcon.Icon = App.Notify_offl; } else { this.notifyIcon.Icon = App.Notify; @@ -115,8 +101,8 @@ namespace webImTray { private void Client_FormClosing(object sender, FormClosingEventArgs e) { if( !forceClosing && e.CloseReason == CloseReason.UserClosing - && MessageBox.Show(this, Options.resourceManager.GetString("exitConfirmation"), - Options.resourceManager.GetString("webMessenger"), + && MessageBox.Show(this, "Do you want to quit?", + "Mibew Messenger", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { e.Cancel = true; } @@ -136,9 +122,6 @@ namespace webImTray { if (Options.ShowInTaskBar != this.ShowInTaskbar) this.ShowInTaskbar = !this.ShowInTaskbar; - // Update localized controls - updateLocalizedControls(); - setupReloadTimer(); } @@ -203,11 +186,7 @@ namespace webImTray { this.ShowInTaskbar = !this.ShowInTaskbar; } - // Update localized controls - updateLocalizedControls(); - setupReloadTimer(); - } private void refreshToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/src/webimtray/WebIMTray/Options.cs b/src/webimtray/WebIMTray/Options.cs index e648d094..2e9c8349 100644 --- a/src/webimtray/WebIMTray/Options.cs +++ b/src/webimtray/WebIMTray/Options.cs @@ -9,7 +9,7 @@ using System.Globalization; namespace webImTray { class Options { - public const string DEFAULT_SERVER = "http://localhost/webim"; + public const string DEFAULT_SERVER = "http://openwebim.org/webim"; public const string PENDING_USERS_PAGE = "/operator/users.php"; public const string SETTINGS_PAGE = "/operator/operators.php"; private const string HTTP_PREFIX = "http://"; @@ -107,17 +107,5 @@ namespace webImTray { if (args.Length == 1 && args[0].Equals("/show")) forceShowWindow = true; } - - public static bool RussianLocale { - get { - return Application.UserAppDataRegistry.GetValue("isrussianlocale", "true").ToString().ToLower().Equals("true"); - } set { - Application.UserAppDataRegistry.SetValue("isrussianlocale", value.ToString()); - } - } - - public static ResourceManager resourceManager = new ResourceManager("webImTray.webImTray", System.Reflection.Assembly.GetExecutingAssembly()); - public static CultureInfo englishCulture = new CultureInfo("en-US"); - public static CultureInfo russianCulture = new CultureInfo("ru-RU"); } } diff --git a/src/webimtray/WebIMTray/options/About.Designer.cs b/src/webimtray/WebIMTray/options/About.Designer.cs index 54844ceb..56406551 100644 --- a/src/webimtray/WebIMTray/options/About.Designer.cs +++ b/src/webimtray/WebIMTray/options/About.Designer.cs @@ -23,105 +23,85 @@ namespace webImTray { /// the contents of this method with the code editor. /// private void InitializeComponent() { + System.Windows.Forms.Label label3; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About)); + System.Windows.Forms.Label label4; this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); label3 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // label3 // - label3.AutoSize = true; - label3.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - label3.Location = new System.Drawing.Point(13, 114); + label3.AccessibleDescription = null; + label3.AccessibleName = null; + resources.ApplyResources(label3, "label3"); label3.Name = "label3"; - label3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 7); - label3.Size = new System.Drawing.Size(335, 21); - label3.TabIndex = 3; // // label4 // - label4.AutoSize = true; - label4.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - label4.Location = new System.Drawing.Point(13, 135); + label4.AccessibleDescription = null; + label4.AccessibleName = null; + resources.ApplyResources(label4, "label4"); label4.Name = "label4"; - label4.Padding = new System.Windows.Forms.Padding(0, 0, 0, 7); - label4.Size = new System.Drawing.Size(138, 21); - label4.TabIndex = 4; // // label1 // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.label1.AccessibleDescription = null; + this.label1.AccessibleName = null; + resources.ApplyResources(this.label1, "label1"); this.label1.ForeColor = System.Drawing.Color.Maroon; - this.label1.Location = new System.Drawing.Point(13, 20); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(208, 25); - this.label1.TabIndex = 0; // // label2 // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label2.Location = new System.Drawing.Point(85, 111); + this.label2.AccessibleDescription = null; + this.label2.AccessibleName = null; + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(108, 18); - this.label2.TabIndex = 1; // // pictureBox1 // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(264, 0); + this.pictureBox1.AccessibleDescription = null; + this.pictureBox1.AccessibleName = null; + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.BackgroundImage = null; + this.pictureBox1.Font = null; + this.pictureBox1.ImageLocation = null; this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(110, 100); - this.pictureBox1.TabIndex = 2; this.pictureBox1.TabStop = false; // // linkLabel1 // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.linkLabel1.Location = new System.Drawing.Point(13, 156); + this.linkLabel1.AccessibleDescription = null; + this.linkLabel1.AccessibleName = null; + resources.ApplyResources(this.linkLabel1, "linkLabel1"); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 7); - this.linkLabel1.Size = new System.Drawing.Size(130, 21); - this.linkLabel1.TabIndex = 5; this.linkLabel1.TabStop = true; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.webim_ru_link); // - // pictureBox2 - // - this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image"))); - this.pictureBox2.Location = new System.Drawing.Point(17, 199); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(110, 76); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // // About // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AccessibleDescription = null; + this.AccessibleName = null; + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; + this.BackgroundImage = null; this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.Controls.Add(this.pictureBox2); this.Controls.Add(this.linkLabel1); this.Controls.Add(label4); this.Controls.Add(label3); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.Font = null; this.Name = "About"; - this.Padding = new System.Windows.Forms.Padding(10, 20, 0, 0); - this.Size = new System.Drawing.Size(374, 329); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -131,10 +111,7 @@ namespace webImTray { private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.PictureBox pictureBox2; } } diff --git a/src/webimtray/WebIMTray/options/About.cs b/src/webimtray/WebIMTray/options/About.cs index 4550975b..7c487416 100644 --- a/src/webimtray/WebIMTray/options/About.cs +++ b/src/webimtray/WebIMTray/options/About.cs @@ -21,28 +21,20 @@ namespace webImTray { public void apply() { } - public string getDescription(ResourceManager resManager) { - return resManager.GetString("about"); + public string getDescription() { + return "About"; } #endregion private void i_services_ru_link(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://i-services.ru/"); + System.Diagnostics.Process.Start("http://openwebim.org/"); } private void webim_ru_link(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://webim.ru/"); + System.Diagnostics.Process.Start("http://openwebim.org/"); } public event ModifiedEvent PanelModified; - - public void updateUI() { - label1.Text = Options.resourceManager.GetString("webimtray"); - label2.Text = Options.resourceManager.GetString("version"); - label3.Text = Options.resourceManager.GetString("copyright"); - label4.Text = Options.resourceManager.GetString("visitUs"); - linkLabel1.Text = Options.resourceManager.GetString("url"); - } } } diff --git a/src/webimtray/WebIMTray/options/About.resx b/src/webimtray/WebIMTray/options/About.resx index 209b1e54..a39dd23a 100644 --- a/src/webimtray/WebIMTray/options/About.resx +++ b/src/webimtray/WebIMTray/options/About.resx @@ -117,13 +117,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - False - + + 0, 21 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + + 0, 0, 0, 7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + $this + + + 0, 21 + + + + True + Qk3mgQAAAAAAADYAAAAoAAAAbgAAAGQAAAABABgAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAA//////// @@ -753,4 +776,202 @@ AZAEXRCV7vmfFZgD32CetUmZlKkO+rCf39CQANqg1gkDXSAD3vAN3iADXQAD0+mgtxgQADs= + + label2 + + + 3 + + + 10, 20, 0, 0 + + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Please, visit our site + + + 6, 13 + + + 4 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tahoma, 9pt + + + 5 + + + pictureBox2 + + + 0, 25 + + + linkLabel1 + + + True + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tahoma, 9pt + + + 0, 18 + + + True + + + Version 1.1.0 + + + 0, 0, 0, 7 + + + 1 + + + $this + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pictureBox1 + + + 0, 21 + + + Copyright (c) 2006-2009 Mibew Messenger Community + + + About + + + 17, 199 + + + 3 + + + label3 + + + 110, 100 + + + $this + + + label1 + + + label4 + + + 110, 76 + + + 85, 111 + + + 0 + + + 2 + + + 370, 325 + + + $this + + + Tahoma, 9pt + + + 5 + + + 4 + + + http://www.openwebim.org + + + 1 + + + 7 + + + Tahoma, 11.25pt, style=Bold + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 13, 156 + + + 13, 114 + + + 0 + + + 264, 0 + + + 13, 20 + + + 2 + + + Tahoma, 15.75pt + + + True + + + 0, 0, 0, 7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + Mibew Tray + + + 13, 135 + + + False + + + True + + + False + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/options/OptionPanel.cs b/src/webimtray/WebIMTray/options/OptionPanel.cs index 22dfbb6e..8ad4cdb5 100644 --- a/src/webimtray/WebIMTray/options/OptionPanel.cs +++ b/src/webimtray/WebIMTray/options/OptionPanel.cs @@ -10,8 +10,7 @@ namespace webImTray { interface OptionsPanel { void initialize(); void apply(); - string getDescription(ResourceManager resManager); - void updateUI(); + string getDescription(); event ModifiedEvent PanelModified; } diff --git a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs index 296e157e..becda70b 100644 --- a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs +++ b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs @@ -23,6 +23,7 @@ namespace webImTray { /// the contents of this method with the code editor. /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsConnectionPanel)); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label2 = new System.Windows.Forms.Label(); this.forceRefreshTime = new System.Windows.Forms.NumericUpDown(); @@ -40,6 +41,10 @@ namespace webImTray { // // groupBox1 // + this.groupBox1.AccessibleDescription = null; + this.groupBox1.AccessibleName = null; + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.BackgroundImage = null; this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.forceRefreshTime); this.groupBox1.Controls.Add(this.forceRefresh); @@ -47,31 +52,21 @@ namespace webImTray { this.groupBox1.Controls.Add(this.webimServer); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.autoDisconnect); - this.groupBox1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.groupBox1.Location = new System.Drawing.Point(4, 4); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(16, 15, 16, 15); - this.groupBox1.Size = new System.Drawing.Size(491, 250); - this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // // label2 // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label2.Location = new System.Drawing.Point(319, 154); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.AccessibleDescription = null; + this.label2.AccessibleName = null; + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 17); - this.label2.TabIndex = 9; // // forceRefreshTime // - this.forceRefreshTime.Enabled = false; - this.forceRefreshTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.forceRefreshTime.Location = new System.Drawing.Point(251, 151); - this.forceRefreshTime.Margin = new System.Windows.Forms.Padding(4); + this.forceRefreshTime.AccessibleDescription = null; + this.forceRefreshTime.AccessibleName = null; + resources.ApplyResources(this.forceRefreshTime, "forceRefreshTime"); this.forceRefreshTime.Maximum = new decimal(new int[] { 120, 0, @@ -83,8 +78,6 @@ namespace webImTray { 0, 0}); this.forceRefreshTime.Name = "forceRefreshTime"; - this.forceRefreshTime.Size = new System.Drawing.Size(59, 23); - this.forceRefreshTime.TabIndex = 8; this.forceRefreshTime.Value = new decimal(new int[] { 15, 0, @@ -94,93 +87,79 @@ namespace webImTray { // // forceRefresh // - this.forceRefresh.AutoSize = true; - this.forceRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.forceRefresh.Location = new System.Drawing.Point(23, 152); - this.forceRefresh.Margin = new System.Windows.Forms.Padding(4); + this.forceRefresh.AccessibleDescription = null; + this.forceRefresh.AccessibleName = null; + resources.ApplyResources(this.forceRefresh, "forceRefresh"); + this.forceRefresh.BackgroundImage = null; this.forceRefresh.Name = "forceRefresh"; - this.forceRefresh.Size = new System.Drawing.Size(187, 21); - this.forceRefresh.TabIndex = 7; this.forceRefresh.UseVisualStyleBackColor = true; this.forceRefresh.CheckedChanged += new System.EventHandler(this.forceRefresh_CheckedChanged); // // autoDesconnectOnSS // - this.autoDesconnectOnSS.AutoSize = true; - this.autoDesconnectOnSS.Enabled = false; - this.autoDesconnectOnSS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.autoDesconnectOnSS.Location = new System.Drawing.Point(23, 124); - this.autoDesconnectOnSS.Margin = new System.Windows.Forms.Padding(4); + this.autoDesconnectOnSS.AccessibleDescription = null; + this.autoDesconnectOnSS.AccessibleName = null; + resources.ApplyResources(this.autoDesconnectOnSS, "autoDesconnectOnSS"); + this.autoDesconnectOnSS.BackgroundImage = null; this.autoDesconnectOnSS.Name = "autoDesconnectOnSS"; - this.autoDesconnectOnSS.Size = new System.Drawing.Size(280, 21); - this.autoDesconnectOnSS.TabIndex = 6; this.autoDesconnectOnSS.UseVisualStyleBackColor = true; // // webimServer // - this.webimServer.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.webimServer.Location = new System.Drawing.Point(23, 56); - this.webimServer.Margin = new System.Windows.Forms.Padding(4); + this.webimServer.AccessibleDescription = null; + this.webimServer.AccessibleName = null; + resources.ApplyResources(this.webimServer, "webimServer"); + this.webimServer.BackgroundImage = null; this.webimServer.Name = "webimServer"; - this.webimServer.Size = new System.Drawing.Size(408, 23); - this.webimServer.TabIndex = 5; this.webimServer.TextChanged += new System.EventHandler(this.webimServer_TextChanged); // // label1 // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label1.Location = new System.Drawing.Point(20, 35); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.AccessibleDescription = null; + this.label1.AccessibleName = null; + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(201, 17); - this.label1.TabIndex = 4; // // autoDisconnect // - this.autoDisconnect.AutoSize = true; - this.autoDisconnect.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.autoDisconnect.Location = new System.Drawing.Point(23, 96); - this.autoDisconnect.Margin = new System.Windows.Forms.Padding(4); + this.autoDisconnect.AccessibleDescription = null; + this.autoDisconnect.AccessibleName = null; + resources.ApplyResources(this.autoDisconnect, "autoDisconnect"); + this.autoDisconnect.BackgroundImage = null; this.autoDisconnect.Name = "autoDisconnect"; - this.autoDisconnect.Size = new System.Drawing.Size(261, 21); - this.autoDisconnect.TabIndex = 3; this.autoDisconnect.UseVisualStyleBackColor = true; this.autoDisconnect.CheckedChanged += new System.EventHandler(this.autoDisconnect_CheckedChanged); // // groupBox2 // + this.groupBox2.AccessibleDescription = null; + this.groupBox2.AccessibleName = null; + resources.ApplyResources(this.groupBox2, "groupBox2"); + this.groupBox2.BackgroundImage = null; this.groupBox2.Controls.Add(this.showUserPreferences); - this.groupBox2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.groupBox2.Location = new System.Drawing.Point(4, 262); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(16, 15, 16, 15); - this.groupBox2.Size = new System.Drawing.Size(491, 107); - this.groupBox2.TabIndex = 2; this.groupBox2.TabStop = false; // // showUserPreferences // - this.showUserPreferences.AutoSize = true; - this.showUserPreferences.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.showUserPreferences.Location = new System.Drawing.Point(20, 33); - this.showUserPreferences.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.showUserPreferences.AccessibleDescription = null; + this.showUserPreferences.AccessibleName = null; + resources.ApplyResources(this.showUserPreferences, "showUserPreferences"); this.showUserPreferences.Name = "showUserPreferences"; - this.showUserPreferences.Size = new System.Drawing.Size(296, 18); - this.showUserPreferences.TabIndex = 0; this.showUserPreferences.TabStop = true; this.showUserPreferences.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.showUserPropertiesOnline); // // OptionsConnectionPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AccessibleDescription = null; + this.AccessibleName = null; + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackgroundImage = null; this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Margin = new System.Windows.Forms.Padding(4); + this.Font = null; this.Name = "OptionsConnectionPanel"; - this.Size = new System.Drawing.Size(499, 405); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.forceRefreshTime)).EndInit(); diff --git a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.cs index 554b1e8d..474cbfcb 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(ResourceManager resManager) { - return resManager.GetString("connection"); + string OptionsPanel.getDescription() { + return "Connection"; } public event ModifiedEvent PanelModified; @@ -68,16 +68,5 @@ namespace webImTray { modified = true; PanelModified.Invoke(); } - - public void updateUI() { - groupBox1.Text = Options.resourceManager.GetString("connection"); - label1.Text = Options.resourceManager.GetString("server"); - autoDisconnect.Text = Options.resourceManager.GetString("autoDisconnect"); - autoDesconnectOnSS.Text = Options.resourceManager.GetString("autoDesconnectOnSS"); - groupBox2.Text = Options.resourceManager.GetString("operatorPreferences"); - showUserPreferences.Text = Options.resourceManager.GetString("showUserPreferences"); - label2.Text = Options.resourceManager.GetString("minutes"); - forceRefresh.Text = Options.resourceManager.GetString("forceRefresh"); - } } } diff --git a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.resx b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.resx index ff31a6db..c9a7997f 100644 --- a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.resx +++ b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.resx @@ -117,4 +117,316 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Force page update every + + + + 17, 124 + + + Tahoma, 9.75pt, style=Bold + + + groupBox1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 45, 20 + + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 7 + + + groupBox1 + + + 3 + + + 145, 17 + + + Microsoft Sans Serif, 8.25pt + + + True + + + 0 + + + 17, 78 + + + Microsoft Sans Serif, 8.25pt + + + label2 + + + True + + + 15, 27 + + + $this + + + label1 + + + Operator preferences + + + 0 + + + 6, 13 + + + True + + + 5 + + + 125, 13 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 188, 123 + + + showUserPreferences + + + groupBox1 + + + webimServer + + + 43, 13 + + + Microsoft Sans Serif, 8.25pt + + + 0 + + + minutes + + + 231, 17 + + + 17, 46 + + + 6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 9 + + + True + + + Microsoft Sans Serif, 8.25pt + + + True + + + OptionsConnectionPanel + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3 + + + forceRefreshTime + + + 3, 213 + + + groupBox1 + + + groupBox1 + + + 0 + + + Become idle if the computer is locked + + + autoDisconnect + + + groupBox1 + + + 239, 125 + + + 8 + + + 202, 17 + + + 374, 329 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Microsoft Sans Serif, 8.25pt + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + Tahoma, 9.75pt, style=Bold + + + 1 + + + 6 + + + groupBox1 + + + False + + + Connection + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + groupBox2 + + + Click here to change your preferences online + + + 252, 14 + + + 1 + + + 5 + + + 4 + + + 17, 101 + + + 4 + + + Become idle if the screen saver is activated + + + forceRefresh + + + 15, 28 + + + False + + + Microsoft Sans Serif, 8.25pt + + + 3 + + + Microsoft Sans Serif, 8.25pt + + + True + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + autoDesconnectOnSS + + + + 12, 12, 12, 12 + + + 12, 12, 12, 12 + + + 307, 20 + + + Tahoma, 9pt + + + 2 + + + Mibew Messenger server + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 368, 203 + + + 368, 87 + + + 2 + + + True + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs b/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs index 00b459e3..b498bd6d 100644 --- a/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs +++ b/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs @@ -34,73 +34,56 @@ namespace webImTray { // // pageSelector // - this.pageSelector.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + resources.ApplyResources(this.pageSelector, "pageSelector"); this.pageSelector.FullRowSelect = true; this.pageSelector.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.pageSelector.HideSelection = false; - this.pageSelector.Location = new System.Drawing.Point(12, 14); this.pageSelector.MultiSelect = false; this.pageSelector.Name = "pageSelector"; this.pageSelector.ShowGroups = false; - this.pageSelector.Size = new System.Drawing.Size(175, 329); - this.pageSelector.TabIndex = 0; this.pageSelector.UseCompatibleStateImageBehavior = false; this.pageSelector.View = System.Windows.Forms.View.List; this.pageSelector.SelectedIndexChanged += new System.EventHandler(this.panelSelectionChanged); // // ok // - this.ok.Location = new System.Drawing.Point(341, 360); + resources.ApplyResources(this.ok, "ok"); this.ok.Name = "ok"; - this.ok.Size = new System.Drawing.Size(75, 23); - this.ok.TabIndex = 1; this.ok.UseVisualStyleBackColor = true; this.ok.Click += new System.EventHandler(this.ok_Click); // // cancel // this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(422, 360); + resources.ApplyResources(this.cancel, "cancel"); this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(75, 23); - this.cancel.TabIndex = 2; this.cancel.UseVisualStyleBackColor = true; // // apply // - this.apply.Enabled = false; - this.apply.Location = new System.Drawing.Point(503, 360); + resources.ApplyResources(this.apply, "apply"); this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(75, 23); - this.apply.TabIndex = 3; this.apply.UseVisualStyleBackColor = true; this.apply.Click += new System.EventHandler(this.apply_Click); // // container // - this.container.Location = new System.Drawing.Point(204, 14); + resources.ApplyResources(this.container, "container"); this.container.Name = "container"; - this.container.Size = new System.Drawing.Size(374, 329); - this.container.TabIndex = 4; // // linkLabel1 // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.linkLabel1.Location = new System.Drawing.Point(12, 360); + resources.ApplyResources(this.linkLabel1, "linkLabel1"); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(96, 16); - this.linkLabel1.TabIndex = 5; this.linkLabel1.TabStop = true; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.openWebIMSite); // // OptionsDialog // this.AcceptButton = this.ok; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(590, 395); this.Controls.Add(this.linkLabel1); this.Controls.Add(this.container); this.Controls.Add(this.apply); @@ -108,7 +91,6 @@ namespace webImTray { this.Controls.Add(this.ok); this.Controls.Add(this.pageSelector); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "OptionsDialog"; diff --git a/src/webimtray/WebIMTray/options/OptionsDialog.cs b/src/webimtray/WebIMTray/options/OptionsDialog.cs index 4c554366..3745560d 100644 --- a/src/webimtray/WebIMTray/options/OptionsDialog.cs +++ b/src/webimtray/WebIMTray/options/OptionsDialog.cs @@ -43,7 +43,7 @@ namespace webImTray { bool inited = false; pageSelector.Items.Clear(); foreach (OptionsPanel p in panels) { - ListViewItem item = new ListViewItem(p.getDescription(Options.resourceManager)); + ListViewItem item = new ListViewItem(p.getDescription()); if (!inited) { item.Selected = true; changePanel(p); @@ -67,7 +67,7 @@ namespace webImTray { OptionsPanel getPanel(string s) { foreach (OptionsPanel p in panels) { - if (s.Equals(p.getDescription(Options.resourceManager))) + if (s.Equals(p.getDescription())) return p; } @@ -85,7 +85,7 @@ namespace webImTray { } private void openWebIMSite(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://webim.ru/"); + System.Diagnostics.Process.Start("http://openwebim.org/"); } private void applyChanges() { @@ -105,13 +105,6 @@ namespace webImTray { } public static void updateUI() { - for (int i = 0; i < 4; i++) { - ((OptionsPanel)panels[i]).updateUI(); - } - currentInstance.ok.Text = Options.resourceManager.GetString("ok"); - currentInstance.cancel.Text = Options.resourceManager.GetString("cancel"); - currentInstance.apply.Text = Options.resourceManager.GetString("apply"); - currentInstance.Text = Options.resourceManager.GetString("optionsTitle"); currentInstance.updatePageSelector(); } } diff --git a/src/webimtray/WebIMTray/options/OptionsDialog.resx b/src/webimtray/WebIMTray/options/OptionsDialog.resx index 2971ce7c..d5d121fa 100644 --- a/src/webimtray/WebIMTray/options/OptionsDialog.resx +++ b/src/webimtray/WebIMTray/options/OptionsDialog.resx @@ -118,6 +118,163 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Microsoft Sans Serif, 9.75pt + + + 12, 14 + + + 175, 329 + + + + 0 + + + pageSelector + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 341, 360 + + + 75, 23 + + + 1 + + + OK + + + ok + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 422, 360 + + + 75, 23 + + + 2 + + + Cancel + + + cancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + False + + + 503, 360 + + + 75, 23 + + + 3 + + + Apply + + + apply + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 204, 14 + + + 374, 329 + + + 4 + + + container + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Tahoma, 9.75pt + + + 12, 360 + + + 0, 16 + + + 5 + + + linkLabel1 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 590, 395 + AAABAAEAEhIAAAAACADYBQAAFgAAACgAAAASAAAAJAAAAAEACAAAAAAAaAEAAAAAAAAAAAAAAAEAAAAB @@ -148,4 +305,13 @@ AAAAAAAAAAAAAP//wAD//8AA + + Mibew Tray Options + + + OptionsDialog + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs index 65023f51..036f7ff0 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs @@ -25,6 +25,7 @@ namespace webImTray { /// the contents of this method with the code editor. /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsGeneralPanel)); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.hideWhenStarted = new System.Windows.Forms.CheckBox(); this.autoStart = new System.Windows.Forms.CheckBox(); @@ -47,44 +48,28 @@ namespace webImTray { this.groupBox1.Controls.Add(this.hideWhenStarted); this.groupBox1.Controls.Add(this.autoStart); this.groupBox1.Controls.Add(this.showInTaskBar); - this.groupBox1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.groupBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(12); - this.groupBox1.Size = new System.Drawing.Size(368, 106); - this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // // hideWhenStarted // - this.hideWhenStarted.AutoSize = true; - this.hideWhenStarted.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.hideWhenStarted.Location = new System.Drawing.Point(15, 76); + resources.ApplyResources(this.hideWhenStarted, "hideWhenStarted"); this.hideWhenStarted.Name = "hideWhenStarted"; - this.hideWhenStarted.Size = new System.Drawing.Size(134, 17); - this.hideWhenStarted.TabIndex = 3; this.hideWhenStarted.UseVisualStyleBackColor = true; this.hideWhenStarted.CheckedChanged += new System.EventHandler(this.checkboxChanged); // // autoStart // - this.autoStart.AutoSize = true; - this.autoStart.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.autoStart.Location = new System.Drawing.Point(15, 53); + resources.ApplyResources(this.autoStart, "autoStart"); this.autoStart.Name = "autoStart"; - this.autoStart.Size = new System.Drawing.Size(225, 17); - this.autoStart.TabIndex = 1; this.autoStart.UseVisualStyleBackColor = true; this.autoStart.CheckedChanged += new System.EventHandler(this.checkboxChanged); // // showInTaskBar // - this.showInTaskBar.AutoSize = true; - this.showInTaskBar.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.showInTaskBar.Location = new System.Drawing.Point(15, 30); + resources.ApplyResources(this.showInTaskBar, "showInTaskBar"); this.showInTaskBar.Name = "showInTaskBar"; - this.showInTaskBar.Size = new System.Drawing.Size(103, 17); - this.showInTaskBar.TabIndex = 0; this.showInTaskBar.UseVisualStyleBackColor = true; this.showInTaskBar.CheckedChanged += new System.EventHandler(this.checkboxChanged); // @@ -94,53 +79,31 @@ namespace webImTray { this.groupBox2.Controls.Add(this.textBox1); this.groupBox2.Controls.Add(this.showOptions); this.groupBox2.Controls.Add(this.showHide); - this.groupBox2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.groupBox2.Location = new System.Drawing.Point(3, 115); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(12); - this.groupBox2.Size = new System.Drawing.Size(368, 89); - this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; // // textBox2 // - this.textBox2.Enabled = false; - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.textBox2.Location = new System.Drawing.Point(216, 52); + resources.ApplyResources(this.textBox2, "textBox2"); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(100, 20); - this.textBox2.TabIndex = 3; // // textBox1 // - this.textBox1.Enabled = false; - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.textBox1.Location = new System.Drawing.Point(216, 29); + resources.ApplyResources(this.textBox1, "textBox1"); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(100, 20); - this.textBox1.TabIndex = 2; // // showOptions // - this.showOptions.AutoSize = true; - this.showOptions.Enabled = false; - this.showOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.showOptions.Location = new System.Drawing.Point(15, 54); + resources.ApplyResources(this.showOptions, "showOptions"); this.showOptions.Name = "showOptions"; - this.showOptions.Size = new System.Drawing.Size(90, 17); - this.showOptions.TabIndex = 1; this.showOptions.UseVisualStyleBackColor = true; this.showOptions.CheckedChanged += new System.EventHandler(this.checkboxChanged); // // showHide // - this.showHide.AutoSize = true; - this.showHide.Enabled = false; - this.showHide.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.showHide.Location = new System.Drawing.Point(15, 31); + resources.ApplyResources(this.showHide, "showHide"); this.showHide.Name = "showHide"; - this.showHide.Size = new System.Drawing.Size(147, 17); - this.showHide.TabIndex = 0; this.showHide.UseVisualStyleBackColor = true; this.showHide.CheckedChanged += new System.EventHandler(this.checkboxChanged); // @@ -148,46 +111,34 @@ namespace webImTray { // this.languageBox.Controls.Add(this.radioRussian); this.languageBox.Controls.Add(this.radioEnglish); - this.languageBox.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold); - this.languageBox.Location = new System.Drawing.Point(3, 210); + resources.ApplyResources(this.languageBox, "languageBox"); this.languageBox.Name = "languageBox"; - this.languageBox.Size = new System.Drawing.Size(371, 53); - this.languageBox.TabIndex = 2; this.languageBox.TabStop = false; // // radioRussian // - this.radioRussian.AutoSize = true; + resources.ApplyResources(this.radioRussian, "radioRussian"); this.radioRussian.Checked = true; - this.radioRussian.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.radioRussian.Location = new System.Drawing.Point(101, 30); this.radioRussian.Name = "radioRussian"; - this.radioRussian.Size = new System.Drawing.Size(63, 17); - this.radioRussian.TabIndex = 1; this.radioRussian.TabStop = true; this.radioRussian.UseVisualStyleBackColor = true; this.radioRussian.CheckedChanged += new System.EventHandler(this.radioRussian_CheckedChanged); // // radioEnglish // - this.radioEnglish.AutoSize = true; - this.radioEnglish.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.radioEnglish.Location = new System.Drawing.Point(15, 30); + resources.ApplyResources(this.radioEnglish, "radioEnglish"); this.radioEnglish.Name = "radioEnglish"; - this.radioEnglish.Size = new System.Drawing.Size(59, 17); - this.radioEnglish.TabIndex = 0; this.radioEnglish.UseVisualStyleBackColor = true; this.radioEnglish.CheckedChanged += new System.EventHandler(this.radioEnglish_CheckedChanged); // // OptionsGeneralPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.languageBox); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Name = "OptionsGeneralPanel"; - this.Size = new System.Drawing.Size(374, 329); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs index 903677e3..97aff6ac 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs @@ -30,14 +30,11 @@ namespace webImTray { Options.HideAfterStart = hideWhenStarted.Checked; // Save locale - Options.RussianLocale = radioRussian.Checked; + // Options.AppLocale = ... // Apply locale - if (radioEnglish.Checked) { - Thread.CurrentThread.CurrentUICulture = Options.englishCulture; - } else if (radioRussian.Checked) { - Thread.CurrentThread.CurrentUICulture = Options.russianCulture; - } + // Thread.CurrentThread.CurrentUICulture = Options.englishCulture; + // Update UI according to the current locale OptionsDialog.updateUI(); modified = false; @@ -50,11 +47,7 @@ namespace webImTray { hideWhenStarted.Checked = Options.HideAfterStart; // Restore previously set locale - if (!Options.RussianLocale) { - radioEnglish.Checked = true; - } else { - radioRussian.Checked = true; - } + // TODO // Update UI according to the current locale OptionsDialog.updateUI(); @@ -62,21 +55,8 @@ namespace webImTray { modified = false; } - string OptionsPanel.getDescription(ResourceManager resManager) { - return resManager.GetString("general"); - } - - public void updateUI() { - groupBox1.Text = Options.resourceManager.GetString("application"); - showInTaskBar.Text = Options.resourceManager.GetString("showInTaskBar"); - autoStart.Text = Options.resourceManager.GetString("autoStart"); - hideWhenStarted.Text = Options.resourceManager.GetString("hideWhenStarted"); - groupBox2.Text = Options.resourceManager.GetString("hotKeys"); - showOptions.Text = Options.resourceManager.GetString("showOptions"); - showHide.Text = Options.resourceManager.GetString("showHide"); - languageBox.Text = Options.resourceManager.GetString("language"); - radioRussian.Text = Options.resourceManager.GetString("russian"); - radioEnglish.Text = Options.resourceManager.GetString("english"); + string OptionsPanel.getDescription() { + return "General"; } private void radioEnglish_CheckedChanged(object sender, EventArgs e) { diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx index ff31a6db..37a8ad75 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx @@ -117,4 +117,379 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + Microsoft Sans Serif, 8.25pt + + + 15, 76 + + + 134, 17 + + + 3 + + + Hide window after start + + + hideWhenStarted + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 15, 53 + + + 225, 17 + + + 1 + + + Start automatically when starting Windows + + + autoStart + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 15, 30 + + + 102, 17 + + + 0 + + + Show in taskbar + + + showInTaskBar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + Tahoma, 9.75pt, style=Bold + + + 3, 3 + + + + 12, 12, 12, 12 + + + 368, 106 + + + 0 + + + Application + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + False + + + Microsoft Sans Serif, 8.25pt + + + 216, 52 + + + 100, 20 + + + 3 + + + textBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + False + + + Microsoft Sans Serif, 8.25pt + + + 216, 29 + + + 100, 20 + + + 2 + + + textBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + True + + + False + + + Microsoft Sans Serif, 8.25pt + + + 15, 54 + + + 90, 17 + + + 1 + + + Show options + + + showOptions + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + True + + + False + + + Microsoft Sans Serif, 8.25pt + + + 15, 31 + + + 144, 17 + + + 0 + + + Show/Hide main window + + + showHide + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + Tahoma, 9.75pt, style=Bold + + + 3, 115 + + + 12, 12, 12, 12 + + + 368, 89 + + + 1 + + + Hotkeys + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 101, 30 + + + 63, 17 + + + 1 + + + Russian + + + radioRussian + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + languageBox + + + 0 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 15, 30 + + + 59, 17 + + + 0 + + + English + + + radioEnglish + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + languageBox + + + 1 + + + Tahoma, 9.75pt, style=Bold + + + 3, 210 + + + 371, 53 + + + 2 + + + Language + + + languageBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 374, 329 + + + OptionsGeneralPanel + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs index 71388f43..a1578373 100644 --- a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs +++ b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs @@ -23,6 +23,7 @@ namespace webImTray { /// the contents of this method with the code editor. /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsSoundsPanel)); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.playSoundOnVisitor = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); @@ -31,32 +32,22 @@ namespace webImTray { // groupBox1 // this.groupBox1.Controls.Add(this.playSoundOnVisitor); - this.groupBox1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.groupBox1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(12); - this.groupBox1.Size = new System.Drawing.Size(368, 156); - this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; // // playSoundOnVisitor // - this.playSoundOnVisitor.AutoSize = true; - this.playSoundOnVisitor.Enabled = false; - this.playSoundOnVisitor.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.playSoundOnVisitor.Location = new System.Drawing.Point(15, 28); + resources.ApplyResources(this.playSoundOnVisitor, "playSoundOnVisitor"); this.playSoundOnVisitor.Name = "playSoundOnVisitor"; - this.playSoundOnVisitor.Size = new System.Drawing.Size(171, 17); - this.playSoundOnVisitor.TabIndex = 0; this.playSoundOnVisitor.UseVisualStyleBackColor = true; // // OptionsSoundsPanel // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.groupBox1); this.Name = "OptionsSoundsPanel"; - this.Size = new System.Drawing.Size(374, 329); this.Load += new System.EventHandler(this.OptionsSoundsPanel_Load); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); diff --git a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs index 96269440..14f82991 100644 --- a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs +++ b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.cs @@ -25,13 +25,8 @@ namespace webImTray { void OptionsPanel.initialize() { } - string OptionsPanel.getDescription(ResourceManager resManager) { - return resManager.GetString("sound"); - } - - public void updateUI() { - groupBox1.Text = Options.resourceManager.GetString("notifications"); - playSoundOnVisitor.Text = Options.resourceManager.GetString("playSoundOnVisitor"); + string OptionsPanel.getDescription() { + return "Sound"; } } } diff --git a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.resx b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.resx index ff31a6db..77e9910b 100644 --- a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.resx +++ b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.resx @@ -117,4 +117,85 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + False + + + + Microsoft Sans Serif, 8.25pt + + + 15, 28 + + + 171, 17 + + + 0 + + + Play sound when visitor comes + + + playSoundOnVisitor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Tahoma, 9.75pt, style=Bold + + + 3, 3 + + + + 12, 12, 12, 12 + + + 368, 156 + + + 2 + + + Notifications + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 374, 329 + + + OptionsSoundsPanel + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/webImTray.csproj b/src/webimtray/WebIMTray/webImTray.csproj index e44c1f1b..f5fb6c28 100644 --- a/src/webimtray/WebIMTray/webImTray.csproj +++ b/src/webimtray/WebIMTray/webImTray.csproj @@ -1,7 +1,7 @@ - + Local - 8.0.50727 + 9.0.21022 2.0 {21C7CA72-7F77-416C-9FD7-2DF748443E46} Debug @@ -26,6 +26,7 @@ + 2.0 bin\Debug\ @@ -150,16 +151,6 @@ Resources.resx - - True - True - webImTray.en-US.resx - - - True - True - webImTray.ru-RU.resx - Designer ResXFileCodeGenerator @@ -194,16 +185,6 @@ ResXFileCodeGenerator Resources.Designer.cs - - Designer - ResXFileCodeGenerator - webImTray.en-US.Designer.cs - - - Designer - ResXFileCodeGenerator - webImTray.ru-RU.Designer.cs - diff --git a/src/webimtray/WebIMTray/webImTray.en-US.resx b/src/webimtray/WebIMTray/webImTray.en-US.resx deleted file mode 100644 index 981a6650..00000000 --- a/src/webimtray/WebIMTray/webImTray.en-US.resx +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - About - - - Application - - - Apply - - - Become idle if the screen saver is activated - - - Become idle if the computer is locked - - - Start automatically when starting Windows - - - Cancel - - - Connection - - - Connection - - - Copyright (c) 2006-2008 Web Messenger Creators Community - - - English - - - Do you want to quit WebIM for Tray? - - - Force page update every - - - General - - - Hide window after start - - - Hide window - - - Hotkeys - - - Language - - - minutes - - - Notifications - - - OK - - - Operator preferences - - - Options - - - Web IM Tray Options - - - Play sound when visitor comes - - - Refresh - - - Russian - - - Web Instant Messenger server - - - Show/Hide main window - - - Show in taskbar - - - Show options - - - Click here to change your preferences online - - - Sound - - - Exit - - - Optoins.. - - - http://www.webim.ru - - - version 1.0.4 - - - Please, visit our site - - - Web Messenger Tray - - - Web Messenger - - \ No newline at end of file diff --git a/src/webimtray/WebIMTray/webImTray.ru-RU.resx b/src/webimtray/WebIMTray/webImTray.ru-RU.resx deleted file mode 100644 index fc2d2aae..00000000 --- a/src/webimtray/WebIMTray/webImTray.ru-RU.resx +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - О программе - - - Приложение - - - Применить - - - Автоматически отсоединяться, если запущен хранитель экрана - - - Автоматически отсоединяться, если компьютер заблокирован - - - Запускать автоматически при загрузке системы - - - Отменить - - - Соединение - - - Связь - - - (c), Команда разработчиков Веб Мессенджер, 2006-08 - - - Английский - - - Вы действительно хотите выйти из приложения? - - - Обновлять каждые - - - Общие - - - Прятать окно после запуска - - - Скрыть окно - - - Быстрый вызов - - - Выбор языка - - - минут - - - Звуковые уведомления - - - Ok - - - Настройки оператора - - - Настройки - - - Настройки Веб Мессенджер "Трей" - - - Звуковое уведомление о появлении посетителя - - - Обновить - - - Русский - - - Сервер Веб Мессенджера - - - Показать/скрыть главное окно - - - Показывать на панели задач - - - Показать настройки - - - Изменить ваши настройки online - - - Звук - - - Выйти - - - Настройки.. - - - http://www.webim.ru - - - Версия 1.0.4 - - - Пожалуйста, посетите на наш сайт - - - Веб Мессенджер "Трей" - - - Веб Мессенджер - - \ No newline at end of file diff --git a/src/webimtray/WebIMTray/webImTray.sln b/src/webimtray/WebIMTray/webImTray.sln index f7c7148a..6465e04e 100644 --- a/src/webimtray/WebIMTray/webImTray.sln +++ b/src/webimtray/WebIMTray/webImTray.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "webImTray", "webImTray.csproj", "{21C7CA72-7F77-416C-9FD7-2DF748443E46}" EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TrayInstaller", "..\TrayInstaller\TrayInstaller.vdproj", "{3B38021D-FBAB-4038-8220-F8C569A3C658}"