OSDN Git Service

Add mic icon and big PTT button
authorMojito Sorbet <mojitotech@gmail.com>
Sun, 1 Nov 2009 20:16:56 +0000 (20:16 +0000)
committerMojito Sorbet <mojitotech@gmail.com>
Sun, 1 Nov 2009 20:16:56 +0000 (20:16 +0000)
git-svn-id: https://radegast.googlecode.com/svn/trunk@406 f7a694da-4d33-11de-9ad6-1127a62b9fcd

Radegast/GUI/Consoles/VoiceConsole.Designer.cs
Radegast/GUI/Consoles/VoiceConsole.cs
Radegast/Properties/Resources.Designer.cs
Radegast/Properties/Resources.resx

index 387d2c7..56c5555 100644 (file)
@@ -63,6 +63,8 @@ namespace Radegast
             this.components = new System.ComponentModel.Container();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VoiceConsole));\r
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
+            this.button1 = new System.Windows.Forms.Button();\r
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
             this.spkrMute = new System.Windows.Forms.CheckBox();\r
             this.micMute = new System.Windows.Forms.CheckBox();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
@@ -86,10 +88,10 @@ namespace Radegast
             this.ctxPoint = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ctxSource = new System.Windows.Forms.ToolStripMenuItem();\r
             this.TalkStates = new System.Windows.Forms.ImageList(this.components);\r
-            this.label1 = new System.Windows.Forms.Label();\r
             this.splitContainer1.Panel1.SuspendLayout();\r
             this.splitContainer1.Panel2.SuspendLayout();\r
             this.splitContainer1.SuspendLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.micLevel)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.spkrLevel)).BeginInit();\r
@@ -104,7 +106,8 @@ namespace Radegast
             // \r
             // splitContainer1.Panel1\r
             // \r
-            this.splitContainer1.Panel1.Controls.Add(this.label1);\r
+            this.splitContainer1.Panel1.Controls.Add(this.button1);\r
+            this.splitContainer1.Panel1.Controls.Add(this.pictureBox1);\r
             this.splitContainer1.Panel1.Controls.Add(this.spkrMute);\r
             this.splitContainer1.Panel1.Controls.Add(this.micMute);\r
             this.splitContainer1.Panel1.Controls.Add(this.pictureBox2);\r
@@ -115,6 +118,8 @@ namespace Radegast
             this.splitContainer1.Panel1.Controls.Add(this.spkrDevice);\r
             this.splitContainer1.Panel1.Controls.Add(this.micDevice);\r
             this.splitContainer1.Panel1.Controls.Add(this.chkVoiceEnable);\r
+            this.splitContainer1.Panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnMouseDown);\r
+            this.splitContainer1.Panel1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp);\r
             // \r
             // splitContainer1.Panel2\r
             // \r
@@ -124,10 +129,30 @@ namespace Radegast
             this.splitContainer1.TabIndex = 7;\r
             this.splitContainer1.TabStop = false;\r
             // \r
+            // button1\r
+            // \r
+            this.button1.BackColor = System.Drawing.SystemColors.AppWorkspace;\r
+            this.button1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.button1.Location = new System.Drawing.Point(92, 228);\r
+            this.button1.Name = "button1";\r
+            this.button1.Size = new System.Drawing.Size(293, 97);\r
+            this.button1.TabIndex = 24;\r
+            this.button1.Text = "PTT";\r
+            this.button1.UseVisualStyleBackColor = false;\r
+            // \r
+            // pictureBox1\r
+            // \r
+            this.pictureBox1.Image = global::Radegast.Properties.Resources.mic;\r
+            this.pictureBox1.Location = new System.Drawing.Point(22, 67);\r
+            this.pictureBox1.Name = "pictureBox1";\r
+            this.pictureBox1.Size = new System.Drawing.Size(32, 32);\r
+            this.pictureBox1.TabIndex = 23;\r
+            this.pictureBox1.TabStop = false;\r
+            // \r
             // spkrMute\r
             // \r
             this.spkrMute.AutoSize = true;\r
-            this.spkrMute.Location = new System.Drawing.Point(92, 114);\r
+            this.spkrMute.Location = new System.Drawing.Point(92, 112);\r
             this.spkrMute.Name = "spkrMute";\r
             this.spkrMute.Size = new System.Drawing.Size(50, 17);\r
             this.spkrMute.TabIndex = 21;\r
@@ -151,7 +176,7 @@ namespace Radegast
             // \r
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));\r
             this.pictureBox2.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.InitialImage")));\r
-            this.pictureBox2.Location = new System.Drawing.Point(28, 112);\r
+            this.pictureBox2.Location = new System.Drawing.Point(22, 114);\r
             this.pictureBox2.Name = "pictureBox2";\r
             this.pictureBox2.Size = new System.Drawing.Size(31, 29);\r
             this.pictureBox2.TabIndex = 19;\r
@@ -320,15 +345,6 @@ namespace Radegast
             this.TalkStates.Images.SetKeyName(1, "Talking.png");\r
             this.TalkStates.Images.SetKeyName(2, "TalkMute.png");\r
             // \r
-            // label1\r
-            // \r
-            this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(170, 241);\r
-            this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(134, 13);\r
-            this.label1.TabIndex = 22;\r
-            this.label1.Text = "Middle Mouse here for PTT";\r
-            // \r
             // VoiceConsole\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -341,6 +357,7 @@ namespace Radegast
             this.splitContainer1.Panel1.PerformLayout();\r
             this.splitContainer1.Panel2.ResumeLayout(false);\r
             this.splitContainer1.ResumeLayout(false);\r
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.micLevel)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.spkrLevel)).EndInit();\r
@@ -375,6 +392,7 @@ namespace Radegast
         private PictureBox pictureBox2;\r
         private CheckBox micMute;\r
         private CheckBox spkrMute;\r
-        private Label label1;\r
+        private PictureBox pictureBox1;\r
+        private Button button1;\r
     }\r
 }\r
index cf991ac..1f0cac5 100644 (file)
@@ -109,6 +109,8 @@ namespace Radegast
             // GUI hooks\r
             MouseDown += new MouseEventHandler(OnMouseDown);\r
             MouseUp += new MouseEventHandler(OnMouseUp);\r
+            instance.MainForm.MouseDown += new MouseEventHandler(OnMouseDown);\r
+            instance.MainForm.MouseUp += new MouseEventHandler(OnMouseUp);\r
         }\r
 \r
         private void UnregisterClientEvents()\r
@@ -296,20 +298,27 @@ namespace Radegast
         #region Talk control\r
         void OnMouseUp(object sender, MouseEventArgs e)\r
         {\r
-            if (e.Button == MouseButtons.Middle)\r
+            this.BeginInvoke(new MethodInvoker(delegate()\r
             {\r
-                micMute.Checked = false;\r
-                gateway.MicMute = true;\r
-            }\r
+                if (e.Button == MouseButtons.Middle)\r
+                {\r
+                    micMute.Checked = true;\r
+                    gateway.MicMute = true;\r
+                }\r
+            }));\r
         }\r
 \r
         void OnMouseDown(object sender, MouseEventArgs e)\r
         {\r
-            if (e.Button == MouseButtons.Middle)\r
+            this.BeginInvoke(new MethodInvoker(delegate()\r
             {\r
-                micMute.Checked = false;\r
-                gateway.MicMute = false;\r
-            }\r
+\r
+                if (e.Button == MouseButtons.Middle)\r
+                {\r
+                    micMute.Checked = false;\r
+                    gateway.MicMute = false;\r
+                }\r
+            }));\r
         }\r
         #endregion\r
 \r
@@ -380,6 +389,7 @@ namespace Radegast
            gateway.MicMute = micMute.Checked;\r
        }\r
 \r
+\r
     }\r
 }\r
 \r
index c7498ff..d90045d 100644 (file)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.4927\r
+//     Runtime Version:2.0.50727.3074\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -568,6 +568,13 @@ namespace Radegast.Properties {
             }\r
         }\r
         \r
+        public static System.Drawing.Bitmap mic {\r
+            get {\r
+                object obj = ResourceManager.GetObject("mic", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         public static System.Drawing.Bitmap paste_16 {\r
             get {\r
                 object obj = ResourceManager.GetObject("paste_16", resourceCulture);\r
index afb84fe..d84bf31 100644 (file)
   <data name="inv_item_socks" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_socks.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="RadegastAuthor" xml:space="preserve">\r
+    <value>Radegast Development Team</value>\r
+  </data>\r
   <data name="inv_item_landmark" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_landmark.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="inv_item_skin" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_skin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="radegast_large" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/radegast_large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="inv_folder_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/inv_folder_sound.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="inv_folder_snapshot" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/inv_folder_snapshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
   <data name="folder_open_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/folder-open_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="inv_item_undershirt" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_undershirt.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="add_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/add_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="inv_item_pants" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_pants.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="radegast_main_screen2" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/radegast-main screen2.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="inv_folder_clothing" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/inv_folder_clothing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="checkerboard" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/checkerboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="GreenOrb_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/GreenOrb_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   <data name="inv_item_snapshot" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_snapshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="status_no_build" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/status_no_build.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="inv_folder_script" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_folder_script.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="folder_closed_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/folder-closed_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="RadegastAuthor" xml:space="preserve">\r
-    <value>Radegast Development Team</value>\r
+  <data name="inv_folder_clothing" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/inv_folder_clothing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="status_no_scripts" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/status_no_scripts.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="add_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/add_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="inv_item_hair" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_hair.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   <data name="computer_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/computer_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="inv_folder_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/inv_folder_sound.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="status_no_build" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/status_no_build.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="applications_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/applications_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   <data name="inv_item_notecard" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_notecard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="client_signatures" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/client_signatures.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>\r
+  </data>\r
+  <data name="UpdateCheckUri" xml:space="preserve">\r
+    <value>http://update.radegastclient.org/svc/get_latest</value>\r
+  </data>\r
   <data name="delete_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/delete_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="checkerboard" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/checkerboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="inv_item_script_dangerous" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_script_dangerous.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="arrow_forward_16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/arrow-forward_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="btn_play" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/btn_play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="status_no_scripts" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/status_no_scripts.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="ProgramName" xml:space="preserve">\r
     <value>Radegast</value>\r
   <data name="inv_item_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="inv_folder_snapshot" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/inv_folder_snapshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="btn_play" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>../Resources/btn_play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="inv_item_shoes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_item_shoes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   <data name="inv_folder_bodypart" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_folder_bodypart.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="radegast_large" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/radegast_large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="UpdateCheckUri" xml:space="preserve">\r
-    <value>http://update.radegastclient.org/svc/get_latest</value>\r
-  </data>\r
-  <data name="client_signatures" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>../Resources/client_signatures.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>\r
+  <data name="mic" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\mic.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
 </root>
\ No newline at end of file