OSDN Git Service

Final tweaks to 1.9 release
authorLatif Khalifa <latifer@streamgrid.net>
Sat, 10 Oct 2009 11:34:20 +0000 (11:34 +0000)
committerLatif Khalifa <latifer@streamgrid.net>
Sat, 10 Oct 2009 11:34:20 +0000 (11:34 +0000)
git-svn-id: https://radegast.googlecode.com/svn/trunk@337 f7a694da-4d33-11de-9ad6-1127a62b9fcd

Radegast/Core/Media/MediaManager.cs
Radegast/GUI/Consoles/AnimDetail.cs
Radegast/GUI/Dialogs/About.Designer.cs
Radegast/GUI/Dialogs/About.cs
Radegast/GUI/Dialogs/About.resx
Radegast/RadegastBuild.cs

index ead3b7b..55862ff 100644 (file)
@@ -79,9 +79,9 @@ namespace Radegast.Media
                 // Set FMOD speaker mode to what the driver supports.\r
                 FMODExec(system.setSpeakerMode(speakermode));\r
 \r
-                // Forcing the ESD sound system on Linux seems to avoid a CPU loop\r
+                // Forcing the ALSA sound system on Linux seems to avoid a CPU loop\r
                 if (System.Environment.OSVersion.Platform == PlatformID.Unix)\r
-                    FMODExec(system.setOutput(FMOD.OUTPUTTYPE.ESD));\r
+                    FMODExec(system.setOutput(FMOD.OUTPUTTYPE.ALSA));\r
 \r
                 // The user has the 'Acceleration' slider set to off, which\r
                 // is really bad for latency.  At 48khz, the latency between\r
index bb170c6..caf6717 100644 (file)
@@ -186,8 +186,7 @@ namespace Radegast
                 lblStatus.Text = "Sending to " + friend.Name;\r
                 Logger.Log("Sending item to " + friend.Name, Helpers.LogLevel.Info);\r
 \r
-                InventoryItem item = (InventoryItem)instance.Client.Inventory.Store[itemID];\r
-                instance.Client.Inventory.GiveItem(item.UUID, item.Name, item.AssetType, friend.UUID, false);\r
+                instance.Client.Inventory.GiveItem(itemID, boxAnimName.Text, AssetType.Animation, friend.UUID, false);\r
                 lblStatus.Text = "Sent";\r
             }\r
 \r
index bd79907..3c8f9f4 100644 (file)
@@ -65,6 +65,7 @@ namespace Radegast
             this.txtOtherLicenses = new System.Windows.Forms.TextBox();\r
             this.txtWrittenBy = new System.Windows.Forms.TextBox();\r
             this.btnClose = new System.Windows.Forms.Button();\r
+            this.lblHomepage = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -82,10 +83,10 @@ namespace Radegast
             // txtTitle\r
             // \r
             this.txtTitle.AutoSize = true;\r
-            this.txtTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.txtTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.txtTitle.Location = new System.Drawing.Point(161, 12);\r
             this.txtTitle.Name = "txtTitle";\r
-            this.txtTitle.Size = new System.Drawing.Size(152, 20);\r
+            this.txtTitle.Size = new System.Drawing.Size(137, 17);\r
             this.txtTitle.TabIndex = 1;\r
             this.txtTitle.Text = "Radegast 1.9.200";\r
             // \r
@@ -93,6 +94,7 @@ namespace Radegast
             // \r
             this.txtLicense.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.txtLicense.Location = new System.Drawing.Point(12, 125);\r
+            this.txtLicense.MaximumSize = new System.Drawing.Size(315, 113);\r
             this.txtLicense.Multiline = true;\r
             this.txtLicense.Name = "txtLicense";\r
             this.txtLicense.ReadOnly = true;\r
@@ -106,6 +108,7 @@ namespace Radegast
             // \r
             this.txtOtherLicenses.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.txtOtherLicenses.Location = new System.Drawing.Point(12, 244);\r
+            this.txtOtherLicenses.MaximumSize = new System.Drawing.Size(315, 92);\r
             this.txtOtherLicenses.Multiline = true;\r
             this.txtOtherLicenses.Name = "txtOtherLicenses";\r
             this.txtOtherLicenses.ReadOnly = true;\r
@@ -129,14 +132,27 @@ namespace Radegast
             // \r
             // btnClose\r
             // \r
+            this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));\r
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.OK;\r
-            this.btnClose.Location = new System.Drawing.Point(252, 342);\r
+            this.btnClose.Location = new System.Drawing.Point(251, 342);\r
             this.btnClose.Name = "btnClose";\r
             this.btnClose.Size = new System.Drawing.Size(75, 23);\r
             this.btnClose.TabIndex = 0;\r
             this.btnClose.Text = "Close";\r
             this.btnClose.UseVisualStyleBackColor = true;\r
             // \r
+            // lblHomepage\r
+            // \r
+            this.lblHomepage.AutoSize = true;\r
+            this.lblHomepage.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.lblHomepage.ForeColor = System.Drawing.Color.Blue;\r
+            this.lblHomepage.Location = new System.Drawing.Point(12, 342);\r
+            this.lblHomepage.Name = "lblHomepage";\r
+            this.lblHomepage.Size = new System.Drawing.Size(118, 13);\r
+            this.lblHomepage.TabIndex = 4;\r
+            this.lblHomepage.Text = "www.radegastclient.org";\r
+            this.lblHomepage.Click += new System.EventHandler(this.lblHomepage_Click);\r
+            // \r
             // frmAbout\r
             // \r
             this.AcceptButton = this.btnClose;\r
@@ -145,6 +161,7 @@ namespace Radegast
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.CancelButton = this.btnClose;\r
             this.ClientSize = new System.Drawing.Size(335, 371);\r
+            this.Controls.Add(this.lblHomepage);\r
             this.Controls.Add(this.btnClose);\r
             this.Controls.Add(this.txtOtherLicenses);\r
             this.Controls.Add(this.txtWrittenBy);\r
@@ -153,7 +170,6 @@ namespace Radegast
             this.Controls.Add(this.pictureBox1);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
-            this.MaximumSize = new System.Drawing.Size(351, 409);\r
             this.MinimizeBox = false;\r
             this.MinimumSize = new System.Drawing.Size(351, 409);\r
             this.Name = "frmAbout";\r
@@ -174,6 +190,7 @@ namespace Radegast
         public System.Windows.Forms.TextBox txtOtherLicenses;\r
         public System.Windows.Forms.TextBox txtWrittenBy;\r
         public System.Windows.Forms.Button btnClose;\r
+        private System.Windows.Forms.Label lblHomepage;\r
 \r
     }\r
 }
\ No newline at end of file
index 602f1e1..4a5d994 100644 (file)
@@ -41,5 +41,10 @@ namespace Radegast
             txtTitle.Text = Properties.Resources.RadegastTitle + "." + RadegastBuild.CurrentRev;\r
         }\r
 \r
+        private void lblHomepage_Click(object sender, System.EventArgs e)\r
+        {\r
+            Instance.MainForm.ProcessLink("http://www.radegastclient.org/");\r
+        }\r
+\r
     }\r
 }\r
index 571e8e8..84252db 100644 (file)
@@ -160,7 +160,11 @@ Copyright © Contributors, http://opensimulator.org/
 Uses TAO OpenGL framework (MIT License)\r
 Copyright © 2003-2007 Tao Framework Team\r
 http://www.taoframework.com\r
-All rights reserved.</value>\r
+All rights reserved.\r
+\r
+Uses artwork files are licenced under the \r
+Creative Commons Share and Share Alike 3.0\r
+Copyright (C) 2002-2009 Linden Research Inc.</value>\r
   </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
index 501a55a..e5bfde6 100644 (file)
@@ -1,5 +1,5 @@
 // Autogenerated: run updatebuildnr.bat/sh to update \r
 namespace Radegast \r
 { \r
-    public static class RadegastBuild { public static int CurrentRev = 316; } \r
+    public static class RadegastBuild { public static int CurrentRev = 337; } \r
 } \r