From: <an...@us...> - 2007-10-04 07:02:58
|
Revision: 973 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=973&view=rev Author: and-81 Date: 2007-10-04 00:02:56 -0700 (Thu, 04 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Translator/ButtonMapping.cs trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Applications/Translator/ProgramSettings.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ServerAddress.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs trunk/plugins/IR Server Suite/Common/MPUtils/MPCommands.cs trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.Designer.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/Program.cs trunk/plugins/IR Server Suite/Input Service/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/MCEReplacement/MCEReplacement.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.resx trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.Designer.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.resx trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.Designer.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.resx trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/ trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Configure.resx trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/ trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/NativeMethods.cs trunk/plugins/IR Server Suite/Input Service/Icon.ico Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -145,9 +145,9 @@ comboBoxComputer.Items.Clear(); comboBoxComputer.Items.Add("localhost"); - ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers(); + string[] networkPCs = IrssUtils.Win32.GetNetworkComputers(false); if (networkPCs != null) - comboBoxComputer.Items.AddRange(networkPCs.ToArray()); + comboBoxComputer.Items.AddRange(networkPCs); comboBoxComputer.Text = _serverHost; } Added: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -0,0 +1,180 @@ +namespace IRServer +{ + partial class Advanced + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Advanced)); + this.groupBoxMode = new System.Windows.Forms.GroupBox(); + this.labelComputer = new System.Windows.Forms.Label(); + this.radioButtonRepeater = new System.Windows.Forms.RadioButton(); + this.radioButtonRelay = new System.Windows.Forms.RadioButton(); + this.radioButtonServer = new System.Windows.Forms.RadioButton(); + this.comboBoxComputer = new System.Windows.Forms.ComboBox(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOK = new System.Windows.Forms.Button(); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.groupBoxMode.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxMode + // + this.groupBoxMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBoxMode.Controls.Add(this.labelComputer); + this.groupBoxMode.Controls.Add(this.radioButtonRepeater); + this.groupBoxMode.Controls.Add(this.radioButtonRelay); + this.groupBoxMode.Controls.Add(this.radioButtonServer); + this.groupBoxMode.Controls.Add(this.comboBoxComputer); + this.groupBoxMode.Location = new System.Drawing.Point(8, 8); + this.groupBoxMode.Name = "groupBoxMode"; + this.groupBoxMode.Size = new System.Drawing.Size(384, 120); + this.groupBoxMode.TabIndex = 0; + this.groupBoxMode.TabStop = false; + this.groupBoxMode.Text = "IR Server Mode"; + // + // labelComputer + // + this.labelComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.labelComputer.Location = new System.Drawing.Point(168, 56); + this.labelComputer.Name = "labelComputer"; + this.labelComputer.Size = new System.Drawing.Size(208, 32); + this.labelComputer.TabIndex = 3; + this.labelComputer.Text = "Input Relay / Repeater host computer:"; + this.labelComputer.TextAlign = System.Drawing.ContentAlignment.BottomLeft; + // + // radioButtonRepeater + // + this.radioButtonRepeater.AutoSize = true; + this.radioButtonRepeater.Location = new System.Drawing.Point(16, 88); + this.radioButtonRepeater.Name = "radioButtonRepeater"; + this.radioButtonRepeater.Size = new System.Drawing.Size(98, 17); + this.radioButtonRepeater.TabIndex = 2; + this.radioButtonRepeater.TabStop = true; + this.radioButtonRepeater.Text = "Repeater mode"; + this.toolTips.SetToolTip(this.radioButtonRepeater, "All output commands from a host IR Server are repeated"); + this.radioButtonRepeater.UseVisualStyleBackColor = true; + this.radioButtonRepeater.CheckedChanged += new System.EventHandler(this.radioButtonRepeater_CheckedChanged); + // + // radioButtonRelay + // + this.radioButtonRelay.AutoSize = true; + this.radioButtonRelay.Location = new System.Drawing.Point(16, 56); + this.radioButtonRelay.Name = "radioButtonRelay"; + this.radioButtonRelay.Size = new System.Drawing.Size(103, 17); + this.radioButtonRelay.TabIndex = 1; + this.radioButtonRelay.TabStop = true; + this.radioButtonRelay.Text = "Input relay mode"; + this.toolTips.SetToolTip(this.radioButtonRelay, "All input is relayed to another IR Server instance"); + this.radioButtonRelay.UseVisualStyleBackColor = true; + this.radioButtonRelay.CheckedChanged += new System.EventHandler(this.radioButtonRelay_CheckedChanged); + // + // radioButtonServer + // + this.radioButtonServer.AutoSize = true; + this.radioButtonServer.Location = new System.Drawing.Point(16, 24); + this.radioButtonServer.Name = "radioButtonServer"; + this.radioButtonServer.Size = new System.Drawing.Size(126, 17); + this.radioButtonServer.TabIndex = 0; + this.radioButtonServer.TabStop = true; + this.radioButtonServer.Text = "Server mode (default)"; + this.toolTips.SetToolTip(this.radioButtonServer, "IR Server operates as a device server (default)"); + this.radioButtonServer.UseVisualStyleBackColor = true; + this.radioButtonServer.CheckedChanged += new System.EventHandler(this.radioButtonServer_CheckedChanged); + // + // comboBoxComputer + // + this.comboBoxComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.comboBoxComputer.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.comboBoxComputer.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.comboBoxComputer.Enabled = false; + this.comboBoxComputer.FormattingEnabled = true; + this.comboBoxComputer.Location = new System.Drawing.Point(168, 88); + this.comboBoxComputer.Name = "comboBoxComputer"; + this.comboBoxComputer.Size = new System.Drawing.Size(208, 21); + this.comboBoxComputer.TabIndex = 4; + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(328, 144); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(64, 24); + this.buttonCancel.TabIndex = 2; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.Location = new System.Drawing.Point(256, 144); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(64, 24); + this.buttonOK.TabIndex = 1; + this.buttonOK.Text = "OK"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); + // + // Advanced + // + this.AcceptButton = this.buttonOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(402, 177); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.groupBoxMode); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(418, 213); + this.Name = "Advanced"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "IR Server - Advanced Configuration"; + this.groupBoxMode.ResumeLayout(false); + this.groupBoxMode.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBoxMode; + private System.Windows.Forms.Label labelComputer; + private System.Windows.Forms.RadioButton radioButtonRepeater; + private System.Windows.Forms.RadioButton radioButtonRelay; + private System.Windows.Forms.RadioButton radioButtonServer; + private System.Windows.Forms.ComboBox comboBoxComputer; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.ToolTip toolTips; + } +} \ No newline at end of file Added: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -0,0 +1,98 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace IRServer +{ + + partial class Advanced : Form + { + + #region Properties + + public IRServerMode Mode + { + get + { + if (radioButtonRelay.Checked) + return IRServerMode.RelayMode; + else if (radioButtonRepeater.Checked) + return IRServerMode.RepeaterMode; + else + return IRServerMode.ServerMode; + } + set + { + switch (value) + { + case IRServerMode.ServerMode: + radioButtonServer.Checked = true; + break; + + case IRServerMode.RelayMode: + radioButtonRelay.Checked = true; + break; + + case IRServerMode.RepeaterMode: + radioButtonRepeater.Checked = true; + break; + } + } + } + public string HostComputer + { + get { return comboBoxComputer.Text; } + set { comboBoxComputer.Text = value; } + } + + #endregion Properties + + #region Constructor + + public Advanced() + { + InitializeComponent(); + + string[] networkPCs = IrssUtils.Win32.GetNetworkComputers(false); + if (networkPCs != null) + comboBoxComputer.Items.AddRange(networkPCs); + } + + #endregion Constructor + + #region Controls + + private void buttonOK_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.OK; + this.Close(); + } + private void buttonCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + private void radioButtonServer_CheckedChanged(object sender, EventArgs e) + { + comboBoxComputer.Enabled = false; + } + private void radioButtonRelay_CheckedChanged(object sender, EventArgs e) + { + comboBoxComputer.Enabled = true; + } + private void radioButtonRepeater_CheckedChanged(object sender, EventArgs e) + { + comboBoxComputer.Enabled = true; + } + + #endregion Controls + + } + +} Added: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.resx (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.resx 2007-10-04 07:02:56 UTC (rev 973) @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> +</root> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -65,7 +65,7 @@ IRServerMode _mode; string _hostComputer; - bool _registered = false; // Used for relay and repeater modes. + bool _registered; // Used for relay and repeater modes. string[] _pluginNameReceive; IRServerPluginBase[] _pluginReceive; Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -2,12 +2,11 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +//using System.Security.Permissions; -// // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -// [assembly: AssemblyTitle("IR Server")] [assembly: AssemblyDescription("Provides multiple connections for local and network access to a remote control transceiver")] [assembly: AssemblyConfiguration("")] @@ -22,7 +21,9 @@ // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: GuidAttribute("a94fbaf3-2d68-45da-8f4f-7dee41f00040")] + // Version information for an assembly consists of the following four values: // // Major Version @@ -38,4 +39,4 @@ [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("a94fbaf3-2d68-45da-8f4f-7dee41f00040")] +//[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)] Modified: trunk/plugins/IR Server Suite/Applications/Translator/ButtonMapping.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/ButtonMapping.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Translator/ButtonMapping.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -55,7 +55,7 @@ #region Constructors - public ButtonMapping() : this(String.Empty, String.Empty, String.Empty) { } + public ButtonMapping() { } public ButtonMapping(string keyCode, string description, string command) { _keyCode = keyCode; Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -92,7 +92,7 @@ /// <param name="config">Configuration to save.</param> /// <param name="fileName">File to save to.</param> /// <returns>Success.</returns> - public static bool Save(Configuration config, string fileName) + internal static bool Save(Configuration config, string fileName) { try { @@ -114,7 +114,7 @@ /// </summary> /// <param name="fileName">File to load from.</param> /// <returns>Loaded Configuration.</returns> - public static Configuration Load(string fileName) + internal static Configuration Load(string fileName) { try { Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -253,7 +253,9 @@ { for (int index = 0; index < args.Length; index++) { - switch (args[index].ToLowerInvariant()) + string command = args[index].ToLowerInvariant(); + + switch (command) { case "-macro": SendCopyDataMessage("Translator", Common.CmdPrefixMacro + args[++index]); @@ -303,7 +305,7 @@ copyData.lpData = Win32.VarPtr(data).ToInt32(); copyData.cbData = data.Length; - IntPtr windowHandle = Win32.FindWindow(null, targetWindow); + IntPtr windowHandle = Win32.FindWindowByTitle(targetWindow); if (windowHandle != IntPtr.Zero) { IntPtr result; Modified: trunk/plugins/IR Server Suite/Applications/Translator/ProgramSettings.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/ProgramSettings.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Translator/ProgramSettings.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -144,7 +144,7 @@ /// Get the Command String to launch the program. /// </summary> /// <returns>Returns the Command String to launch the program.</returns> - public string LaunchCommand() + internal string LaunchCommand() { return String.Format("{0}|{1}|{2}|{3}|{4}|{5}|{6}|{7}", _filename, Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -30,7 +30,7 @@ #endregion Properties delegate void DelegateKeyCodeSet(); - DelegateKeyCodeSet _keyCodeSet = null; + DelegateKeyCodeSet _keyCodeSet; void KeyCodeSet() { timer.Stop(); @@ -55,7 +55,7 @@ timer.Start(); } - + void MessageReceiver(IrssMessage received) { if (received.Type == MessageType.RemoteEvent) @@ -70,7 +70,7 @@ { KeyCodeSet(); } - + } } Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Setup.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -66,9 +66,10 @@ comboBoxComputer.Items.Clear(); comboBoxComputer.Items.Add("localhost"); - ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers(); + + string[] networkPCs = IrssUtils.Win32.GetNetworkComputers(false); if (networkPCs != null) - comboBoxComputer.Items.AddRange(networkPCs.ToArray()); + comboBoxComputer.Items.AddRange(networkPCs); } #endregion Constructor Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -30,11 +30,11 @@ #region Variables - static ClientMessageSink _handleMessage = null; + static ClientMessageSink _handleMessage; Client _client; - static bool _registered = false; + static bool _registered; string _serverHost; string _programFile; @@ -44,7 +44,7 @@ NotifyIcon _notifyIcon; - bool _inConfiguration = false; + bool _inConfiguration; #endregion Variables Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -184,7 +184,7 @@ } } - void ButtonPress(string keyCode) + static void ButtonPress(string keyCode) { if (!Program.Registered) return; Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -33,10 +33,9 @@ static Client _client; - static bool _registered = false; + static bool _registered; static string _serverHost; - static string _lastKeyCode = String.Empty; static string _installFolder; Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -55,6 +55,7 @@ this.connectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.disconnectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.changeServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timerFlash = new System.Windows.Forms.Timer(this.components); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.buttonAddButton = new System.Windows.Forms.Button(); @@ -62,7 +63,6 @@ this.buttonSetCode = new System.Windows.Forms.Button(); this.buttonSetShortcut = new System.Windows.Forms.Button(); this.comboBoxShortcut = new System.Windows.Forms.ComboBox(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelRemote.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemote)).BeginInit(); this.menuStrip.SuspendLayout(); @@ -216,42 +216,42 @@ // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.saveAsToolStripMenuItem.Text = "Save as ..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // // closeToolStripMenuItem // this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.closeToolStripMenuItem.Text = "Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // // quitToolStripMenuItem // this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; - this.quitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.quitToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.quitToolStripMenuItem.Text = "Quit"; this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // @@ -286,9 +286,16 @@ this.changeServerToolStripMenuItem.Text = "Change Server"; this.changeServerToolStripMenuItem.Click += new System.EventHandler(this.changeServerToolStripMenuItem_Click); // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Text = "Help"; + this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); + // // timerFlash // - this.timerFlash.Interval = 750; + this.timerFlash.Interval = 1250; this.timerFlash.Tick += new System.EventHandler(this.timerFlash_Tick); // // saveFileDialog @@ -347,13 +354,6 @@ this.comboBoxShortcut.Size = new System.Drawing.Size(112, 21); this.comboBoxShortcut.TabIndex = 9; // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); - this.helpToolStripMenuItem.Text = "Help"; - this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -28,20 +28,20 @@ #region Variables - Client _client = null; + Client _client; - bool _registered = false; + bool _registered; - string _serverHost = String.Empty; + string _serverHost = String.Empty; - bool _unsavedChanges = false; - //bool _fileOpen = false; + bool _unsavedChanges; + //bool _fileOpen; string _fileName = String.Empty; Label _currentButton = null; Point _mouseOffset; - bool _isMouseDown = false; + bool _isMouseDown; #endregion Variables Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2007-10-04 07:02:56 UTC (rev 973) @@ -44,11 +44,13 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\x86\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> + <DefineConstants> + </DefineConstants> <Optimize>true</Optimize> - <DebugType>pdbonly</DebugType> + <DebugType>none</DebugType> <PlatformTarget>x86</PlatformTarget> <ErrorReport>prompt</ErrorReport> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -62,10 +62,12 @@ /// <returns>true if the current object is equal to the other parameter; otherwise, false.</returns> public override bool Equals(object obj) { - if (!(obj is MessageManagerCombo)) + MessageManagerCombo asCombo = obj as MessageManagerCombo; + + if (asCombo == null) return false; - return Equals((MessageManagerCombo)obj); + return Equals(asCombo); } /// <summary> Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -2,6 +2,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +//using System.Security.Permissions; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -36,3 +37,5 @@ [assembly: AssemblyFileVersion("1.0.3.4")] [assembly: CLSCompliant(true)] + +//[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)] Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-03 03:14:49 UTC (rev 972) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -408,11 +408,11 @@ break; case "class": - windowHandle = Win32.FindWindow(commands[1], null); + windowHandle = Win32.FindWindowByClass(commands[1]); break; case "window": - windowHandle = Win32.FindWindow(null, commands[1]); + windowHandle = Win32.FindWindowByTitle(commands[1]); break; } Added: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.Designer.cs (rev 0) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -0,0 +1,174 @@ +namespace IrssUtils.Forms +{ + + partial class BlastCommand + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.labelIRFile = new System.Windows.Forms.Label(); + this.labelBlasterPort = new System.Windows.Forms.Label(); + this.comboBoxPort = new System.Windows.Forms.ComboBox(); + this.labelIRCommandFile = new System.Windows.Forms.Label(); + this.buttonTest = new System.Windows.Forms.Button(); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.checkBoxUseForAll = new System.Windows.Forms.CheckBox(); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.SuspendLayout(); + // + // labelIRFile + // + this.labelIRFile.Location = new System.Drawing.Point(8, 8); + this.labelIRFile.Name = "labelIRFile"; + this.labelIRFile.Size = new System.Drawing.Size(88, 20); + this.labelIRFile.TabIndex = 0; + this.labelIRFile.Text = "IR Command:"; + this.labelIRFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // labelBlasterPort + // + this.labelBlasterPort.Location = new System.Drawing.Point(8, 40); + this.labelBlasterPort.Name = "labelBlasterPort"; + this.labelBlasterPort.Size = new System.Drawing.Size(88, 21); + this.labelBlasterPort.TabIndex = 2; + this.labelBlasterPort.Text = "Blaster port:"; + this.labelBlasterPort.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // comboBoxPort + // + this.comboBoxPort.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxPort.FormattingEnabled = true; + this.comboBoxPort.Location = new System.Drawing.Point(96, 40); + this.comboBoxPort.Name = "comboBoxPort"; + this.comboBoxPort.Size = new System.Drawing.Size(160, 21); + this.comboBoxPort.TabIndex = 3; + this.toolTips.SetToolTip(this.comboBoxPort, "Choose the blaster port to transmit this command to"); + // + // labelIRCommandFile + // + this.labelIRCommandFile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.labelIRCommandFile.AutoEllipsis = true; + this.labelIRCommandFile.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.labelIRCommandFile.Location = new System.Drawing.Point(96, 8); + this.labelIRCommandFile.Name = "labelIRCommandFile"; + this.labelIRCommandFile.Size = new System.Drawing.Size(248, 20); + this.labelIRCommandFile.TabIndex = 1; + this.labelIRCommandFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // buttonTest + // + this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonTest.Location = new System.Drawing.Point(8, 72); + this.buttonTest.Name = "buttonTest"; + this.buttonTest.Size = new System.Drawing.Size(56, 24); + this.buttonTest.TabIndex = 4; + this.buttonTest.Text = "Test"; + this.toolTips.SetToolTip(this.buttonTest, "Test this blast command"); + this.buttonTest.UseVisualStyleBackColor = true; + this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click); + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.Location = new System.Drawing.Point(224, 72); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(56, 24); + this.buttonOK.TabIndex = 6; + this.buttonOK.Text = "OK"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(288, 72); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(56, 24); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // checkBoxUseForAll + // + this.checkBoxUseForAll.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.checkBoxUseForAll.Location = new System.Drawing.Point(72, 72); + this.checkBoxUseForAll.Name = "checkBoxUseForAll"; + this.checkBoxUseForAll.Size = new System.Drawing.Size(144, 24); + this.checkBoxUseForAll.TabIndex = 5; + this.checkBoxUseForAll.Text = "Use this port for all"; + this.toolTips.SetToolTip(this.checkBoxUseForAll, "Use the selected blaster port for all blast commands in this group"); + this.checkBoxUseForAll.UseVisualStyleBackColor = true; + this.checkBoxUseForAll.Visible = false; + // + // BlastCommand + // + this.AcceptButton = this.buttonOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(352, 105); + this.Controls.Add(this.checkBoxUseForAll); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonTest); + this.Controls.Add(this.labelIRCommandFile); + this.Controls.Add(this.labelBlasterPort); + this.Controls.Add(this.comboBoxPort); + this.Controls.Add(this.labelIRFile); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(360, 132); + this.Name = "BlastCommand"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Blast Command"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Label labelIRFile; + private System.Windows.Forms.Label labelBlasterPort; + private System.Windows.Forms.ComboBox comboBoxPort; + private System.Windows.Forms.Label labelIRCommandFile; + private System.Windows.Forms.Button buttonTest; + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.CheckBox checkBoxUseForAll; + private System.Windows.Forms.ToolTip toolTips; + } + +} Added: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs (rev 0) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs 2007-10-04 07:02:56 UTC (rev 973) @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace IrssUtils.Forms +{ + + public partial class BlastCommand : Form + { + + #region Properties + + public string CommandString + { + get + { + return String.Format("{0}|{1}", + labelIRCommandFile.Text, + comboBoxPort.SelectedItem as string); + } + } + + public string BlasterPort + { + get { return comboBoxPort.SelectedItem as string; } + set { comboBoxPort.SelectedItem = value; } + } + + public bool UseForAll + { + get { return checkBoxUseForAll.Checked; } + } + + #endregion Properties + + #region Variables + + string _baseFolder; + + BlastIrDelegate _blastIrDelegate; + + #endregion Variables + + #region Constructors + + BlastCommand(BlastIrDelegate blastIrDelegate, string baseFolder, string[] ports) + { + if (blastIrDelegate == null) + throw new ArgumentNullException("blastIrDelegate"); + + if (String.IsNullOrEmpty(baseFolder)) + throw new ArgumentNullException("baseFolder"); + + if (ports == null) + throw new ArgumentNullException("ports"); + + InitializeComponent(); + + _blastIrDelegate = blastIrDelegate; + + _baseFolder = baseFolder; + + comboBoxPort.Items.AddRange(ports); + comboBoxPort.SelectedIndex = 0; + } + + public BlastCommand(BlastIrDelegate blastIrDelegate, string baseFolder, string[] ports, string name) + : this(blastIrDelegate, baseFolder, ports) + { + if (String.IsNullOrEmpty(name)) + throw new ArgumentNullException("fileName"); + + labelIRCommandFile.Text = name; + } + + public BlastCommand(BlastIrDelegate blastIrDelegate, string baseFolder, string[] ports, string[] commands) + : this(blastIrDelegate, baseFolder, ports) + { + if (commands == null) + throw new ArgumentNullException("commands"); + + labelIRCommandFile.Text = commands[0]; + + if (comboBoxPort.Items.Contains(commands[1])) + comboBoxPort.SelectedItem = commands[1]; + } + + public BlastCommand(BlastIrDelegate blastIrDelegate, string baseFolder, string[] ports, string name, bool useAllCheckBoxVisible, int commandCount) + : this(blastIrDelegate, baseFolder, ports, name) + { + checkBoxUseForAll.Text = String.Format("Use this port for all ({0})", commandCount); + checkBoxUseForAll.Visible = true; + } + + public BlastCommand(BlastIrDelegate blastIrDelegate, string baseFolder, string[] ports, string[] commands, bool useAllCheckBoxVisible, int commandCount) + : this(blastIrDelegate, baseFolder, ports, commands) + { + checkBoxUseForAll.Text = String.Format("Use this port for all ({0})", commandCount); + checkBoxUseForAll.Visible = true; + } + + #endregion Constructors + + #region Buttons + + private void buttonOK_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.OK; + this.Close(); + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + private void buttonTest_Click(object sender, EventArgs e) + { + string name = labelIRCommandFile.Text.Trim(); + + if (name.Length == 0) + return; + + tr... [truncated message content] |