corrade-vassal – Diff between revs 13 and 16

Subversion Repositories:

?pathlinks?

Rev 13 – Rev 20 – Go to most recent revision – Details – Blame – Last modification – View Log

 //  Please see: http://www.gnu.org/licenses/gpl.html for legal details,  //
 //  rights of fair usage, the disclaimer and warranty conditions.        //
 ///////////////////////////////////////////////////////////////////////////
-using System;
-using System.ComponentModel;
+using System;
-using System.Drawing;
-using System.IO;
+using System.Drawing;
+using System.Linq;
+using System.Net;
-using System.Linq;
+using System.Net.Http.Headers;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
+using OpenMetaverse;
-using OpenMetaverse;
+using wasSharp;
 namespace Vassal
+{
             // general
             mainForm.HTTPServerURL.Text = Vassal.vassalConfiguration.HTTPServerURL;
             mainForm.Group.Text = Vassal.vassalConfiguration.Group;
             mainForm.Password.Text = Vassal.vassalConfiguration.Password;
             mainForm.TeleportTimeout.Text = Vassal.vassalConfiguration.TeleportTimeout.ToString(Utils.EnUsCulture);
-            mainForm.DataTimeout.Text = Vassal.vassalConfiguration.DataTimeout.ToString(Utils.EnUsCulture);
+            mainForm.ServicesTimeout.Text = Vassal.vassalConfiguration.ServicesTimeout.ToString(Utils.EnUsCulture);
             mainForm.RegionRestartDelay.Text = Vassal.vassalConfiguration.RegionRestartDelay.ToString(Utils.EnUsCulture);
             // filters
             mainForm.ActiveInputFilters.Items.Clear();
-            foreach (Filter filter in Vassal.vassalConfiguration.InputFilters)
+            foreach (var filter in Vassal.vassalConfiguration.InputFilters)
+            {
                 mainForm.ActiveInputFilters.Items.Add(new ListViewItem
                 {
-                    Text = wasGetDescriptionFromEnumValue(filter),
+                    Text = Reflection.GetDescriptionFromEnumValue(filter),
                     Tag = filter
                 });
+            }
             mainForm.ActiveOutputFilters.Items.Clear();
             mainForm.ActiveInputFilters.DisplayMember = "Text";
-            foreach (Filter filter in Vassal.vassalConfiguration.OutputFilters)
+            foreach (var filter in Vassal.vassalConfiguration.OutputFilters)
+            {
                 mainForm.ActiveOutputFilters.Items.Add(new ListViewItem
                 {
-                    Text = wasGetDescriptionFromEnumValue(filter),
+                    Text = Reflection.GetDescriptionFromEnumValue(filter),
                     Tag = filter
                 });
+            }
             mainForm.ActiveOutputFilters.DisplayMember = "Text";
             // cryptography
             mainForm.ENIGMARotorSequence.Items.Clear();
-            foreach (char rotor in Vassal.vassalConfiguration.ENIGMA.rotors)
+            foreach (var rotor in Vassal.vassalConfiguration.ENIGMA.rotors)
+            {
                 mainForm.ENIGMARotorSequence.Items.Add(new ListViewItem
+                {
                     Text = rotor.ToString(),
                     Tag = rotor
                 });
+            }
             mainForm.ENIGMARotorSequence.DisplayMember = "Text";
             mainForm.ENIGMAPlugSequence.Items.Clear();
-            foreach (char plug in Vassal.vassalConfiguration.ENIGMA.plugs)
+            foreach (var plug in Vassal.vassalConfiguration.ENIGMA.plugs)
+            {
                 mainForm.ENIGMAPlugSequence.Items.Add(new ListViewItem
+                {
                     Text = plug.ToString(),
                     Tag = plug
                 });
+            }
             mainForm.ENIGMAPlugSequence.DisplayMember = "Text";
+            mainForm.ENIGMAReflector.Text = Vassal.vassalConfiguration.ENIGMA.reflector.ToString();
+            mainForm.VIGENERESecret.Text = Vassal.vassalConfiguration.VIGENERESecret;
+            // HTTP
+            string mediaType;
+            switch (Vassal.vassalConfiguration.InputFilters.LastOrDefault())
+            {
+                case Filter.RFC1738:
+                    mediaType = @"application/x-www-form-urlencoded";
+                    break;
+                default:
+                    mediaType = @"text/plain";
+                    break;
+            }
+            // Create HTTP Client
-            mainForm.ENIGMAReflector.Text = Vassal.vassalConfiguration.ENIGMA.reflector.ToString();
+            Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal",
-            mainForm.VIGENERESecret.Text = Vassal.vassalConfiguration.VIGENERESecret;
+                Vassal.VASSAL_VERSION), new CookieContainer(), mediaType, 60000);
         };
         private readonly Action SetUserConfiguration = () =>
+        {
             // general
             Vassal.vassalConfiguration.HTTPServerURL = mainForm.HTTPServerURL.Text;
             Vassal.vassalConfiguration.Group = mainForm.Group.Text;
             Vassal.vassalConfiguration.Password = mainForm.Password.Text;
             uint outUint;
-            if (uint.TryParse(mainForm.TeleportTimeout.Text, out outUint))
+            if (uint.TryParse(mainForm.ServicesTimeout.Text, out outUint))
             {
-                Vassal.vassalConfiguration.TeleportTimeout = outUint;
+                Vassal.vassalConfiguration.ServicesTimeout = outUint;
             }
-            if (uint.TryParse(mainForm.DataTimeout.Text, out outUint))
+            if (uint.TryParse(mainForm.TeleportTimeout.Text, out outUint))
+            {
-                Vassal.vassalConfiguration.DataTimeout = outUint;
+                Vassal.vassalConfiguration.TeleportTimeout = outUint;
+            }
             if (uint.TryParse(mainForm.RegionRestartDelay.Text, out outUint))
                 plugs = mainForm.ENIGMAPlugSequence.Items.Cast<ListViewItem>().Select(o => (char) o.Tag).ToArray(),
                 reflector = mainForm.ENIGMAReflector.Text[0]
             };
+            Vassal.vassalConfiguration.VIGENERESecret = mainForm.VIGENERESecret.Text;
+            // HTTP
+            string mediaType;
+            switch (Vassal.vassalConfiguration.InputFilters.LastOrDefault())
+            {
+                case Filter.RFC1738:
+                    mediaType = @"application/x-www-form-urlencoded";
+                    break;
+                default:
+                    mediaType = @"text/plain";
+                    break;
+            }
+            // Create HTTP Client
+            Vassal.HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal",
-            Vassal.vassalConfiguration.VIGENERESecret = mainForm.VIGENERESecret.Text;
+                Vassal.VASSAL_VERSION), new CookieContainer(), mediaType, 60000);
         };
         public SettingsForm()
+        {
             InitializeComponent();
-            mainForm = this;
-        }
-        ///////////////////////////////////////////////////////////////////////////
-        //    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
-        ///////////////////////////////////////////////////////////////////////////
-        /// <summary>
-        ///     Get enumeration value from its description.
-        /// </summary>
-        /// <typeparam name="T">the enumeration type</typeparam>
-        /// <param name="description">the description of a member</param>
-        /// <returns>the value or the default of T if case no description found</returns>
-        private static T wasGetEnumValueFromDescription<T>(string description)
-        {
-            var field = typeof (T).GetFields()
-                .AsParallel().SelectMany(f => f.GetCustomAttributes(
-                    typeof (DescriptionAttribute), false), (
-                        f, a) => new {Field = f, Att = a}).SingleOrDefault(a => ((DescriptionAttribute) a.Att)
-                            .Description.Equals(description));
-            return field != null ? (T) field.Field.GetRawConstantValue() : default(T);
-        }
-        ///////////////////////////////////////////////////////////////////////////
-        //    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
-        ///////////////////////////////////////////////////////////////////////////
-        /// <summary>
-        ///     Get the description from an enumeration value.
-        /// </summary>
-        /// <param name="value">an enumeration value</param>
-        /// <returns>the description or the empty string</returns>
-        private static string wasGetDescriptionFromEnumValue(Enum value)
-        {
-            DescriptionAttribute attribute = value.GetType()
-                .GetField(value.ToString())
-                .GetCustomAttributes(typeof (DescriptionAttribute), false)
-                .SingleOrDefault() as DescriptionAttribute;
-            return attribute != null ? attribute.Description : string.Empty;
+            mainForm = this;
+        }
         private void LoadSettingsRequested(object sender, EventArgs e)
+        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
+            {
                 switch (mainForm.LoadSettingsDialog.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = mainForm.LoadSettingsDialog.FileName;
+                        var file = mainForm.LoadSettingsDialog.FileName;
                         new Thread(() =>
+                        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
+            {
                 switch (mainForm.SaveSettingsDialog.ShowDialog())
+                {
                     case DialogResult.OK:
-                        string file = mainForm.SaveSettingsDialog.FileName;
+                        var file = mainForm.SaveSettingsDialog.FileName;
                         new Thread(() =>
+                        {
                             mainForm.BeginInvoke((MethodInvoker) (() =>
+                            {
                                 try
+                }
                 InputDecode.BackColor = Color.Empty;
                 ActiveInputFilters.Items.Add(new ListViewItem
+                {
                     Text = InputDecode.Text,
-                    Tag = wasGetEnumValueFromDescription<Filter>(InputDecode.Text)
+                    Tag = Reflection.GetEnumValueFromDescription<Filter>(InputDecode.Text)
                 });
             }));
+        }
+                }
                 InputDecryption.BackColor = Color.Empty;
                 ActiveInputFilters.Items.Add(new ListViewItem
+                {
                     Text = InputDecryption.Text,
-                    Tag = wasGetEnumValueFromDescription<Filter>(InputDecryption.Text)
+                    Tag = Reflection.GetEnumValueFromDescription<Filter>(InputDecryption.Text)
                 });
             }));
+        }
+                }
                 OutputEncrypt.BackColor = Color.Empty;
                 ActiveOutputFilters.Items.Add(new ListViewItem
+                {
                     Text = OutputEncrypt.Text,
-                    Tag = wasGetEnumValueFromDescription<Filter>(OutputEncrypt.Text)
+                    Tag = Reflection.GetEnumValueFromDescription<Filter>(OutputEncrypt.Text)
                 });
             }));
+        }
+                }
                 OutputEncode.BackColor = Color.Empty;
                 ActiveOutputFilters.Items.Add(new ListViewItem
+                {
                     Text = OutputEncode.Text,
-                    Tag = wasGetEnumValueFromDescription<Filter>(OutputEncode.Text)
+                    Tag = Reflection.GetEnumValueFromDescription<Filter>(OutputEncode.Text)
                 });
             }));
+        }
         private void DeleteSelectedOutputFilterRequested(object sender, EventArgs e)
+        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
             {
-                ListViewItem listViewItem = ActiveOutputFilters.SelectedItem as ListViewItem;
+                var listViewItem = ActiveOutputFilters.SelectedItem as ListViewItem;
                 if (listViewItem == null)
+                {
                     ActiveOutputFilters.BackColor = Color.MistyRose;
                     return;
         private void DeleteSelectedInputFilterRequested(object sender, EventArgs e)
+        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
             {
-                ListViewItem listViewItem = ActiveInputFilters.SelectedItem as ListViewItem;
+                var listViewItem = ActiveInputFilters.SelectedItem as ListViewItem;
                 if (listViewItem == null)
+                {
                     ActiveInputFilters.BackColor = Color.MistyRose;
                     return;
         private void DeleteENIGMARotorRequested(object sender, EventArgs e)
+        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
             {
-                ListViewItem listViewItem = ENIGMARotorSequence.SelectedItem as ListViewItem;
+                var listViewItem = ENIGMARotorSequence.SelectedItem as ListViewItem;
                 if (listViewItem == null)
+                {
                     ENIGMARotorSequence.BackColor = Color.MistyRose;
                     return;
         private void DeleteENIGMAPlugRequested(object sender, EventArgs e)
+        {
             mainForm.BeginInvoke((MethodInvoker) (() =>
             {
-                ListViewItem listViewItem = ENIGMAPlugSequence.SelectedItem as ListViewItem;
+                var listViewItem = ENIGMAPlugSequence.SelectedItem as ListViewItem;
                 if (listViewItem == null)
+                {
                     ENIGMAPlugSequence.BackColor = Color.MistyRose;
                     return;
             // save settings
             VassalConfiguration.Save(Vassal.VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE, ref Vassal.vassalConfiguration);
             // Spawn a thread to check Corrade's connection status.
             new Thread(() =>
+            {
-                TcpClient tcpClient = new TcpClient();
+                var tcpClient = new TcpClient();
                 try
+                {
-                    Uri uri = new Uri(Vassal.vassalConfiguration.HTTPServerURL);
+                    var uri = new Uri(Vassal.vassalConfiguration.HTTPServerURL);
                     tcpClient.Connect(uri.Host, uri.Port);
                     // port open
                     Vassal.vassalForm.BeginInvoke((MethodInvoker) (() => { Vassal.vassalForm.Tabs.Enabled = true; }));
                     // set the loading spinner
                     if (Vassal.vassalForm.RegionAvatarsMap.Image == null)
+                    {
-                        Assembly thisAssembly = Assembly.GetExecutingAssembly();
+                        var thisAssembly = Assembly.GetExecutingAssembly();
-                        Stream file =
+                        var file =
                             thisAssembly.GetManifestResourceStream("Vassal.img.loading.gif");
                         switch (file != null)
+                        {
                             case true:
                                 Vassal.vassalForm.BeginInvoke((MethodInvoker) (() =>
+                    }
                     Vassal.vassalForm.VassalStatusGroup.Enabled = true;
                 }));
             }));
+        }
+        private void ShowToolTip(object sender, EventArgs e)
+        {
+            mainForm.BeginInvoke(
+                (Action) (() =>
+                {
+                    var pictureBox = sender as PictureBox;
+                    if (pictureBox != null)
+                    {
+                        toolTip1.Show(toolTip1.GetToolTip(pictureBox), pictureBox);
+                    }
+                }));
+        }
+    }
+}