Update voice console with the latest event changes, added tab button for voice.

git-svn-id: https://radegast.googlecode.com/svn/trunk@394 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Consoles/TabsConsole.cs b/Radegast/GUI/Consoles/TabsConsole.cs
index c3d1dcf..5cef849 100644 (file)
--- a/Radegast/GUI/Consoles/TabsConsole.cs
+++ b/Radegast/GUI/Consoles/TabsConsole.cs
@@ -447,10 +447,10 @@ namespace Radegast
                 tab.Visible = false;\r
             }\r
 \r
-            //tab = AddTab("voice", "Voice", new VoiceConsole(instance));\r
-            //tab.AllowClose = false;\r
-            //tab.AllowDetach = true;\r
-            //tab.Visible = false;\r
+            tab = AddTab("voice", "Voice", new VoiceConsole(instance));\r
+            tab.AllowClose = false;\r
+            tab.AllowDetach = true;\r
+            tab.Visible = false;\r
         }\r
 \r
         /// <summary>\r

diff --git a/Radegast/GUI/Consoles/VoiceConsole.cs b/Radegast/GUI/Consoles/VoiceConsole.cs
index a0f03e6..ae20afc 100644 (file)
--- a/Radegast/GUI/Consoles/VoiceConsole.cs
+++ b/Radegast/GUI/Consoles/VoiceConsole.cs
@@ -56,7 +56,7 @@ namespace Radegast
         private TabsConsole tabConsole;\r
         private Avatar currentAvatar;\r
         private Dictionary<uint, Avatar> avatars = new Dictionary<uint, Avatar>();\r
-        private Dictionary<uint, bool> bots = new Dictionary<uint,bool>();\r
+        private Dictionary<uint, bool> bots = new Dictionary<uint, bool>();\r
         private Radegast.Core.VoiceGateway gateway;\r
         private Radegast.Core.VoiceSession session;\r
 \r
@@ -69,7 +69,7 @@ namespace Radegast
             this.instance.ClientChanged += new EventHandler<ClientChangedEventArgs>(instance_ClientChanged);\r
 \r
             // Callbacks\r
-            netcom.ClientLoginStatus += new EventHandler<ClientLoginEventArgs>(netcom_ClientLoginStatus);\r
+            netcom.ClientLoginStatus += new EventHandler<LoginProgressEventArgs>(netcom_ClientLoginStatus);\r
             netcom.ClientLoggedOut += new EventHandler(netcom_ClientLoggedOut);\r
 \r
             gateway = new Radegast.Core.VoiceGateway(this.instance.Client);\r
@@ -83,8 +83,8 @@ namespace Radegast
 \r
 \r
             chkVoiceEnable.Checked = instance.GlobalSettings["Voice.enabled"].AsBoolean();\r
-//            if (chkVoiceEnable.Checked)\r
-//                gateway.Start();\r
+            //            if (chkVoiceEnable.Checked)\r
+            //                gateway.Start();\r
         }\r
 \r
         private void RegisterClientEvents(GridClient client)\r
@@ -101,17 +101,17 @@ namespace Radegast
             gateway.MicMute = true;\r
             gateway.SpkrMute = false;\r
             gateway.SpkrLevel = 64;\r
-            gateway.MicLevel = 64;           \r
+            gateway.MicLevel = 64;\r
         }\r
 \r
         private void UnregisterClientEvents(GridClient client)\r
         {\r
         }\r
 \r
-#region Connection Status\r
+        #region Connection Status\r
         void gateway_OnDaemonRunning()\r
         {\r
-            SetProgress( 1 );\r
+            SetProgress(1);\r
         }\r
 \r
         void SetProgress(int value)\r
@@ -125,7 +125,7 @@ namespace Radegast
 \r
             progressBar1.Value = value;\r
         }\r
-#endregion\r
+        #endregion\r
         #region Sessions\r
         #endregion\r
 \r
@@ -137,24 +137,24 @@ namespace Radegast
 \r
         void ChatConsole_Disposed(object sender, EventArgs e)\r
         {\r
-            netcom.ClientLoginStatus -= new EventHandler<ClientLoginEventArgs>(netcom_ClientLoginStatus);\r
+            netcom.ClientLoginStatus -= new EventHandler<LoginProgressEventArgs>(netcom_ClientLoginStatus);\r
             netcom.ClientLoggedOut -= new EventHandler(netcom_ClientLoggedOut);\r
             UnregisterClientEvents(client);\r
         }\r
 \r
-       private void MainForm_Load(object sender, EventArgs e)\r
+        private void MainForm_Load(object sender, EventArgs e)\r
         {\r
             tabConsole = instance.TabConsole;\r
         }\r
 \r
-        private void netcom_ClientLoginStatus(object sender, ClientLoginEventArgs e)\r
+        private void netcom_ClientLoginStatus(object sender, LoginProgressEventArgs e)\r
         {\r
             if (e.Status != LoginStatus.Success) return;\r
         }\r
 \r
         private void netcom_ClientLoggedOut(object sender, EventArgs e)\r
         {\r
-             participants.Items.Clear();\r
+            participants.Items.Clear();\r
         }\r
 \r
         #region Talk control\r
@@ -205,7 +205,7 @@ namespace Radegast
         {\r
 \r
         }\r
-#endregion\r
+        #endregion\r
 \r
         private void chkVoiceEnable_Click(object sender, EventArgs e)\r
         {\r

diff --git a/Radegast/GUI/Dialogs/MainForm.Designer.cs b/Radegast/GUI/Dialogs/MainForm.Designer.cs
index 3925f97..79e09ed 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.Designer.cs
+++ b/Radegast/GUI/Dialogs/MainForm.Designer.cs
@@ -112,9 +112,11 @@ namespace Radegast
             this.tbtnMap = new System.Windows.Forms.ToolStripButton();\r
             this.tbnObjects = new System.Windows.Forms.ToolStripButton();\r
             this.lblTime = new System.Windows.Forms.ToolStripLabel();\r
+            this.tbtnVoice = new System.Windows.Forms.ToolStripButton();\r
             this.tbtnMedia = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
             this.tbtnHelp = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.keyboardShortcutsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.reportBugsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();\r
@@ -133,7 +135,6 @@ namespace Radegast
             this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();\r
             this.pnlDialog = new System.Windows.Forms.Panel();\r
             this.timerWorldClock = new System.Windows.Forms.Timer(this.components);\r
-            this.keyboardShortcutsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStrip1.SuspendLayout();\r
             this.statusStrip1.SuspendLayout();\r
             this.toolStripContainer1.TopToolStripPanel.SuspendLayout();\r
@@ -158,6 +159,7 @@ namespace Radegast
             this.tbnObjects,\r
             this.lblTime,\r
             this.tbtnMedia,\r
+            this.tbtnVoice,\r
             this.toolStripSeparator2,\r
             this.tbtnHelp});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
@@ -511,6 +513,17 @@ namespace Radegast
             this.lblTime.Size = new System.Drawing.Size(30, 22);\r
             this.lblTime.Text = "--:--";\r
             // \r
+            // tbtnVoice\r
+            // \r
+            this.tbtnVoice.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+            this.tbtnVoice.Enabled = false;\r
+            this.tbtnVoice.Image = ((System.Drawing.Image)(resources.GetObject("tbtnVoice.Image")));\r
+            this.tbtnVoice.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.tbtnVoice.Name = "tbtnVoice";\r
+            this.tbtnVoice.Size = new System.Drawing.Size(40, 22);\r
+            this.tbtnVoice.Text = "Voice";\r
+            this.tbtnVoice.Click += new System.EventHandler(this.tbtnVoice_Click);\r
+            // \r
             // tbtnMedia\r
             // \r
             this.tbtnMedia.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
@@ -543,6 +556,13 @@ namespace Radegast
             this.tbtnHelp.Size = new System.Drawing.Size(45, 22);\r
             this.tbtnHelp.Text = "&Help";\r
             // \r
+            // keyboardShortcutsToolStripMenuItem\r
+            // \r
+            this.keyboardShortcutsToolStripMenuItem.Name = "keyboardShortcutsToolStripMenuItem";\r
+            this.keyboardShortcutsToolStripMenuItem.Size = new System.Drawing.Size(203, 22);\r
+            this.keyboardShortcutsToolStripMenuItem.Text = "Keyboard Shortcuts";\r
+            this.keyboardShortcutsToolStripMenuItem.Click += new System.EventHandler(this.keyboardShortcutsToolStripMenuItem_Click);\r
+            // \r
             // reportBugsToolStripMenuItem\r
             // \r
             this.reportBugsToolStripMenuItem.Name = "reportBugsToolStripMenuItem";\r
@@ -725,13 +745,6 @@ namespace Radegast
             this.timerWorldClock.Interval = 1000;\r
             this.timerWorldClock.Tick += new System.EventHandler(this.timerWorldClock_Tick);\r
             // \r
-            // keyboardShortcutsToolStripMenuItem\r
-            // \r
-            this.keyboardShortcutsToolStripMenuItem.Name = "keyboardShortcutsToolStripMenuItem";\r
-            this.keyboardShortcutsToolStripMenuItem.Size = new System.Drawing.Size(203, 22);\r
-            this.keyboardShortcutsToolStripMenuItem.Text = "Keyboard Shortcuts";\r
-            this.keyboardShortcutsToolStripMenuItem.Click += new System.EventHandler(this.keyboardShortcutsToolStripMenuItem_Click);\r
-            // \r
             // frmMain\r
             // \r
             this.AutoSavePosition = true;\r
@@ -828,6 +841,7 @@ namespace Radegast
         public System.Windows.Forms.ToolStripMenuItem disconnectToolStripMenuItem;\r
         public System.Windows.Forms.ToolStripMenuItem reconnectToolStripMenuItem;\r
         private System.Windows.Forms.ToolStripMenuItem keyboardShortcutsToolStripMenuItem;\r
+        private System.Windows.Forms.ToolStripButton tbtnVoice;\r
     }\r
 }\r
 \r

diff --git a/Radegast/GUI/Dialogs/MainForm.cs b/Radegast/GUI/Dialogs/MainForm.cs
index ee1e3da..c00b982 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.cs
+++ b/Radegast/GUI/Dialogs/MainForm.cs
@@ -278,7 +278,7 @@ namespace Radegast
             else if (e.Status == LoginStatus.Success)\r
             {\r
                 InAutoReconnect = false;\r
-                disconnectToolStripMenuItem.Enabled =\r
+                tbtnVoice.Enabled = disconnectToolStripMenuItem.Enabled =\r
                 tbtnGroups.Enabled = tbnObjects.Enabled = tbtnWorld.Enabled = tbnTools.Enabled = tmnuImport.Enabled =\r
                     tbtnFriends.Enabled = tbtnInventory.Enabled = tbtnSearch.Enabled = tbtnMap.Enabled = true;\r
 \r
@@ -289,7 +289,7 @@ namespace Radegast
 \r
         private void netcom_ClientLoggedOut(object sender, EventArgs e)\r
         {\r
-            disconnectToolStripMenuItem.Enabled =\r
+            tbtnVoice.Enabled = disconnectToolStripMenuItem.Enabled =\r
             tbtnGroups.Enabled = tbnObjects.Enabled = tbtnWorld.Enabled = tbnTools.Enabled = tmnuImport.Enabled =\r
                 tbtnFriends.Enabled = tbtnInventory.Enabled = tbtnSearch.Enabled = tbtnMap.Enabled = false;\r
 \r
@@ -545,6 +545,11 @@ namespace Radegast
                         e.Handled = e.SuppressKeyPress = true;\r
                         tbtnMedia.PerformClick();\r
                         break;\r
+\r
+                    case Keys.D9:\r
+                        e.Handled = e.SuppressKeyPress = true;\r
+                        tbtnVoice.PerformClick();\r
+                        break;\r
                 }\r
             }\r
 \r
@@ -1164,6 +1169,11 @@ namespace Radegast
             ToggleHidden("groups");\r
         }\r
 \r
+        private void tbtnVoice_Click(object sender, EventArgs e)\r
+        {\r
+            ToggleHidden("voice");\r
+        }\r
+\r
         private void tbtnMedia_Click(object sender, EventArgs e)\r
         {\r
             if (tabsConsole.TabExists("media"))\r
@@ -1255,6 +1265,5 @@ namespace Radegast
             }\r
         }\r
         #endregion\r
-\r
     }\r
 }
\ No newline at end of file

diff --git a/Radegast/GUI/Dialogs/MainForm.resx b/Radegast/GUI/Dialogs/MainForm.resx
index 1031760..9f60d73 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.resx
+++ b/Radegast/GUI/Dialogs/MainForm.resx
@@ -271,6 +271,21 @@
         KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
+  <data name="tbtnVoice.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI\r
+        ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9\r
+        HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN\r
+        rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K\r
+        TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx\r
+        oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8\r
+        7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI\r
+        xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX\r
+        LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd\r
+        KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC\r
+</value>\r
+  </data>\r
   <data name="tbtnHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r

diff --git a/Radegast/Radegast.csproj b/Radegast/Radegast.csproj
index d80015d..f19e357 100644 (file)
--- a/Radegast/Radegast.csproj
+++ b/Radegast/Radegast.csproj
@@ -294,6 +294,12 @@
     <Compile Include="GUI\Consoles\Assets\SLImageHandler.Designer.cs">\r
       <DependentUpon>SLImageHandler.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="GUI\Consoles\VoiceConsole.cs">\r
+      <SubType>UserControl</SubType>\r
+    </Compile>\r
+    <Compile Include="GUI\Consoles\VoiceConsole.Designer.cs">\r
+      <DependentUpon>VoiceConsole.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="GUI\Dialogs\About.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -549,6 +555,9 @@
       <DependentUpon>SLImageHandler.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="GUI\Consoles\VoiceConsole.resx">\r
+      <DependentUpon>VoiceConsole.cs</DependentUpon>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="GUI\Dialogs\About.resx">\r
       <DependentUpon>About.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r