Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1028] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-11-05 05:22:02
|
Revision: 1028
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1028&view=rev
Author: and-81
Date: 2007-11-04 21:21:59 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.resx
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/
trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Default.xml
trunk/plugins/IR Server Suite/Applications/Translator/Graphics/DeleteAll.png
trunk/plugins/IR Server Suite/Applications/Translator/Graphics/NoIcon.png
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-11-04 18:16:22 UTC (rev 1027)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-11-05 05:21:59 UTC (rev 1028)
@@ -124,14 +124,14 @@
}
catch (FileNotFoundException)
{
- IrssLog.Warn("No configuration file found ({0}), using default configuration", fileName);
- return new Configuration();
+ IrssLog.Warn("No configuration file found ({0}), creating new configuration", fileName);
}
catch (Exception ex)
{
IrssLog.Error(ex.ToString());
- return null;
}
+
+ return null;
}
#endregion Static Methods
Modified: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2007-11-04 18:16:22 UTC (rev 1027)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2007-11-05 05:21:59 UTC (rev 1028)
@@ -13,25 +13,30 @@
#region Constants
- static readonly string CopyDataTarget = "Translator CopyData Target";
+ /// <summary>
+ /// Window name for CopyData messages.
+ /// </summary>
+ public const string CopyDataTarget = "Translator CopyData Target";
- const int CopyDataID = 24;
+ /// <summary>
+ /// Data value for CopyData messages.
+ /// </summary>
+ public const int CopyDataID = 24;
#endregion Constants
#region Constructor / Destructor
/// <summary>
- /// Initializes a new instance of the <see cref="NotifyWindow"/> class.
+ /// Initializes a new instance of the <see cref="CopyDataWM"/> class.
/// </summary>
public CopyDataWM()
{
- Create();
}
/// <summary>
/// Releases unmanaged resources and performs other cleanup operations before the
- /// <see cref="NotifyWindow"/> is reclaimed by garbage collection.
+ /// <see cref="CopyDataWM"/> is reclaimed by garbage collection.
/// </summary>
~CopyDataWM()
{
@@ -65,7 +70,7 @@
{
// Dispose managed resources ...
- Destroy();
+ Stop();
}
// Free native resources ...
@@ -74,26 +79,26 @@
#endregion IDisposable Members
#region Methods
-
- void Create()
+
+ public bool Start()
{
if (Handle != IntPtr.Zero)
- return;
+ return false;
- CreateParams Params = new CreateParams();
- Params.ExStyle = 0x80;
- Params.Style = unchecked((int)0x80000000);
- Params.Caption = CopyDataTarget;
+ CreateParams createParams = new CreateParams();
+ createParams.Caption = "Test";
+ createParams.ExStyle = 0x80;
+ createParams.Style = unchecked((int)0x80000000);
- CreateHandle(Params);
+ CreateHandle(createParams);
+
+ return (Handle != IntPtr.Zero);
}
- void Destroy()
+ public void Stop()
{
- if (Handle == IntPtr.Zero)
- return;
-
- DestroyHandle();
+ if (Handle != IntPtr.Zero)
+ DestroyHandle();
}
#endregion Methods
@@ -128,11 +133,13 @@
IrssLog.Error("Error processing WM_COPYDATA message: {0}", ex.ToString());
}
}
+
+ base.WndProc(ref m);
}
#endregion Overrides
- internal static void SendCopyDataMessage(string data)
+ public static void SendCopyDataMessage(string data)
{
Win32.COPYDATASTRUCT copyData;
Added: trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Default.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Default.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Default.xml 2007-11-05 05:21:59 UTC (rev 1028)
@@ -0,0 +1,11 @@
+<?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 />
+ <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 />
+ </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-11-04 18:16:22 UTC (rev 1027)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2007-11-05 05:21:59 UTC (rev 1028)
@@ -65,6 +65,7 @@
this.textBoxApp = new System.Windows.Forms.TextBox();
this.tabPageSerial = new System.Windows.Forms.TabPage();
this.groupBoxPortSetup = new System.Windows.Forms.GroupBox();
+ this.checkBoxWaitForResponse = new System.Windows.Forms.CheckBox();
this.comboBoxComPort = new System.Windows.Forms.ComboBox();
this.comboBoxStopBits = new System.Windows.Forms.ComboBox();
this.labelStopBits = new System.Windows.Forms.Label();
@@ -175,7 +176,6 @@
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.checkBoxWaitForResponse = new System.Windows.Forms.CheckBox();
this.groupBoxButton.SuspendLayout();
this.groupBoxSet.SuspendLayout();
this.tabControl.SuspendLayout();
@@ -280,6 +280,7 @@
//
this.textBoxCommand.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxCommand.BackColor = System.Drawing.SystemColors.Info;
this.textBoxCommand.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.textBoxCommand.Location = new System.Drawing.Point(64, 264);
this.textBoxCommand.Name = "textBoxCommand";
@@ -617,6 +618,16 @@
this.groupBoxPortSetup.TabStop = false;
this.groupBoxPortSetup.Text = "Port setup";
//
+ // checkBoxWaitForResponse
+ //
+ this.checkBoxWaitForResponse.Location = new System.Drawing.Point(232, 88);
+ this.checkBoxWaitForResponse.Name = "checkBoxWaitForResponse";
+ this.checkBoxWaitForResponse.Size = new System.Drawing.Size(176, 21);
+ this.checkBoxWaitForResponse.TabIndex = 10;
+ this.checkBoxWaitForResponse.Text = "Wait for response";
+ this.toolTips.SetToolTip(this.checkBoxWaitForResponse, "Wait up to 5 seconds for a response after the command has been sent");
+ this.checkBoxWaitForResponse.UseVisualStyleBackColor = true;
+ //
// comboBoxComPort
//
this.comboBoxComPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -1006,52 +1017,52 @@
this.toolStripSeparator2,
this.specialKeysToolStripMenuItem});
this.contextMenuStripKeystrokes.Name = "contextMenuStripKeystrokes";
- this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(139, 148);
+ this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(145, 148);
//
// cutToolStripMenuItem
//
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ 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(138, 22);
+ 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(138, 22);
+ 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(135, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
//
// selectAllToolStripMenuItem
//
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ 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(138, 22);
+ 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(135, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
//
// specialKeysToolStripMenuItem
//
@@ -1077,7 +1088,7 @@
this.scrollLockToolStripMenuItem,
this.tabToolStripMenuItem});
this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
- this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.specialKeysToolStripMenuItem.Text = "Special Keys";
//
// arrowsToolStripMenuItem
@@ -1088,34 +1099,34 @@
this.leftToolStripMenuItem,
this.rightToolStripMenuItem});
this.arrowsToolStripMenuItem.Name = "arrowsToolStripMenuItem";
- this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ 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(105, 22);
+ this.upToolStripMenuItem.Size = new System.Drawing.Size(112, 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(105, 22);
+ this.downToolStripMenuItem.Size = new System.Drawing.Size(112, 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(105, 22);
+ this.leftToolStripMenuItem.Size = new System.Drawing.Size(112, 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(105, 22);
+ this.rightToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.rightToolStripMenuItem.Text = "Right";
this.rightToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1139,118 +1150,118 @@
this.f15ToolStripMenuItem,
this.f16ToolStripMenuItem});
this.functionKeysToolStripMenuItem.Name = "functionKeysToolStripMenuItem";
- this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ 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(92, 22);
+ this.f1ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f2ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f3ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f4ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f5ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f6ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f7ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f8ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f9ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f10ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f11ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f12ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f13ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f14ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f15ToolStripMenuItem.Size = new System.Drawing.Size(103, 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(92, 22);
+ this.f16ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
this.f16ToolStripMenuItem.Text = "F16";
this.f16ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1262,34 +1273,34 @@
this.multiplyToolStripMenuItem,
this.divideToolStripMenuItem});
this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
- this.keypadToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ 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(118, 22);
+ this.addToolStripMenuItem.Size = new System.Drawing.Size(126, 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(118, 22);
+ this.subtractToolStripMenuItem.Size = new System.Drawing.Size(126, 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(118, 22);
+ this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(126, 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(118, 22);
+ this.divideToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.divideToolStripMenuItem.Text = "Divide";
this.divideToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1300,137 +1311,137 @@
this.controlToolStripMenuItem,
this.shiftToolStripMenuItem});
this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
- this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ 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(114, 22);
+ this.altToolStripMenuItem.Size = new System.Drawing.Size(120, 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(114, 22);
+ this.controlToolStripMenuItem.Size = new System.Drawing.Size(120, 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(114, 22);
+ this.shiftToolStripMenuItem.Size = new System.Drawing.Size(120, 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(145, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
//
// backspaceToolStripMenuItem
//
this.backspaceToolStripMenuItem.Name = "backspaceToolStripMenuItem";
- this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ 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(148, 22);
+ this.tabToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.tabToolStripMenuItem.Text = "Tab";
this.tabToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
//
@@ -1699,16 +1710,6 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
- // checkBoxWaitForResponse
- //
- this.checkBoxWaitForResponse.Location = new System.Drawing.Point(232, 88);
- this.checkBoxWaitForResponse.Name = "checkBoxWaitForResponse";
- this.checkBoxWaitForResponse.Size = new System.Drawing.Size(176, 21);
- this.checkBoxWaitForResponse.TabIndex = 10;
- this.checkBoxWaitForResponse.Text = "Wait for response";
- this.toolTips.SetToolTip(this.checkBoxWaitForResponse, "Wait up to 5 seconds for a response after the command has been sent");
- this.checkBoxWaitForResponse.UseVisualStyleBackColor = true;
- //
// ButtonMappingForm
//
this.AcceptButton = this.buttonOK;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-11-04 18:16:22 UTC (rev 1027)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-11-05 05:21:59 UTC (rev 1028)
@@ -36,13 +36,20 @@
this.contextMenuStripPrograms = new System.Windows.Forms.ContextMenuStrip(this.components);
this.imageListPrograms = new System.Windows.Forms.ImageList(this.components);
this.buttonClear = new System.Windows.Forms.Button();
- this.buttonModify = new System.Windows.Forms.Button();
+ this.buttonEdit = new System.Windows.Forms.Button();
this.buttonDelete = new System.Windows.Forms.Button();
this.buttonNew = new System.Windows.Forms.Button();
this.listViewButtons = new System.Windows.Forms.ListView();
this.columnHeaderButton = new System.Windows.Forms.ColumnHeader();
this.columnHeaderDescription = new System.Windows.Forms.ColumnHeader();
this.columnHeaderCommand = new System.Windows.Forms.ColumnHeader();
+ this.contextMenuStripButtonMapping = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.newButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.clearButtonsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.copyButtonsFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buttonOK = new System.Windows.Forms.Button();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPagePrograms = new System.Windows.Forms.TabPage();
@@ -86,6 +93,8 @@
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.contextMenuStripButtonMapping.SuspendLayout();
this.tabControl.SuspendLayout();
this.tabPagePrograms.SuspendLayout();
this.tabPageEvents.SuspendLayout();
@@ -100,8 +109,10 @@
this.listViewPrograms.Alignment = System.Windows.Forms.ListViewAlignment.Left;
this.listViewPrograms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.listViewPrograms.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1});
this.listViewPrograms.ContextMenuStrip = this.contextMenuStripPrograms;
- this.listViewPrograms.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewPrograms.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewPrograms.HideSelection = false;
this.listViewPrograms.LargeImageList = this.imageListPrograms;
this.listViewPrograms.Location = new System.Drawing.Point(8, 8);
@@ -112,7 +123,7 @@
this.listViewPrograms.Size = new System.Drawing.Size(504, 80);
this.listViewPrograms.TabIndex = 0;
this.listViewPrograms.TileSize = new System.Drawing.Size(128, 48);
- this.toolTip.SetToolTip(this.listViewPrograms, "Choose a Program to modify mappings for here");
+ this.toolTip.SetToolTip(this.listViewPrograms, "Choose a Program to modify mappings");
this.listViewPrograms.UseCompatibleStateImageBehavior = false;
this.listViewPrograms.DoubleClick += new System.EventHandler(this.listViewPrograms_DoubleClick);
this.listViewPrograms.SelectedIndexChanged += new System.EventHandler(this.listViewPrograms_SelectedIndexChanged);
@@ -139,19 +150,19 @@
this.buttonClear.Text = "Clear";
this.toolTip.SetToolTip(this.buttonClear, "Clear all button mappings");
this.buttonClear.UseVisualStyleBackColor = true;
- this.buttonClear.Click += new System.EventHandler(this.buttonClear_Click);
+ this.buttonClear.Click += new System.EventHandler(this.buttonClearMappings_Click);
//
- // buttonModify
+ // buttonEdit
//
- this.buttonModify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonModify.Location = new System.Drawing.Point(72, 344);
- this.buttonModify.Name = "buttonModify";
- this.buttonModify.Size = new System.Drawing.Size(56, 24);
- this.buttonModify.TabIndex = 3;
- this.buttonModify.Text = "Edit";
- this.toolTip.SetToolTip(this.buttonModify, "Edit the currently selected button mapping");
- this.buttonModify.UseVisualStyleBackColor = true;
- this.buttonModify.Click += new System.EventHandler(this.buttonModify_Click);
+ this.buttonEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonEdit.Location = new System.Drawing.Point(72, 344);
+ this.buttonEdit.Name = "buttonEdit";
+ this.buttonEdit.Size = new System.Drawing.Size(56, 24);
+ this.buttonEdit.TabIndex = 3;
+ this.buttonEdit.Text = "Edit";
+ this.toolTip.SetToolTip(this.buttonEdit, "Edit the currently selected button mapping");
+ this.buttonEdit.UseVisualStyleBackColor = true;
+ this.buttonEdit.Click += new System.EventHandler(this.buttonEditMapping_Click);
//
// buttonDelete
//
@@ -163,7 +174,7 @@
this.buttonDelete.Text = "Delete";
this.toolTip.SetToolTip(this.buttonDelete, "Delete the currently selected button mapping");
this.buttonDelete.UseVisualStyleBackColor = true;
- this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
+ this.buttonDelete.Click += new System.EventHandler(this.buttonDeleteMapping_Click);
//
// buttonNew
//
@@ -175,7 +186,7 @@
this.buttonNew.Text = "New";
this.toolTip.SetToolTip(this.buttonNew, "Create a new button mapping");
this.buttonNew.UseVisualStyleBackColor = true;
- this.buttonNew.Click += new System.EventHandler(this.buttonNew_Click);
+ this.buttonNew.Click += new System.EventHandler(this.buttonNewMapping_Click);
//
// listViewButtons
//
@@ -186,12 +197,15 @@
this.columnHeaderButton,
this.columnHeaderDescription,
this.columnHeaderCommand});
+ this.listViewButtons.ContextMenuStrip = this.contextMenuStripButtonMapping;
this.listViewButtons.FullRowSelect = true;
this.listViewButtons.GridLines = true;
this.listViewButtons.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+ this.listViewButtons.HideSelection = false;
this.listViewButtons.Location = new System.Drawing.Point(8, 96);
this.listViewButtons.MultiSelect = false;
this.listViewButtons.Name = "listViewButtons";
+ this.listViewButtons.ShowGroups = false;
this.listViewButtons.Size = new System.Drawing.Size(504, 240);
this.listViewButtons.TabIndex = 1;
this.listViewButtons.UseCompatibleStateImageBehavior = false;
@@ -214,6 +228,63 @@
this.columnHeaderCommand.Text = "Command";
this.columnHeaderCommand.Width = 200;
//
+ // contextMenuStripButtonMapping
+ //
+ this.contextMenuStripButtonMapping.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newButtonToolStripMenuItem,
+ this.editButtonToolStripMenuItem,
+ this.deleteButtonToolStripMenuItem,
+ this.clearButtonsToolStripMenuItem,
+ this.toolStripSeparator3,
+ this.copyButtonsFromToolStripMenuItem});
+ this.contextMenuStripButtonMapping.Name = "contextMenuStripButtonMapping";
+ this.contextMenuStripButtonMapping.Size = new System.Drawing.Size(151, 120);
+ this.contextMenuStripButtonMapping.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripButtonMapping_Opening);
+ //
+ // newButtonToolStripMenuItem
+ //
+ this.newButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Plus;
+ this.newButtonToolStripMenuItem.Name = "newButtonToolStripMenuItem";
+ this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.newButtonToolStripMenuItem.Text = "&New";
+ this.newButtonToolStripMenuItem.Click += new System.EventHandler(this.newButtonToolStripMenuItem_Click);
+ //
+ // editButtonToolStripMenuItem
+ //
+ this.editButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Edit;
+ this.editButtonToolStripMenuItem.Name = "editButtonToolStripMenuItem";
+ this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.editButtonToolStripMenuItem.Text = "&Edit";
+ this.editButtonToolStripMenuItem.Click += new System.EventHandler(this.editButtonToolStripMenuItem_Click);
+ //
+ // deleteButtonToolStripMenuItem
+ //
+ this.deleteButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
+ this.deleteButtonToolStripMenuItem.Name = "deleteButtonToolStripMenuItem";
+ this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.deleteButtonToolStripMenuItem.Text = "&Delete";
+ this.deleteButtonToolStripMenuItem.Click += new System.EventHandler(this.deleteButtonToolStripMenuItem_Click);
+ //
+ // clearButtonsToolStripMenuItem
+ //
+ this.clearButtonsToolStripMenuItem.Image = global::Translator.Properties.Resources.DeleteAll;
+ this.clearButtonsToolStripMenuItem.Name = "clearButtonsToolStripMenuItem";
+ this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.clearButtonsToolStripMenuItem.Text = "&Clear";
+ this.clearButtonsToolStripMenuItem.Click += new System.EventHandler(this.clearButtonsToolStripMenuItem_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6);
+ //
+ // copyButtonsFromToolStripMenuItem
+ //
+ this.copyButtonsFromToolStripMenuItem.Image = global::Translator.Properties.Resources.MoveRight;
+ this.copyButtonsFromToolStripMenuItem.Name = "copyButtonsFromToolStripMenuItem";
+ this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.copyButtonsFromToolStripMenuItem.Text = "Copy &from ...";
+ //
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -245,7 +316,7 @@
// tabPagePrograms
//
this.tabPagePrograms.Controls.Add(this.buttonClear);
- this.tabPagePrograms.Controls.Add(this.buttonModify);
+ this.tabPagePrograms.Controls.Add(this.buttonEdit);
this.tabPagePrograms.Controls.Add(this.buttonDelete);
this.tabPagePrograms.Controls.Add(this.buttonNew);
this.tabPagePrograms.Controls.Add(this.listViewButtons);
@@ -354,6 +425,7 @@
this.listViewEventMap.HideSelection = false;
this.listViewEventMap.Location = new System.Drawing.Point(8, 8);
this.listViewEventMap.Name = "listViewEventMap";
+ this.listViewEventMap.ShowGroups = false;
this.listViewEventMap.Size = new System.Drawing.Size(504, 296);
this.listViewEventMap.TabIndex = 0;
this.listViewEventMap.UseCompatibleStateImageBehavior = false;
@@ -414,6 +486,7 @@
this.listViewMacro.Location = new System.Drawing.Point(8, 8);
this.listViewMacro.MultiSelect = false;
this.listViewMacro.Name = "listViewMacro";
+ this.listViewMacro.ShowGroups = false;
this.listViewMacro.Size = new System.Drawing.Size(504, 328);
this.listViewMacro.TabIndex = 5;
this.listViewMacro.UseCompatibleStateImageBehavior = false;
@@ -495,6 +568,7 @@
this.listViewIR.Location = new System.Drawing.Point(8, 8);
this.listViewIR.MultiSelect = false;
this.listViewIR.Name = "listViewIR";
+ this.listViewIR.ShowGroups = false;
this.listViewIR.Size = new System.Drawing.Size(504, 328);
this.listViewIR.TabIndex = 0;
this.listViewIR.UseCompatibleStateImageBehavior = false;
@@ -681,6 +755,7 @@
this.Text = "Translator";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
this.Load += new System.EventHandler(this.MainForm_Load);
+ this.contextMenuStripButtonMapping.ResumeLayout(false);
this.tabControl.ResumeLayout(false);
this.tabPagePrograms.ResumeLayout(false);
this.tabPageEvents.ResumeLayout(false);
@@ -700,7 +775,7 @@
private System.Windows.Forms.ColumnHeader columnHeaderButton;
private System.Windows.Forms.ColumnHeader columnHeaderCommand;
private System.Windows.Forms.Button buttonNew;
- private System.Windows.Forms.Button buttonModify;
+ private System.Windows.Forms.Button buttonEdit;
private System.Windows.Forms.Button buttonDelete;
private System.Windows.Forms.Button buttonClear;
private System.Windows.Forms.Button buttonOK;
@@ -750,6 +825,14 @@
private System.Windows.Forms.ContextMenuStrip contextMenuStripPrograms;
private System.Windows.Forms.ContextMenuStrip contextMenuStripEvents;
private System.Windows.Forms.ToolStripMenuItem removeEventToolStripMenuItem;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStripButtonMapping;
+ private System.Windows.Forms.ToolStripMenuItem newButtonToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editButtonToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem deleteButtonToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem clearButtonsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripMenuItem copyButtonsFromToolStripMenuItem;
+ private System.Windows.Forms.ColumnHeader columnHeader1;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-04 18:16:22 UTC (rev 1027)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-05 05:21:59 UTC (rev 1028)
@@ -98,6 +98,8 @@
ToolStripMenuItem _editProgramToolStripMenuItem;
ToolStripMenuItem _removeProgramToolStripMenuItem;
+ int _selectedProgram = 0;
+
#endregion Variables
#region Constructor
@@ -126,44 +128,81 @@
#endregion Constructor
+ #region Implementation
+
+ private void MainForm_Load(object sender, EventArgs e)
+ {
+ Program.HandleMessage += new ClientMessageSink(ReceivedMessage);
+ }
+ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ Program.HandleMessage -= new ClientMessageSink(ReceivedMessage);
+
+ CommitEvents();
+
+ Configuration.Save(Program.Config, Program.ConfigFile);
+ }
+
void RefreshProgramList()
{
imageListPrograms.Images.Clear();
imageListPrograms.Images.Add(Properties.Resources.WinLogo);
+ imageListPrograms.Images.Add(Properties.Resources.NoIcon);
+ string wasSelected = string.Empty;
+ if (listViewPrograms.Items.Count > 0)
+ wasSelected = listViewPrograms.Items[_selectedProgram].Text;
+
listViewPrograms.Items.Clear();
-
+ _selectedProgram = 0;
+
+ // Add System-Wide ...
ListViewItem newItem = new ListViewItem(SystemWide, 0);
newItem.ToolTipText = "Defines mappings that effect the whole computer";
listViewPrograms.Items.Add(newItem);
- int imageIndex = 1;
+ // Add other programs ...
+ int imageIndex = 2;
foreach (ProgramSettings progSettings in Program.Config.Programs)
{
Icon icon = Win32.GetIconFor(progSettings.Filename);
- imageListPrograms.Images.Add(icon);
+ if (icon != null)
+ {
+ imageListPrograms.Images.Add(icon);
+ newItem = new ListViewItem(progSettings.Name, imageIndex++);
+ newItem.ToolTipText = progSettings.Filename;
+ }
+ else
+ {
+ newItem = new ListViewItem(progSettings.Name, 1);
+ newItem.ToolTipText = "Please check program file path";
+ }
- newItem = new ListViewItem(progSettings.Name, imageIndex++);
- newItem.ToolTipText = progSettings.Filename;
listViewPrograms.Items.Add(newItem);
+
+ if (progSettings.Name.Equals(wasSelected))
+ newItem.Selected = true;
}
+ if (wasSelected.Equals(SystemWide) || listViewPrograms.SelectedItems.Count == 0)
+ listViewPrograms.Items[0].Selected = true;
+
Program.UpdateNotifyMenu();
}
void RefreshButtonList()
{
listViewButtons.Items.Clear();
- List<ButtonMapping> current = GetCurrentSettings();
- if (current == null)
+ List<ButtonMapping> currentMappings = GetCurrentButtonMappings();
+ if (currentMappings == null)
return;
- foreach (ButtonMapping map in current)
+ foreach (ButtonMapping map in currentMappings)
{
listViewButtons.Items.Add(
new ListViewItem(
- new string[] { map.KeyCode.ToString(), map.Description, map.Command }
+ new string[] { map.KeyCode, map.Description, map.Command }
)
);
}
@@ -235,21 +274,18 @@
Program.UpdateNotifyMenu();
}
- List<ButtonMapping> GetCurrentSettings()
+ List<ButtonMapping> GetCurrentButtonMappings()
{
- if (listViewPrograms.SelectedItems.Count == 0)
- return null;
-
- string selectedItem = listViewPrograms.SelectedItems[0].Text;
-
- if (selectedItem == SystemWide)
+ if (_selectedProgram == 0)
{
return Program.Config.SystemWideMappings;
}
else
{
+ string selectedItem = listViewPrograms.Items[_selectedProgram].Text;
+
foreach (ProgramSettings progSettings in Program.Config.Programs)
- if (progSettings.Name == selectedItem)
+ if (progSettings.Name.Equals(selectedItem))
return progSettings.ButtonMappings;
}
@@ -268,33 +304,24 @@
}
void RefreshProgramsContextMenu()
{
- if (listViewPrograms.SelectedItems.Count == 0 ||
- listViewPrograms.SelectedItems[0].Text == SystemWide)
+ if (_selectedProgram == 0)
{
+ _editProgramToolStripMenuItem.Text = "&Edit ...";
+ _removeProgramToolStripMenuItem.Text = "&Remove ...";
+
_editProgramToolStripMenuItem.Enabled = false;
_removeProgramToolStripMenuItem.Enabled = false;
}
else
{
+ string program = listViewPrograms.Items[_selectedProgram].Text;
+
+ _editProgramToolStripMenuItem.Text = String.Format("&Edit \"{0}\"", program);
+ _removeProgramToolStripMenuItem.Text = String.Format("&Remove \"{0}\"", program);
+
_editProgramToolStripMenuItem.Enabled = true;
_removeProgramToolStripMenuItem.Enabled = true;
}
-
- if (listViewPrograms.SelectedItems.Count == 0)
- {
- _editProgramToolStripMenuItem.Text = "&Edit ...";
- _removeProgramToolStripMenuItem.Text = "&Remove ...";
- }/*
- else if (listViewPrograms.SelectedItems[0].Text == SystemWide)
- {
- }*/
- else
- {
- string program = listViewPrograms.SelectedItems[0].Text;
- _editProgramToolStripMenuItem.Text = "&Edit \"" + program + "\"";
- _removeProgramToolStripMenuItem.Text = "&Remove \"" + program + "\"";
- }
-
}
void AddProgram()
@@ -309,25 +336,14 @@
}
}
- bool EditProgram(ProgramSettings progSettings)
+ bool EditCurrentProgram()
{
- EditProgramForm editProg = new EditProgramForm(progSettings);
+ if (_selectedProgram == 0)
+ return false;
- if (editProg.ShowDialog(this) == DialogResult.OK)
- {
- progSettings.Name = editProg.DisplayName;
- progSettings.Filename = editProg.Filename;
- progSettings.Folder = editProg.StartupFolder;
- progSettings.Arguments = editProg.Parameters;
- progSettings.WindowState = editProg.StartState;
- progSettings.UseShellExecute = editProg.UseShellExecute;
- progSettings.IgnoreSystemWide = editProg.IgnoreSystemWide;
-
- Program.UpdateNotifyMenu();
- return true;
- }
-
- return false;
+ string selectedItem = listViewPrograms.Items[_selectedProgram].Text;
+
+ return EditProgram(selectedItem);
}
bool EditProgram(string programName)
{
@@ -349,7 +365,27 @@
return false;
}
+ bool EditProgram(ProgramSettings progSettings)
+ {
+ EditProgramForm editProg = new EditProgramForm(progSettings);
+ if (editProg.ShowDialog(this) == DialogResult.OK)
+ {
+ progSettings.Name = editProg.DisplayName;
+ progSettings.Filename = editProg.Filename;
+ progSettings.Folder = editProg.StartupFolder;
+ progSettings.Arguments = editProg.Parameters;
+ progSettings.WindowState = editProg.StartState;
+ progSettings.UseShellExecute = editProg.UseShellExecute;
+ progSettings.IgnoreSystemWide = editProg.IgnoreSystemWide;
+
+ Program.UpdateNotifyMenu();
+ return true;
+ }
+
+ return false;
+ }
+
void EditIR()
{
if (listViewIR.SelectedItems.Count != 1)
@@ -418,67 +454,12 @@
}
}
- private void MainForm_Load(object sender, EventArgs e)
+ void NewButtonMapping()
{
- Program.HandleMessage += new ClientMessageSink(ReceivedMessage);
- }
- private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
- {
- Program.HandleMessage -= new ClientMessageSink(ReceivedMessage);
+ List<ButtonMapping> currentMappings = GetCurrentButtonMappings();
+ if (currentMappings == null)
+ return;
- CommitEvents();
-
- Configuration.Save(Program.Config, Program.ConfigFile);
- }
-
- void ReceivedMessage(IrssMessage received)
- {
- if (_learnIR != null && received.Type == MessageType.LearnIR)
- {
- if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
- {
- _learnIR.LearnStatus("Learned IR successfully", true);
- }
- else if ((received.Flags & MessageFlags.Timeout) == MessageFlags.Timeout)
- {
- _learnIR.LearnStatus("Learn IR timed out", false);
- }
- else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
- {
- _learnIR.LearnStatus("Learn IR failed", false);
- }
- }
- }
-
- #region Controls
-
- private void listViewButtons_DoubleClick(object sender, EventArgs e)
- {
- buttonModify_Click(null, null);
- }
- private void listViewButtons_KeyDown(object sender, KeyEventArgs e)
- {
- switch (e.KeyData)
- {
- case Keys.OemMinus:
- case Keys.Delete:
- buttonDelete_Click(null, null);
- break;
-
- case Keys.F2:
- case Keys.Enter:
- buttonModify_Click(null, null);
- break;
-
- case Keys.Oemplus:
- case Keys.Insert:
- buttonNew_Click(null, null);
- break;
- }
- }
-
- private void buttonNew_Click(object sender, EventArgs e)
- {
GetKeyCodeForm getKeyCode = new GetKeyCodeForm();
getKeyCode.ShowDialog(this);
@@ -487,11 +468,10 @@
if (String.IsNullOrEmpty(keyCode))
return;
- List<ButtonMapping> currentMapping = GetCurrentSettings();
ButtonMappingForm map = null;
ButtonMapping existing = null;
- foreach (ButtonMapping test in currentMapping)
+ foreach (ButtonMapping test in currentMappings)
{
if (keyCode == test.KeyCode)
{
@@ -523,16 +503,16 @@
{
listViewButtons.Items.Add(
new ListViewItem(
- new string[] { map.KeyCode.ToString(), map.Description, map.Command }
+ new string[] { map.KeyCode, map.Description, map.Command }
));
- currentMapping.Add(new ButtonMapping(map.KeyCode, map.Description, map.Command));
+ currentMappings.Add(new ButtonMapping(map.KeyCode, map.Description, map.Command));
}
else
{
for (int index = 0; index < listViewButtons.Items.Count; index++)
{
- if (listViewButtons.Items[index].SubItems[0].Text == map.KeyCode.ToString())
+ if (listViewButtons.Items[index].SubItems[0].Text == map.KeyCode)
{
listViewButtons.Items[index].SubItems[1].Text = map.Description;
listViewButtons.Items[index].SubItems[2].Text = map.Command;
@@ -545,39 +525,45 @@
}
}
- private void buttonDelete_Click(object sender, EventArgs e)
+ void DeleteButtonMapping()
{
if (listViewButtons.SelectedIndices.Count != 1)
return;
+ List<ButtonMapping> currentMappings = GetCurrentButtonMappings();
+ if (currentMappings == null)
+ return;
+
ListViewItem item = listViewButtons.SelectedItems[0];
-
listViewButtons.Items.Remove(item);
ButtonMapping toRemove = null;
- foreach (ButtonMapping test in GetCurrentSettings())
+ foreach (ButtonMapping test in currentMappings)
{
- if (test.KeyCode.ToString() == item.SubItems[0]...
[truncated message content] |
