From: <che...@us...> - 2009-11-25 16:28:01
|
Revision: 3183 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3183&view=rev Author: chef_koch Date: 2009-11-25 15:49:08 +0000 (Wed, 25 Nov 2009) Log Message: ----------- added context menu to ircommands and macros fixed disabling/enabling toolbars and contextmenus in ircommands and macros added BringWindowToTop when clicking setup in TrayIcon even if setup was opened already added icons for programs in TrayIcon's context menu Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 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.resx trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-11-25 15:40:49 UTC (rev 3182) +++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-11-25 15:49:08 UTC (rev 3183) @@ -40,13 +40,14 @@ this.mappingsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.newMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.remapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.copyMappingsFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonOK = new System.Windows.Forms.Button(); - this.contextMenuStripEvents = new System.Windows.Forms.ContextMenuStrip(this.components); + this.eventsContextMenuStripEvents = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addEventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.removeEventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.checkBoxAutoRun = new System.Windows.Forms.CheckBox(); @@ -58,29 +59,28 @@ this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.tabPageIRCommands = new System.Windows.Forms.TabPage(); - this.toolStripIRCommands = new System.Windows.Forms.ToolStrip(); - this.toolStripButtonNewIR = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonEditIR = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonDeleteIR = new System.Windows.Forms.ToolStripButton(); + this.irCommandsToolStrip = new System.Windows.Forms.ToolStrip(); + this.newIRToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.editIRToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.deleteIRToolStripButton = new System.Windows.Forms.ToolStripButton(); this.listViewIR = new System.Windows.Forms.ListView(); this.tabPageMacro = new System.Windows.Forms.TabPage(); - this.toolStripMacros = new System.Windows.Forms.ToolStrip(); - this.toolStripButtonNewMacro = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonEditMacro = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonDeleteMacro = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonCreateShortcutForMacro = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonTestMacro = new System.Windows.Forms.ToolStripButton(); + this.macrosToolStrip = new System.Windows.Forms.ToolStrip(); + this.newMacroToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.editMacroToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.deleteMacroToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.createShortcutForMacroToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.testMacroToolStripButton = new System.Windows.Forms.ToolStripButton(); this.listViewMacro = new System.Windows.Forms.ListView(); this.tabPageEvents = new System.Windows.Forms.TabPage(); this.buttonSetCommand = new System.Windows.Forms.Button(); @@ -93,6 +93,12 @@ this.columnHeaderEvent = new System.Windows.Forms.ColumnHeader(); this.columnHeaderEventCommand = new System.Windows.Forms.ColumnHeader(); this.tabPagePrograms = new System.Windows.Forms.TabPage(); + this.mappingsToolStrip = new System.Windows.Forms.ToolStrip(); + this.newMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.editMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.deleteMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.clearMappingsToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.remapToolStripButton = new System.Windows.Forms.ToolStripButton(); this.programsPanel = new System.Windows.Forms.Panel(); this.programsToolStrip = new System.Windows.Forms.ToolStrip(); this.addProgramToolStripButton = new System.Windows.Forms.ToolStripButton(); @@ -102,27 +108,35 @@ this.columnHeaderButton = new System.Windows.Forms.ColumnHeader(); this.columnHeaderDescription = new System.Windows.Forms.ColumnHeader(); this.columnHeaderCommand = new System.Windows.Forms.ColumnHeader(); - this.mappingsToolStrip = new System.Windows.Forms.ToolStrip(); - this.newMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.editMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.removeMappingToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.clearMappingsToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.remapToolStripButton = new System.Windows.Forms.ToolStripButton(); this.tabControl = new System.Windows.Forms.TabControl(); + this.irCommandsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.macrosContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.testMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.createShortcutForMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.programsContextMenuStrip.SuspendLayout(); this.mappingsContextMenuStrip.SuspendLayout(); - this.contextMenuStripEvents.SuspendLayout(); + this.eventsContextMenuStripEvents.SuspendLayout(); this.menuStrip.SuspendLayout(); this.tabPageIRCommands.SuspendLayout(); - this.toolStripIRCommands.SuspendLayout(); + this.irCommandsToolStrip.SuspendLayout(); this.tabPageMacro.SuspendLayout(); - this.toolStripMacros.SuspendLayout(); + this.macrosToolStrip.SuspendLayout(); this.tabPageEvents.SuspendLayout(); this.tabPagePrograms.SuspendLayout(); + this.mappingsToolStrip.SuspendLayout(); this.programsPanel.SuspendLayout(); this.programsToolStrip.SuspendLayout(); - this.mappingsToolStrip.SuspendLayout(); this.tabControl.SuspendLayout(); + this.irCommandsContextMenuStrip.SuspendLayout(); + this.macrosContextMenuStrip.SuspendLayout(); this.SuspendLayout(); // // programsContextMenuStrip @@ -153,7 +167,7 @@ this.removeProgramToolStripMenuItem.Name = "removeProgramToolStripMenuItem"; this.removeProgramToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.removeProgramToolStripMenuItem.Text = "&Remove Program"; - this.removeProgramToolStripMenuItem.Click += new System.EventHandler(this.RemoveProgram); + this.removeProgramToolStripMenuItem.Click += new System.EventHandler(this.DeleteProgram); // // imageListPrograms // @@ -166,7 +180,7 @@ this.mappingsContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newMappingToolStripMenuItem, this.editMappingToolStripMenuItem, - this.removeMappingToolStripMenuItem, + this.deleteMappingToolStripMenuItem, this.clearMappingsToolStripMenuItem, this.remapToolStripMenuItem, this.toolStripSeparator3, @@ -178,54 +192,54 @@ // newMappingToolStripMenuItem // this.newMappingToolStripMenuItem.Name = "newMappingToolStripMenuItem"; - this.newMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.newMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.newMappingToolStripMenuItem.Text = "&New"; this.newMappingToolStripMenuItem.Click += new System.EventHandler(this.NewButtonMapping); // // editMappingToolStripMenuItem // this.editMappingToolStripMenuItem.Name = "editMappingToolStripMenuItem"; - this.editMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.editMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.editMappingToolStripMenuItem.Text = "&Edit"; this.editMappingToolStripMenuItem.Click += new System.EventHandler(this.EditButtonMapping); // - // removeMappingToolStripMenuItem + // deleteMappingToolStripMenuItem // - this.removeMappingToolStripMenuItem.Name = "removeMappingToolStripMenuItem"; - this.removeMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.removeMappingToolStripMenuItem.Text = "&Delete"; - this.removeMappingToolStripMenuItem.Click += new System.EventHandler(this.DeleteButtonMapping); + this.deleteMappingToolStripMenuItem.Name = "deleteMappingToolStripMenuItem"; + this.deleteMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.deleteMappingToolStripMenuItem.Text = "&Delete"; + this.deleteMappingToolStripMenuItem.Click += new System.EventHandler(this.DeleteButtonMapping); // // clearMappingsToolStripMenuItem // this.clearMappingsToolStripMenuItem.Name = "clearMappingsToolStripMenuItem"; - this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.clearMappingsToolStripMenuItem.Text = "&Clear"; this.clearMappingsToolStripMenuItem.Click += new System.EventHandler(this.ClearButtonMappings); // // remapToolStripMenuItem // this.remapToolStripMenuItem.Name = "remapToolStripMenuItem"; - this.remapToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.remapToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.remapToolStripMenuItem.Text = "&Remap"; this.remapToolStripMenuItem.Click += new System.EventHandler(this.RemapButtonMapping); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); // // copyMappingsFromToolStripMenuItem // this.copyMappingsFromToolStripMenuItem.Name = "copyMappingsFromToolStripMenuItem"; - this.copyMappingsFromToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.copyMappingsFromToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.copyMappingsFromToolStripMenuItem.Text = "Copy &from ..."; // // buttonOK // this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOK.Location = new System.Drawing.Point(472, 440); + this.buttonOK.Location = new System.Drawing.Point(464, 409); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(64, 24); this.buttonOK.TabIndex = 3; @@ -233,17 +247,24 @@ this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // contextMenuStripEvents + // eventsContextMenuStripEvents // - this.contextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.eventsContextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addEventToolStripMenuItem, this.removeEventToolStripMenuItem}); - this.contextMenuStripEvents.Name = "contextMenuStripEvents"; - this.contextMenuStripEvents.Size = new System.Drawing.Size(118, 26); + this.eventsContextMenuStripEvents.Name = "contextMenuStripEvents"; + this.eventsContextMenuStripEvents.Size = new System.Drawing.Size(154, 48); // + // addEventToolStripMenuItem + // + this.addEventToolStripMenuItem.Name = "addEventToolStripMenuItem"; + this.addEventToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.addEventToolStripMenuItem.Text = "Add new event"; + // // removeEventToolStripMenuItem // this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem"; - this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(153, 22); this.removeEventToolStripMenuItem.Text = "&Remove"; this.removeEventToolStripMenuItem.Click += new System.EventHandler(this.removeEventToolStripMenuItem_Click); // @@ -251,7 +272,7 @@ // this.checkBoxAutoRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.checkBoxAutoRun.AutoSize = true; - this.checkBoxAutoRun.Location = new System.Drawing.Point(8, 448); + this.checkBoxAutoRun.Location = new System.Drawing.Point(8, 417); this.checkBoxAutoRun.Name = "checkBoxAutoRun"; this.checkBoxAutoRun.Size = new System.Drawing.Size(167, 17); this.checkBoxAutoRun.TabIndex = 2; @@ -276,7 +297,7 @@ this.programsListView.Name = "programsListView"; this.programsListView.ShowGroups = false; this.programsListView.ShowItemToolTips = true; - this.programsListView.Size = new System.Drawing.Size(445, 84); + this.programsListView.Size = new System.Drawing.Size(451, 86); this.programsListView.TabIndex = 0; this.programsListView.TileSize = new System.Drawing.Size(128, 48); this.toolTip.SetToolTip(this.programsListView, "Choose a Program to modify mappings"); @@ -288,10 +309,11 @@ // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.configurationToolStripMenuItem, + this.settingsToolStripMenuItem, this.helpToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(544, 24); + this.menuStrip.Size = new System.Drawing.Size(536, 24); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "menuStrip"; // @@ -301,15 +323,10 @@ this.newToolStripMenuItem, this.openToolStripMenuItem, this.importToolStripMenuItem, - this.exportToolStripMenuItem, - this.toolStripSeparator1, - this.serverToolStripMenuItem, - this.advancedToolStripMenuItem, - this.toolStripSeparator2, - this.exitToolStripMenuItem}); + this.exportToolStripMenuItem}); this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; - this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.configurationToolStripMenuItem.Text = "&File"; + this.configurationToolStripMenuItem.Size = new System.Drawing.Size(93, 20); + this.configurationToolStripMenuItem.Text = "&Configuration"; // // newToolStripMenuItem // @@ -317,7 +334,7 @@ this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.newToolStripMenuItem.Text = "&New"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + this.newToolStripMenuItem.Click += new System.EventHandler(this.NewConfig); // // openToolStripMenuItem // @@ -325,53 +342,45 @@ this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.openToolStripMenuItem.Text = "&Open..."; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenConfig); // // importToolStripMenuItem // this.importToolStripMenuItem.Name = "importToolStripMenuItem"; this.importToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.importToolStripMenuItem.Text = "&Import..."; - this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); + this.importToolStripMenuItem.Click += new System.EventHandler(this.ImportConfig); // // exportToolStripMenuItem // this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; this.exportToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.exportToolStripMenuItem.Text = "&Export..."; - this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click); + this.exportToolStripMenuItem.Click += new System.EventHandler(this.ExportConfig); // - // toolStripSeparator1 + // settingsToolStripMenuItem // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(154, 6); + this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.serverToolStripMenuItem, + this.advancedToolStripMenuItem}); + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.settingsToolStripMenuItem.Text = "Settings"; // // serverToolStripMenuItem // this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; - this.serverToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.serverToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.serverToolStripMenuItem.Text = "&Server..."; - this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem2_Click); + this.serverToolStripMenuItem.Click += new System.EventHandler(this.SetServer); // // advancedToolStripMenuItem // this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; - this.advancedToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.advancedToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.advancedToolStripMenuItem.Text = "&Advanced..."; - this.advancedToolStripMenuItem.Click += new System.EventHandler(this.advancedToolStripMenuItem_Click); + this.advancedToolStripMenuItem.Click += new System.EventHandler(this.ShowAdvancedSettings); // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(154, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(157, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -395,6 +404,11 @@ this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 6); + // // openFileDialog // this.openFileDialog.Filter = "XML Files|*.xml"; @@ -406,56 +420,56 @@ // // tabPageIRCommands // - this.tabPageIRCommands.Controls.Add(this.toolStripIRCommands); + this.tabPageIRCommands.Controls.Add(this.irCommandsToolStrip); this.tabPageIRCommands.Controls.Add(this.listViewIR); this.tabPageIRCommands.Location = new System.Drawing.Point(4, 22); this.tabPageIRCommands.Name = "tabPageIRCommands"; this.tabPageIRCommands.Padding = new System.Windows.Forms.Padding(3); - this.tabPageIRCommands.Size = new System.Drawing.Size(520, 374); + this.tabPageIRCommands.Size = new System.Drawing.Size(512, 343); this.tabPageIRCommands.TabIndex = 3; this.tabPageIRCommands.Text = "IR Commands"; this.tabPageIRCommands.UseVisualStyleBackColor = true; // - // toolStripIRCommands + // irCommandsToolStrip // - this.toolStripIRCommands.Dock = System.Windows.Forms.DockStyle.Bottom; - this.toolStripIRCommands.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStripIRCommands.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButtonNewIR, - this.toolStripButtonEditIR, - this.toolStripButtonDeleteIR}); - this.toolStripIRCommands.Location = new System.Drawing.Point(3, 346); - this.toolStripIRCommands.Name = "toolStripIRCommands"; - this.toolStripIRCommands.Size = new System.Drawing.Size(514, 25); - this.toolStripIRCommands.TabIndex = 1; - this.toolStripIRCommands.Text = "IR Commands"; + this.irCommandsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom; + this.irCommandsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.irCommandsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newIRToolStripButton, + this.editIRToolStripButton, + this.deleteIRToolStripButton}); + this.irCommandsToolStrip.Location = new System.Drawing.Point(3, 315); + this.irCommandsToolStrip.Name = "irCommandsToolStrip"; + this.irCommandsToolStrip.Size = new System.Drawing.Size(506, 25); + this.irCommandsToolStrip.TabIndex = 1; + this.irCommandsToolStrip.Text = "IR Commands"; // - // toolStripButtonNewIR + // newIRToolStripButton // - this.toolStripButtonNewIR.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonNewIR.Name = "toolStripButtonNewIR"; - this.toolStripButtonNewIR.Size = new System.Drawing.Size(35, 22); - this.toolStripButtonNewIR.Text = "New"; - this.toolStripButtonNewIR.ToolTipText = "Create a new IR Command"; - this.toolStripButtonNewIR.Click += new System.EventHandler(this.toolStripButtonNewIR_Click); + this.newIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newIRToolStripButton.Name = "newIRToolStripButton"; + this.newIRToolStripButton.Size = new System.Drawing.Size(35, 22); + this.newIRToolStripButton.Text = "New"; + this.newIRToolStripButton.ToolTipText = "Create a new IR Command"; + this.newIRToolStripButton.Click += new System.EventHandler(this.NewIRCommand); // - // toolStripButtonEditIR + // editIRToolStripButton // - this.toolStripButtonEditIR.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonEditIR.Name = "toolStripButtonEditIR"; - this.toolStripButtonEditIR.Size = new System.Drawing.Size(31, 22); - this.toolStripButtonEditIR.Text = "Edit"; - this.toolStripButtonEditIR.ToolTipText = "Edit the selected IR Command"; - this.toolStripButtonEditIR.Click += new System.EventHandler(this.toolStripButtonEditIR_Click); + this.editIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.editIRToolStripButton.Name = "editIRToolStripButton"; + this.editIRToolStripButton.Size = new System.Drawing.Size(31, 22); + this.editIRToolStripButton.Text = "Edit"; + this.editIRToolStripButton.ToolTipText = "Edit the selected IR Command"; + this.editIRToolStripButton.Click += new System.EventHandler(this.EditIRCommand); // - // toolStripButtonDeleteIR + // deleteIRToolStripButton // - this.toolStripButtonDeleteIR.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonDeleteIR.Name = "toolStripButtonDeleteIR"; - this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(44, 22); - this.toolStripButtonDeleteIR.Text = "Delete"; - this.toolStripButtonDeleteIR.ToolTipText = "Delete the selected IR Command"; - this.toolStripButtonDeleteIR.Click += new System.EventHandler(this.toolStripButtonDeleteIR_Click); + this.deleteIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteIRToolStripButton.Name = "deleteIRToolStripButton"; + this.deleteIRToolStripButton.Size = new System.Drawing.Size(44, 22); + this.deleteIRToolStripButton.Text = "Delete"; + this.deleteIRToolStripButton.ToolTipText = "Delete the selected IR Command"; + this.deleteIRToolStripButton.Click += new System.EventHandler(this.DeleteIRCommand); // // listViewIR // @@ -466,110 +480,113 @@ this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listViewIR.HideSelection = false; this.listViewIR.LabelEdit = true; - this.listViewIR.Location = new System.Drawing.Point(8, 8); + this.listViewIR.Location = new System.Drawing.Point(6, 6); this.listViewIR.MultiSelect = false; this.listViewIR.Name = "listViewIR"; this.listViewIR.ShowGroups = false; - this.listViewIR.Size = new System.Drawing.Size(504, 328); + this.listViewIR.Size = new System.Drawing.Size(500, 306); this.listViewIR.TabIndex = 0; this.listViewIR.UseCompatibleStateImageBehavior = false; this.listViewIR.View = System.Windows.Forms.View.List; this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit); - this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick); + this.listViewIR.SelectedIndexChanged += new System.EventHandler(this.listViewIR_SelectedIndexChanged); + this.listViewIR.DoubleClick += new System.EventHandler(this.EditIRCommand); // // tabPageMacro // - this.tabPageMacro.Controls.Add(this.toolStripMacros); + this.tabPageMacro.Controls.Add(this.macrosToolStrip); this.tabPageMacro.Controls.Add(this.listViewMacro); this.tabPageMacro.Location = new System.Drawing.Point(4, 22); this.tabPageMacro.Name = "tabPageMacro"; this.tabPageMacro.Padding = new System.Windows.Forms.Padding(3); - this.tabPageMacro.Size = new System.Drawing.Size(520, 374); + this.tabPageMacro.Size = new System.Drawing.Size(512, 343); this.tabPageMacro.TabIndex = 2; this.tabPageMacro.Text = "Macros"; this.tabPageMacro.UseVisualStyleBackColor = true; // - // toolStripMacros + // macrosToolStrip // - this.toolStripMacros.Dock = System.Windows.Forms.DockStyle.Bottom; - this.toolStripMacros.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStripMacros.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButtonNewMacro, - this.toolStripButtonEditMacro, - this.toolStripButtonDeleteMacro, - this.toolStripButtonCreateShortcutForMacro, - this.toolStripButtonTestMacro}); - this.toolStripMacros.Location = new System.Drawing.Point(3, 346); - this.toolStripMacros.Name = "toolStripMacros"; - this.toolStripMacros.Size = new System.Drawing.Size(514, 25); - this.toolStripMacros.TabIndex = 1; - this.toolStripMacros.Text = "Macros"; + this.macrosToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom; + this.macrosToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.macrosToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newMacroToolStripButton, + this.editMacroToolStripButton, + this.deleteMacroToolStripButton, + this.createShortcutForMacroToolStripButton, + this.testMacroToolStripButton}); + this.macrosToolStrip.Location = new System.Drawing.Point(3, 315); + this.macrosToolStrip.Name = "macrosToolStrip"; + this.macrosToolStrip.Size = new System.Drawing.Size(506, 25); + this.macrosToolStrip.TabIndex = 1; + this.macrosToolStrip.Text = "Macros"; // - // toolStripButtonNewMacro + // newMacroToolStripButton // - this.toolStripButtonNewMacro.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonNewMacro.Name = "toolStripButtonNewMacro"; - this.toolStripButtonNewMacro.Size = new System.Drawing.Size(35, 22); - this.toolStripButtonNewMacro.Text = "New"; - this.toolStripButtonNewMacro.ToolTipText = "Create a new macro"; - this.toolStripButtonNewMacro.Click += new System.EventHandler(this.toolStripButtonNewMacro_Click); + this.newMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newMacroToolStripButton.Name = "newMacroToolStripButton"; + this.newMacroToolStripButton.Size = new System.Drawing.Size(35, 22); + this.newMacroToolStripButton.Text = "New"; + this.newMacroToolStripButton.ToolTipText = "Create a new macro"; + this.newMacroToolStripButton.Click += new System.EventHandler(this.NewMacro); // - // toolStripButtonEditMacro + // editMacroToolStripButton // - this.toolStripButtonEditMacro.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonEditMacro.Name = "toolStripButtonEditMacro"; - this.toolStripButtonEditMacro.Size = new System.Drawing.Size(31, 22); - this.toolStripButtonEditMacro.Text = "Edit"; - this.toolStripButtonEditMacro.ToolTipText = "Edit the selected macro"; - this.toolStripButtonEditMacro.Click += new System.EventHandler(this.toolStripButtonEditMacro_Click); + this.editMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.editMacroToolStripButton.Name = "editMacroToolStripButton"; + this.editMacroToolStripButton.Size = new System.Drawing.Size(31, 22); + this.editMacroToolStripButton.Text = "Edit"; + this.editMacroToolStripButton.ToolTipText = "Edit the selected macro"; + this.editMacroToolStripButton.Click += new System.EventHandler(this.EditMacro); // - // toolStripButtonDeleteMacro + // deleteMacroToolStripButton // - this.toolStripButtonDeleteMacro.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonDeleteMacro.Name = "toolStripButtonDeleteMacro"; - this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(44, 22); - this.toolStripButtonDeleteMacro.Text = "Delete"; - this.toolStripButtonDeleteMacro.ToolTipText = "Delete the selected macro"; - this.toolStripButtonDeleteMacro.Click += new System.EventHandler(this.toolStripButtonDeleteMacro_Click); + this.deleteMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteMacroToolStripButton.Name = "deleteMacroToolStripButton"; + this.deleteMacroToolStripButton.Size = new System.Drawing.Size(44, 22); + this.deleteMacroToolStripButton.Text = "Delete"; + this.deleteMacroToolStripButton.ToolTipText = "Delete the selected macro"; + this.deleteMacroToolStripButton.Click += new System.EventHandler(this.DeleteMacro); // - // toolStripButtonCreateShortcutForMacro + // createShortcutForMacroToolStripButton // - this.toolStripButtonCreateShortcutForMacro.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButtonCreateShortcutForMacro.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonCreateShortcutForMacro.Name = "toolStripButtonCreateShortcutForMacro"; - this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(92, 22); - this.toolStripButtonCreateShortcutForMacro.Text = "Create shortcut"; - this.toolStripButtonCreateShortcutForMacro.ToolTipText = "Create a shortcut to run the selected macro"; - this.toolStripButtonCreateShortcutForMacro.Click += new System.EventHandler(this.toolStripButtonCreateShortcutForMacro_Click); + this.createShortcutForMacroToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.createShortcutForMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.createShortcutForMacroToolStripButton.Name = "createShortcutForMacroToolStripButton"; + this.createShortcutForMacroToolStripButton.Size = new System.Drawing.Size(92, 22); + this.createShortcutForMacroToolStripButton.Text = "Create shortcut"; + this.createShortcutForMacroToolStripButton.ToolTipText = "Create a shortcut to run the selected macro"; + this.createShortcutForMacroToolStripButton.Click += new System.EventHandler(this.CreateShortcutForMacro); // - // toolStripButtonTestMacro + // testMacroToolStripButton // - this.toolStripButtonTestMacro.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonTestMacro.Name = "toolStripButtonTestMacro"; - this.toolStripButtonTestMacro.Size = new System.Drawing.Size(33, 22); - this.toolStripButtonTestMacro.Text = "Test"; - this.toolStripButtonTestMacro.ToolTipText = "Test the selected macro"; - this.toolStripButtonTestMacro.Click += new System.EventHandler(this.toolStripButtonTestMacro_Click); + this.testMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.testMacroToolStripButton.Name = "testMacroToolStripButton"; + this.testMacroToolStripButton.Size = new System.Drawing.Size(33, 22); + this.testMacroToolStripButton.Text = "Test"; + this.testMacroToolStripButton.ToolTipText = "Test the selected macro"; + this.testMacroToolStripButton.Click += new System.EventHandler(this.TestMacro); // // listViewMacro // this.listViewMacro.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.listViewMacro.ContextMenuStrip = this.macrosContextMenuStrip; this.listViewMacro.FullRowSelect = true; this.listViewMacro.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listViewMacro.HideSelection = false; this.listViewMacro.LabelEdit = true; - this.listViewMacro.Location = new System.Drawing.Point(8, 8); + this.listViewMacro.Location = new System.Drawing.Point(6, 6); this.listViewMacro.MultiSelect = false; this.listViewMacro.Name = "listViewMacro"; this.listViewMacro.ShowGroups = false; - this.listViewMacro.Size = new System.Drawing.Size(504, 328); + this.listViewMacro.Size = new System.Drawing.Size(500, 306); this.listViewMacro.TabIndex = 0; this.listViewMacro.UseCompatibleStateImageBehavior = false; this.listViewMacro.View = System.Windows.Forms.View.List; this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit); - this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick); + this.listViewMacro.SelectedIndexChanged += new System.EventHandler(this.listViewMacro_SelectedIndexChanged); + this.listViewMacro.DoubleClick += new System.EventHandler(this.EditMacro); // // tabPageEvents // @@ -583,7 +600,7 @@ this.tabPageEvents.Location = new System.Drawing.Point(4, 22); this.tabPageEvents.Name = "tabPageEvents"; this.tabPageEvents.Padding = new System.Windows.Forms.Padding(3); - this.tabPageEvents.Size = new System.Drawing.Size(520, 374); + this.tabPageEvents.Size = new System.Drawing.Size(512, 343); this.tabPageEvents.TabIndex = 1; this.tabPageEvents.Text = "Events"; this.tabPageEvents.UseVisualStyleBackColor = true; @@ -591,29 +608,29 @@ // buttonSetCommand // this.buttonSetCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonSetCommand.Location = new System.Drawing.Point(456, 344); + this.buttonSetCommand.Location = new System.Drawing.Point(450, 313); this.buttonSetCommand.Name = "buttonSetCommand"; this.buttonSetCommand.Size = new System.Drawing.Size(56, 24); this.buttonSetCommand.TabIndex = 6; this.buttonSetCommand.Text = "Set"; this.buttonSetCommand.UseVisualStyleBackColor = true; - this.buttonSetCommand.Click += new System.EventHandler(this.buttonSetCommand_Click); + this.buttonSetCommand.Click += new System.EventHandler(this.SetCommandToEvent); // // buttonAddEvent // this.buttonAddEvent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonAddEvent.Location = new System.Drawing.Point(456, 312); + this.buttonAddEvent.Location = new System.Drawing.Point(450, 283); this.buttonAddEvent.Name = "buttonAddEvent"; this.buttonAddEvent.Size = new System.Drawing.Size(56, 24); this.buttonAddEvent.TabIndex = 3; this.buttonAddEvent.Text = "Add"; this.buttonAddEvent.UseVisualStyleBackColor = true; - this.buttonAddEvent.Click += new System.EventHandler(this.buttonAddEvent_Click); + this.buttonAddEvent.Click += new System.EventHandler(this.AddEvent); // // labelCommand // this.labelCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.labelCommand.Location = new System.Drawing.Point(8, 344); + this.labelCommand.Location = new System.Drawing.Point(8, 315); this.labelCommand.Name = "labelCommand"; this.labelCommand.Size = new System.Drawing.Size(80, 20); this.labelCommand.TabIndex = 4; @@ -626,7 +643,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.comboBoxCommands.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCommands.FormattingEnabled = true; - this.comboBoxCommands.Location = new System.Drawing.Point(88, 344); + this.comboBoxCommands.Location = new System.Drawing.Point(88, 313); this.comboBoxCommands.Name = "comboBoxCommands"; this.comboBoxCommands.Size = new System.Drawing.Size(352, 21); this.comboBoxCommands.TabIndex = 5; @@ -634,7 +651,7 @@ // labelEvent // this.labelEvent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.labelEvent.Location = new System.Drawing.Point(8, 312); + this.labelEvent.Location = new System.Drawing.Point(8, 283); this.labelEvent.Name = "labelEvent"; this.labelEvent.Size = new System.Drawing.Size(80, 21); this.labelEvent.TabIndex = 1; @@ -647,7 +664,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.comboBoxEvents.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEvents.FormattingEnabled = true; - this.comboBoxEvents.Location = new System.Drawing.Point(88, 312); + this.comboBoxEvents.Location = new System.Drawing.Point(88, 283); this.comboBoxEvents.Name = "comboBoxEvents"; this.comboBoxEvents.Size = new System.Drawing.Size(352, 21); this.comboBoxEvents.TabIndex = 2; @@ -660,15 +677,15 @@ this.listViewEventMap.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeaderEvent, this.columnHeaderEventCommand}); - this.listViewEventMap.ContextMenuStrip = this.contextMenuStripEvents; + this.listViewEventMap.ContextMenuStrip = this.eventsContextMenuStripEvents; this.listViewEventMap.FullRowSelect = true; this.listViewEventMap.GridLines = true; this.listViewEventMap.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listViewEventMap.HideSelection = false; - this.listViewEventMap.Location = new System.Drawing.Point(8, 8); + this.listViewEventMap.Location = new System.Drawing.Point(6, 6); this.listViewEventMap.Name = "listViewEventMap"; this.listViewEventMap.ShowGroups = false; - this.listViewEventMap.Size = new System.Drawing.Size(504, 296); + this.listViewEventMap.Size = new System.Drawing.Size(500, 271); this.listViewEventMap.TabIndex = 0; this.listViewEventMap.UseCompatibleStateImageBehavior = false; this.listViewEventMap.View = System.Windows.Forms.View.Details; @@ -688,17 +705,79 @@ // // tabPagePrograms // + this.tabPagePrograms.Controls.Add(this.mappingsToolStrip); this.tabPagePrograms.Controls.Add(this.programsPanel); this.tabPagePrograms.Controls.Add(this.mappingsListView); - this.tabPagePrograms.Controls.Add(this.mappingsToolStrip); this.tabPagePrograms.Location = new System.Drawing.Point(4, 22); this.tabPagePrograms.Name = "tabPagePrograms"; this.tabPagePrograms.Padding = new System.Windows.Forms.Padding(3); - this.tabPagePrograms.Size = new System.Drawing.Size(520, 374); + this.tabPagePrograms.Size = new System.Drawing.Size(512, 343); this.tabPagePrograms.TabIndex = 0; this.tabPagePrograms.Text = "Programs"; this.tabPagePrograms.UseVisualStyleBackColor = true; // + // mappingsToolStrip + // + this.mappingsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom; + this.mappingsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.mappingsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newMappingToolStripButton, + this.editMappingToolStripButton, + this.deleteMappingToolStripButton, + this.clearMappingsToolStripButton, + this.remapToolStripButton}); + this.mappingsToolStrip.Location = new System.Drawing.Point(3, 315); + this.mappingsToolStrip.Name = "mappingsToolStrip"; + this.mappingsToolStrip.Size = new System.Drawing.Size(506, 25); + this.mappingsToolStrip.TabIndex = 2; + this.mappingsToolStrip.Text = "Button Mappings"; + // + // newMappingToolStripButton + // + this.newMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newMappingToolStripButton.Name = "newMappingToolStripButton"; + this.newMappingToolStripButton.Size = new System.Drawing.Size(35, 22); + this.newMappingToolStripButton.Text = "New"; + this.newMappingToolStripButton.ToolTipText = "Create a new button mapping"; + this.newMappingToolStripButton.Click += new System.EventHandler(this.NewButtonMapping); + // + // editMappingToolStripButton + // + this.editMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.editMappingToolStripButton.Name = "editMappingToolStripButton"; + this.editMappingToolStripButton.Size = new System.Drawing.Size(31, 22); + this.editMappingToolStripButton.Text = "Edit"; + this.editMappingToolStripButton.ToolTipText = "Edit the selected button mapping"; + this.editMappingToolStripButton.Click += new System.EventHandler(this.EditButtonMapping); + // + // deleteMappingToolStripButton + // + this.deleteMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteMappingToolStripButton.Name = "deleteMappingToolStripButton"; + this.deleteMappingToolStripButton.Size = new System.Drawing.Size(44, 22); + this.deleteMappingToolStripButton.Text = "Delete"; + this.deleteMappingToolStripButton.ToolTipText = "Delete the selected button mapping"; + this.deleteMappingToolStripButton.Click += new System.EventHandler(this.DeleteButtonMapping); + // + // clearMappingsToolStripButton + // + this.clearMappingsToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.clearMappingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.clearMappingsToolStripButton.Name = "clearMappingsToolStripButton"; + this.clearMappingsToolStripButton.Size = new System.Drawing.Size(61, 22); + this.clearMappingsToolStripButton.Text = "Delete All"; + this.clearMappingsToolStripButton.ToolTipText = "Delete all the button mappings"; + this.clearMappingsToolStripButton.Click += new System.EventHandler(this.ClearButtonMappings); + // + // remapToolStripButton + // + this.remapToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.remapToolStripButton.Name = "remapToolStripButton"; + this.remapToolStripButton.Size = new System.Drawing.Size(48, 22); + this.remapToolStripButton.Text = "Remap"; + this.remapToolStripButton.ToolTipText = "Link a new code to the selected mapping"; + this.remapToolStripButton.Click += new System.EventHandler(this.RemapButtonMapping); + // // programsPanel // this.programsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -707,9 +786,9 @@ this.programsPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.programsPanel.Controls.Add(this.programsListView); this.programsPanel.Controls.Add(this.programsToolStrip); - this.programsPanel.Location = new System.Drawing.Point(8, 8); + this.programsPanel.Location = new System.Drawing.Point(6, 6); this.programsPanel.Name = "programsPanel"; - this.programsPanel.Size = new System.Drawing.Size(504, 88); + this.programsPanel.Size = new System.Drawing.Size(500, 90); this.programsPanel.TabIndex = 3; // // programsToolStrip @@ -721,9 +800,9 @@ this.editProgramToolStripButton, this.removeProgramToolStripButton}); this.programsToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.programsToolStrip.Location = new System.Drawing.Point(445, 0); + this.programsToolStrip.Location = new System.Drawing.Point(451, 0); this.programsToolStrip.Name = "programsToolStrip"; - this.programsToolStrip.Size = new System.Drawing.Size(55, 84); + this.programsToolStrip.Size = new System.Drawing.Size(45, 86); this.programsToolStrip.TabIndex = 2; this.programsToolStrip.Text = "toolStrip1"; // @@ -732,7 +811,7 @@ this.addProgramToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.addProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.addProgramToolStripButton.Name = "addProgramToolStripButton"; - this.addProgramToolStripButton.Size = new System.Drawing.Size(52, 19); + this.addProgramToolStripButton.Size = new System.Drawing.Size(42, 19); this.addProgramToolStripButton.Text = "Add"; this.addProgramToolStripButton.Click += new System.EventHandler(this.AddProgram); // @@ -742,19 +821,19 @@ this.editProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editProgramToolStripButton.Image"))); this.editProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.editProgramToolStripButton.Name = "editProgramToolStripButton"; - this.editProgramToolStripButton.Size = new System.Drawing.Size(52, 19); + this.editProgramToolStripButton.Size = new System.Drawing.Size(42, 19); this.editProgramToolStripButton.Text = "Edit"; this.editProgramToolStripButton.Click += new System.EventHandler(this.EditProgram); // - // removeProgramToolStripButton + // deleteProgramToolStripButton // this.removeProgramToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.removeProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("removeProgramToolStripButton.Image"))); + this.removeProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("deleteProgramToolStripButton.Image"))); this.removeProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.removeProgramToolStripButton.Name = "removeProgramToolStripButton"; - this.removeProgramToolStripButton.Size = new System.Drawing.Size(52, 19); - this.removeProgramToolStripButton.Text = "Remove"; - this.removeProgramToolStripButton.Click += new System.EventHandler(this.RemoveProgram); + this.removeProgramToolStripButton.Name = "deleteProgramToolStripButton"; + this.removeProgramToolStripButton.Size = new System.Drawing.Size(42, 19); + this.removeProgramToolStripButton.Text = "Delete"; + this.removeProgramToolStripButton.Click += new System.EventHandler(this.DeleteProgram); // // mappingsListView // @@ -771,11 +850,11 @@ this.mappingsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.mappingsListView.HideSelection = false; this.mappingsListView.ImeMode = System.Windows.Forms.ImeMode.On; - this.mappingsListView.Location = new System.Drawing.Point(8, 104); + this.mappingsListView.Location = new System.Drawing.Point(6, 102); this.mappingsListView.MultiSelect = false; this.mappingsListView.Name = "mappingsListView"; this.mappingsListView.ShowGroups = false; - this.mappingsListView.Size = new System.Drawing.Size(504, 232); + this.mappingsListView.Size = new System.Drawing.Size(500, 210); this.mappingsListView.TabIndex = 1; this.mappingsListView.UseCompatibleStateImageBehavior = false; this.mappingsListView.View = System.Windows.Forms.View.Details; @@ -798,73 +877,12 @@ this.columnHeaderCommand.Text = "Command"; this.columnHeaderCommand.Width = 200; // - // mappingsToolStrip - // - this.mappingsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom; - this.mappingsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.mappingsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newMappingToolStripButton, - this.editMappingToolStripButton, - this.removeMappingToolStripButton, - this.clearMappingsToolStripButton, - this.remapToolStripButton}); - this.mappingsToolStrip.Location = new System.Drawing.Point(3, 346); - this.mappingsToolStrip.Name = "mappingsToolStrip"; - this.mappingsToolStrip.Size = new System.Drawing.Size(514, 25); - this.mappingsToolStrip.TabIndex = 2; - this.mappingsToolStrip.Text = "Button Mappings"; - // - // newMappingToolStripButton - // - this.newMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.newMappingToolStripButton.Name = "newMappingToolStripButton"; - this.newMappingToolStripButton.Size = new System.Drawing.Size(35, 22); - this.newMappingToolStripButton.Text = "New"; - this.newMappingToolStripButton.ToolTipText = "Create a new button mapping"; - this.newMappingToolStripButton.Click += new System.EventHandler(this.NewButtonMapping); - // - // editMappingToolStripButton - // - this.editMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.editMappingToolStripButton.Name = "editMappingToolStripButton"; - this.editMappingToolStripButton.Size = new System.Drawing.Size(31, 22); - this.editMappingToolStripButton.Text = "Edit"; - this.editMappingToolStripButton.ToolTipText = "Edit the selected button mapping"; - this.editMappingToolStripButton.Click += new System.EventHandler(this.EditButtonMapping); - // - // removeMappingToolStripButton - // - this.removeMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.removeMappingToolStripButton.Name = "removeMappingToolStripButton"; - this.removeMappingToolStripButton.Size = new System.Drawing.Size(44, 22); - this.removeMappingToolStripButton.Text = "Delete"; - this.removeMappingToolStripButton.ToolTipText = "Delete the selected button mapping"; - this.removeMappingToolStripButton.Click += new System.EventHandler(this.DeleteButtonMapping); - // - // clearMappingsToolStripButton - // - this.clearMappingsToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.clearMappingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.clearMappingsToolStripButton.Name = "clearMappingsToolStripButton"; - this.clearMappingsToolStripButton.Size = new System.Drawing.Size(61, 22); - this.clearMappingsToolStripButton.Text = "Delete All"; - this.clearMappingsToolStripButton.ToolTipText = "Delete all the button mappings"; - this.clearMappingsToolStripButton.Click += new System.EventHandler(this.ClearButtonMappings); - // - // remapToolStripButton - // - this.remapToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.remapToolStripButton.Name = "remapToolStripButton"; - this.remapToolStripButton.Size = new System.Drawing.Size(48, 22); - this.remapToolStripButton.Text = "Remap"; - this.remapToolStripButton.ToolTipText = "Link a new code to the selected mapping"; - this.remapToolStripButton.Click += new System.EventHandler(this.RemapButtonMapping); - // // tabControl // this.tabControl.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.tabControl.ContextMenuStrip = this.irCommandsContextMenuStrip; this.tabControl.Controls.Add(this.tabPagePrograms); this.tabControl.Controls.Add(this.tabPageEvents); this.tabControl.Controls.Add(this.tabPageMacro); @@ -872,16 +890,104 @@ this.tabControl.Location = new System.Drawing.Point(8, 34); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(528, 400); + this.tabControl.Size = new System.Drawing.Size(520, 369); this.tabControl.TabIndex = 1; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // + // irCommandsContextMenuStrip + // + this.irCommandsContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addIRToolStripMenuItem, + this.editIRToolStripMenuItem, + this.deleteIRToolStripMenuItem}); + this.irCommandsContextMenuStrip.Name = "contextMenuStrip1"; + this.irCommandsContextMenuStrip.Size = new System.Drawing.Size(195, 70); + // + // addIRToolStripMenuItem + // + this.addIRToolStripMenuItem.Name = "addIRToolStripMenuItem"; + this.addIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.addIRToolStripMenuItem.Text = "Add new IR Command"; + this.addIRToolStripMenuItem.Click += new System.EventHandler(this.NewIRCommand); + // + // editIRToolStripMenuItem + // + this.editIRToolStripMenuItem.Name = "editIRToolStripMenuItem"; + this.editIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.editIRToolStripMenuItem.Text = "Edit IR Command"; + this.editIRToolStripMenuItem.Click += new System.EventHandler(this.EditIRCommand); + // + // deleteIRToolStripMenuItem + // + this.deleteIRToolStripMenuItem.Name = "deleteIRToolStripMenuItem"; + this.deleteIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.deleteIRToolStripMenuItem.Text = "Delete IR Command"; + this.deleteIRToo... [truncated message content] |