From: <an...@us...> - 2008-02-14 11:00:45
|
Revision: 1366 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1366&view=rev Author: and-81 Date: 2008-02-14 03:00:35 -0800 (Thu, 14 Feb 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Commands/Command/Command.csproj trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj trunk/plugins/IR Server Suite/Documentation/introduction.html trunk/plugins/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Remap.png trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.resx trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")] +[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")] Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("5eeca936-da49-4952-ab3b-9f11ec57e4aa")] +[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")] Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("81eb136b-cc74-4eed-976d-f96ebccd1ce4")] +[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")] Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -22,7 +22,7 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: GuidAttribute("a94fbaf3-2d68-45da-8f4f-7dee41f00040")] +[assembly: Guid("a94fbaf3-2d68-45da-8f4f-7dee41f00040")] // Version information for an assembly consists of the following four values: // Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -45,16 +45,23 @@ this.editButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deleteButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearButtonsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.remapButtonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.copyButtonsFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonOK = new System.Windows.Forms.Button(); this.tabControl = new System.Windows.Forms.TabControl(); this.tabPagePrograms = new System.Windows.Forms.TabPage(); + this.panelPrograms = new System.Windows.Forms.Panel(); + this.panelProgramsButtons = new System.Windows.Forms.Panel(); + this.labelProgramsDelete = new System.Windows.Forms.Label(); + this.labelProgramsEdit = new System.Windows.Forms.Label(); + this.labelProgramsAdd = new System.Windows.Forms.Label(); this.toolStripButtonMappings = new System.Windows.Forms.ToolStrip(); this.toolStripButtonNewMapping = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonEditMapping = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDeleteMapping = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDeleteAllMappings = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonRemapMapping = new System.Windows.Forms.ToolStripButton(); this.tabPageEvents = new System.Windows.Forms.TabPage(); this.buttonSetCommand = new System.Windows.Forms.Button(); this.buttonAddEvent = new System.Windows.Forms.Button(); @@ -101,6 +108,8 @@ this.contextMenuStripButtonMapping.SuspendLayout(); this.tabControl.SuspendLayout(); this.tabPagePrograms.SuspendLayout(); + this.panelPrograms.SuspendLayout(); + this.panelProgramsButtons.SuspendLayout(); this.toolStripButtonMappings.SuspendLayout(); this.tabPageEvents.SuspendLayout(); this.contextMenuStripEvents.SuspendLayout(); @@ -114,20 +123,20 @@ // listViewPrograms // this.listViewPrograms.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.listViewPrograms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.listViewPrograms.BorderStyle = System.Windows.Forms.BorderStyle.None; this.listViewPrograms.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1}); this.listViewPrograms.ContextMenuStrip = this.contextMenuStripPrograms; + this.listViewPrograms.Dock = System.Windows.Forms.DockStyle.Fill; this.listViewPrograms.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listViewPrograms.HideSelection = false; this.listViewPrograms.LargeImageList = this.imageListPrograms; - this.listViewPrograms.Location = new System.Drawing.Point(8, 8); + this.listViewPrograms.Location = new System.Drawing.Point(0, 0); this.listViewPrograms.MultiSelect = false; this.listViewPrograms.Name = "listViewPrograms"; this.listViewPrograms.ShowGroups = false; this.listViewPrograms.ShowItemToolTips = true; - this.listViewPrograms.Size = new System.Drawing.Size(504, 80); + this.listViewPrograms.Size = new System.Drawing.Size(470, 84); this.listViewPrograms.TabIndex = 0; this.listViewPrograms.TileSize = new System.Drawing.Size(128, 48); this.toolTip.SetToolTip(this.listViewPrograms, "Choose a Program to modify mappings"); @@ -161,11 +170,11 @@ this.listViewButtons.GridLines = true; this.listViewButtons.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listViewButtons.HideSelection = false; - this.listViewButtons.Location = new System.Drawing.Point(8, 96); + this.listViewButtons.Location = new System.Drawing.Point(8, 104); this.listViewButtons.MultiSelect = false; this.listViewButtons.Name = "listViewButtons"; this.listViewButtons.ShowGroups = false; - this.listViewButtons.Size = new System.Drawing.Size(504, 240); + this.listViewButtons.Size = new System.Drawing.Size(504, 232); this.listViewButtons.TabIndex = 1; this.listViewButtons.UseCompatibleStateImageBehavior = false; this.listViewButtons.View = System.Windows.Forms.View.Details; @@ -194,17 +203,18 @@ this.editButtonToolStripMenuItem, this.deleteButtonToolStripMenuItem, this.clearButtonsToolStripMenuItem, + this.remapButtonToolStripMenuItem, this.toolStripSeparator3, this.copyButtonsFromToolStripMenuItem}); this.contextMenuStripButtonMapping.Name = "contextMenuStripButtonMapping"; - this.contextMenuStripButtonMapping.Size = new System.Drawing.Size(144, 120); + this.contextMenuStripButtonMapping.Size = new System.Drawing.Size(151, 142); this.contextMenuStripButtonMapping.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripButtonMapping_Opening); // // newButtonToolStripMenuItem // this.newButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Plus; this.newButtonToolStripMenuItem.Name = "newButtonToolStripMenuItem"; - this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.newButtonToolStripMenuItem.Text = "&New"; this.newButtonToolStripMenuItem.Click += new System.EventHandler(this.newButtonToolStripMenuItem_Click); // @@ -212,7 +222,7 @@ // this.editButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Edit; this.editButtonToolStripMenuItem.Name = "editButtonToolStripMenuItem"; - this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.editButtonToolStripMenuItem.Text = "&Edit"; this.editButtonToolStripMenuItem.Click += new System.EventHandler(this.editButtonToolStripMenuItem_Click); // @@ -220,7 +230,7 @@ // this.deleteButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete; this.deleteButtonToolStripMenuItem.Name = "deleteButtonToolStripMenuItem"; - this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.deleteButtonToolStripMenuItem.Text = "&Delete"; this.deleteButtonToolStripMenuItem.Click += new System.EventHandler(this.deleteButtonToolStripMenuItem_Click); // @@ -228,20 +238,28 @@ // this.clearButtonsToolStripMenuItem.Image = global::Translator.Properties.Resources.DeleteAll; this.clearButtonsToolStripMenuItem.Name = "clearButtonsToolStripMenuItem"; - this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.clearButtonsToolStripMenuItem.Text = "&Clear"; this.clearButtonsToolStripMenuItem.Click += new System.EventHandler(this.clearButtonsToolStripMenuItem_Click); // + // remapButtonToolStripMenuItem + // + this.remapButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Remap; + this.remapButtonToolStripMenuItem.Name = "remapButtonToolStripMenuItem"; + this.remapButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.remapButtonToolStripMenuItem.Text = "&Remap"; + this.remapButtonToolStripMenuItem.Click += new System.EventHandler(this.remapButtonToolStripMenuItem_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6); // // copyButtonsFromToolStripMenuItem // this.copyButtonsFromToolStripMenuItem.Image = global::Translator.Properties.Resources.MoveRight; this.copyButtonsFromToolStripMenuItem.Name = "copyButtonsFromToolStripMenuItem"; - this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.copyButtonsFromToolStripMenuItem.Text = "Copy &from ..."; // // buttonOK @@ -274,8 +292,8 @@ // // tabPagePrograms // + this.tabPagePrograms.Controls.Add(this.panelPrograms); this.tabPagePrograms.Controls.Add(this.listViewButtons); - this.tabPagePrograms.Controls.Add(this.listViewPrograms); this.tabPagePrograms.Controls.Add(this.toolStripButtonMappings); this.tabPagePrograms.Location = new System.Drawing.Point(4, 22); this.tabPagePrograms.Name = "tabPagePrograms"; @@ -285,6 +303,64 @@ this.tabPagePrograms.Text = "Programs"; this.tabPagePrograms.UseVisualStyleBackColor = true; // + // panelPrograms + // + this.panelPrograms.BackColor = System.Drawing.SystemColors.Window; + this.panelPrograms.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panelPrograms.Controls.Add(this.listViewPrograms); + this.panelPrograms.Controls.Add(this.panelProgramsButtons); + this.panelPrograms.Location = new System.Drawing.Point(8, 8); + this.panelPrograms.Name = "panelPrograms"; + this.panelPrograms.Size = new System.Drawing.Size(504, 88); + this.panelPrograms.TabIndex = 3; + // + // panelProgramsButtons + // + this.panelProgramsButtons.Controls.Add(this.labelProgramsDelete); + this.panelProgramsButtons.Controls.Add(this.labelProgramsEdit); + this.panelProgramsButtons.Controls.Add(this.labelProgramsAdd); + this.panelProgramsButtons.Dock = System.Windows.Forms.DockStyle.Right; + this.panelProgramsButtons.Location = new System.Drawing.Point(470, 0); + this.panelProgramsButtons.Name = "panelProgramsButtons"; + this.panelProgramsButtons.Size = new System.Drawing.Size(30, 84); + this.panelProgramsButtons.TabIndex = 1; + // + // labelProgramsDelete + // + this.labelProgramsDelete.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.labelProgramsDelete.Cursor = System.Windows.Forms.Cursors.Hand; + this.labelProgramsDelete.Image = global::Translator.Properties.Resources.Delete; + this.labelProgramsDelete.Location = new System.Drawing.Point(1, 52); + this.labelProgramsDelete.Name = "labelProgramsDelete"; + this.labelProgramsDelete.Size = new System.Drawing.Size(24, 24); + this.labelProgramsDelete.TabIndex = 2; + this.labelProgramsDelete.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip.SetToolTip(this.labelProgramsDelete, "Remove program"); + // + // labelProgramsEdit + // + this.labelProgramsEdit.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.labelProgramsEdit.Cursor = System.Windows.Forms.Cursors.Hand; + this.labelProgramsEdit.Image = global::Translator.Properties.Resources.Edit; + this.labelProgramsEdit.Location = new System.Drawing.Point(1, 27); + this.labelProgramsEdit.Name = "labelProgramsEdit"; + this.labelProgramsEdit.Size = new System.Drawing.Size(24, 24); + this.labelProgramsEdit.TabIndex = 1; + this.labelProgramsEdit.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip.SetToolTip(this.labelProgramsEdit, "Edit program"); + // + // labelProgramsAdd + // + this.labelProgramsAdd.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.labelProgramsAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.labelProgramsAdd.Image = global::Translator.Properties.Resources.Plus; + this.labelProgramsAdd.Location = new System.Drawing.Point(1, 2); + this.labelProgramsAdd.Name = "labelProgramsAdd"; + this.labelProgramsAdd.Size = new System.Drawing.Size(24, 24); + this.labelProgramsAdd.TabIndex = 0; + this.labelProgramsAdd.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip.SetToolTip(this.labelProgramsAdd, "Add program"); + // // toolStripButtonMappings // this.toolStripButtonMappings.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -293,7 +369,8 @@ this.toolStripButtonNewMapping, this.toolStripButtonEditMapping, this.toolStripButtonDeleteMapping, - this.toolStripButtonDeleteAllMappings}); + this.toolStripButtonDeleteAllMappings, + this.toolStripButtonRemapMapping}); this.toolStripButtonMappings.Location = new System.Drawing.Point(3, 346); this.toolStripButtonMappings.Name = "toolStripButtonMappings"; this.toolStripButtonMappings.Size = new System.Drawing.Size(514, 25); @@ -305,7 +382,7 @@ this.toolStripButtonNewMapping.Image = global::Translator.Properties.Resources.Plus; this.toolStripButtonNewMapping.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonNewMapping.Name = "toolStripButtonNewMapping"; - this.toolStripButtonNewMapping.Size = new System.Drawing.Size(51, 22); + this.toolStripButtonNewMapping.Size = new System.Drawing.Size(48, 22); this.toolStripButtonNewMapping.Text = "New"; this.toolStripButtonNewMapping.ToolTipText = "Create a new button mapping"; this.toolStripButtonNewMapping.Click += new System.EventHandler(this.toolStripButtonNewMapping_Click); @@ -315,7 +392,7 @@ this.toolStripButtonEditMapping.Image = global::Translator.Properties.Resources.Edit; this.toolStripButtonEditMapping.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonEditMapping.Name = "toolStripButtonEditMapping"; - this.toolStripButtonEditMapping.Size = new System.Drawing.Size(47, 22); + this.toolStripButtonEditMapping.Size = new System.Drawing.Size(45, 22); this.toolStripButtonEditMapping.Text = "Edit"; this.toolStripButtonEditMapping.ToolTipText = "Edit the selected button mapping"; this.toolStripButtonEditMapping.Click += new System.EventHandler(this.toolStripButtonEditMapping_Click); @@ -325,7 +402,7 @@ this.toolStripButtonDeleteMapping.Image = global::Translator.Properties.Resources.Delete; this.toolStripButtonDeleteMapping.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDeleteMapping.Name = "toolStripButtonDeleteMapping"; - this.toolStripButtonDeleteMapping.Size = new System.Drawing.Size(60, 22); + this.toolStripButtonDeleteMapping.Size = new System.Drawing.Size(58, 22); this.toolStripButtonDeleteMapping.Text = "Delete"; this.toolStripButtonDeleteMapping.ToolTipText = "Delete the selected button mapping"; this.toolStripButtonDeleteMapping.Click += new System.EventHandler(this.toolStripButtonDeleteMapping_Click); @@ -336,11 +413,21 @@ this.toolStripButtonDeleteAllMappings.Image = global::Translator.Properties.Resources.DeleteAll; this.toolStripButtonDeleteAllMappings.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDeleteAllMappings.Name = "toolStripButtonDeleteAllMappings"; - this.toolStripButtonDeleteAllMappings.Size = new System.Drawing.Size(77, 22); + this.toolStripButtonDeleteAllMappings.Size = new System.Drawing.Size(72, 22); this.toolStripButtonDeleteAllMappings.Text = "Delete All"; this.toolStripButtonDeleteAllMappings.ToolTipText = "Delete all the button mappings"; this.toolStripButtonDeleteAllMappings.Click += new System.EventHandler(this.toolStripButtonDeleteAllMappings_Click); // + // toolStripButtonRemapMapping + // + this.toolStripButtonRemapMapping.Image = global::Translator.Properties.Resources.Remap; + this.toolStripButtonRemapMapping.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonRemapMapping.Name = "toolStripButtonRemapMapping"; + this.toolStripButtonRemapMapping.Size = new System.Drawing.Size(60, 22); + this.toolStripButtonRemapMapping.Text = "Remap"; + this.toolStripButtonRemapMapping.ToolTipText = "Link a new code to the selected mapping"; + this.toolStripButtonRemapMapping.Click += new System.EventHandler(this.toolStripButtonRemapMapping_Click); + // // tabPageEvents // this.tabPageEvents.Controls.Add(this.buttonSetCommand); @@ -461,13 +548,13 @@ this.contextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.removeEventToolStripMenuItem}); this.contextMenuStripEvents.Name = "contextMenuStripEvents"; - this.contextMenuStripEvents.Size = new System.Drawing.Size(118, 26); + this.contextMenuStripEvents.Size = new System.Drawing.Size(125, 26); // // removeEventToolStripMenuItem // this.removeEventToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete; this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem"; - this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.removeEventToolStripMenuItem.Text = "&Remove"; this.removeEventToolStripMenuItem.Click += new System.EventHandler(this.removeEventToolStripMenuItem_Click); // @@ -504,7 +591,7 @@ this.toolStripButtonNewMacro.Image = global::Translator.Properties.Resources.Plus; this.toolStripButtonNewMacro.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonNewMacro.Name = "toolStripButtonNewMacro"; - this.toolStripButtonNewMacro.Size = new System.Drawing.Size(51, 22); + this.toolStripButtonNewMacro.Size = new System.Drawing.Size(48, 22); this.toolStripButtonNewMacro.Text = "New"; this.toolStripButtonNewMacro.ToolTipText = "Create a new macro"; this.toolStripButtonNewMacro.Click += new System.EventHandler(this.toolStripButtonNewMacro_Click); @@ -514,7 +601,7 @@ this.toolStripButtonEditMacro.Image = global::Translator.Properties.Resources.Edit; this.toolStripButtonEditMacro.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonEditMacro.Name = "toolStripButtonEditMacro"; - this.toolStripButtonEditMacro.Size = new System.Drawing.Size(47, 22); + this.toolStripButtonEditMacro.Size = new System.Drawing.Size(45, 22); this.toolStripButtonEditMacro.Text = "Edit"; this.toolStripButtonEditMacro.ToolTipText = "Edit the selected macro"; this.toolStripButtonEditMacro.Click += new System.EventHandler(this.toolStripButtonEditMacro_Click); @@ -524,7 +611,7 @@ this.toolStripButtonDeleteMacro.Image = global::Translator.Properties.Resources.Delete; this.toolStripButtonDeleteMacro.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDeleteMacro.Name = "toolStripButtonDeleteMacro"; - this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(60, 22); + this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(58, 22); this.toolStripButtonDeleteMacro.Text = "Delete"; this.toolStripButtonDeleteMacro.ToolTipText = "Delete the selected macro"; this.toolStripButtonDeleteMacro.Click += new System.EventHandler(this.toolStripButtonDeleteMacro_Click); @@ -535,7 +622,7 @@ this.toolStripButtonCreateShortcutForMacro.Image = global::Translator.Properties.Resources.Shortcut; this.toolStripButtonCreateShortcutForMacro.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonCreateShortcutForMacro.Name = "toolStripButtonCreateShortcutForMacro"; - this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(108, 22); + this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(103, 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); @@ -545,7 +632,7 @@ this.toolStripButtonTestMacro.Image = global::Translator.Properties.Resources.MoveRight; this.toolStripButtonTestMacro.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonTestMacro.Name = "toolStripButtonTestMacro"; - this.toolStripButtonTestMacro.Size = new System.Drawing.Size(49, 22); + this.toolStripButtonTestMacro.Size = new System.Drawing.Size(48, 22); this.toolStripButtonTestMacro.Text = "Test"; this.toolStripButtonTestMacro.ToolTipText = "Test the selected macro"; this.toolStripButtonTestMacro.Click += new System.EventHandler(this.toolStripButtonTestMacro_Click); @@ -601,7 +688,7 @@ this.toolStripButtonNewIR.Image = global::Translator.Properties.Resources.Plus; this.toolStripButtonNewIR.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonNewIR.Name = "toolStripButtonNewIR"; - this.toolStripButtonNewIR.Size = new System.Drawing.Size(51, 22); + this.toolStripButtonNewIR.Size = new System.Drawing.Size(48, 22); this.toolStripButtonNewIR.Text = "New"; this.toolStripButtonNewIR.ToolTipText = "Create a new IR Command"; this.toolStripButtonNewIR.Click += new System.EventHandler(this.toolStripButtonNewIR_Click); @@ -611,7 +698,7 @@ this.toolStripButtonEditIR.Image = global::Translator.Properties.Resources.Edit; this.toolStripButtonEditIR.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonEditIR.Name = "toolStripButtonEditIR"; - this.toolStripButtonEditIR.Size = new System.Drawing.Size(47, 22); + this.toolStripButtonEditIR.Size = new System.Drawing.Size(45, 22); this.toolStripButtonEditIR.Text = "Edit"; this.toolStripButtonEditIR.ToolTipText = "Edit the selected IR Command"; this.toolStripButtonEditIR.Click += new System.EventHandler(this.toolStripButtonEditIR_Click); @@ -621,7 +708,7 @@ this.toolStripButtonDeleteIR.Image = global::Translator.Properties.Resources.Delete; this.toolStripButtonDeleteIR.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDeleteIR.Name = "toolStripButtonDeleteIR"; - this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(60, 22); + this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(58, 22); this.toolStripButtonDeleteIR.Text = "Delete"; this.toolStripButtonDeleteIR.ToolTipText = "Delete the selected IR Command"; this.toolStripButtonDeleteIR.Click += new System.EventHandler(this.toolStripButtonDeleteIR_Click); @@ -682,58 +769,58 @@ this.toolStripSeparator2, this.quitToolStripMenuItem}); this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; - this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20); this.configurationToolStripMenuItem.Text = "&File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.newToolStripMenuItem.Text = "&New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.openToolStripMenuItem.Text = "&Open ..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // // importToolStripMenuItem // this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.importToolStripMenuItem.Text = "&Import ..."; this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); // // exportToolStripMenuItem // this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.exportToolStripMenuItem.Text = "&Export ..."; this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(129, 6); // // serverToolStripMenuItem // this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; - this.serverToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.serverToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.serverToolStripMenuItem.Text = "&Server ..."; this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(129, 6); // // quitToolStripMenuItem // this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; - this.quitToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.quitToolStripMenuItem.Size = new System.Drawing.Size(132, 22); this.quitToolStripMenuItem.Text = "&Quit"; this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // @@ -743,20 +830,20 @@ this.translatorHelpToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); this.helpToolStripMenuItem.Text = "&Help"; // // translatorHelpToolStripMenuItem // this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem"; - this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.translatorHelpToolStripMenuItem.Text = "&Contents"; this.translatorHelpToolStripMenuItem.Click += new System.EventHandler(this.translatorHelpToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -792,6 +879,8 @@ this.tabControl.ResumeLayout(false); this.tabPagePrograms.ResumeLayout(false); this.tabPagePrograms.PerformLayout(); + this.panelPrograms.ResumeLayout(false); + this.panelProgramsButtons.ResumeLayout(false); this.toolStripButtonMappings.ResumeLayout(false); this.toolStripButtonMappings.PerformLayout(); this.tabPageEvents.ResumeLayout(false); @@ -879,6 +968,13 @@ private System.Windows.Forms.ToolStripButton toolStripButtonNewIR; private System.Windows.Forms.ToolStripButton toolStripButtonEditIR; private System.Windows.Forms.ToolStripButton toolStripButtonDeleteIR; + private System.Windows.Forms.ToolStripButton toolStripButtonRemapMapping; + private System.Windows.Forms.Panel panelPrograms; + private System.Windows.Forms.Panel panelProgramsButtons; + private System.Windows.Forms.Label labelProgramsDelete; + private System.Windows.Forms.Label labelProgramsEdit; + private System.Windows.Forms.Label labelProgramsAdd; + private System.Windows.Forms.ToolStripMenuItem remapButtonToolStripMenuItem; } } Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -612,7 +612,51 @@ currentMappings.Clear(); listViewButtons.Items.Clear(); } + void RemapButtonMapping() + { + if (listViewButtons.SelectedIndices.Count != 1) + return; + ListViewItem item = listViewButtons.SelectedItems[0]; + + List<ButtonMapping> currentMappings = GetCurrentButtonMappings(); + if (currentMappings == null) + return; + + ButtonMapping toModify = null; + foreach (ButtonMapping test in currentMappings) + { + if (test.KeyCode.Equals(item.SubItems[0].Text, StringComparison.Ordinal)) + { + toModify = test; + break; + } + } + + if (toModify == null) + return; + + GetKeyCodeForm getKeyCode = new GetKeyCodeForm(); + getKeyCode.ShowDialog(this); + + string keyCode = getKeyCode.KeyCode; + if (String.IsNullOrEmpty(keyCode)) + return; + + foreach (ButtonMapping test in currentMappings) + { + if (test.KeyCode.Equals(keyCode, StringComparison.Ordinal)) + { + MessageBox.Show(this, String.Format("{0} is already mapped to {1} ({2})", keyCode, test.Description, test.Command), "Cannot remap", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + } + + item.SubItems[0].Text = keyCode; + + toModify.KeyCode = keyCode; + } + void ClickCopyFrom(object sender, EventArgs e) { ToolStripMenuItem origin = sender as ToolStripMenuItem; @@ -1203,6 +1247,10 @@ { ClearButtonMappings(); } + private void remapButtonToolStripMenuItem_Click(object sender, EventArgs e) + { + RemapButtonMapping(); + } #endregion Menus @@ -1222,6 +1270,10 @@ { ClearButtonMappings(); } + private void toolStripButtonRemapMapping_Click(object sender, EventArgs e) + { + RemapButtonMapping(); + } private void toolStripButtonNewMacro_Click(object sender, EventArgs e) { @@ -1330,7 +1382,6 @@ } } - } } Added: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Remap.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Remap.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -38,4 +38,4 @@ [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("00506894-d61e-47b9-9039-879c543a73e1")] +[assembly: Guid("00506894-d61e-47b9-9039-879c543a73e1")] Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.312 +// Runtime Version:2.0.50727.832 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -158,6 +158,13 @@ } } + internal static System.Drawing.Bitmap Remap { + get { + object obj = ResourceManager.GetObject("Remap", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap ScrollDown { get { object obj = ResourceManager.GetObject("ScrollDown", resourceCulture); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx 2008-02-14 11:00:35 UTC (rev 1366) @@ -160,6 +160,9 @@ <data name="Plus" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\graphics\plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Remap" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\remap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="ScrollDown" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\graphics\scrolldown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-02-14 11:00:35 UTC (rev 1366) @@ -179,6 +179,7 @@ <Content Include="Graphics\MoveUp.png" /> <Content Include="Graphics\NoIcon.png" /> <Content Include="Graphics\Plus.png" /> + <Content Include="Graphics\Remap.png" /> <Content Include="Graphics\ScrollDown.png" /> <Content Include="Graphics\ScrollUp.png" /> <Content Include="Graphics\Shortcut.png" /> Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("2011f0d4-cec8-43d2-8678-79f24cd6c517")] +[assembly: Guid("2011f0d4-cec8-43d2-8678-79f24cd6c517")] Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("b9084277-405c-48e6-80d1-c0d0e1dae27d")] +[assembly: Guid("b9084277-405c-48e6-80d1-c0d0e1dae27d")] Modified: trunk/plugins/IR Server Suite/Commands/Command/Command.csproj =================================================================== --- trunk/plugins/IR Server Suite/Commands/Command/Command.csproj 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Commands/Command/Command.csproj 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,6 +33,7 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> + <Reference Include="System.Data" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> </ItemGroup> Modified: trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj =================================================================== --- trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,6 +33,7 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> + <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> Modified: trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj =================================================================== --- trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,7 +33,9 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> + <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> + <Reference Include="System.Speech, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> </ItemGroup> Modified: trunk/plugins/IR Server Suite/Documentation/introduction.html =================================================================== --- trunk/plugins/IR Server Suite/Documentation/introduction.html 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Documentation/introduction.html 2008-02-14 11:00:35 UTC (rev 1366) @@ -19,9 +19,15 @@ By having one point of access to the IR Device, Input Service regulates the communications with the IR Device. This means that multiple plugins and applications can be accessing the device at effectively the same time without interfering with each other.<BR> <BR> This means, for example, the MediaPortal TV Server as well as the MediaPortal client can share the device. And by using other applications in the suite you can control your whole PC.<BR> - </P> +<P><B>System requirements</B><BR> +<UL> +<LI>Windows XP or Vista</LI> +<LI>Microsoft .net 2.0</LI> +<LI>A supported remote control or input device</LI> +</UL> + <P><B>Suite Overview</B><BR> <BR> <A HREF="Input Service\index.html">Input Service</A><BR> Modified: trunk/plugins/IR Server Suite/Documentation/new.html =================================================================== --- trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,7 +33,8 @@ <LI>Translator: Can create a shortcut on the users desktop to launch a macro.</LI> <LI>Documentation: New documentation areas (Troubleshooting FAQ) and improvements.</LI> <LI>MCE Remote Receiver: Can now set remote and keyboard repeat rates to mimic system keyboard repeat rate settings.</LI> -<LI>IR Server Plugin: Added support for HCW (Hauppauge) Receiver.</LI> +<LI>IR Server Plugin: Added support for HCW (Hauppauge) Receiver - Experimental.</LI> +<LI>Translator: Added a "remap" button for changing the button associated with a command.</LI> </UL></P> <BR> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -21,7 +21,7 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: GuidAttribute("A03753AF-FBBF-44e0-9964-144C48A4D2CF")] +[assembly: Guid("A03753AF-FBBF-44e0-9964-144C48A4D2CF")] // Version information for an assembly consists of the following four values: // Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -34,6 +34,6 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("db244336-eeac-4789-af94-6fbe53df225f")] +[assembly: Guid("db244336-eeac-4789-af94-6fbe53df225f")] [assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,4 +33,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("560F8887-A826-40c8-BAB2-022FB7011EEF")] +[assembly: Guid("560F8887-A826-40c8-BAB2-022FB7011EEF")] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,4 +33,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("efdc4eaa-6ccc-4928-a1e7-f4b634780081")] +[assembly: Guid("efdc4eaa-6ccc-4928-a1e7-f4b634780081")] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,4 +33,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("a50e930e-1653-40d5-ba5a-3c0315868c1b")] +[assembly: Guid("a50e930e-1653-40d5-ba5a-3c0315868c1b")] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,4 +33,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("fef45a20-12af-4750-b7fa-8c8b6ea42a15")] +[assembly: Guid("fef45a20-12af-4750-b7fa-8c8b6ea42a15")] Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-02-13 07:16:16 UTC (rev 1365) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -33,4 +33,4 @@ [assembly: AssemblyFileVersion("1.0.4.2")] [assembly: CLSCompliant(true)] -[assembly: GuidAttribute("2286B6BF-A7F8-4f1a-B72A-764B5002C949")] +[assembly: Guid("2286B6BF-A7F8-4f1a-B72A-764B5002C949")] Added: trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.Designer.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -0,0 +1,100 @@ +namespace LiveDriveReceiver +{ + + partial class Configure + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.SuspendLayout(); + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.Location = new System.Drawing.Point(112, 104); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(64, 24); + this.buttonOK.TabIndex = 4; + this.buttonOK.Text = "OK"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(184, 104); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(64, 24); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(8, 32); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(240, 21); + this.comboBox1.TabIndex = 6; + // + // Configure + // + this.AcceptButton = this.buttonOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(256, 137); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(264, 164); + this.Name = "Configure"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "LiveDrive / Audigy Drive Configuration"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.ToolTip toolTips; + private System.Windows.Forms.ComboBox comboBox1; + } + +} Added: trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.cs 2008-02-14 11:00:35 UTC (rev 1366) @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Runtime.InteropServices; +using System.Text; +using System.Windows.Forms; + +namespace LiveDriveReceiver +{ + + partial class Configure : Form + { + + #region Interop + + [DllImport("winmm.dll")] + static extern int midiInGetDevCaps(int uDeviceID, ref MidiInCaps lpCaps, int uSize); + + #endregion Interop + + #region Structures + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] + struct MidiInCaps + { + public const int MAXPNAMELEN = 32; + + public Int16 wMid; + public Int16 wPid; + public Int32 vDriverVersion; + [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAXPNAMELEN)] + public byte[] szPname; + public Int32 dwSupport; + } + + #endregion Structures + + + #region Properties + + + #endregion Properties + + #region Constructor + + public Configure() + { + InitializeComponent(); + } + + #endregion Constructor + + #region Buttons + + private void buttonOK_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.OK; + this.Close(); + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + #endregion Buttons + + } + +} Added: trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.resx =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.resx (rev 0) +++ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Configure.resx 2008-02-14 11:00:35 UTC (rev 1366) @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.... [truncated message content] |