diff --git a/src/webimtray/WebIMTray/App.Designer.cs b/src/webimtray/WebIMTray/App.Designer.cs index 82827d5c..0c341a3a 100644 --- a/src/webimtray/WebIMTray/App.Designer.cs +++ b/src/webimtray/WebIMTray/App.Designer.cs @@ -60,6 +60,20 @@ namespace webImTray { } } + internal static System.Drawing.Bitmap _01_navigate { + get { + object obj = ResourceManager.GetObject("_01_navigate", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap _02_properties { + get { + object obj = ResourceManager.GetObject("_02_properties", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Icon Notify { get { object obj = ResourceManager.GetObject("Notify", resourceCulture); diff --git a/src/webimtray/WebIMTray/App.resx b/src/webimtray/WebIMTray/App.resx index 56698b5e..3b259b8c 100644 --- a/src/webimtray/WebIMTray/App.resx +++ b/src/webimtray/WebIMTray/App.resx @@ -124,4 +124,10 @@ icons\Notify_offl.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + toolbarImages\01 navigate.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + toolbarImages\02 properties.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/Main.Designer.cs b/src/webimtray/WebIMTray/Main.Designer.cs index c80dfe99..40d682bd 100644 --- a/src/webimtray/WebIMTray/Main.Designer.cs +++ b/src/webimtray/WebIMTray/Main.Designer.cs @@ -30,6 +30,7 @@ namespace webImTray { this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notifyMenu.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -37,8 +38,7 @@ namespace webImTray { // notifyIcon // this.notifyIcon.ContextMenuStrip = this.notifyMenu; - this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); - this.notifyIcon.Visible = true; + resources.ApplyResources(this.notifyIcon, "notifyIcon"); this.notifyIcon.MouseDown += new System.Windows.Forms.MouseEventHandler(this.notifyIconClick); // // notifyMenu @@ -48,35 +48,30 @@ namespace webImTray { this.toolStripMenuItem1, this.exitToolStripMenuItem}); this.notifyMenu.Name = "notifyMenu"; - this.notifyMenu.Size = new System.Drawing.Size(79, 54); + resources.ApplyResources(this.notifyMenu, "notifyMenu"); // // optionsToolStripMenuItem // - this.optionsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("optionsToolStripMenuItem.Image"))); - this.optionsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; + resources.ApplyResources(this.optionsToolStripMenuItem, "optionsToolStripMenuItem"); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(78, 22); this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsMenu_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(75, 6); + resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1"); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(78, 22); + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); this.exitToolStripMenuItem.Click += new System.EventHandler(this.menuExitClick); // // webBrowser1 // - this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill; - this.webBrowser1.Location = new System.Drawing.Point(0, 24); + resources.ApplyResources(this.webBrowser1, "webBrowser1"); this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser1.Name = "webBrowser1"; - this.webBrowser1.Size = new System.Drawing.Size(864, 461); - this.webBrowser1.TabIndex = 2; this.webBrowser1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.webBrowser1_PreviewKeyDown); // // reloadPageTimer @@ -88,34 +83,36 @@ namespace webImTray { // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.refreshToolStripMenuItem, - this.optionsMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.optionsMenuItem, + this.hideToolStripMenuItem}); + resources.ApplyResources(this.menuStrip1, "menuStrip1"); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(864, 24); - this.menuStrip1.TabIndex = 3; - this.menuStrip1.Text = "menuStrip1"; // // refreshToolStripMenuItem // + this.refreshToolStripMenuItem.Image = global::webImTray.App._01_navigate; + resources.ApplyResources(this.refreshToolStripMenuItem, "refreshToolStripMenuItem"); this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(57, 20); - this.refreshToolStripMenuItem.Text = "Refresh"; this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); // // optionsMenuItem // + this.optionsMenuItem.Image = global::webImTray.App._02_properties; + resources.ApplyResources(this.optionsMenuItem, "optionsMenuItem"); this.optionsMenuItem.Name = "optionsMenuItem"; - this.optionsMenuItem.Size = new System.Drawing.Size(56, 20); - this.optionsMenuItem.Text = "Options"; this.optionsMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem1_Click); // + // hideToolStripMenuItem + // + this.hideToolStripMenuItem.Name = "hideToolStripMenuItem"; + resources.ApplyResources(this.hideToolStripMenuItem, "hideToolStripMenuItem"); + this.hideToolStripMenuItem.Click += new System.EventHandler(this.hideApp); + // // MainWindow // - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(864, 485); + resources.ApplyResources(this, "$this"); this.Controls.Add(this.webBrowser1); this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; this.Name = "MainWindow"; this.ShowInTaskbar = false; @@ -123,12 +120,6 @@ 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(); @@ -147,6 +138,7 @@ namespace webImTray { private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem optionsMenuItem; + private System.Windows.Forms.ToolStripMenuItem hideToolStripMenuItem; } } diff --git a/src/webimtray/WebIMTray/Main.cs b/src/webimtray/WebIMTray/Main.cs index 4204e1c0..378a62cc 100644 --- a/src/webimtray/WebIMTray/Main.cs +++ b/src/webimtray/WebIMTray/Main.cs @@ -202,5 +202,10 @@ namespace webImTray { hideWindow(); } } + + private void hideApp(object sender, EventArgs e) + { + hideWindow(); + } } } diff --git a/src/webimtray/WebIMTray/Main.resx b/src/webimtray/WebIMTray/Main.resx index 689888ba..50b49f9c 100644 --- a/src/webimtray/WebIMTray/Main.resx +++ b/src/webimtray/WebIMTray/Main.resx @@ -118,20 +118,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 135, 12 + 134, 99 - 259, 20 + 245, 102 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAIVJREFUOE/dk0EO - gCAMBPlgv+l/DBcTH4O2WrLCFi56kaQJgXbYbUNKXy4RKSz2bT3PF4vwfS3MOdO4oAOAF48hN4BJ1Jdn - kKpAE321RRHkYcEBmKxABnO12rhOgV9WOQ3Eodh1mwJawGK0hftubDNAqygEoAU2GWbBYD9REH0adv76 - 5z0AIQLwRor4ZGsAAAAASUVORK5CYII= - + + 131, 54 + + + notifyMenu + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -161,15 +161,134 @@ AADghwAA4IcAAOCHAADxjwAA//8AAP//AAA= + + + True + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAIVJREFUOE/dk0EO + gCAMBPlgv+l/DBcTH4O2WrLCFi56kaQJgXbYbUNKXy4RKSz2bT3PF4vwfS3MOdO4oAOAF48hN4BJ1Jdn + kKpAE321RRHkYcEBmKxABnO12rhOgV9WOQ3Eodh1mwJawGK0hftubDNAqygEoAU2GWbBYD9REH0adv76 + 5z0AIQLwRor4ZGsAAAAASUVORK5CYII= + + + + Silver + + + 130, 22 + + + Options.. + + + 127, 6 + + + 130, 22 + + + Exit + + + + Fill + + + 0, 24 + + + 864, 461 + + + 2 + + + webBrowser1 + + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + - 544, 11 + 384, 102 - 17, 48 + 0, 0 + + + Silver + + + 73, 20 + + + Refresh + + + Black + + + 72, 20 + + + Options + + + Esc + + + 40, 20 + + + Hide + + + Hides application into tray + + + 0, 0 + + + 864, 24 + + + 3 + + + menuStrip1 + + + menuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True 173 + + 5, 13 + + + 864, 485 + AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -189,4 +308,58 @@ AACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA//8AAP//AAD//wAA + + notifyIcon + + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + optionsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripMenuItem1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + reloadPageTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + refreshToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + optionsMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + hideToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainWindow + + + webImTray.LockNotificationForm, webImTray, Version=1.0.4.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/src/webimtray/WebIMTray/Properties/Resources.resx b/src/webimtray/WebIMTray/Properties/Resources.resx index 7b56db39..5ea0895e 100644 --- a/src/webimtray/WebIMTray/Properties/Resources.resx +++ b/src/webimtray/WebIMTray/Properties/Resources.resx @@ -1,77 +1,96 @@  + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + text/microsoft-resx + 2.0 + System.Resources.ResXResourceReader, System.Windows.Forms, ... + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + this is my long stringthis is a comment + Blue + + [base64 mime encoded serialized .NET Framework object] + + + [base64 mime encoded string representing a byte array form of the .NET Framework object] + This is a comment + + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + - + + @@ -90,12 +109,12 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/src/webimtray/WebIMTray/icons/logo.bmp b/src/webimtray/WebIMTray/icons/logo.bmp deleted file mode 100644 index 252dfbc8..00000000 Binary files a/src/webimtray/WebIMTray/icons/logo.bmp and /dev/null differ diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs index 036f7ff0..bed56daf 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs @@ -36,8 +36,7 @@ namespace webImTray { this.showOptions = new System.Windows.Forms.CheckBox(); this.showHide = new System.Windows.Forms.CheckBox(); this.languageBox = new System.Windows.Forms.GroupBox(); - this.radioRussian = new System.Windows.Forms.RadioButton(); - this.radioEnglish = new System.Windows.Forms.RadioButton(); + this.languageSelector = new System.Windows.Forms.ComboBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.languageBox.SuspendLayout(); @@ -109,27 +108,17 @@ namespace webImTray { // // languageBox // - this.languageBox.Controls.Add(this.radioRussian); - this.languageBox.Controls.Add(this.radioEnglish); + this.languageBox.Controls.Add(this.languageSelector); resources.ApplyResources(this.languageBox, "languageBox"); this.languageBox.Name = "languageBox"; this.languageBox.TabStop = false; // - // radioRussian + // languageSelector // - resources.ApplyResources(this.radioRussian, "radioRussian"); - this.radioRussian.Checked = true; - this.radioRussian.Name = "radioRussian"; - this.radioRussian.TabStop = true; - this.radioRussian.UseVisualStyleBackColor = true; - this.radioRussian.CheckedChanged += new System.EventHandler(this.radioRussian_CheckedChanged); - // - // radioEnglish - // - resources.ApplyResources(this.radioEnglish, "radioEnglish"); - this.radioEnglish.Name = "radioEnglish"; - this.radioEnglish.UseVisualStyleBackColor = true; - this.radioEnglish.CheckedChanged += new System.EventHandler(this.radioEnglish_CheckedChanged); + this.languageSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.languageSelector, "languageSelector"); + this.languageSelector.FormattingEnabled = true; + this.languageSelector.Name = "languageSelector"; // // OptionsGeneralPanel // @@ -144,7 +133,6 @@ namespace webImTray { this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.languageBox.ResumeLayout(false); - this.languageBox.PerformLayout(); this.ResumeLayout(false); } @@ -161,7 +149,6 @@ namespace webImTray { private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.GroupBox languageBox; - private System.Windows.Forms.RadioButton radioRussian; - private System.Windows.Forms.RadioButton radioEnglish; + private System.Windows.Forms.ComboBox languageSelector; } } diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs index 97aff6ac..374fec6a 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.cs @@ -47,7 +47,8 @@ namespace webImTray { hideWhenStarted.Checked = Options.HideAfterStart; // Restore previously set locale - // TODO + languageSelector.Items.Add("English"); + languageSelector.SelectedIndex = 0; // Update UI according to the current locale OptionsDialog.updateUI(); diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx index 37a8ad75..ef5aa458 100644 --- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx +++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx @@ -117,11 +117,78 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + hideWhenStarted + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + autoStart + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 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 + True - Microsoft Sans Serif, 8.25pt @@ -209,36 +276,83 @@ 2 - - Tahoma, 9.75pt, style=Bold + + textBox2 - - 3, 3 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 12, 12, 12 + + groupBox2 - - 368, 106 - - + 0 - - Application + + textBox1 - - groupBox1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox2 + + + 1 + + + showOptions + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + 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 - - 2 + + 1 False @@ -360,95 +474,29 @@ 3 - - Tahoma, 9.75pt, style=Bold + + Tahoma, 9.75pt - - 3, 115 + + 15, 32 - - 12, 12, 12, 12 + + 209, 24 - - 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 + + languageSelector - - Microsoft Sans Serif, 8.25pt + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 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 + + 0 Tahoma, 9.75pt, style=Bold @@ -457,7 +505,7 @@ 3, 210 - 371, 53 + 371, 72 2 diff --git a/src/webimtray/WebIMTray/toolbarImages/02 properties.bmp b/src/webimtray/WebIMTray/toolbarImages/02 properties.bmp new file mode 100644 index 00000000..ef443f64 Binary files /dev/null and b/src/webimtray/WebIMTray/toolbarImages/02 properties.bmp differ diff --git a/src/webimtray/WebIMTray/toolbarImages/02 talk.bmp b/src/webimtray/WebIMTray/toolbarImages/02 talk.bmp deleted file mode 100644 index a689d320..00000000 Binary files a/src/webimtray/WebIMTray/toolbarImages/02 talk.bmp and /dev/null differ diff --git a/src/webimtray/WebIMTray/toolbarImages/03 properties.bmp b/src/webimtray/WebIMTray/toolbarImages/03 properties.bmp deleted file mode 100644 index 2943943f..00000000 Binary files a/src/webimtray/WebIMTray/toolbarImages/03 properties.bmp and /dev/null differ diff --git a/src/webimtray/WebIMTray/webImTray.csproj b/src/webimtray/WebIMTray/webImTray.csproj index f5fb6c28..bb632503 100644 --- a/src/webimtray/WebIMTray/webImTray.csproj +++ b/src/webimtray/WebIMTray/webImTray.csproj @@ -27,6 +27,7 @@ 2.0 + v3.5 bin\Debug\ @@ -79,6 +80,9 @@ System + + 3.5 + System.Data @@ -96,6 +100,11 @@ + + + + + True True