Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [831] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-08-13 15:37:09
|
Revision: 831
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=831&view=rev
Author: and-81
Date: 2007-08-13 08:37:07 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
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/Translator/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/TransceiverInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginInterface.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug USB Receiver/IgorPlug USB Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Receiver/WinLirc Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/BlastCommand.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/LearnIR.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Plugins/MCE Replacement Transceiver/
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -52,7 +52,6 @@
this.groupBoxSetup = new System.Windows.Forms.GroupBox();
this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.groupBoxCommands = new System.Windows.Forms.GroupBox();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.buttonHelp = new System.Windows.Forms.Button();
@@ -329,7 +328,6 @@
//
this.groupBoxCommands.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxCommands.Controls.Add(this.comboBoxSpeed);
this.groupBoxCommands.Controls.Add(this.comboBoxPort);
this.groupBoxCommands.Controls.Add(this.buttonCrash);
this.groupBoxCommands.Controls.Add(this.buttonBlast);
@@ -344,16 +342,6 @@
this.groupBoxCommands.TabStop = false;
this.groupBoxCommands.Text = "Commands";
//
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(168, 50);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(80, 21);
- this.comboBoxSpeed.TabIndex = 4;
- this.toolTip.SetToolTip(this.comboBoxSpeed, "Speed to blast IR at");
- //
// comboBoxPort
//
this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -429,7 +417,6 @@
private System.Windows.Forms.GroupBox groupBoxCommands;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.ComboBox comboBoxPort;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.ComboBox comboBoxComputer;
private System.Windows.Forms.Button buttonHelp;
}
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -141,10 +141,6 @@
comboBoxPort.Items.Add("None");
comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.Add("None");
- comboBoxSpeed.SelectedIndex = 0;
-
ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers();
if (networkPCs != null)
{
@@ -192,10 +188,6 @@
comboBoxPort.Items.Clear();
comboBoxPort.Items.AddRange(_transceiverInfo.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(_transceiverInfo.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
return;
}
@@ -327,7 +319,7 @@
return true;
}
- bool BlastIR(string fileName, string port, string speed)
+ bool BlastIR(string fileName, string port)
{
try
{
@@ -336,14 +328,12 @@
FileStream file = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
- byte[] outData = new byte[8 + port.Length + speed.Length + file.Length];
+ byte[] outData = new byte[4 + port.Length + file.Length];
BitConverter.GetBytes(port.Length).CopyTo(outData, 0);
Encoding.ASCII.GetBytes(port).CopyTo(outData, 4);
- BitConverter.GetBytes(speed.Length).CopyTo(outData, 4 + port.Length);
- Encoding.ASCII.GetBytes(speed).CopyTo(outData, 8 + port.Length);
- file.Read(outData, 8 + port.Length + speed.Length, (int)file.Length);
+ file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
@@ -433,7 +423,7 @@
return;
}
- if (BlastIR(TempIRFile, comboBoxPort.SelectedItem as string, comboBoxSpeed.SelectedItem as string))
+ if (BlastIR(TempIRFile, comboBoxPort.SelectedItem as string))
AddStatusLine("Blasting");
else
AddStatusLine("Can't Blast");
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -850,14 +850,10 @@
if (portLen > 0)
_pluginTransmit.SetPort(Encoding.ASCII.GetString(data, 4, portLen));
- int speedLen = BitConverter.ToInt32(data, 4 + portLen);
- if (speedLen > 0)
- _pluginTransmit.SetSpeed(Encoding.ASCII.GetString(data, 4 + portLen + 4, speedLen));
+ byte[] fileData = new byte[data.Length - (4 + portLen)];
+ for (int index = 4 + portLen; index < data.Length; index++)
+ fileData[index - (4 + portLen)] = data[index];
- byte[] fileData = new byte[data.Length - (4 + portLen + 4 + speedLen)];
- for (int index = (4 + portLen + 4 + speedLen); index < data.Length; index++)
- fileData[index - (4 + portLen + 4 + speedLen)] = data[index];
-
string tempFile = Path.GetTempFileName();
FileStream fileStream = new FileStream(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
@@ -1086,7 +1082,6 @@
{
transceiverInfo.Name = _pluginTransmit.Name;
transceiverInfo.Ports = _pluginTransmit.AvailablePorts;
- transceiverInfo.Speeds = _pluginTransmit.AvailableSpeeds;
transceiverInfo.CanLearn = _pluginTransmit.CanLearn;
transceiverInfo.CanTransmit = _pluginTransmit.CanTransmit;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -29,8 +29,6 @@
private void InitializeComponent()
{
this.labelIRFile = new System.Windows.Forms.Label();
- this.labelBlasterSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.labelBlasterPort = new System.Windows.Forms.Label();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.labelIRCommandFile = new System.Windows.Forms.Label();
@@ -48,24 +46,6 @@
this.labelIRFile.Text = "IR Command:";
this.labelIRFile.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // labelBlasterSpeed
- //
- this.labelBlasterSpeed.Location = new System.Drawing.Point(8, 72);
- this.labelBlasterSpeed.Name = "labelBlasterSpeed";
- this.labelBlasterSpeed.Size = new System.Drawing.Size(88, 21);
- this.labelBlasterSpeed.TabIndex = 4;
- this.labelBlasterSpeed.Text = "Blaster speed:";
- this.labelBlasterSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(96, 72);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(104, 21);
- this.comboBoxSpeed.TabIndex = 5;
- //
// labelBlasterPort
//
this.labelBlasterPort.Location = new System.Drawing.Point(8, 40);
@@ -99,10 +79,10 @@
// 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, 112);
+ 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 = 6;
+ this.buttonTest.TabIndex = 4;
this.buttonTest.Text = "Test";
this.buttonTest.UseVisualStyleBackColor = true;
this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
@@ -110,10 +90,10 @@
// 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(160, 112);
+ this.buttonOK.Location = new System.Drawing.Point(160, 72);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(56, 24);
- this.buttonOK.TabIndex = 7;
+ this.buttonOK.TabIndex = 5;
this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
@@ -122,10 +102,10 @@
//
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(224, 112);
+ this.buttonCancel.Location = new System.Drawing.Point(224, 72);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(56, 24);
- this.buttonCancel.TabIndex = 8;
+ this.buttonCancel.TabIndex = 6;
this.buttonCancel.Text = "Cancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
@@ -136,20 +116,18 @@
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(288, 144);
+ this.ClientSize = new System.Drawing.Size(288, 104);
this.Controls.Add(this.buttonOK);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonTest);
this.Controls.Add(this.labelIRCommandFile);
- this.Controls.Add(this.labelBlasterSpeed);
- this.Controls.Add(this.comboBoxSpeed);
this.Controls.Add(this.labelBlasterPort);
this.Controls.Add(this.comboBoxPort);
this.Controls.Add(this.labelIRFile);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(294, 176);
+ this.MinimumSize = new System.Drawing.Size(294, 130);
this.Name = "BlastCommand";
this.ShowIcon = false;
this.ShowInTaskbar = false;
@@ -162,8 +140,6 @@
#endregion
private System.Windows.Forms.Label labelIRFile;
- private System.Windows.Forms.Label labelBlasterSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.Label labelBlasterPort;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.Label labelIRCommandFile;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -20,10 +20,9 @@
{
get
{
- return String.Format("{0}|{1}|{2}",
+ return String.Format("{0}|{1}",
labelIRCommandFile.Text,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
}
@@ -35,7 +34,7 @@
{
InitializeComponent();
- SetupPortsAndSpeeds();
+ SetupPorts();
labelIRCommandFile.Text = file;
}
@@ -43,7 +42,7 @@
{
InitializeComponent();
- SetupPortsAndSpeeds();
+ SetupPorts();
if (commands == null)
return;
@@ -52,20 +51,14 @@
if (comboBoxPort.Items.Contains(commands[1]))
comboBoxPort.SelectedItem = commands[1];
-
- if (comboBoxSpeed.Items.Contains(commands[2]))
- comboBoxSpeed.SelectedItem = commands[2];
}
#endregion Constructors
- void SetupPortsAndSpeeds()
+ void SetupPorts()
{
comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
}
#region Buttons
@@ -92,8 +85,7 @@
try
{
Program.BlastIR(Common.FolderIRCommands + fileName + Common.FileExtensionIR,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -40,8 +40,6 @@
this.buttonSet = new System.Windows.Forms.Button();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPageBlastIR = new System.Windows.Forms.TabPage();
- this.labelBlasterSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.buttonLearnIR = new System.Windows.Forms.Button();
this.labelBlasterPort = new System.Windows.Forms.Label();
this.comboBoxIRCode = new System.Windows.Forms.ComboBox();
@@ -169,13 +167,13 @@
this.checkBoxMouseMoveUp = new System.Windows.Forms.CheckBox();
this.labelMouseMove = new System.Windows.Forms.Label();
this.numericUpDownMouseMove = new System.Windows.Forms.NumericUpDown();
+ this.tabPageMisc = new System.Windows.Forms.TabPage();
+ this.labelMiscCommand = new System.Windows.Forms.Label();
+ this.comboBoxMiscCommand = new System.Windows.Forms.ComboBox();
this.buttonTest = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.tabPageMisc = new System.Windows.Forms.TabPage();
- this.labelMiscCommand = new System.Windows.Forms.Label();
- this.comboBoxMiscCommand = new System.Windows.Forms.ComboBox();
this.groupBoxButton.SuspendLayout();
this.groupBoxSet.SuspendLayout();
this.tabControl.SuspendLayout();
@@ -320,8 +318,6 @@
//
// tabPageBlastIR
//
- this.tabPageBlastIR.Controls.Add(this.labelBlasterSpeed);
- this.tabPageBlastIR.Controls.Add(this.comboBoxSpeed);
this.tabPageBlastIR.Controls.Add(this.buttonLearnIR);
this.tabPageBlastIR.Controls.Add(this.labelBlasterPort);
this.tabPageBlastIR.Controls.Add(this.comboBoxIRCode);
@@ -335,31 +331,13 @@
this.tabPageBlastIR.Text = "Blast IR";
this.tabPageBlastIR.UseVisualStyleBackColor = true;
//
- // labelBlasterSpeed
- //
- this.labelBlasterSpeed.Location = new System.Drawing.Point(8, 80);
- this.labelBlasterSpeed.Name = "labelBlasterSpeed";
- this.labelBlasterSpeed.Size = new System.Drawing.Size(88, 21);
- this.labelBlasterSpeed.TabIndex = 4;
- this.labelBlasterSpeed.Text = "Blaster speed:";
- this.labelBlasterSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(96, 80);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(120, 21);
- this.comboBoxSpeed.TabIndex = 5;
- //
// buttonLearnIR
//
this.buttonLearnIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLearnIR.Location = new System.Drawing.Point(360, 176);
this.buttonLearnIR.Name = "buttonLearnIR";
this.buttonLearnIR.Size = new System.Drawing.Size(64, 24);
- this.buttonLearnIR.TabIndex = 6;
+ this.buttonLearnIR.TabIndex = 4;
this.buttonLearnIR.Text = "Learn";
this.toolTips.SetToolTip(this.buttonLearnIR, "Click here to add a new IR Command to the list");
this.buttonLearnIR.UseVisualStyleBackColor = true;
@@ -1013,52 +991,52 @@
this.toolStripSeparator2,
this.specialKeysToolStripMenuItem});
this.contextMenuStripKeystrokes.Name = "contextMenuStripKeystrokes";
- this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(145, 148);
+ this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(139, 148);
//
// cutToolStripMenuItem
//
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.cutToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.cutToolStripMenuItem.Text = "Cut";
this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
//
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.copyToolStripMenuItem.Text = "Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
// pasteToolStripMenuItem
//
this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
- this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.pasteToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.pasteToolStripMenuItem.Text = "Paste";
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(135, 6);
//
// selectAllToolStripMenuItem
//
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.selectAllToolStripMenuItem.Text = "Select All";
this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
//
// selectNoneToolStripMenuItem
//
this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
- this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.selectNoneToolStripMenuItem.Text = "Select None";
this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6);
//
// specialKeysToolStripMenuItem
//
@@ -1084,7 +1062,7 @@
this.scrollLockToolStripMenuItem,
this.tabToolStripMenuItem});
this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
- this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.specialKeysToolStripMenuItem.Text = "Special Keys";
//
// arrowsToolStripMenuItem
@@ -1095,34 +1073,34 @@
this.leftToolStripMenuItem,
this.rightToolStripMenuItem});
this.arrowsToolStripMenuItem.Name = "arrowsToolStripMenuItem";
- this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.arrowsToolStripMenuItem.Text = "Arrows";
//
// upToolStripMenuItem
//
this.upToolStripMenuItem.Name = "upToolStripMenuItem";
- this.upToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.upToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.upToolStripMenuItem.Text = "Up";
this.upToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// downToolStripMenuItem
//
this.downToolStripMenuItem.Name = "downToolStripMenuItem";
- this.downToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.downToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.downToolStripMenuItem.Text = "Down";
this.downToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// leftToolStripMenuItem
//
this.leftToolStripMenuItem.Name = "leftToolStripMenuItem";
- this.leftToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.leftToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.leftToolStripMenuItem.Text = "Left";
this.leftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// rightToolStripMenuItem
//
this.rightToolStripMenuItem.Name = "rightToolStripMenuItem";
- this.rightToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.rightToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.rightToolStripMenuItem.Text = "Right";
this.rightToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1146,118 +1124,118 @@
this.f15ToolStripMenuItem,
this.f16ToolStripMenuItem});
this.functionKeysToolStripMenuItem.Name = "functionKeysToolStripMenuItem";
- this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.functionKeysToolStripMenuItem.Text = "Function Keys";
//
// f1ToolStripMenuItem
//
this.f1ToolStripMenuItem.Name = "f1ToolStripMenuItem";
- this.f1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f1ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f1ToolStripMenuItem.Text = "F1";
this.f1ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f2ToolStripMenuItem
//
this.f2ToolStripMenuItem.Name = "f2ToolStripMenuItem";
- this.f2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f2ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f2ToolStripMenuItem.Text = "F2";
this.f2ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f3ToolStripMenuItem
//
this.f3ToolStripMenuItem.Name = "f3ToolStripMenuItem";
- this.f3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f3ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f3ToolStripMenuItem.Text = "F3";
this.f3ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f4ToolStripMenuItem
//
this.f4ToolStripMenuItem.Name = "f4ToolStripMenuItem";
- this.f4ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f4ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f4ToolStripMenuItem.Text = "F4";
this.f4ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f5ToolStripMenuItem
//
this.f5ToolStripMenuItem.Name = "f5ToolStripMenuItem";
- this.f5ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f5ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f5ToolStripMenuItem.Text = "F5";
this.f5ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f6ToolStripMenuItem
//
this.f6ToolStripMenuItem.Name = "f6ToolStripMenuItem";
- this.f6ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f6ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f6ToolStripMenuItem.Text = "F6";
this.f6ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f7ToolStripMenuItem
//
this.f7ToolStripMenuItem.Name = "f7ToolStripMenuItem";
- this.f7ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f7ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f7ToolStripMenuItem.Text = "F7";
this.f7ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f8ToolStripMenuItem
//
this.f8ToolStripMenuItem.Name = "f8ToolStripMenuItem";
- this.f8ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f8ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f8ToolStripMenuItem.Text = "F8";
this.f8ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f9ToolStripMenuItem
//
this.f9ToolStripMenuItem.Name = "f9ToolStripMenuItem";
- this.f9ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f9ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f9ToolStripMenuItem.Text = "F9";
this.f9ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f10ToolStripMenuItem
//
this.f10ToolStripMenuItem.Name = "f10ToolStripMenuItem";
- this.f10ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f10ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f10ToolStripMenuItem.Text = "F10";
this.f10ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f11ToolStripMenuItem
//
this.f11ToolStripMenuItem.Name = "f11ToolStripMenuItem";
- this.f11ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f11ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f11ToolStripMenuItem.Text = "F11";
this.f11ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f12ToolStripMenuItem
//
this.f12ToolStripMenuItem.Name = "f12ToolStripMenuItem";
- this.f12ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f12ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f12ToolStripMenuItem.Text = "F12";
this.f12ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f13ToolStripMenuItem
//
this.f13ToolStripMenuItem.Name = "f13ToolStripMenuItem";
- this.f13ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f13ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f13ToolStripMenuItem.Text = "F13";
this.f13ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f14ToolStripMenuItem
//
this.f14ToolStripMenuItem.Name = "f14ToolStripMenuItem";
- this.f14ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f14ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f14ToolStripMenuItem.Text = "F14";
this.f14ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f15ToolStripMenuItem
//
this.f15ToolStripMenuItem.Name = "f15ToolStripMenuItem";
- this.f15ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f15ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f15ToolStripMenuItem.Text = "F15";
this.f15ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// f16ToolStripMenuItem
//
this.f16ToolStripMenuItem.Name = "f16ToolStripMenuItem";
- this.f16ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.f16ToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
this.f16ToolStripMenuItem.Text = "F16";
this.f16ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1269,34 +1247,34 @@
this.multiplyToolStripMenuItem,
this.divideToolStripMenuItem});
this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
- this.keypadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.keypadToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.keypadToolStripMenuItem.Text = "Keypad";
//
// addToolStripMenuItem
//
this.addToolStripMenuItem.Name = "addToolStripMenuItem";
- this.addToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.addToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.addToolStripMenuItem.Text = "Add";
this.addToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// subtractToolStripMenuItem
//
this.subtractToolStripMenuItem.Name = "subtractToolStripMenuItem";
- this.subtractToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.subtractToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.subtractToolStripMenuItem.Text = "Subtract";
this.subtractToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// multiplyToolStripMenuItem
//
this.multiplyToolStripMenuItem.Name = "multiplyToolStripMenuItem";
- this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.multiplyToolStripMenuItem.Text = "Multiply";
this.multiplyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// divideToolStripMenuItem
//
this.divideToolStripMenuItem.Name = "divideToolStripMenuItem";
- this.divideToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
+ this.divideToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
this.divideToolStripMenuItem.Text = "Divide";
this.divideToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1307,137 +1285,137 @@
this.controlToolStripMenuItem,
this.shiftToolStripMenuItem});
this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
- this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.modifiersToolStripMenuItem.Text = "Modifiers";
//
// altToolStripMenuItem
//
this.altToolStripMenuItem.Name = "altToolStripMenuItem";
- this.altToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.altToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.altToolStripMenuItem.Text = "Alt";
this.altToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// controlToolStripMenuItem
//
this.controlToolStripMenuItem.Name = "controlToolStripMenuItem";
- this.controlToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.controlToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.controlToolStripMenuItem.Text = "Control";
this.controlToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// shiftToolStripMenuItem
//
this.shiftToolStripMenuItem.Name = "shiftToolStripMenuItem";
- this.shiftToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.shiftToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
this.shiftToolStripMenuItem.Text = "Shift";
this.shiftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6);
//
// backspaceToolStripMenuItem
//
this.backspaceToolStripMenuItem.Name = "backspaceToolStripMenuItem";
- this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.backspaceToolStripMenuItem.Text = "Backspace";
this.backspaceToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// breakToolStripMenuItem
//
this.breakToolStripMenuItem.Name = "breakToolStripMenuItem";
- this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.breakToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.breakToolStripMenuItem.Text = "Break";
this.breakToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// capsLockToolStripMenuItem
//
this.capsLockToolStripMenuItem.Name = "capsLockToolStripMenuItem";
- this.capsLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.capsLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.capsLockToolStripMenuItem.Text = "Caps Lock";
this.capsLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// delToolStripMenuItem
//
this.delToolStripMenuItem.Name = "delToolStripMenuItem";
- this.delToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.delToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.delToolStripMenuItem.Text = "Delete";
this.delToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// endToolStripMenuItem
//
this.endToolStripMenuItem.Name = "endToolStripMenuItem";
- this.endToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.endToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.endToolStripMenuItem.Text = "End";
this.endToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// enterToolStripMenuItem
//
this.enterToolStripMenuItem.Name = "enterToolStripMenuItem";
- this.enterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.enterToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.enterToolStripMenuItem.Text = "Enter";
this.enterToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// escapeToolStripMenuItem
//
this.escapeToolStripMenuItem.Name = "escapeToolStripMenuItem";
- this.escapeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.escapeToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.escapeToolStripMenuItem.Text = "Escape";
this.escapeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.helpToolStripMenuItem.Text = "Help";
this.helpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// homeToolStripMenuItem
//
this.homeToolStripMenuItem.Name = "homeToolStripMenuItem";
- this.homeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.homeToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.homeToolStripMenuItem.Text = "Home";
this.homeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// insToolStripMenuItem
//
this.insToolStripMenuItem.Name = "insToolStripMenuItem";
- this.insToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.insToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.insToolStripMenuItem.Text = "Insert";
this.insToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// numLockToolStripMenuItem
//
this.numLockToolStripMenuItem.Name = "numLockToolStripMenuItem";
- this.numLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.numLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.numLockToolStripMenuItem.Text = "Num Lock";
this.numLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// pageDownToolStripMenuItem
//
this.pageDownToolStripMenuItem.Name = "pageDownToolStripMenuItem";
- this.pageDownToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.pageDownToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.pageDownToolStripMenuItem.Text = "Page Down";
this.pageDownToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// pageUpToolStripMenuItem
//
this.pageUpToolStripMenuItem.Name = "pageUpToolStripMenuItem";
- this.pageUpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.pageUpToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.pageUpToolStripMenuItem.Text = "Page Up";
this.pageUpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// scrollLockToolStripMenuItem
//
this.scrollLockToolStripMenuItem.Name = "scrollLockToolStripMenuItem";
- this.scrollLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.scrollLockToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.scrollLockToolStripMenuItem.Text = "Scroll Lock";
this.scrollLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
// tabToolStripMenuItem
//
this.tabToolStripMenuItem.Name = "tabToolStripMenuItem";
- this.tabToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.tabToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.tabToolStripMenuItem.Text = "Tab";
this.tabToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1641,6 +1619,36 @@
0,
0});
//
+ // tabPageMisc
+ //
+ this.tabPageMisc.Controls.Add(this.labelMiscCommand);
+ this.tabPageMisc.Controls.Add(this.comboBoxMiscCommand);
+ this.tabPageMisc.Location = new System.Drawing.Point(4, 22);
+ this.tabPageMisc.Name = "tabPageMisc";
+ this.tabPageMisc.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageMisc.Size = new System.Drawing.Size(432, 206);
+ this.tabPageMisc.TabIndex = 7;
+ this.tabPageMisc.Text = "Misc";
+ this.tabPageMisc.UseVisualStyleBackColor = true;
+ //
+ // labelMiscCommand
+ //
+ this.labelMiscCommand.Location = new System.Drawing.Point(8, 16);
+ this.labelMiscCommand.Name = "labelMiscCommand";
+ this.labelMiscCommand.Size = new System.Drawing.Size(88, 21);
+ this.labelMiscCommand.TabIndex = 0;
+ this.labelMiscCommand.Text = "Command:";
+ this.labelMiscCommand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // comboBoxMiscCommand
+ //
+ this.comboBoxMiscCommand.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxMiscCommand.FormattingEnabled = true;
+ this.comboBoxMiscCommand.Location = new System.Drawing.Point(96, 16);
+ this.comboBoxMiscCommand.Name = "comboBoxMiscCommand";
+ this.comboBoxMiscCommand.Size = new System.Drawing.Size(328, 21);
+ this.comboBoxMiscCommand.TabIndex = 1;
+ //
// buttonTest
//
this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -1676,36 +1684,6 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
- // tabPageMisc
- //
- this.tabPageMisc.Controls.Add(this.labelMiscCommand);
- this.tabPageMisc.Controls.Add(this.comboBoxMiscCommand);
- this.tabPageMisc.Location = new System.Drawing.Point(4, 22);
- this.tabPageMisc.Name = "tabPageMisc";
- this.tabPageMisc.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMisc.Size = new System.Drawing.Size(432, 206);
- this.tabPageMisc.TabIndex = 7;
- this.tabPageMisc.Text = "Misc";
- this.tabPageMisc.UseVisualStyleBackColor = true;
- //
- // labelMiscCommand
- //
- this.labelMiscCommand.Location = new System.Drawing.Point(8, 16);
- this.labelMiscCommand.Name = "labelMiscCommand";
- this.labelMiscCommand.Size = new System.Drawing.Size(88, 21);
- this.labelMiscCommand.TabIndex = 0;
- this.labelMiscCommand.Text = "Command:";
- this.labelMiscCommand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxMiscCommand
- //
- this.comboBoxMiscCommand.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxMiscCommand.FormattingEnabled = true;
- this.comboBoxMiscCommand.Location = new System.Drawing.Point(96, 16);
- this.comboBoxMiscCommand.Name = "comboBoxMiscCommand";
- this.comboBoxMiscCommand.Size = new System.Drawing.Size(328, 21);
- this.comboBoxMiscCommand.TabIndex = 1;
- //
// ButtonMappingForm
//
this.AcceptButton = this.buttonOK;
@@ -1771,8 +1749,6 @@
private System.Windows.Forms.Button buttonSet;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage tabPageBlastIR;
- private System.Windows.Forms.Label labelBlasterSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.Button buttonLearnIR;
private System.Windows.Forms.Label labelBlasterPort;
private System.Windows.Forms.ComboBox comboBoxIRCode;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -106,11 +106,6 @@
if (comboBoxPort.Items.Count > 0)
comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- if (comboBoxSpeed.Items.Count > 0)
- comboBoxSpeed.SelectedIndex = 0;
-
// Setup Serial tab
comboBoxComPort.Items.Clear();
comboBoxComPort.Items.AddRange(SerialPort.GetPortNames());
@@ -151,7 +146,7 @@
prefix = _command.Substring(0, find + 2);
suffix = _command.Substring(find + 2);
}
-
+
switch (prefix)
{
case Common.CmdPrefixBlast:
@@ -161,7 +156,6 @@
tabControl.SelectTab(tabPageBlastIR);
comboBoxIRCode.SelectedItem = commands[0];
comboBoxPort.SelectedItem = commands[1];
- comboBoxSpeed.SelectedItem = commands[2];
break;
}
@@ -323,11 +317,10 @@
case "tabPageBlastIR":
{
textBoxCommand.Text = _command =
- String.Format("{0}{1}|{2}|{3}",
+ String.Format("{0}{1}|{2}",
Common.CmdPrefixBlast,
comboBoxIRCode.SelectedItem as string,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
break;
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.Designer.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -38,8 +38,6 @@
this.groupBoxStatus = new System.Windows.Forms.GroupBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.labelPort = new System.Windows.Forms.Label();
- this.labelSpeed = new System.Windows.Forms.Label();
- this.comboBoxSpeed = new System.Windows.Forms.ComboBox();
this.groupBoxTest = new System.Windows.Forms.GroupBox();
this.groupBoxStatus.SuspendLayout();
this.groupBoxTest.SuspendLayout();
@@ -48,7 +46,7 @@
// buttonDone
//
this.buttonDone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonDone.Location = new System.Drawing.Point(216, 176);
+ this.buttonDone.Location = new System.Drawing.Point(216, 152);
this.buttonDone.Name = "buttonDone";
this.buttonDone.Size = new System.Drawing.Size(56, 24);
this.buttonDone.TabIndex = 5;
@@ -73,7 +71,7 @@
// buttonLearn
//
this.buttonLearn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonLearn.Location = new System.Drawing.Point(8, 176);
+ this.buttonLearn.Location = new System.Drawing.Point(8, 152);
this.buttonLearn.Name = "buttonLearn";
this.buttonLearn.Size = new System.Drawing.Size(56, 24);
this.buttonLearn.TabIndex = 4;
@@ -101,11 +99,12 @@
//
// buttonTest
//
+ this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonTest.Enabled = false;
- this.buttonTest.Location = new System.Drawing.Point(200, 40);
+ this.buttonTest.Location = new System.Drawing.Point(200, 16);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(56, 24);
- this.buttonTest.TabIndex = 4;
+ this.buttonTest.TabIndex = 2;
this.buttonTest.Text = "Test";
this.buttonTest.UseVisualStyleBackColor = true;
this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
@@ -126,7 +125,7 @@
//
this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxPort.FormattingEnabled = true;
- this.comboBoxPort.Location = new System.Drawing.Point(8, 40);
+ this.comboBoxPort.Location = new System.Drawing.Point(64, 16);
this.comboBoxPort.Name = "comboBoxPort";
this.comboBoxPort.Size = new System.Drawing.Size(88, 21);
this.comboBoxPort.TabIndex = 1;
@@ -135,41 +134,21 @@
//
this.labelPort.Location = new System.Drawing.Point(8, 16);
this.labelPort.Name = "labelPort";
- this.labelPort.Size = new System.Drawing.Size(88, 24);
+ this.labelPort.Size = new System.Drawing.Size(56, 21);
this.labelPort.TabIndex = 0;
this.labelPort.Text = "Port:";
this.labelPort.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // labelSpeed
- //
- this.labelSpeed.Location = new System.Drawing.Point(104, 16);
- this.labelSpeed.Name = "labelSpeed";
- this.labelSpeed.Size = new System.Drawing.Size(88, 24);
- this.labelSpeed.TabIndex = 2;
- this.labelSpeed.Text = "Speed:";
- this.labelSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // comboBoxSpeed
- //
- this.comboBoxSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSpeed.FormattingEnabled = true;
- this.comboBoxSpeed.Location = new System.Drawing.Point(104, 40);
- this.comboBoxSpeed.Name = "comboBoxSpeed";
- this.comboBoxSpeed.Size = new System.Drawing.Size(88, 21);
- this.comboBoxSpeed.TabIndex = 3;
- //
// groupBoxTest
//
this.groupBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxTest.Controls.Add(this.comboBoxPort);
- this.groupBoxTest.Controls.Add(this.labelSpeed);
this.groupBoxTest.Controls.Add(this.buttonTest);
- this.groupBoxTest.Controls.Add(this.comboBoxSpeed);
this.groupBoxTest.Controls.Add(this.labelPort);
this.groupBoxTest.Location = new System.Drawing.Point(8, 96);
this.groupBoxTest.Name = "groupBoxTest";
- this.groupBoxTest.Size = new System.Drawing.Size(264, 72);
+ this.groupBoxTest.Size = new System.Drawing.Size(264, 48);
this.groupBoxTest.TabIndex = 3;
this.groupBoxTest.TabStop = false;
this.groupBoxTest.Text = "Test";
@@ -179,7 +158,7 @@
this.AcceptButton = this.buttonDone;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(280, 207);
+ this.ClientSize = new System.Drawing.Size(280, 184);
this.Controls.Add(this.groupBoxTest);
this.Controls.Add(this.buttonDone);
this.Controls.Add(this.groupBoxStatus);
@@ -188,7 +167,7 @@
this.Controls.Add(this.textBoxName);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(288, 234);
+ this.MinimumSize = new System.Drawing.Size(288, 220);
this.Name = "LearnIR";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -211,8 +190,6 @@
private System.Windows.Forms.GroupBox groupBoxStatus;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.Label labelPort;
- private System.Windows.Forms.Label labelSpeed;
- private System.Windows.Forms.ComboBox comboBoxSpeed;
private System.Windows.Forms.GroupBox groupBoxTest;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -53,10 +53,6 @@
comboBoxPort.Items.Clear();
comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
comboBoxPort.SelectedIndex = 0;
-
- comboBoxSpeed.Items.Clear();
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
- comboBoxSpeed.SelectedIndex = 0;
}
#endregion Constructor
@@ -163,8 +159,7 @@
try
{
Program.BlastIR(Common.FolderIRCommands + command + Common.FileExtensionIR,
- comboBoxPort.SelectedItem as string,
- comboBoxSpeed.SelectedItem as string);
+ comboBoxPort.SelectedItem as string);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-13 12:57:24 UTC (rev 830)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-08-13 15:37:07 UTC (rev 831)
@@ -1232,7 +1232,7 @@
case Common.XmlTagBlast:
{
string[] commands = Common.SplitBlastCommand(commandProperty);
- BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1], commands[2]);
+ BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]);
break;
}
@@ -1345,8 +1345,7 @@
/// </summary>
/// <param name="fileName">File to blast (absolute path).</param>
/// <param name="port">Port to blast to.</param>
- /// <param name="speed">Speed to blast at.</param>
- internal static void BlastIR(string fileName, string port, string speed)
+ internal static void BlastIR(string fileName, string port)
{
if (!_registered)
throw new Exception("Cannot Blast, not registered ...
[truncated message content] |
