diff --git a/src/mibewtray/MibewInstaller/MibewInstaller.vdproj b/src/mibewtray/MibewInstaller/MibewInstaller.vdproj index 95627d15..c56d2efa 100644 --- a/src/mibewtray/MibewInstaller/MibewInstaller.vdproj +++ b/src/mibewtray/MibewInstaller/MibewInstaller.vdproj @@ -66,7 +66,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\MibewTray11.msi" + "OutputFilename" = "8:Release\\MibewTray111.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -191,23 +191,23 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mibew Tray" - "ProductCode" = "8:{1362E6BF-F684-4D34-8768-536D9AAA06D3}" - "PackageCode" = "8:{E2D977FB-6F9D-4BF2-910B-08C3187542EC}" + "ProductCode" = "8:{897DF909-F9E7-40BD-A164-242407859800}" + "PackageCode" = "8:{827DD7FB-975A-4475-AC2A-A47EB906BF30}" "UpgradeCode" = "8:{484448C1-3D53-454F-BC23-BA913AAE7E1D}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.0" + "ProductVersion" = "8:1.1.1" "Manufacturer" = "8:Mibew Community" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://openwebim.org/forums/" + "ARPHELPLINK" = "8:http://mibew.org/forums/" "Title" = "8:Mibew Messenger Tray" "Subject" = "8:" "ARPCONTACT" = "8:Mibew Community" "Keywords" = "8:" "ARPCOMMENTS" = "8:Tray Application for Mibew Messenger" - "ARPURLINFOABOUT" = "8:http://www.openwebim.org" + "ARPURLINFOABOUT" = "8:http://www.mibew.org" "ARPPRODUCTICON" = "8:_5050C10B17B645A4856D44594EE57741" "ARPIconIndex" = "3:32512" "SearchPath" = "8:" diff --git a/src/mibewtray/MibewTray/App.Designer.cs b/src/mibewtray/MibewTray/App.Designer.cs index 1f85b56c..dc0e016a 100644 --- a/src/mibewtray/MibewTray/App.Designer.cs +++ b/src/mibewtray/MibewTray/App.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Runtime Version:4.0.30319.18034 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace webImTray { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class App { @@ -60,6 +60,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap hide { get { object obj = ResourceManager.GetObject("hide", resourceCulture); @@ -67,6 +70,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap history { get { object obj = ResourceManager.GetObject("history", resourceCulture); @@ -74,6 +80,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// internal static System.Drawing.Icon Notify { get { object obj = ResourceManager.GetObject("Notify", resourceCulture); @@ -81,6 +90,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// internal static System.Drawing.Icon Notify_offl { get { object obj = ResourceManager.GetObject("Notify_offl", resourceCulture); @@ -88,6 +100,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap options { get { object obj = ResourceManager.GetObject("options", resourceCulture); @@ -95,6 +110,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap refresh { get { object obj = ResourceManager.GetObject("refresh", resourceCulture); @@ -102,6 +120,9 @@ namespace webImTray { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap visitors { get { object obj = ResourceManager.GetObject("visitors", resourceCulture); diff --git a/src/mibewtray/MibewTray/AssemblyInfo.cs b/src/mibewtray/MibewTray/AssemblyInfo.cs index b8e67e74..320b567d 100644 --- a/src/mibewtray/MibewTray/AssemblyInfo.cs +++ b/src/mibewtray/MibewTray/AssemblyInfo.cs @@ -26,7 +26,7 @@ using System.Runtime.CompilerServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.0")] +[assembly: AssemblyVersion("1.1.1")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/src/mibewtray/MibewTray/Main.cs b/src/mibewtray/MibewTray/Main.cs index 5b52332c..c89df9ef 100644 --- a/src/mibewtray/MibewTray/Main.cs +++ b/src/mibewtray/MibewTray/Main.cs @@ -43,7 +43,7 @@ namespace webImTray { void navigateThere() { #if DEBUG - webBrowser1.Navigate("http://openwebim.org/webim/operator/users.php?nomenu"); + webBrowser1.Navigate("http://demo.mibew.org/operator/users.php?nomenu"); #else webBrowser1.Navigate(Options.WebIMServer + Options.PENDING_USERS_PAGE); #endif diff --git a/src/mibewtray/MibewTray/Options.cs b/src/mibewtray/MibewTray/Options.cs index 805b35a6..02184842 100644 --- a/src/mibewtray/MibewTray/Options.cs +++ b/src/mibewtray/MibewTray/Options.cs @@ -9,7 +9,7 @@ using System.Globalization; namespace webImTray { class Options { - public const string DEFAULT_SERVER = "http://openwebim.org/webim"; + public const string DEFAULT_SERVER = "http://demo.mibew.org"; public const string PENDING_USERS_PAGE = "/operator/users.php?nomenu"; public const string HISTORY_PAGE = "/operator/history.php"; public const string SETTINGS_PAGE = "/operator/operators.php"; diff --git a/src/mibewtray/MibewTray/mibewTray.csproj b/src/mibewtray/MibewTray/mibewTray.csproj index 26e544ca..ba291216 100644 --- a/src/mibewtray/MibewTray/mibewTray.csproj +++ b/src/mibewtray/MibewTray/mibewTray.csproj @@ -1,4 +1,5 @@ - + + Local 9.0.21022 @@ -25,8 +26,24 @@ - 2.0 + 3.5 v3.5 + false + F:\mibewtray\MibewInstaller\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 2 + 1.0.0.%2a + false + true + true bin\Debug\ @@ -75,6 +92,18 @@ prompt AnyCPU + + 140A3DB550346C895737527D0E4FE4D49ED69092 + + + mibewTray_TemporaryKey.pfx + + + true + + + false + System @@ -188,6 +217,18 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + diff --git a/src/mibewtray/MibewTray/mibewTray.csproj.user b/src/mibewtray/MibewTray/mibewTray.csproj.user new file mode 100644 index 00000000..fe3cbfdc --- /dev/null +++ b/src/mibewtray/MibewTray/mibewTray.csproj.user @@ -0,0 +1,13 @@ + + + + F:\mibewtray\MibewInstaller\|publish\ + + + + + + en-US + false + + \ No newline at end of file diff --git a/src/mibewtray/MibewTray/options/About.Designer.cs b/src/mibewtray/MibewTray/options/About.Designer.cs index 56406551..89d36c8a 100644 --- a/src/mibewtray/MibewTray/options/About.Designer.cs +++ b/src/mibewtray/MibewTray/options/About.Designer.cs @@ -26,81 +26,96 @@ namespace webImTray { System.Windows.Forms.Label label3; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About)); System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; + System.Windows.Forms.Label label6; 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.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); label3 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // label3 // - label3.AccessibleDescription = null; - label3.AccessibleName = null; resources.ApplyResources(label3, "label3"); label3.Name = "label3"; // // label4 // - label4.AccessibleDescription = null; - label4.AccessibleName = null; resources.ApplyResources(label4, "label4"); label4.Name = "label4"; // + // label5 + // + resources.ApplyResources(label5, "label5"); + label5.Name = "label5"; + // + // label6 + // + resources.ApplyResources(label6, "label6"); + label6.Name = "label6"; + // // label1 // - this.label1.AccessibleDescription = null; - this.label1.AccessibleName = null; resources.ApplyResources(this.label1, "label1"); this.label1.ForeColor = System.Drawing.Color.Maroon; this.label1.Name = "label1"; // // label2 // - this.label2.AccessibleDescription = null; - this.label2.AccessibleName = null; resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // // pictureBox1 // - 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.TabStop = false; // // linkLabel1 // - this.linkLabel1.AccessibleDescription = null; - this.linkLabel1.AccessibleName = null; resources.ApplyResources(this.linkLabel1, "linkLabel1"); this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.TabStop = true; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.webim_ru_link); // + // linkLabel2 + // + resources.ApplyResources(this.linkLabel2, "linkLabel2"); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.TabStop = true; + // + // linkLabel3 + // + resources.ApplyResources(this.linkLabel3, "linkLabel3"); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.TabStop = true; + this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); + // // About // - 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.linkLabel3); + this.Controls.Add(label6); + this.Controls.Add(this.linkLabel2); + this.Controls.Add(label5); 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.Load += new System.EventHandler(this.About_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -113,5 +128,7 @@ namespace webImTray { private System.Windows.Forms.Label label2; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.LinkLabel linkLabel3; } } diff --git a/src/mibewtray/MibewTray/options/About.cs b/src/mibewtray/MibewTray/options/About.cs index 7c487416..7cd94f74 100644 --- a/src/mibewtray/MibewTray/options/About.cs +++ b/src/mibewtray/MibewTray/options/About.cs @@ -28,13 +28,23 @@ namespace webImTray { #endregion private void i_services_ru_link(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://openwebim.org/"); + System.Diagnostics.Process.Start("http://mibew.org/"); } private void webim_ru_link(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://openwebim.org/"); + System.Diagnostics.Process.Start("http://mibew.org/"); } public event ModifiedEvent PanelModified; + + private void About_Load(object sender, EventArgs e) + { + + } + + private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start("http://mibew.org/forums/"); + } } } diff --git a/src/mibewtray/MibewTray/options/About.resx b/src/mibewtray/MibewTray/options/About.resx index a39dd23a..5e8bf4f5 100644 --- a/src/mibewtray/MibewTray/options/About.resx +++ b/src/mibewtray/MibewTray/options/About.resx @@ -117,36 +117,216 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + + True + - - 0, 21 + + Tahoma, 9pt - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 + + 17, 134 + + 0, 0, 0, 7 + + + 309, 21 + + + 3 + + + Copyright (c) 2006-2013 Mibew Messenger Community + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + False + + + True + + + Tahoma, 9pt + + + 22, 217 + 0, 0, 0, 7 - + + 114, 21 + + + 4 + + + Please, visit our site + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + False + + + True + + + Tahoma, 9pt + + + NoControl + + + 186, 206 + + + 0, 0, 0, 7 + + + 0, 21 + + + 6 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + False + + + True + + + Tahoma, 9pt + + + NoControl + + + 190, 217 + + + 0, 0, 0, 7 + + + 133, 21 + + + 8 + + + Mibew Support Forums + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Tahoma, 15.75pt + + + 70, 41 + + + 120, 25 + + + 0 + + + Mibew Tray + + + label1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - $this + + 9 - - 0, 21 - - True + + Tahoma, 11.25pt, style=Bold + + + 118, 170 + + + 109, 18 + + + 1 + + + Version 1.1.1 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + Qk3mgQAAAAAAADYAAAAoAAAAbgAAAGQAAAABABgAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAA//////// @@ -706,272 +886,145 @@ ////////////////AAA= - - - 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 - - - - 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 + + 264, 0 110, 100 - - $this - - - label1 - - - label4 - - - 110, 76 - - - 85, 111 - - - 0 - 2 - - 370, 325 + + pictureBox1 - + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $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 + + Tahoma, 9pt - 13, 156 + 28, 254 - - 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 + + 103, 21 - + + 5 + + + http://mibew.org + + + linkLabel1 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - Mibew Tray + + 4 - - 13, 135 + + True + + + Tahoma, 9pt + + + NoControl + + + 186, 242 + + + 0, 0, 0, 7 + + + 0, 21 + + + 7 + + + linkLabel2 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + Tahoma, 9pt + + + NoControl + + + 185, 254 + + + 0, 0, 0, 7 + + + 145, 21 + + + 9 + + + http://mibew.org/forums + + + linkLabel3 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 - - False - True - - False - + + 6, 13 + + + 10, 20, 0, 0 + + + 342, 297 + + + About + + + 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/mibewtray/MibewTray/options/OptionsConnectionPanel.Designer.cs b/src/mibewtray/MibewTray/options/OptionsConnectionPanel.Designer.cs index becda70b..f3afb7dd 100644 --- a/src/mibewtray/MibewTray/options/OptionsConnectionPanel.Designer.cs +++ b/src/mibewtray/MibewTray/options/OptionsConnectionPanel.Designer.cs @@ -41,10 +41,6 @@ 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); @@ -52,20 +48,17 @@ namespace webImTray { this.groupBox1.Controls.Add(this.webimServer); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.autoDisconnect); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // // label2 // - this.label2.AccessibleDescription = null; - this.label2.AccessibleName = null; resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // // forceRefreshTime // - this.forceRefreshTime.AccessibleDescription = null; - this.forceRefreshTime.AccessibleName = null; resources.ApplyResources(this.forceRefreshTime, "forceRefreshTime"); this.forceRefreshTime.Maximum = new decimal(new int[] { 120, @@ -87,63 +80,44 @@ namespace webImTray { // // forceRefresh // - this.forceRefresh.AccessibleDescription = null; - this.forceRefresh.AccessibleName = null; resources.ApplyResources(this.forceRefresh, "forceRefresh"); - this.forceRefresh.BackgroundImage = null; this.forceRefresh.Name = "forceRefresh"; this.forceRefresh.UseVisualStyleBackColor = true; this.forceRefresh.CheckedChanged += new System.EventHandler(this.forceRefresh_CheckedChanged); // // autoDesconnectOnSS // - this.autoDesconnectOnSS.AccessibleDescription = null; - this.autoDesconnectOnSS.AccessibleName = null; resources.ApplyResources(this.autoDesconnectOnSS, "autoDesconnectOnSS"); - this.autoDesconnectOnSS.BackgroundImage = null; this.autoDesconnectOnSS.Name = "autoDesconnectOnSS"; this.autoDesconnectOnSS.UseVisualStyleBackColor = true; // // webimServer // - this.webimServer.AccessibleDescription = null; - this.webimServer.AccessibleName = null; resources.ApplyResources(this.webimServer, "webimServer"); - this.webimServer.BackgroundImage = null; this.webimServer.Name = "webimServer"; this.webimServer.TextChanged += new System.EventHandler(this.webimServer_TextChanged); // // label1 // - this.label1.AccessibleDescription = null; - this.label1.AccessibleName = null; resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // // autoDisconnect // - this.autoDisconnect.AccessibleDescription = null; - this.autoDisconnect.AccessibleName = null; resources.ApplyResources(this.autoDisconnect, "autoDisconnect"); - this.autoDisconnect.BackgroundImage = null; this.autoDisconnect.Name = "autoDisconnect"; 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); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // // showUserPreferences // - this.showUserPreferences.AccessibleDescription = null; - this.showUserPreferences.AccessibleName = null; resources.ApplyResources(this.showUserPreferences, "showUserPreferences"); this.showUserPreferences.Name = "showUserPreferences"; this.showUserPreferences.TabStop = true; @@ -151,14 +125,10 @@ namespace webImTray { // // OptionsConnectionPanel // - 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.Font = null; this.Name = "OptionsConnectionPanel"; this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); diff --git a/src/mibewtray/MibewTray/options/OptionsConnectionPanel.resx b/src/mibewtray/MibewTray/options/OptionsConnectionPanel.resx index c9a7997f..a0610f99 100644 --- a/src/mibewtray/MibewTray/options/OptionsConnectionPanel.resx +++ b/src/mibewtray/MibewTray/options/OptionsConnectionPanel.resx @@ -117,136 +117,181 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Force page update every + + + True - - 17, 124 + + Microsoft Sans Serif, 8.25pt - - Tahoma, 9.75pt, style=Bold + + 239, 125 - - groupBox1 + + 43, 13 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 - - 45, 20 + + minutes - - $this + + label2 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox1 + + + 0 + + + False + + + Microsoft Sans Serif, 8.25pt + + + 188, 123 + + + 45, 20 + + + 8 + + + forceRefreshTime + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 17, 124 + + + 145, 17 + 7 - + + Force page update every + + + forceRefresh + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + True + + + False + + + Microsoft Sans Serif, 8.25pt + + + 17, 101 + + + 231, 17 + + + 6 + + + Become idle if the screen saver is activated + + + autoDesconnectOnSS + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 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 + + 307, 20 + + + 5 + + + webimServer System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + + groupBox1 - - 9 + + 4 + + + True + + + Microsoft Sans Serif, 8.25pt + + + 15, 28 + + + 125, 13 + + + 4 + + + Mibew Messenger Installation Location + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 True @@ -254,32 +299,14 @@ Microsoft Sans Serif, 8.25pt - - True + + 17, 78 - - OptionsConnectionPanel + + 202, 17 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3, 3 - - - forceRefreshTime - - - 3, 213 - - - groupBox1 - - - groupBox1 - - - 0 + + 3 Become idle if the computer is locked @@ -287,138 +314,84 @@ autoDisconnect - + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 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 + + Tahoma, 9.75pt, style=Bold - - False + + 3, 3 + + + + 12, 12, 12, 12 + + + 368, 203 + + + 1 Connection + + groupBox1 + 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 + + $this - - 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 + + 54, 43 - - Mibew Messenger server + + 252, 14 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - 368, 203 + + Click here to change your preferences online + + + showUserPreferences + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + Tahoma, 9.75pt, style=Bold + + + 3, 213 + + + 12, 12, 12, 12 368, 87 @@ -426,7 +399,34 @@ 2 - + + Operator preferences + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + True - + + + 6, 13 + + + 374, 329 + + + OptionsConnectionPanel + + + 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/mibewtray/MibewTray/options/OptionsDialog.cs b/src/mibewtray/MibewTray/options/OptionsDialog.cs index 3745560d..df213d5f 100644 --- a/src/mibewtray/MibewTray/options/OptionsDialog.cs +++ b/src/mibewtray/MibewTray/options/OptionsDialog.cs @@ -14,7 +14,7 @@ namespace webImTray { static OptionsPanel[] panels = new OptionsPanel[] { new OptionsGeneralPanel(), new OptionsConnectionPanel(), - new OptionsSoundsPanel(), + // new OptionsSoundsPanel(), new About() }; @@ -85,7 +85,7 @@ namespace webImTray { } private void openWebIMSite(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("http://openwebim.org/"); + System.Diagnostics.Process.Start("http://mibew.org/"); } private void applyChanges() { diff --git a/src/mibewtray/MibewTray/options/OptionsGeneralPanel.Designer.cs b/src/mibewtray/MibewTray/options/OptionsGeneralPanel.Designer.cs index bed56daf..754832c0 100644 --- a/src/mibewtray/MibewTray/options/OptionsGeneralPanel.Designer.cs +++ b/src/mibewtray/MibewTray/options/OptionsGeneralPanel.Designer.cs @@ -30,15 +30,9 @@ namespace webImTray { this.hideWhenStarted = new System.Windows.Forms.CheckBox(); this.autoStart = new System.Windows.Forms.CheckBox(); this.showInTaskBar = new System.Windows.Forms.CheckBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.showOptions = new System.Windows.Forms.CheckBox(); - this.showHide = new System.Windows.Forms.CheckBox(); this.languageBox = new System.Windows.Forms.GroupBox(); this.languageSelector = new System.Windows.Forms.ComboBox(); this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); this.languageBox.SuspendLayout(); this.SuspendLayout(); // @@ -72,40 +66,6 @@ namespace webImTray { this.showInTaskBar.UseVisualStyleBackColor = true; this.showInTaskBar.CheckedChanged += new System.EventHandler(this.checkboxChanged); // - // groupBox2 - // - this.groupBox2.Controls.Add(this.textBox2); - this.groupBox2.Controls.Add(this.textBox1); - this.groupBox2.Controls.Add(this.showOptions); - this.groupBox2.Controls.Add(this.showHide); - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.TabStop = false; - // - // textBox2 - // - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.Name = "textBox2"; - // - // textBox1 - // - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - // - // showOptions - // - resources.ApplyResources(this.showOptions, "showOptions"); - this.showOptions.Name = "showOptions"; - this.showOptions.UseVisualStyleBackColor = true; - this.showOptions.CheckedChanged += new System.EventHandler(this.checkboxChanged); - // - // showHide - // - resources.ApplyResources(this.showHide, "showHide"); - this.showHide.Name = "showHide"; - this.showHide.UseVisualStyleBackColor = true; - this.showHide.CheckedChanged += new System.EventHandler(this.checkboxChanged); - // // languageBox // this.languageBox.Controls.Add(this.languageSelector); @@ -125,13 +85,10 @@ namespace webImTray { 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.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); this.languageBox.ResumeLayout(false); this.ResumeLayout(false); @@ -143,11 +100,6 @@ namespace webImTray { private System.Windows.Forms.CheckBox showInTaskBar; private System.Windows.Forms.CheckBox autoStart; private System.Windows.Forms.CheckBox hideWhenStarted; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.CheckBox showOptions; - private System.Windows.Forms.CheckBox showHide; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.GroupBox languageBox; private System.Windows.Forms.ComboBox languageSelector; } diff --git a/src/mibewtray/MibewTray/options/OptionsGeneralPanel.resx b/src/mibewtray/MibewTray/options/OptionsGeneralPanel.resx index 456067c3..d74a698f 100644 --- a/src/mibewtray/MibewTray/options/OptionsGeneralPanel.resx +++ b/src/mibewtray/MibewTray/options/OptionsGeneralPanel.resx @@ -117,16 +117,83 @@ 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, 154 + + + 0 + + + Application + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + True - Microsoft Sans Serif, 8.25pt - 15, 76 + 15, 122 134, 17 @@ -156,7 +223,7 @@ Microsoft Sans Serif, 8.25pt - 15, 53 + 15, 76 225, 17 @@ -209,187 +276,6 @@ 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 - False @@ -397,7 +283,7 @@ Tahoma, 9.75pt - 15, 32 + 75, 39 209, 24 @@ -421,10 +307,10 @@ Tahoma, 9.75pt, style=Bold - 3, 210 + 3, 189 - 371, 72 + 368, 93 2