Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1126] trunk/plugins
|
From: <an...@us...> - 2007-12-05 16:48:01
|
Revision: 1126
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1126&view=rev
Author: and-81
Date: 2007-12-05 08:47:57 -0800 (Wed, 05 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.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/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.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.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs
trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.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/Microsoft MCE Transceiver/Driver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.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/DriverXP.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/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/CreateIRFile.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Menu.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/ExternalChannels.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/ExternalChannels.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/Forms/StbSetup.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Wii Remote.xml
trunk/plugins/IR Server Suite/Documentation/troubleshooting.html
Property Changed:
----------------
trunk/plugins/IgorPlugUSB/
trunk/plugins/MCEReplacement/
trunk/plugins/MCEReplacementTray/
trunk/plugins/MessagePlugin/
trunk/plugins/RarPlayer/
trunk/plugins/TV3ExtChannelChanger/
trunk/plugins/TV3MceBlaster/
trunk/plugins/TV3UuirtBlaster/
trunk/plugins/TVServerStatus/
trunk/plugins/XBCDRC/
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -71,7 +71,7 @@
bool _registered; // Used for relay and repeater modes.
string[] _pluginNameReceive;
- IRServerPluginBase[] _pluginReceive;
+ List<IRServerPluginBase> _pluginReceive;
string _pluginNameTransmit;
IRServerPluginBase _pluginTransmit;
@@ -172,7 +172,7 @@
}
else
{
- List<IRServerPluginBase> plugins = new List<IRServerPluginBase>(_pluginNameReceive.Length);
+ _pluginReceive = new List<IRServerPluginBase>(_pluginNameReceive.Length);
for (int index = 0; index < _pluginNameReceive.Length; index++)
{
@@ -186,14 +186,15 @@
}
else
{
- plugins.Add(plugin);
+ _pluginReceive.Add(plugin);
if (!String.IsNullOrEmpty(_pluginNameTransmit) && plugin.Name.Equals(_pluginNameTransmit, StringComparison.OrdinalIgnoreCase))
_pluginTransmit = plugin;
}
}
- _pluginReceive = plugins.ToArray();
+ if (_pluginReceive.Count == 0)
+ _pluginReceive = null;
}
if (String.IsNullOrEmpty(_pluginNameTransmit))
@@ -235,6 +236,8 @@
if (_pluginReceive != null)
{
+ List<IRServerPluginBase> removePlugins = new List<IRServerPluginBase>();
+
foreach (IRServerPluginBase plugin in _pluginReceive)
{
try
@@ -272,10 +275,18 @@
{
IrssLog.Error("Failed to start receive plugin: \"{0}\"", plugin.Name);
IrssLog.Error(ex.ToString());
+
+ removePlugins.Add(plugin);
}
}
+
+ foreach (IRServerPluginBase plugin in removePlugins)
+ _pluginReceive.Remove(plugin);
+
+ if (_pluginReceive.Count == 0)
+ _pluginReceive = null;
}
-
+
if (_pluginTransmit != null && !startedTransmit)
{
try
@@ -289,6 +300,8 @@
{
IrssLog.Error("Failed to start transmit plugin: \"{0}\"", _pluginNameTransmit);
IrssLog.Error(ex.ToString());
+
+ _pluginTransmit = null;
}
}
@@ -370,13 +383,15 @@
{
if (_pluginTransmit != null && !stoppedTransmit)
_pluginTransmit.Stop();
-
- _pluginTransmit = null;
}
catch (Exception ex)
{
IrssLog.Error(ex.ToString());
}
+ finally
+ {
+ _pluginTransmit = null;
+ }
// Stop Server
try
@@ -431,6 +446,8 @@
SaveSettings();
+ Thread.Sleep(1000);
+
Start(); // Restart communications
}
}
@@ -733,10 +750,10 @@
{
try
{
- plugin.Resume();
-
if (plugin == _pluginTransmit)
resumedTransmit = true;
+
+ plugin.Resume();
}
catch (Exception ex)
{
@@ -1471,23 +1488,20 @@
{
doc.Load(ConfigurationFile);
}
+ catch (DirectoryNotFoundException)
+ {
+ IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", ConfigurationFile);
+
+ Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile));
+
+ CreateDefaultSettings();
+ return;
+ }
catch (FileNotFoundException)
{
IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile);
- string[] blasters = Program.DetectBlasters();
- if (blasters == null)
- _pluginNameTransmit = String.Empty;
- else
- _pluginNameTransmit = blasters[0];
-
- string[] receivers = Program.DetectReceivers();
- if (receivers == null)
- _pluginNameReceive = null;
- else
- _pluginNameReceive = receivers;
-
- SaveSettings();
+ CreateDefaultSettings();
return;
}
catch (Exception ex)
@@ -1520,7 +1534,7 @@
{
try
{
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
@@ -1558,7 +1572,30 @@
IrssLog.Error(ex.ToString());
}
}
+ void CreateDefaultSettings()
+ {
+ try
+ {
+ string[] blasters = Program.DetectBlasters();
+ if (blasters == null)
+ _pluginNameTransmit = String.Empty;
+ else
+ _pluginNameTransmit = blasters[0];
+ string[] receivers = Program.DetectReceivers();
+ if (receivers == null)
+ _pluginNameReceive = null;
+ else
+ _pluginNameReceive = receivers;
+
+ SaveSettings();
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex.ToString());
+ }
+ }
+
#endregion Implementation
}
Added: trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Wii Remote.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Wii Remote.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Wii Remote.xml 2007-12-05 16:47:57 UTC (rev 1126)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <ServerHost>localhost</ServerHost>
+ <SystemWideMappings>
+ <ButtonMapping KeyCode="Wiimote_Button:B" Description="" Command="Keys: {ENTER}" />
+ <ButtonMapping KeyCode="Wiimote_Button:A" Description="" Command="Keys: {SPACE}" />
+ <ButtonMapping KeyCode="Wiimote_Pad:Down" Description="" Command="Keys: {DOWN}" />
+ <ButtonMapping KeyCode="Wiimote_Pad:Up" Description="" Command="Keys: {UP}" />
+ <ButtonMapping KeyCode="Wiimote_Pad:Left" Description="" Command="Keys: {LEFT}" />
+ <ButtonMapping KeyCode="Wiimote_Pad:Right" Description="" Command="Keys: {RIGHT}" />
+ <ButtonMapping KeyCode="Wiimote_Button:One" Description="" Command="Keys: {PGUP}" />
+ <ButtonMapping KeyCode="Wiimote_Button:Two" Description="" Command="Keys: {PGDN}" />
+ <ButtonMapping KeyCode="Wiimote_Button:Home" Description="" Command="Keys: {WIN}" />
+ </SystemWideMappings>
+ <Programs>
+ <ProgramSettings Name="MediaPortal" FileName="C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe" Folder="C:\Program Files\Team MediaPortal\MediaPortal" Arguments="" UseShellExecute="false" ForceWindowFocus="false" IgnoreSystemWide="true" WindowState="Normal">
+ <ButtonMappings>
+ <ButtonMapping KeyCode="31710" Description="Right" Command="Macro: Mouse Macro1" />
+ </ButtonMappings>
+ </ProgramSettings>
+ </Programs>
+ <Events />
+</Configuration>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -138,6 +138,7 @@
this.altToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.controlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.shiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.windowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.backspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.breakToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -176,6 +177,7 @@
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.windowsKeyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBoxButton.SuspendLayout();
this.groupBoxSet.SuspendLayout();
this.tabControl.SuspendLayout();
@@ -1017,52 +1019,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(153, 170);
//
// cutToolStripMenuItem
//
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.cutToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 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(149, 6);
//
// selectAllToolStripMenuItem
//
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(149, 6);
//
// specialKeysToolStripMenuItem
//
@@ -1086,9 +1088,10 @@
this.pageDownToolStripMenuItem,
this.pageUpToolStripMenuItem,
this.scrollLockToolStripMenuItem,
- this.tabToolStripMenuItem});
+ this.tabToolStripMenuItem,
+ this.windowsKeyToolStripMenuItem});
this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
- this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.specialKeysToolStripMenuItem.Text = "Special Keys";
//
// arrowsToolStripMenuItem
@@ -1309,7 +1312,8 @@
this.modifiersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.altToolStripMenuItem,
this.controlToolStripMenuItem,
- this.shiftToolStripMenuItem});
+ this.shiftToolStripMenuItem,
+ this.windowsToolStripMenuItem});
this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.modifiersToolStripMenuItem.Text = "Modifiers";
@@ -1317,24 +1321,31 @@
// altToolStripMenuItem
//
this.altToolStripMenuItem.Name = "altToolStripMenuItem";
- this.altToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
+ this.altToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 22);
this.shiftToolStripMenuItem.Text = "Shift";
this.shiftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
+ // windowsToolStripMenuItem
+ //
+ this.windowsToolStripMenuItem.Name = "windowsToolStripMenuItem";
+ this.windowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.windowsToolStripMenuItem.Text = "Windows";
+ this.windowsToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -1710,6 +1721,13 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
+ // windowsKeyToolStripMenuItem
+ //
+ this.windowsKeyToolStripMenuItem.Name = "windowsKeyToolStripMenuItem";
+ this.windowsKeyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.windowsKeyToolStripMenuItem.Text = "Windows Key";
+ this.windowsKeyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
// ButtonMappingForm
//
this.AcceptButton = this.buttonOK;
@@ -1911,6 +1929,8 @@
private System.Windows.Forms.ComboBox comboBoxMiscCommand;
private System.Windows.Forms.CheckBox checkBoxForceFocus;
private System.Windows.Forms.CheckBox checkBoxWaitForResponse;
+ private System.Windows.Forms.ToolStripMenuItem windowsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem windowsKeyToolStripMenuItem;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -97,6 +97,10 @@
}
}
+ void InsertKeystroke(char key)
+ {
+ textBoxKeys.Paste(key.ToString());
+ }
void InsertKeystroke(string keystroke)
{
textBoxKeys.Paste(keystroke);
@@ -485,7 +489,7 @@
}
catch (Exception ex)
{
- MessageBox.Show(this, ex.Message, "Test failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show(this, ex.ToString(), "Test failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@@ -652,9 +656,10 @@
case "multiplyToolStripMenuItem": InsertKeystroke("{MULTIPLY}"); break;
case "divideToolStripMenuItem": InsertKeystroke("{DIVIDE}"); break;
- case "altToolStripMenuItem": InsertKeystroke("%"); break;
- case "controlToolStripMenuItem": InsertKeystroke("^"); break;
- case "shiftToolStripMenuItem": InsertKeystroke("+"); break;
+ case "altToolStripMenuItem": InsertKeystroke(Keyboard.ModifierAlt); break;
+ case "controlToolStripMenuItem": InsertKeystroke(Keyboard.ModifierControl); break;
+ case "shiftToolStripMenuItem": InsertKeystroke(Keyboard.ModifierShift); break;
+ case "windowsToolStripMenuItem": InsertKeystroke(Keyboard.ModifierWinKey); break;
case "backspaceToolStripMenuItem": InsertKeystroke("{BACKSPACE}"); break;
case "breakToolStripMenuItem": InsertKeystroke("{BREAK}"); break;
@@ -672,6 +677,7 @@
case "pageUpToolStripMenuItem": InsertKeystroke("{PGUP}"); break;
case "scrollLockToolStripMenuItem": InsertKeystroke("{SCROLLLOCK}"); break;
case "tabToolStripMenuItem": InsertKeystroke("{TAB}"); break;
+ case "windowsKeyToolStripMenuItem": InsertKeystroke("{WIN}"); break;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -89,7 +89,7 @@
{
try
{
- using (XmlTextWriter writer = new XmlTextWriter(fileName, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(fileName, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
@@ -280,7 +280,7 @@
}
catch (Exception ex)
{
- IrssLog.Error(ex.Message);
+ IrssLog.Error(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -790,7 +790,7 @@
}
catch (Exception ex)
{
- IrssLog.Error(ex.Message);
+ IrssLog.Error(ex.ToString());
}
IrssLog.Debug("Active program not found in Translator program list");
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -216,7 +216,7 @@
try
{
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
@@ -343,7 +343,7 @@
}
catch (Exception ex)
{
- IrssLog.Error("ReceivedMessage - {0}", ex.Message);
+ IrssLog.Error("ReceivedMessage(): {0}", ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -123,7 +123,7 @@
}
catch (Exception ex)
{
- IrssLog.Error(ex.Message);
+ IrssLog.Error(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -251,7 +251,7 @@
{
try
{
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
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-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -390,7 +390,7 @@
{
IrssLog.Info("Saving Skin: {0}", fileName);
- using (XmlTextWriter writer = new XmlTextWriter(fileName, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(fileName, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
@@ -494,7 +494,7 @@
{
try
{
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -405,7 +405,7 @@
{
try
{
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8))
+ using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -247,12 +247,14 @@
void ClientDisconnect(object obj)
{
ClientManager clientManager = obj as ClientManager;
-
if (clientManager == null || _clientManagers == null)
return;
lock (_clientManagers)
{
+ if (_clientManagers == null)
+ return;
+
if (_clientManagers.Contains(clientManager))
_clientManagers.Remove(clientManager);
}
@@ -273,13 +275,18 @@
{
Socket socket = _serverSocket.Accept();
- ClientManager manager = new ClientManager(socket, clientManagerMessageSink);
- manager.DisconnectCallback = new WaitCallback(ClientDisconnect);
+ lock (_clientManagers)
+ {
+ if (_clientManagers == null)
+ continue;
- lock (_clientManagers)
+ ClientManager manager = new ClientManager(socket, clientManagerMessageSink);
+ manager.DisconnectCallback = new WaitCallback(ClientDisconnect);
+
_clientManagers.Add(manager);
- manager.Start();
+ manager.Start();
+ }
}
}
#if TRACE
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs 2007-12-05 14:50:52 UTC (rev 1125)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs 2007-12-05 16:47:57 UTC (rev 1126)
@@ -30,10 +30,70 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
- this.textBoxKeystrokes = new System.Windows.Forms.TextBox();
+ this.textBoxKeys = new System.Windows.Forms.TextBox();
this.labelKeystrokes = new System.Windows.Forms.Label();
+ this.contextMenuStripKeystrokes = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.specialKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.arrowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.upToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.downToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.leftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.rightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.functionKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f11ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f13ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f14ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f15ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.f16ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.subtractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.multiplyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.divideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.modifiersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.altToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.controlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.shiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.windowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.backspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.breakToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.capsLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.delToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.endToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.enterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.escapeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.homeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.insToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.numLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.pageDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.pageUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.scrollLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.tabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.windowsKeyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.contextMenuStripKeystrokes.SuspendLayout();
this.SuspendLayout();
//
// buttonCancel
@@ -59,17 +119,18 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
- // textBoxKeystrokes
+ // textBoxKeys
//
- this.textBoxKeystrokes.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ this.textBoxKeys.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxKeystrokes.Location = new System.Drawing.Point(8, 24);
- this.textBoxKeystrokes.Multiline = true;
- this.textBoxKeystrokes.Name = "textBoxKeystrokes";
- this.textBoxKeystrokes.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBoxKeystrokes.Size = new System.Drawing.Size(320, 96);
- this.textBoxKeystrokes.TabIndex = 1;
+ this.textBoxKeys.ContextMenuStrip = this.contextMenuStripKeystrokes;
+ this.textBoxKeys.Location = new System.Drawing.Point(8, 24);
+ this.textBoxKeys.Multiline = true;
+ this.textBoxKeys.Name = "textBoxKeys";
+ this.textBoxKeys.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.textBoxKeys.Size = new System.Drawing.Size(320, 96);
+ this.textBoxKeys.TabIndex = 1;
//
// labelKeystrokes
//
@@ -81,6 +142,462 @@
this.labelKeystrokes.TabIndex = 0;
this.labelKeystrokes.Text = "Keystrokes:";
//
+ // contextMenuStripKeystrokes
+ //
+ this.contextMenuStripKeystrokes.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.cutToolStripMenuItem,
+ this.copyToolStripMenuItem,
+ this.pasteToolStripMenuItem,
+ this.toolStripSeparator1,
+ this.selectAllToolStripMenuItem,
+ this.selectNoneToolStripMenuItem,
+ this.toolStripSeparator2,
+ this.specialKeysToolStripMenuItem});
+ this.contextMenuStripKeystrokes.Name = "contextMenuStripKeystrokes";
+ this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(145, 148);
+ //
+ // cutToolStripMenuItem
+ //
+ this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
+ this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 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.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.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);
+ //
+ // selectAllToolStripMenuItem
+ //
+ this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(144, 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.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);
+ //
+ // specialKeysToolStripMenuItem
+ //
+ this.specialKeysToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.arrowsToolStripMenuItem,
+ this.functionKeysToolStripMenuItem,
+ this.keypadToolStripMenuItem,
+ this.modifiersToolStripMenuItem,
+ this.toolStripSeparator3,
+ this.backspaceToolStripMenuItem,
+ this.breakToolStripMenuItem,
+ this.capsLockToolStripMenuItem,
+ this.delToolStripMenuItem,
+ this.endToolStripMenuItem,
+ this.enterToolStripMenuItem,
+ this.escapeToolStripMenuItem,
+ this.helpToolStripMenuItem,
+ this.homeToolStripMenuItem,
+ this.insToolStripMenuItem,
+ this.numLockToolStripMenuItem,
+ this.pageDownToolStripMenuItem,
+ this.pageUpToolStripMenuItem,
+ this.scrollLockToolStripMenuItem,
+ this.tabToolStripMenuItem,
+ this.windowsKeyToolStripMenuItem});
+ this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
+ this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+ this.specialKeysToolStripMenuItem.Text = "Special Keys";
+ //
+ // arrowsToolStripMenuItem
+ //
+ this.arrowsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.upToolStripMenuItem,
+ this.downToolStripMenuItem,
+ this.leftToolStripMenuItem,
+ this.rightToolStripMenuItem});
+ this.arrowsToolStripMenuItem.Name = "arrowsToolStripMenuItem";
+ this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.arrowsToolStripMenuItem.Text = "Arrows";
+ //
+ // upToolStripMenuItem
+ //
+ this.upToolStripMenuItem.Name = "upToolStripMenuItem";
+ this.upToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 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(152, 22);
+ this.rightToolStripMenuItem.Text = "Right";
+ this.rightToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // functionKeysToolStripMenuItem
+ //
+ this.functionKeysToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.f1ToolStripMenuItem,
+ this.f2ToolStripMenuItem,
+ this.f3ToolStripMenuItem,
+ this.f4ToolStripMenuItem,
+ this.f5ToolStripMenuItem,
+ this.f6ToolStripMenuItem,
+ this.f7ToolStripMenuItem,
+ this.f8ToolStripMenuItem,
+ this.f9ToolStripMenuItem,
+ this.f10ToolStripMenuItem,
+ this.f11ToolStripMenuItem,
+ this.f12ToolStripMenuItem,
+ this.f13ToolStripMenuItem,
+ this.f14ToolStripMenuItem,
+ this.f15ToolStripMenuItem,
+ this.f16ToolStripMenuItem});
+ this.functionKeysToolStripMenuItem.Name = "functionKeysToolStripMenuItem";
+ this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.functionKeysToolStripMenuItem.Text = "Function Keys";
+ //
+ // f1ToolStripMenuItem
+ //
+ this.f1ToolStripMenuItem.Name = "f1ToolStripMenuItem";
+ this.f1ToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 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(152, 22);
+ this.f16ToolStripMenuItem.Text = "F16";
+ this.f16ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // keypadToolStripMenuItem
+ //
+ this.keypadToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addToolStripMenuItem,
+ this.subtractToolStripMenuItem,
+ this.multiplyToolStripMenuItem,
+ this.divideToolStripMenuItem});
+ this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
+ this.keypadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.keypadToolStripMenuItem.Text = "Keypad";
+ //
+ // addToolStripMenuItem
+ //
+ this.addToolStripMenuItem.Name = "addToolStripMenuItem";
+ this.addToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 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(152, 22);
+ this.divideToolStripMenuItem.Text = "Divide";
+ this.divideToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // modifiersToolStripMenuItem
+ //
+ this.modifiersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.altToolStripMenuItem,
+ this.controlToolStripMenuItem,
+ this.shiftToolStripMenuItem,
+ this.windowsToolStripMenuItem});
+ this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
+ this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.modifiersToolStripMenuItem.Text = "Modifiers";
+ //
+ // altToolStripMenuItem
+ //
+ this.altToolStripMenuItem.Name = "altToolStripMenuItem";
+ this.altToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(152, 22);
+ this.shiftToolStripMenuItem.Text = "Shift";
+ this.shiftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // windowsToolStripMenuItem
+ //
+ this.windowsToolStripMenuItem.Name = "windowsToolStripMenuItem";
+ this.windowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.windowsToolStripMenuItem.Text = "Windows";
+ this.windowsToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+ //
+ // backspaceToolStripMenuItem
+ //
+ this.backspaceToolStripMenuItem.Name = "backspaceToolStripMenuItem";
+ this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(152, 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.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.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.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.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.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.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.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.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.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.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.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.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.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.Text = "Tab";
+ this.tabToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
+ // windowsKeyToolStripMenuItem
+ //
+ this.windowsKeyToolStripMenuItem.Name = "windowsKeyToolStripMenuItem";
+ this.windowsKeyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.windowsKeyToolStripMenuItem.Text = "Windows Key";
+ this.windowsKeyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
+ //
// KeysCommand
//
this.AcceptButton = this.buttonOK;
@@ -91,13 +608,14 @@
this.Controls.Add(this.labelKeystrokes);
this.Controls.Add(this...
[truncated message content] |
