From: <che...@us...> - 2009-12-13 15:03:31
|
Revision: 3230 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3230&view=rev Author: chef_koch Date: 2009-12-13 15:03:20 +0000 (Sun, 13 Dec 2009) Log Message: ----------- moved handling of keystrokes to it's own panel to prevent redundant code - this includes textbox, context menu and it's code added media and volume keys to vk key enumeration added media and volume keys to context menu of KeystrokeCommandPanel Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.cs trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.resx trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.resx trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Keyboard.cs Added Paths: ----------- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.Designer.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.resx Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2009-12-12 16:32:05 UTC (rev 3229) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2009-12-13 15:03:20 UTC (rev 3230) @@ -95,67 +95,7 @@ this.radioButtonApplication = new System.Windows.Forms.RadioButton(); this.radioButtonClass = new System.Windows.Forms.RadioButton(); this.tabPageKeystrokes = new System.Windows.Forms.TabPage(); - this.buttonKeyHelp = new System.Windows.Forms.Button(); - this.labelKeystrokes = new System.Windows.Forms.Label(); - this.textBoxKeys = new System.Windows.Forms.TextBox(); - 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.keystrokeCommandPanel = new IrssUtils.Panels.KeystrokeCommandPanel(); this.tabPageMouse = new System.Windows.Forms.TabPage(); this.groupBoxMouseScroll = new System.Windows.Forms.GroupBox(); this.checkBoxMouseScrollDown = new System.Windows.Forms.CheckBox(); @@ -195,7 +135,6 @@ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWParam)).BeginInit(); this.groupBoxMessageTarget.SuspendLayout(); this.tabPageKeystrokes.SuspendLayout(); - this.contextMenuStripKeystrokes.SuspendLayout(); this.tabPageMouse.SuspendLayout(); this.groupBoxMouseScroll.SuspendLayout(); this.groupBoxMouseClick.SuspendLayout(); @@ -958,9 +897,7 @@ // // tabPageKeystrokes // - this.tabPageKeystrokes.Controls.Add(this.buttonKeyHelp); - this.tabPageKeystrokes.Controls.Add(this.labelKeystrokes); - this.tabPageKeystrokes.Controls.Add(this.textBoxKeys); + this.tabPageKeystrokes.Controls.Add(this.keystrokeCommandPanel); this.tabPageKeystrokes.Location = new System.Drawing.Point(4, 22); this.tabPageKeystrokes.Name = "tabPageKeystrokes"; this.tabPageKeystrokes.Padding = new System.Windows.Forms.Padding(3); @@ -969,500 +906,15 @@ this.tabPageKeystrokes.Text = "Keystrokes"; this.tabPageKeystrokes.UseVisualStyleBackColor = true; // - // buttonKeyHelp + // keystrokeCommandPanel // - this.buttonKeyHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonKeyHelp.Location = new System.Drawing.Point(360, 176); - this.buttonKeyHelp.Name = "buttonKeyHelp"; - this.buttonKeyHelp.Size = new System.Drawing.Size(64, 24); - this.buttonKeyHelp.TabIndex = 2; - this.buttonKeyHelp.Text = "Help"; - this.toolTips.SetToolTip(this.buttonKeyHelp, "Click here for help on keystroke commands"); - this.buttonKeyHelp.UseVisualStyleBackColor = true; - this.buttonKeyHelp.Click += new System.EventHandler(this.buttonKeyHelp_Click); + this.keystrokeCommandPanel.CommandString = ""; + this.keystrokeCommandPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.keystrokeCommandPanel.Location = new System.Drawing.Point(3, 3); + this.keystrokeCommandPanel.Name = "keystrokeCommandPanel"; + this.keystrokeCommandPanel.Size = new System.Drawing.Size(434, 200); + this.keystrokeCommandPanel.TabIndex = 0; // - // labelKeystrokes - // - this.labelKeystrokes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.labelKeystrokes.Location = new System.Drawing.Point(8, 8); - this.labelKeystrokes.Name = "labelKeystrokes"; - this.labelKeystrokes.Size = new System.Drawing.Size(416, 16); - this.labelKeystrokes.TabIndex = 0; - this.labelKeystrokes.Text = "Keystrokes:"; - this.labelKeystrokes.TextAlign = System.Drawing.ContentAlignment.BottomLeft; - // - // textBoxKeys - // - 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.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.Both; - this.textBoxKeys.ShortcutsEnabled = false; - this.textBoxKeys.Size = new System.Drawing.Size(416, 144); - this.textBoxKeys.TabIndex = 1; - this.toolTips.SetToolTip(this.textBoxKeys, "Enter keystrokes here, right-click for a list of special keys"); - // - // 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(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(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(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(112, 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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(103, 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(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(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(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(126, 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(128, 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(128, 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(128, 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(128, 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); - // // tabPageMouse // this.tabPageMouse.Controls.Add(this.groupBoxMouseScroll); @@ -1491,7 +943,6 @@ // checkBoxMouseScrollDown // this.checkBoxMouseScrollDown.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseScrollDown.Image = IrssUtils.Properties.Resources.ScrollDown; this.checkBoxMouseScrollDown.Location = new System.Drawing.Point(48, 96); this.checkBoxMouseScrollDown.Name = "checkBoxMouseScrollDown"; this.checkBoxMouseScrollDown.Size = new System.Drawing.Size(32, 32); @@ -1503,7 +954,6 @@ // checkBoxMouseScrollUp // this.checkBoxMouseScrollUp.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseScrollUp.Image = IrssUtils.Properties.Resources.ScrollUp; this.checkBoxMouseScrollUp.Location = new System.Drawing.Point(48, 40); this.checkBoxMouseScrollUp.Name = "checkBoxMouseScrollUp"; this.checkBoxMouseScrollUp.Size = new System.Drawing.Size(32, 32); @@ -1528,7 +978,6 @@ // checkBoxMouseClickRight // this.checkBoxMouseClickRight.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseClickRight.Image = IrssUtils.Properties.Resources.ClickRight; this.checkBoxMouseClickRight.Location = new System.Drawing.Point(88, 64); this.checkBoxMouseClickRight.Name = "checkBoxMouseClickRight"; this.checkBoxMouseClickRight.Size = new System.Drawing.Size(32, 32); @@ -1540,7 +989,6 @@ // checkBoxMouseClickMiddle // this.checkBoxMouseClickMiddle.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseClickMiddle.Image = IrssUtils.Properties.Resources.ClickMiddle; this.checkBoxMouseClickMiddle.Location = new System.Drawing.Point(48, 64); this.checkBoxMouseClickMiddle.Name = "checkBoxMouseClickMiddle"; this.checkBoxMouseClickMiddle.Size = new System.Drawing.Size(32, 32); @@ -1552,7 +1000,6 @@ // checkBoxMouseClickLeft // this.checkBoxMouseClickLeft.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseClickLeft.Image = IrssUtils.Properties.Resources.ClickLeft; this.checkBoxMouseClickLeft.Location = new System.Drawing.Point(8, 64); this.checkBoxMouseClickLeft.Name = "checkBoxMouseClickLeft"; this.checkBoxMouseClickLeft.Size = new System.Drawing.Size(32, 32); @@ -1580,7 +1027,6 @@ // checkBoxMouseMoveLeft // this.checkBoxMouseMoveLeft.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseMoveLeft.Image = IrssUtils.Properties.Resources.MoveLeft; this.checkBoxMouseMoveLeft.Location = new System.Drawing.Point(24, 64); this.checkBoxMouseMoveLeft.Name = "checkBoxMouseMoveLeft"; this.checkBoxMouseMoveLeft.Size = new System.Drawing.Size(32, 32); @@ -1592,7 +1038,6 @@ // checkBoxMouseMoveDown // this.checkBoxMouseMoveDown.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseMoveDown.Image = IrssUtils.Properties.Resources.MoveDown; this.checkBoxMouseMoveDown.Location = new System.Drawing.Point(56, 96); this.checkBoxMouseMoveDown.Name = "checkBoxMouseMoveDown"; this.checkBoxMouseMoveDown.Size = new System.Drawing.Size(32, 32); @@ -1604,7 +1049,6 @@ // checkBoxMouseMoveRight // this.checkBoxMouseMoveRight.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseMoveRight.Image = IrssUtils.Properties.Resources.MoveRight; this.checkBoxMouseMoveRight.Location = new System.Drawing.Point(88, 64); this.checkBoxMouseMoveRight.Name = "checkBoxMouseMoveRight"; this.checkBoxMouseMoveRight.Size = new System.Drawing.Size(32, 32); @@ -1616,7 +1060,6 @@ // checkBoxMouseMoveUp // this.checkBoxMouseMoveUp.Appearance = System.Windows.Forms.Appearance.Button; - this.checkBoxMouseMoveUp.Image = IrssUtils.Properties.Resources.MoveUp; this.checkBoxMouseMoveUp.Location = new System.Drawing.Point(56, 32); this.checkBoxMouseMoveUp.Name = "checkBoxMouseMoveUp"; this.checkBoxMouseMoveUp.Size = new System.Drawing.Size(32, 32); @@ -1769,8 +1212,6 @@ this.groupBoxMessageTarget.ResumeLayout(false); this.groupBoxMessageTarget.PerformLayout(); this.tabPageKeystrokes.ResumeLayout(false); - this.tabPageKeystrokes.PerformLayout(); - this.contextMenuStripKeystrokes.ResumeLayout(false); this.tabPageMouse.ResumeLayout(false); this.groupBoxMouseScroll.ResumeLayout(false); this.groupBoxMouseClick.ResumeLayout(false); @@ -1837,9 +1278,6 @@ private System.Windows.Forms.Label labelWParam; private System.Windows.Forms.Label labelMessage; private System.Windows.Forms.TabPage tabPageKeystrokes; - private System.Windows.Forms.Button buttonKeyHelp; - private System.Windows.Forms.Label labelKeystrokes; - private System.Windows.Forms.TextBox textBoxKeys; private System.Windows.Forms.Button buttonTest; private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.Button buttonOK; @@ -1868,69 +1306,12 @@ private System.Windows.Forms.CheckBox checkBoxMouseMoveDown; private System.Windows.Forms.CheckBox checkBoxMouseMoveRight; private System.Windows.Forms.ToolTip toolTips; - private System.Windows.Forms.ContextMenuStrip contextMenuStripKeystrokes; - private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pasteToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectNoneToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem specialKeysToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem arrowsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem upToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem downToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem leftToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem rightToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem functionKeysToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f1ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f2ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f3ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f4ToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripMenuItem backspaceToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem breakToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem capsLockToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem delToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem endToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem enterToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem escapeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f5ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f6ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f7ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f8ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f9ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f10ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f11ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f12ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f13ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f14ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f15ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem f16ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem keypadToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem subtractToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem multiplyToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem homeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem insToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem numLockToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pageDownToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pageUpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem scrollLockToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem tabToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem divideToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem modifiersToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem altToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem controlToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem shiftToolStripMenuItem; private System.Windows.Forms.TabPage tabPageMisc; private System.Windows.Forms.Label labelMiscCommand; 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; + private IrssUtils.Panels.KeystrokeCommandPanel keystrokeCommandPanel; } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2009-12-12 16:32:05 UTC (rev 3229) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2009-12-13 15:03:20 UTC (rev 3230) @@ -82,6 +82,7 @@ public ButtonMappingForm(string keyCode, string description, string command) { InitializeComponent(); + SetImages(); _keyCode = keyCode; _description = description; @@ -90,6 +91,19 @@ #endregion Constructors + private void SetImages() + { + this.checkBoxMouseScrollDown.Image = IrssUtils.Properties.Resources.ScrollDown; + this.checkBoxMouseScrollUp.Image = IrssUtils.Properties.Resources.ScrollUp; + this.checkBoxMouseClickRight.Image = IrssUtils.Properties.Resources.ClickRight; + this.checkBoxMouseClickMiddle.Image = IrssUtils.Properties.Resources.ClickMiddle; + this.checkBoxMouseClickLeft.Image = IrssUtils.Properties.Resources.ClickLeft; + this.checkBoxMouseMoveLeft.Image = IrssUtils.Properties.Resources.MoveLeft; + this.checkBoxMouseMoveDown.Image = IrssUtils.Properties.Resources.MoveDown; + this.checkBoxMouseMoveRight.Image = IrssUtils.Properties.Resources.MoveRight; + this.checkBoxMouseMoveUp.Image = IrssUtils.Properties.Resources.MoveUp; + } + private void SetupIRList() { comboBoxIRCode.Items.Clear(); @@ -114,16 +128,6 @@ } } - private void InsertKeystroke(char key) - { - textBoxKeys.Paste(key.ToString()); - } - - private void InsertKeystroke(string keystroke) - { - textBoxKeys.Paste(keystroke); - } - private void ButtonMappingForm_Load(object sender, EventArgs e) { textBoxKeyCode.Text = _keyCode; @@ -272,7 +276,7 @@ case Common.CmdPrefixKeys: { tabControl.SelectTab(tabPageKeystrokes); - textBoxKeys.Text = suffix; + keystrokeCommandPanel.CommandString = suffix; break; } @@ -477,7 +481,7 @@ case "tabPageKeystrokes": { - textBoxCommand.Text = _command = Common.CmdPrefixKeys + textBoxKeys.Text; + textBoxCommand.Text = _command = Common.CmdPrefixKeys + keystrokeCommandPanel.CommandString; break; } @@ -707,20 +711,6 @@ SetupMacroList(); } - private void buttonKeyHelp_Click(object sender, EventArgs e) - { - try - { - string file = Path.Combine(SystemRegistry.GetInstallFolder(), "IR Server Suite.chm"); - Help.ShowHelp(this, file, HelpNavigator.Topic, "Common\\keystrokes_info.html"); - } - catch (Exception ex) - { - IrssLog.Error(ex); - MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void textBoxButtonDesc_TextChanged(object sender, EventArgs e) { _description = textBoxButtonDesc.Text; @@ -744,180 +734,6 @@ if (origin != checkBoxMouseScrollDown) checkBoxMouseScrollDown.Checked = false; } - private void KeystrokeToolStripMenuItem_Click(object sender, EventArgs e) - { - ToolStripMenuItem origin = sender as ToolStripMenuItem; - - if (origin == null) - return; - - switch (origin.Name) - { - case "upToolStripMenuItem": - InsertKeystroke("{UP}"); - break; - case "downToolStripMenuItem": - InsertKeystroke("{DOWN}"); - break; - case "leftToolStripMenuItem": - InsertKeystroke("{LEFT}"); - break; - case "rightToolStripMenuItem": - InsertKeystroke("{RIGHT}"); - break; - - case "f1ToolStripMenuItem": - InsertKeystroke("{F1}"); - break; - case "f2ToolStripMenuItem": - InsertKeystroke("{F2}"); - break; - case "f3ToolStripMenuItem": - InsertKeystroke("{F3}"); - break; - case "f4ToolStripMenuItem": - InsertKeystroke("{F4}"); - break; - case "f5ToolStripMenuItem": - InsertKeystroke("{F5}"); - break; - case "f6ToolStripMenuItem": - InsertKeystroke("{F6}"); - break; - case "f7ToolStripMenuItem": - InsertKeystroke("{F7}"); - break; - case "f8ToolStripMenuItem": - InsertKeystroke("{F8}"); - break; - case "f9ToolStripMenuItem": - InsertKeystroke("{F9}"); - break; - case "f10ToolStripMenuItem": - InsertKeystroke("{F10}"); - break; - case "f11ToolStripMenuItem": - InsertKeystroke("{F11}"); - break; - case "f12ToolStripMenuItem": - InsertKeystroke("{F12}"); - break; - case "f13ToolStripMenuItem": - InsertKeystroke("{F13}"); - break; - case "f14ToolStripMenuItem": - InsertKeystroke("{F14}"); - break; - case "f15ToolStripMenuItem": - InsertKeystroke("{F15}"); - break; - case "f16ToolStripMenuItem": - InsertKeystroke("{F16}"); - break; - - case "addToolStripMenuItem": - InsertKeystroke("{ADD}"); - break; - case "subtractToolStripMenuItem": - InsertKeystroke("{SUBTRACT}"); - break; - case "multiplyToolStripMenuItem": - InsertKeystroke("{MULTIPLY}"); - break; - case "divideToolStripMenuItem": - InsertKeystroke("{DIVIDE}"); - 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; - case "capsLockToolStripMenuItem": - InsertKeystroke("{CAPSLOCK}"); - break; - case "delToolStripMenuItem": - InsertKeystroke("{DEL}"); - break; - - case "endToolStripMenuItem": - InsertKeystroke("{END}"); - break; - case "enterToolStripMenuItem": - InsertKeystroke("{ENTER}"); - break; - case "escapeToolStripMenuItem": - InsertKeystroke("{ESC}"); - break; - case "helpToolStripMenuItem": - InsertKeystroke("{HELP}"); - break; - case "homeToolStripMenuItem": - InsertKeystroke("{HOME}"); - break; - case "insToolStripMenuItem": - InsertKeystroke("{INS}"); - break; - case "numLockToolStripMenuItem": - InsertKeystroke("{NUMLOCK}"); - break; - case "pageDownToolStripMenuItem": - InsertKeystroke("{PGDN}"); - break; - case "pageUpToolStripMenuItem": - InsertKeystroke("{PGUP}"); - break; - case "scrollLockToolStripMenuItem": - InsertKeystroke("{SCROLLLOCK}"); - break; - case "tabToolStripMenuItem": - InsertKeystroke("{TAB}"); - break; - case "windowsKeyToolStripMenuItem": - InsertKeystroke("{WIN}"); - break; - } - } - - private void cutToolStripMenuItem_Click(object sender, EventArgs e) - { - textBoxKeys.Cut(); - } - - private void copyToolStripMenuItem_Click(object sender, EventArgs e) - { - textBoxKeys.Copy(); - } - - private void pasteToolStripMenuItem_Click(object sender, EventArgs e) - { - textBoxKeys.Paste(); - } - - private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) - { - textBoxKeys.SelectAll(); - } - - private void selectNoneToolStripMenuItem_Click(object sender, EventArgs e) - { - textBoxKeys.SelectionLength = 0; - } - #endregion Controls } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx 2009-12-12 16:32:05 UTC (rev 3229) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx 2009-12-13 15:03:20 UTC (rev 3230) @@ -120,9 +120,6 @@ <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> - <metadata name="contextMenuStripKeystrokes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>107, 17</value> - </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-12-12 16:32:05 UTC (rev 3229) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-12-13 15:03:20 UTC (rev 3230) @@ -61,7 +61,6 @@ public MainForm() { InitializeComponent(); - SetImages(); RefreshProgramList(); @@ -85,6 +84,8 @@ } } + #endregion Constructor + private void SetImages() { // main menu @@ -151,8 +152,6 @@ this.deleteIRToolStripMenuItem.Image = IrssUtils.Properties.Resources.Delete; } - #endregion Constructor - #region Implementation #region Main Form Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs 2009-12-12 16:32:05 UTC (rev 3229) +++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs 2009-12-13 15:03:20 UTC (rev 3230) @@ -30,70 +30,9 @@ /// </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.textBoxKeys = new System.Windows.Forms.TextBox(); - 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.window... [truncated message content] |