From: <an...@us...> - 2008-03-08 10:05:07
|
Revision: 1436 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1436&view=rev Author: and-81 Date: 2008-03-08 02:05:03 -0800 (Sat, 08 Mar 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs trunk/plugins/IR Server Suite/Applications/IR Server/Config.resx trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.resx trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/GBPVR.exe.xml trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Meedio.exe.xml trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/PVRX2.exe.xml trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputListener.cs trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Graphics/Advanced.png Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/ trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Advanced.png trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Detect.png trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Help.png trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/ttBdaDrvApi_Dll.dll trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/FireFly/ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/FireFly/FireFly.xml trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Hauppauge/Hauppauge34.xml trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Hauppauge/Hauppauge45.xml trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Medion/ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Medion/Medion.xml trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Wii Remote/ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Wii Remote/WiiRemote.xml Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.cs 2008-03-08 10:05:03 UTC (rev 1436) @@ -184,7 +184,7 @@ IRServerInfo _irServerInfo = new IRServerInfo(); - //string[] _devices; + string[] _devices; string _selectedDevice; #endregion Variables @@ -205,8 +205,7 @@ DelegateSetDevices _setDevices; void SetDevices(string[] devices) { - // TODO: add code to automatically add devices to the list if they come from forwarded remote button presses. - //_devices = devices; + _devices = devices; comboBoxDevice.Items.Clear(); comboBoxDevice.Items.AddRange(devices); @@ -315,7 +314,7 @@ string[] receivers = received.GetDataAsString().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - this.Invoke(_setDevices, new Object[] { receivers }); + this.Invoke(_setDevices, new object[] { receivers }); break; case MessageType.RemoteEvent: @@ -348,6 +347,23 @@ string text = String.Format("Remote Event \"{0}\", \"{1}\"", deviceName, keyCode); this.Invoke(_addStatusLine, text); + bool foundDevice = false; + foreach (string device in _devices) + { + if (device.Equals(deviceName, StringComparison.OrdinalIgnoreCase)) + { + foundDevice = true; + break; + } + } + + if (!foundDevice) + { + List<string> newDevices = new List<string>(_devices); + newDevices.Add(deviceName); + this.Invoke(_setDevices, new object[] { newDevices.ToArray() }); + } + // If this remote event matches the criteria then set it to an abstract button in the list view ... if (deviceName.Equals(_selectedDevice, StringComparison.OrdinalIgnoreCase)) { Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-03-08 10:05:03 UTC (rev 1436) @@ -40,6 +40,12 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> + <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> + <Name>IrssUtils</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Program.cs 2008-03-08 10:05:03 UTC (rev 1436) @@ -1,6 +1,8 @@ using System; using System.Runtime.InteropServices; +using IrssUtils; + namespace HcwPvrTuner { @@ -62,6 +64,13 @@ Console.WriteLine("HCW PVR Tuner"); Console.WriteLine(); +#if DEBUG + IrssLog.LogLevel = IrssLog.Level.Debug; +#else + IrssLog.LogLevel = IrssLog.Level.Info; +#endif + IrssLog.Append("Dbox Tuner.log"); + // TODO: Add standard IRSS logging ... if (args.Length != 1) @@ -80,8 +89,7 @@ if (!int.TryParse(args[0], out channelNumber)) throw new ApplicationException(String.Format("Failed to convert command line parameter ({0}) to channel number", args[0])); - Console.WriteLine("Attempting to tune channel {0} ...", channelNumber); - Console.WriteLine(); + Info("Attempting to tune channel {0} ...", channelNumber); int returnValue = UIR_Open(0, 0); if (returnValue == 0) @@ -95,14 +103,12 @@ returnValue = UIR_GetConfig(-1, -1, ref config); if (returnValue == 0) { - Console.WriteLine("Device configuration ..."); - Console.WriteLine(); - Console.WriteLine("Device: {0} Vendor: {1}", config.d, config.e); - Console.WriteLine("Region: {0} Code Set: {1}", config.c, config.f); - Console.WriteLine("Digit Delay: {0} Minimum Digits: {1}", config.j, config.i); - Console.WriteLine("One Digit Delay: {0} Tune Delay: {1}", config.n, config.m); - Console.WriteLine("Need Enter: {0} Enter Delay: {1}", config.k, config.l); - Console.WriteLine(); + Info("Device configuration ..."); + Info("Device: {0} Vendor: {1}", config.d, config.e); + Info("Region: {0} Code Set: {1}", config.c, config.f); + Info("Digit Delay: {0} Minimum Digits: {1}", config.j, config.i); + Info("One Digit Delay: {0} Tune Delay: {1}", config.n, config.m); + Info("Need Enter: {0} Enter Delay: {1}", config.k, config.l); } else { @@ -115,12 +121,12 @@ } catch (ApplicationException ex) { - Console.WriteLine("Error: {0}", ex.Message); + Info("Error: {0}", ex.Message); return ReturnError; } catch (Exception ex) { - Console.WriteLine(ex.ToString()); + Info(ex.ToString()); return ReturnError; } finally @@ -129,10 +135,20 @@ UIR_Close(); } - Console.WriteLine("Done."); + Info("Done."); + + IrssLog.Close(); + return ReturnSuccess; } + static void Info(string format, params object[] args) + { + string message = String.Format(format, args); + IrssLog.Info(message); + Console.WriteLine(message); + } + } } Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2008-03-08 10:05:03 UTC (rev 1436) @@ -28,139 +28,147 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Config)); - this.buttonOK = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.toolTips = new System.Windows.Forms.ToolTip(this.components); - this.checkBoxRunAtBoot = new System.Windows.Forms.CheckBox(); - this.buttonAdvanced = new System.Windows.Forms.Button(); - this.buttonDetect = new System.Windows.Forms.Button(); - this.groupBoxTransceiver = new System.Windows.Forms.GroupBox(); - this.gridPlugins = new SourceGrid.Grid(); - this.buttonHelp = new System.Windows.Forms.Button(); - this.groupBoxTransceiver.SuspendLayout(); - 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(352, 304); - this.buttonOK.Name = "buttonOK"; - this.buttonOK.Size = new System.Drawing.Size(64, 24); - this.buttonOK.TabIndex = 5; - 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(424, 304); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(64, 24); - this.buttonCancel.TabIndex = 6; - this.buttonCancel.Text = "Cancel"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); - // - // checkBoxRunAtBoot - // - this.checkBoxRunAtBoot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.checkBoxRunAtBoot.AutoSize = true; - this.checkBoxRunAtBoot.Location = new System.Drawing.Point(8, 272); - this.checkBoxRunAtBoot.Name = "checkBoxRunAtBoot"; - this.checkBoxRunAtBoot.Size = new System.Drawing.Size(165, 17); - this.checkBoxRunAtBoot.TabIndex = 1; - this.checkBoxRunAtBoot.Text = "&Start IR Server with Windows"; - this.toolTips.SetToolTip(this.checkBoxRunAtBoot, "Run IR Server when windows boots up?"); - this.checkBoxRunAtBoot.UseVisualStyleBackColor = true; - // - // buttonAdvanced - // - this.buttonAdvanced.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonAdvanced.Location = new System.Drawing.Point(80, 304); - this.buttonAdvanced.Name = "buttonAdvanced"; - this.buttonAdvanced.Size = new System.Drawing.Size(64, 24); - this.buttonAdvanced.TabIndex = 3; - this.buttonAdvanced.Text = "Advanced"; - this.toolTips.SetToolTip(this.buttonAdvanced, "Click here for advanced options"); - this.buttonAdvanced.UseVisualStyleBackColor = true; - this.buttonAdvanced.Click += new System.EventHandler(this.buttonAdvanced_Click); - // - // buttonDetect - // - this.buttonDetect.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.buttonDetect.Location = new System.Drawing.Point(216, 304); - this.buttonDetect.Name = "buttonDetect"; - this.buttonDetect.Size = new System.Drawing.Size(80, 24); - this.buttonDetect.TabIndex = 4; - this.buttonDetect.Text = "Detect"; - this.toolTips.SetToolTip(this.buttonDetect, "Click here to automatically detect attached devices"); - this.buttonDetect.UseVisualStyleBackColor = true; - this.buttonDetect.Click += new System.EventHandler(this.buttonDetect_Click); - // - // groupBoxTransceiver - // - this.groupBoxTransceiver.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.groupBoxTransceiver.Controls.Add(this.gridPlugins); - this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 8); - this.groupBoxTransceiver.Name = "groupBoxTransceiver"; - this.groupBoxTransceiver.Size = new System.Drawing.Size(480, 256); - this.groupBoxTransceiver.TabIndex = 0; - this.groupBoxTransceiver.TabStop = false; - this.groupBoxTransceiver.Text = "Device plugins"; - // - // gridPlugins - // - this.gridPlugins.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.gridPlugins.BackColor = System.Drawing.SystemColors.Window; - this.gridPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.gridPlugins.Location = new System.Drawing.Point(16, 24); - this.gridPlugins.Name = "gridPlugins"; - this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows; - this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row; - this.gridPlugins.Size = new System.Drawing.Size(448, 216); - this.gridPlugins.TabIndex = 0; - this.gridPlugins.TabStop = true; - this.gridPlugins.ToolTipText = ""; - // - // buttonHelp - // - this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonHelp.Location = new System.Drawing.Point(8, 304); - this.buttonHelp.Name = "buttonHelp"; - this.buttonHelp.Size = new System.Drawing.Size(64, 24); - this.buttonHelp.TabIndex = 2; - this.buttonHelp.Text = "Help"; - this.buttonHelp.UseVisualStyleBackColor = true; - this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click); - // - // Config - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(496, 343); - this.Controls.Add(this.buttonDetect); - this.Controls.Add(this.buttonAdvanced); - this.Controls.Add(this.buttonHelp); - this.Controls.Add(this.checkBoxRunAtBoot); - this.Controls.Add(this.groupBoxTransceiver); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOK); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(504, 370); - this.Name = "Config"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "IR Server - Configuration"; - this.groupBoxTransceiver.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Config)); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.checkBoxRunAtBoot = new System.Windows.Forms.CheckBox(); + this.groupBoxTransceiver = new System.Windows.Forms.GroupBox(); + this.gridPlugins = new SourceGrid.Grid(); + this.toolStrip = new System.Windows.Forms.ToolStrip(); + this.toolStripButtonDetect = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonAdvancedSettings = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonHelp = new System.Windows.Forms.ToolStripButton(); + this.groupBoxTransceiver.SuspendLayout(); + this.toolStrip.SuspendLayout(); + 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(352, 304); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(64, 24); + this.buttonOK.TabIndex = 2; + 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(424, 304); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(64, 24); + this.buttonCancel.TabIndex = 3; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // checkBoxRunAtBoot + // + this.checkBoxRunAtBoot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkBoxRunAtBoot.AutoSize = true; + this.checkBoxRunAtBoot.Location = new System.Drawing.Point(16, 304); + this.checkBoxRunAtBoot.Name = "checkBoxRunAtBoot"; + this.checkBoxRunAtBoot.Size = new System.Drawing.Size(165, 17); + this.checkBoxRunAtBoot.TabIndex = 1; + this.checkBoxRunAtBoot.Text = "&Start IR Server with Windows"; + this.toolTips.SetToolTip(this.checkBoxRunAtBoot, "Run IR Server when windows boots up?"); + this.checkBoxRunAtBoot.UseVisualStyleBackColor = true; + // + // groupBoxTransceiver + // + this.groupBoxTransceiver.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.groupBoxTransceiver.Controls.Add(this.gridPlugins); + this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 32); + this.groupBoxTransceiver.Name = "groupBoxTransceiver"; + this.groupBoxTransceiver.Size = new System.Drawing.Size(480, 264); + this.groupBoxTransceiver.TabIndex = 0; + this.groupBoxTransceiver.TabStop = false; + this.groupBoxTransceiver.Text = "Device plugins"; + // + // gridPlugins + // + this.gridPlugins.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.gridPlugins.BackColor = System.Drawing.SystemColors.Window; + this.gridPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.gridPlugins.Location = new System.Drawing.Point(8, 16); + this.gridPlugins.Name = "gridPlugins"; + this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows; + this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row; + this.gridPlugins.Size = new System.Drawing.Size(464, 240); + this.gridPlugins.TabIndex = 0; + this.gridPlugins.TabStop = true; + this.gridPlugins.ToolTipText = ""; + // + // toolStrip + // + this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButtonDetect, + this.toolStripButtonAdvancedSettings, + this.toolStripButtonHelp}); + this.toolStrip.Location = new System.Drawing.Point(0, 0); + this.toolStrip.Name = "toolStrip"; + this.toolStrip.Size = new System.Drawing.Size(496, 25); + this.toolStrip.TabIndex = 4; + // + // toolStripButtonDetect + // + this.toolStripButtonDetect.Image = global::IRServer.Properties.Resources.Detect; + this.toolStripButtonDetect.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonDetect.Name = "toolStripButtonDetect"; + this.toolStripButtonDetect.Size = new System.Drawing.Size(59, 22); + this.toolStripButtonDetect.Text = "Detect"; + this.toolStripButtonDetect.ToolTipText = "Detect attached devices"; + this.toolStripButtonDetect.Click += new System.EventHandler(this.toolStripButtonDetect_Click); + // + // toolStripButtonAdvancedSettings + // + this.toolStripButtonAdvancedSettings.Image = global::IRServer.Properties.Resources.Advanced; + this.toolStripButtonAdvancedSettings.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonAdvancedSettings.Name = "toolStripButtonAdvancedSettings"; + this.toolStripButtonAdvancedSettings.Size = new System.Drawing.Size(75, 22); + this.toolStripButtonAdvancedSettings.Text = "Advanced"; + this.toolStripButtonAdvancedSettings.ToolTipText = "Advanced settings"; + this.toolStripButtonAdvancedSettings.Click += new System.EventHandler(this.toolStripButtonAdvancedSettings_Click); + // + // toolStripButtonHelp + // + this.toolStripButtonHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButtonHelp.Image = global::IRServer.Properties.Resources.Help; + this.toolStripButtonHelp.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonHelp.Name = "toolStripButtonHelp"; + this.toolStripButtonHelp.Size = new System.Drawing.Size(48, 22); + this.toolStripButtonHelp.Text = "Help"; + this.toolStripButtonHelp.Click += new System.EventHandler(this.toolStripButtonHelp_Click); + // + // Config + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(496, 343); + this.Controls.Add(this.toolStrip); + this.Controls.Add(this.checkBoxRunAtBoot); + this.Controls.Add(this.groupBoxTransceiver); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(504, 370); + this.Name = "Config"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "IR Server - Configuration"; + this.groupBoxTransceiver.ResumeLayout(false); + this.toolStrip.ResumeLayout(false); + this.toolStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -171,9 +179,10 @@ private System.Windows.Forms.ToolTip toolTips; private System.Windows.Forms.GroupBox groupBoxTransceiver; private System.Windows.Forms.CheckBox checkBoxRunAtBoot; - private System.Windows.Forms.Button buttonHelp; private SourceGrid.Grid gridPlugins; - private System.Windows.Forms.Button buttonAdvanced; - private System.Windows.Forms.Button buttonDetect; + private System.Windows.Forms.ToolStrip toolStrip; + private System.Windows.Forms.ToolStripButton toolStripButtonDetect; + private System.Windows.Forms.ToolStripButton toolStripButtonAdvancedSettings; + private System.Windows.Forms.ToolStripButton toolStripButtonHelp; } } \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-08 10:05:03 UTC (rev 1436) @@ -66,9 +66,9 @@ SourceGrid.Cells.CheckBox checkBox; for (int row = 1; row < gridPlugins.RowsCount; row++) { - checkBox = gridPlugins[row, 1] as SourceGrid.Cells.CheckBox; + checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox; if (checkBox != null && checkBox.Checked) - receivers.Add(gridPlugins[row, 0].DisplayText); + receivers.Add(gridPlugins[row, ColName].DisplayText); } if (receivers.Count == 0) @@ -81,13 +81,13 @@ SourceGrid.Cells.CheckBox checkBox; for (int row = 1; row < gridPlugins.RowsCount; row++) { - checkBox = gridPlugins[row, 1] as SourceGrid.Cells.CheckBox; + checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox; if (checkBox == null) continue; if (value == null) checkBox.Checked = false; - else if (Array.IndexOf<string>(value, gridPlugins[row, 0].DisplayText) != -1) + else if (Array.IndexOf<string>(value, gridPlugins[row, ColName].DisplayText) != -1) checkBox.Checked = true; else checkBox.Checked = false; @@ -101,23 +101,26 @@ SourceGrid.Cells.CheckBox checkBox; for (int row = 1; row < gridPlugins.RowsCount; row++) { - checkBox = gridPlugins[row, 2] as SourceGrid.Cells.CheckBox; + checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; if (checkBox != null && checkBox.Checked) - return gridPlugins[row, 0].DisplayText; + return gridPlugins[row, ColName].DisplayText; } return String.Empty; } set { + if (String.IsNullOrEmpty(value)) + return; + SourceGrid.Cells.CheckBox checkBox; for (int row = 1; row < gridPlugins.RowsCount; row++) { - checkBox = gridPlugins[row, 2] as SourceGrid.Cells.CheckBox; + checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; if (checkBox == null) continue; - if (gridPlugins[row, 0].DisplayText.Equals(value, StringComparison.OrdinalIgnoreCase)) + if (gridPlugins[row, ColName].DisplayText.Equals(value, StringComparison.OrdinalIgnoreCase)) checkBox.Checked = true; else checkBox.Checked = false; @@ -157,6 +160,87 @@ #endregion Constructor + #region Controls + + private void buttonOK_Click(object sender, EventArgs e) + { + try + { + if (checkBoxRunAtBoot.Checked) + SystemRegistry.SetAutoRun("IR Server", Application.ExecutablePath); + else + SystemRegistry.RemoveAutoRun("IR Server"); + } + catch (Exception ex) + { + IrssLog.Error(ex); + } + + this.DialogResult = DialogResult.OK; + this.Close(); + } + private void buttonCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } + + private void buttonClickEvent_Executed(object sender, EventArgs e) + { + SourceGrid.CellContext context = (SourceGrid.CellContext)sender; + SourceGrid.Cells.Button cell = (SourceGrid.Cells.Button)context.Cell; + + IConfigure plugin = cell.Row.Tag as IConfigure; + if (plugin != null) + plugin.Configure(this); + } + private void TransmitChanged(object sender, EventArgs e) + { + SourceGrid.CellContext context = (SourceGrid.CellContext)sender; + SourceGrid.Cells.CheckBox cell = (SourceGrid.Cells.CheckBox)context.Cell; + + if (!cell.Checked) + return; + + PluginBase plugin = cell.Row.Tag as PluginBase; + + for (int row = 1; row < gridPlugins.RowsCount; row++) + { + SourceGrid.Cells.CheckBox checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; + + if (checkBox != null && checkBox.Checked && !gridPlugins[row, ColName].DisplayText.Equals(plugin.Name, StringComparison.OrdinalIgnoreCase)) + checkBox.Checked = false; + } + } + private void PluginDoubleClick(object sender, EventArgs e) + { + SourceGrid.CellContext context = (SourceGrid.CellContext)sender; + SourceGrid.Cells.Cell cell = (SourceGrid.Cells.Cell)context.Cell; + + SourceGrid.Cells.CheckBox checkBoxReceive = gridPlugins[cell.Row.Index, ColReceive] as SourceGrid.Cells.CheckBox; + if (checkBoxReceive != null) + checkBoxReceive.Checked = true; + + SourceGrid.Cells.CheckBox checkBoxTransmit = gridPlugins[cell.Row.Index, ColTransmit] as SourceGrid.Cells.CheckBox; + if (checkBoxTransmit != null) + checkBoxTransmit.Checked = true; + } + + private void toolStripButtonDetect_Click(object sender, EventArgs e) + { + Detect(); + } + private void toolStripButtonAdvancedSettings_Click(object sender, EventArgs e) + { + Advanced(); + } + private void toolStripButtonHelp_Click(object sender, EventArgs e) + { + ShowHelp(); + } + + #endregion Controls + void CreateGrid() { int row = 0; @@ -166,7 +250,7 @@ // Setup Column Headers gridPlugins.Rows.Insert(row); - gridPlugins[row, ColIcon] = new SourceGrid.Cells.ColumnHeader("*"); + gridPlugins[row, ColIcon] = new SourceGrid.Cells.ColumnHeader(" "); gridPlugins[row, ColName] = new SourceGrid.Cells.ColumnHeader("Name"); gridPlugins[row, ColReceive] = new SourceGrid.Cells.ColumnHeader("Receive"); gridPlugins[row, ColTransmit] = new SourceGrid.Cells.ColumnHeader("Transmit"); @@ -178,9 +262,19 @@ gridPlugins.Rows.Insert(++row); gridPlugins.Rows[row].Tag = transceiver; - // TODO: Icon Cell - gridPlugins[row, ColIcon] = new SourceGrid.Cells.Cell(); + // Icon Cell + if (transceiver.DeviceIcon != null) + { + SourceGrid.Cells.Image iconCell = new SourceGrid.Cells.Image(transceiver.DeviceIcon); + iconCell.Editor.EnableEdit = false; + gridPlugins[row, ColIcon] = iconCell; + } + else + { + gridPlugins[row, ColIcon] = new SourceGrid.Cells.Cell(); + } + // Name Cell SourceGrid.Cells.Cell nameCell = new SourceGrid.Cells.Cell(transceiver.Name); @@ -245,124 +339,54 @@ gridPlugins.AutoSizeCells(); } - #region Controls - - private void buttonOK_Click(object sender, EventArgs e) + void Detect() { - try + SourceGrid.Cells.CheckBox checkBox; + for (int row = 1; row < gridPlugins.RowsCount; row++) { - if (checkBoxRunAtBoot.Checked) - SystemRegistry.SetAutoRun("IR Server", Application.ExecutablePath); - else - SystemRegistry.RemoveAutoRun("IR Server"); + PluginBase plugin = gridPlugins.Rows[row].Tag as PluginBase; + + bool detected = plugin.Detect(); + + // Receive + checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox; + if (checkBox != null) + checkBox.Checked = detected; + + // Transmit + checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; + if (checkBox != null) + checkBox.Checked = detected; } - catch (Exception ex) - { - IrssLog.Error(ex); - } - - this.DialogResult = DialogResult.OK; - this.Close(); } - private void buttonCancel_Click(object sender, EventArgs e) + void Advanced() { - this.DialogResult = DialogResult.Cancel; - this.Close(); - } + Advanced advanced = new Advanced(); - private void buttonClickEvent_Executed(object sender, EventArgs e) - { - SourceGrid.CellContext context = (SourceGrid.CellContext)sender; - SourceGrid.Cells.Button cell = (SourceGrid.Cells.Button)context.Cell; + advanced.AbstractRemoteMode = _abstractRemoteMode; + advanced.Mode = _mode; + advanced.HostComputer = _hostComputer; - IConfigure plugin = cell.Row.Tag as IConfigure; - if (plugin != null) - plugin.Configure(this); - } - private void TransmitChanged(object sender, EventArgs e) - { - SourceGrid.CellContext context = (SourceGrid.CellContext)sender; - SourceGrid.Cells.CheckBox cell = (SourceGrid.Cells.CheckBox)context.Cell; - - if (!cell.Checked) - return; - - PluginBase plugin = cell.Row.Tag as PluginBase; - - for (int row = 1; row < gridPlugins.RowsCount; row++) + if (advanced.ShowDialog(this) == DialogResult.OK) { - SourceGrid.Cells.CheckBox checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; - - if (checkBox != null && checkBox.Checked && !gridPlugins[row, ColName].DisplayText.Equals(plugin.Name, StringComparison.OrdinalIgnoreCase)) - checkBox.Checked = false; + _abstractRemoteMode = advanced.AbstractRemoteMode; + _mode = advanced.Mode; + _hostComputer = advanced.HostComputer; } } - private void PluginDoubleClick(object sender, EventArgs e) + void ShowHelp() { - SourceGrid.CellContext context = (SourceGrid.CellContext)sender; - SourceGrid.Cells.Cell cell = (SourceGrid.Cells.Cell)context.Cell; - - SourceGrid.Cells.CheckBox checkBoxReceive = gridPlugins[cell.Row.Index, ColReceive] as SourceGrid.Cells.CheckBox; - if (checkBoxReceive != null) - checkBoxReceive.Checked = true; - - SourceGrid.Cells.CheckBox checkBoxTransmit = gridPlugins[cell.Row.Index, ColTransmit] as SourceGrid.Cells.CheckBox; - if (checkBoxTransmit != null) - checkBoxTransmit.Checked = true; - } - - private void buttonHelp_Click(object sender, EventArgs e) - { try { string file = Path.Combine(SystemRegistry.GetInstallFolder(), "IR Server Suite.chm"); - Help.ShowHelp(this, file, HelpNavigator.Topic, "IR Server\\index.html"); + Help.ShowHelp(this, file, HelpNavigator.Topic, "Input Service\\index.html"); } catch (Exception ex) { MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - private void buttonAdvanced_Click(object sender, EventArgs e) - { - Advanced advanced = new Advanced(); - advanced.AbstractRemoteMode = _abstractRemoteMode; - advanced.Mode = _mode; - advanced.HostComputer = _hostComputer; - - if (advanced.ShowDialog(this) == DialogResult.OK) - { - _abstractRemoteMode = advanced.AbstractRemoteMode; - _mode = advanced.Mode; - _hostComputer = advanced.HostComputer; - } - } - - #endregion Controls - - private void buttonDetect_Click(object sender, EventArgs e) - { - SourceGrid.Cells.CheckBox checkBox; - for (int row = 1; row < gridPlugins.RowsCount; row++) - { - PluginBase plugin = gridPlugins.Rows[row].Tag as PluginBase; - - bool detected = plugin.Detect(); - - // Receive - checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox; - if (checkBox != null) - checkBox.Checked = detected; - - // Transmit - checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox; - if (checkBox != null) - checkBox.Checked = detected; - } - } - } } Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Config.resx 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.resx 2008-03-08 10:05:03 UTC (rev 1436) @@ -120,6 +120,9 @@ <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>200, 17</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> Added: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Advanced.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Advanced.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Detect.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Detect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Help.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/IR Server/Graphics/Help.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-03-08 10:05:03 UTC (rev 1436) @@ -118,6 +118,9 @@ </Compile> </ItemGroup> <ItemGroup> + <None Include="Graphics\Advanced.png" /> + <None Include="Graphics\Detect.png" /> + <Content Include="Graphics\Help.png" /> <Content Include="Icon.ico" /> <Content Include="Icon16.ico" /> <Content Include="IRServer.exe.manifest"> Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.Designer.cs 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.Designer.cs 2008-03-08 10:05:03 UTC (rev 1436) @@ -60,6 +60,27 @@ } } + internal static System.Drawing.Bitmap Advanced { + get { + object obj = ResourceManager.GetObject("Advanced", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Detect { + get { + object obj = ResourceManager.GetObject("Detect", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Help { + get { + object obj = ResourceManager.GetObject("Help", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Icon Icon16 { get { object obj = ResourceManager.GetObject("Icon16", resourceCulture); Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.resx 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.resx 2008-03-08 10:05:03 UTC (rev 1436) @@ -118,6 +118,15 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="Advanced" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\advanced.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Detect" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\detect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="Icon16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Icon16.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> Modified: trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/GBPVR.exe.xml =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/GBPVR.exe.xml 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/GBPVR.exe.xml 2008-03-08 10:05:03 UTC (rev 1436) @@ -1,44 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <Programs> - <ProgramSettings Name="GBPVR" FileName="C:\Program Files\devnz\gbpvr\GBPVR.exe" Folder="C:\Program Files\devnz\gbpvr" Arguments="" UseShellExecute="false" ForceWindowFocus="false" IgnoreSystemWide="false" WindowState="Normal"> - <ButtonMappings> - <ButtonMapping KeyCode="31743" Description="0" Command="Keys: {NUM0}" /> - <ButtonMapping KeyCode="31742" Description="1" Command="Keys: {NUM1}" /> - <ButtonMapping KeyCode="31741" Description="2" Command="Keys: {NUM2}" /> - <ButtonMapping KeyCode="31740" Description="3" Command="Keys: {NUM3}" /> - <ButtonMapping KeyCode="31739" Description="4" Command="Keys: {NUM4}" /> - <ButtonMapping KeyCode="31738" Description="5" Command="Keys: {NUM5}" /> - <ButtonMapping KeyCode="31737" Description="6" Command="Keys: {NUM6}" /> - <ButtonMapping KeyCode="31736" Description="7" Command="Keys: {NUM7}" /> - <ButtonMapping KeyCode="31735" Description="8" Command="Keys: {NUM8}" /> - <ButtonMapping KeyCode="31734" Description="9" Command="Keys: {NUM9}" /> - <ButtonMapping KeyCode="31713" Description="UP" Command="Keys: {UP}" /> - <ButtonMapping KeyCode="31712" Description="DOWN" Command="Keys: {DOWN}" /> - <ButtonMapping KeyCode="31711" Description="LEFT" Command="Keys: {LEFT}" /> - <ButtonMapping KeyCode="31710" Description="RIGHT" Command="Keys: {RIGHT}" /> - <ButtonMapping KeyCode="31709" Description="OK" Command="Keys: {ENTER}" /> - <ButtonMapping KeyCode="31722" Description="REW" Command="Keys: ^d" /> - <ButtonMapping KeyCode="31723" Description="FF" Command="Keys: ^f" /> - <ButtonMapping KeyCode="31721" Description="PLAY" Command="Keys: ^p" /> - <ButtonMapping KeyCode="31719" Description="PAUSE" Command="Keys: ^q" /> - <ButtonMapping KeyCode="31718" Description="STOP" Command="Keys: ^s" /> - <ButtonMapping KeyCode="31720" Description="RECORD" Command="Keys: ^k" /> - <ButtonMapping KeyCode="31716" Description="Track-" Command="Keys: ^{LEFT}" /> - <ButtonMapping KeyCode="31717" Description="Track+" Command="Keys: ^{RIGHT}" /> - <ButtonMapping KeyCode="31708" Description="Back" Command="Keys: {ESC}" /> - <ButtonMapping KeyCode="31728" Description="Info" Command="Keys: ^b" /> - <ButtonMapping KeyCode="31725" Description="Ch+" Command="Keys: {PGUP}" /> - <ButtonMapping KeyCode="31724" Description="Ch-" Command="Keys: {PGDN}" /> - <ButtonMapping KeyCode="31671" Description="Recorded TV" Command="Keys: {F8}" /> - <ButtonMapping KeyCode="31705" Description="Guide" Command="Keys: {F1}" /> - <ButtonMapping KeyCode="31706" Description="Live TV" Command="Keys: {F2}" /> - <ButtonMapping KeyCode="31730" Description="Last Channel" Command="Keys: ^w" /> - <ButtonMapping KeyCode="31714" Description="Videos" Command="Keys: {F3}" /> - <ButtonMapping KeyCode="31715" Description="Radio" Command="Keys: {F6}" /> - <ButtonMapping KeyCode="31732" Description="Audio" Command="Keys: {F4}" /> - <ButtonMapping KeyCode="31731" Description="Main Menu" Command="Keys: {HOME}" /> - </ButtonMappings> - </ProgramSettings> - </Programs> + <ButtonMappings> + <ButtonMapping KeyCode="31743" Description="0" Command="Keys: {NUM0}" /> + <ButtonMapping KeyCode="31742" Description="1" Command="Keys: {NUM1}" /> + <ButtonMapping KeyCode="31741" Description="2" Command="Keys: {NUM2}" /> + <ButtonMapping KeyCode="31740" Description="3" Command="Keys: {NUM3}" /> + <ButtonMapping KeyCode="31739" Description="4" Command="Keys: {NUM4}" /> + <ButtonMapping KeyCode="31738" Description="5" Command="Keys: {NUM5}" /> + <ButtonMapping KeyCode="31737" Description="6" Command="Keys: {NUM6}" /> + <ButtonMapping KeyCode="31736" Description="7" Command="Keys: {NUM7}" /> + <ButtonMapping KeyCode="31735" Description="8" Command="Keys: {NUM8}" /> + <ButtonMapping KeyCode="31734" Description="9" Command="Keys: {NUM9}" /> + <ButtonMapping KeyCode="31713" Description="UP" Command="Keys: {UP}" /> + <ButtonMapping KeyCode="31712" Description="DOWN" Command="Keys: {DOWN}" /> + <ButtonMapping KeyCode="31711" Description="LEFT" Command="Keys: {LEFT}" /> + <ButtonMapping KeyCode="31710" Description="RIGHT" Command="Keys: {RIGHT}" /> + <ButtonMapping KeyCode="31709" Description="OK" Command="Keys: {ENTER}" /> + <ButtonMapping KeyCode="31722" Description="REW" Command="Keys: ^d" /> + <ButtonMapping KeyCode="31723" Description="FF" Command="Keys: ^f" /> + <ButtonMapping KeyCode="31721" Description="PLAY" Command="Keys: ^p" /> + <ButtonMapping KeyCode="31719" Description="PAUSE" Command="Keys: ^q" /> + <ButtonMapping KeyCode="31718" Description="STOP" Command="Keys: ^s" /> + <ButtonMapping KeyCode="31720" Description="RECORD" Command="Keys: ^k" /> + <ButtonMapping KeyCode="31716" Description="Track-" Command="Keys: ^{LEFT}" /> + <ButtonMapping KeyCode="31717" Description="Track+" Command="Keys: ^{RIGHT}" /> + <ButtonMapping KeyCode="31708" Description="Back" Command="Keys: {ESC}" /> + <ButtonMapping KeyCode="31728" Description="Info" Command="Keys: ^b" /> + <ButtonMapping KeyCode="31725" Description="Ch+" Command="Keys: {PGUP}" /> + <ButtonMapping KeyCode="31724" Description="Ch-" Command="Keys: {PGDN}" /> + <ButtonMapping KeyCode="31671" Description="Recorded TV" Command="Keys: {F8}" /> + <ButtonMapping KeyCode="31705" Description="Guide" Command="Keys: {F1}" /> + <ButtonMapping KeyCode="31706" Description="Live TV" Command="Keys: {F2}" /> + <ButtonMapping KeyCode="31730" Description="Last Channel" Command="Keys: ^w" /> + <ButtonMapping KeyCode="31714" Description="Videos" Command="Keys: {F3}" /> + <ButtonMapping KeyCode="31715" Description="Radio" Command="Keys: {F6}" /> + <ButtonMapping KeyCode="31732" Description="Audio" Command="Keys: {F4}" /> + <ButtonMapping KeyCode="31731" Description="Main Menu" Command="Keys: {HOME}" /> + </ButtonMappings> </Configuration> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Meedio.exe.xml =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Meedio.exe.xml 2008-03-07 15:43:52 UTC (rev 1435) +++ trunk/plugins/IR Server Suite/Applications/Translator/Default Settings/Meedio.exe.xml 2008-03-08 10:05:03 UTC (rev 1436) @@ -1,64 +1,57 @@ <?xml version="1.0" encoding="utf-8"?> <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ServerHost>localhost</ServerHost> - <SystemWideMappings /> - <Programs> - <ProgramSettings Name="Meedio" FileName="e:\meedio\meedioapp\meedio.exe" Folder="" Arguments="" UseShellExecute="false" ForceWindowFocus="false" IgnoreSystemWide="false" WindowState="Normal"> - <ButtonMappings> - <ButtonMapping KeyCode="Up" Description="UP" Command="Window Message: CLASS|H2-WM-COMMAND|273|1|0" /> - <ButtonMapping KeyCode="Down" Description="DOWN" Command="Window Message: CLASS|H2-WM-COMMAND|273|2|0" /> - <ButtonMapping KeyCode="Left" Description="LEFT" Command="Window Message: CLASS|H2-WM-COMMAND|273|3|0" /> - <ButtonMapping KeyCode="Right" Description="RIGHT" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="OK" Description="SELECT" Command="Window Message: CLASS|H2-WM-COMMAND|273|5|0" /> - <ButtonMapping KeyCode="VolumeUp" Description="VOLUP" Command="Window Message: CLASS|H2-WM-COMMAND|273|30|0" /> - <ButtonMapping KeyCode="VolumeDown" Description="VOLDN" Command="Window Message: CLASS|H2-WM-COMMAND|273|31|0" /> - <ButtonMapping KeyCode="ChannelUp" Description="CHANNELUP" Command="Window Message: CLASS|H2-WM-COMMAND|273|7|0" /> - <ButtonMapping KeyCode="ChannelDown" Description="CHANNELDN" Command="Window Message: CLASS|H2-WM-COMMAND|273|8|0" /> - <ButtonMapping KeyCode="Start" Description="HOME" Command="Window Message: CLASS|H2-WM-COMMAND|273|44|0" /> - <ButtonMapping KeyCode="Back" Description="BACK" Command="Window Message: CLASS|H2-WM-COMMAND|273|6|0" /> - <ButtonMapping KeyCode="Info" Description="INFO" Command="Window Message: CLASS|H2-WM-COMMAND|273|36|0" /> - <ButtonMapping KeyCode="Mute" Description="MUTE" Command="Window Message: CLASS|H2-WM-COMMAND|273|32|0" /> - <ButtonMapping KeyCode="Number0" Description="0" Command="Window Message: CLASS|H2-WM-COMMAND|273|10|0" /> - <ButtonMapping KeyCode="Number1" Description="1" Command="Window Message: CLASS|H2-WM-COMMAND|273|11|0" /> - <ButtonMapping KeyCode="Number2" Description="2" Command="Window Message: CLASS|H2-WM-COMMAND|273|12|0" /> - <ButtonMapping KeyCode="Number3" Description="3" Command="Window Message: CLASS|H2-WM-COMMAND|273|13|0" /> - <ButtonMapping KeyCode="Number4" Description="4" Command="Window Message: CLASS|H2-WM-COMMAND|273|14|0" /> - <ButtonMapping KeyCode="Number5" Description="5" Command="Window Message: CLASS|H2-WM-COMMAND|273|15|0" /> - <ButtonMapping KeyCode="Number6" Description="6" Command="Window Message: CLASS|H2-WM-COMMAND|273|16|0" /> - <ButtonMapping KeyCode="Number7" Description="7" Command="Window Message: CLASS|H2-WM-COMMAND|273|17|0" /> - <ButtonMapping KeyCode="Number8" Description="8" Command="Window Message: CLASS|H2-WM-COMMAND|273|18|0" /> - <ButtonMapping KeyCode="Number9" Description="9" Command="Window Message: CLASS|H2-WM-COMMAND|273|19|0" /> - <ButtonMapping KeyCode="Play" Description="PLAY" Command="Window Message: CLASS|H2-WM-COMMAND|273|21|0" /> - <ButtonMapping KeyCode="Pause" Description="PAUSE" Command="Window Message: CLASS|H2-WM-COMMAND|273|22|0" /> - <ButtonMapping KeyCode="Stop" Description="STOP" Command="Window Message: CLASS|H2-WM-COMMAND|273|27|0" /> - <ButtonMapping KeyCode="FastForward" Description="FFWD" Command="Window Message: CLASS|H2-WM-COMMAND|273|25|0" /> - <ButtonMapping KeyCode="Rewind" Description="REW" Command="Window Message: CLASS|H2-WM-COMMAND|273|26|0" /> - <ButtonMapping KeyCode="Record" Description="RECORD" Command="Window Message: CLASS|H2-WM-COMMAND|273|28|0" /> - <ButtonMapping KeyCode="NextChapter" Description="NEXT" Command="Window Message: CLASS|H2-WM-COMMAND|273|23|0" /> - <ButtonMapping KeyCode="PreviousChapter" Description="PREVIOUS" Command="Window Message: CLASS|H2-WM-COMMAND|273|24|0" /> - <ButtonMapping KeyCode="Power" Description="POWER" Command="Window Message: CLASS|H2-WM-COMMAND|273|38|0" /> - <ButtonMapping KeyCode="Power2" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="Teletext" Description="TELETEXT" Command="Window Message: CLASS|H2-WM-COMMAND|273|52|0" /> - <ButtonMapping KeyCode="Red" Description="RED" Command="Window Message: CLASS|H2-WM-COMMAND|273|53|0" /> - <ButtonMapping KeyCode="Green" Description="GREEN" Command="Window Message: CLASS|H2-WM-COMMAND|273|54|0" /> - <ButtonMapping KeyCode="Yellow" Description="YELLOW" Command="Window Message: CLASS|H2-WM-COMMAND|273|55|0" /> - <ButtonMapping KeyCode="Blue" Description="BLUE" Command="Window Message: CLASS|H2-WM-COMMAND|273|56|0" /> - <ButtonMapping KeyCode="Clear" Description="CLEAR" Command="Window Message: CLASS|H2-WM-COMMAND|273|39|0" /> - <ButtonMapping KeyCode="Enter" Description="ENTER" Command="Window Message: CLASS|H2-WM-COMMAND|273|20|0" /> - <ButtonMapping KeyCode="_Hash" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="_Star" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="Music" Description="GOTO-MUSIC" Command="Window Message: CLASS|H2-WM-COMMAND|273|46|0" /> - <ButtonMapping KeyCode="Pictures" Description="GOTO-PHOTOS" Command="Window Message: CLASS|H2-WM-COMMAND|273|47|0" /> - <ButtonMapping KeyCode="Videos" Description="GOTO-VIDEO" Command="Window Message: CLASS|H2-WM-COMMAND|273|50|0" /> - <ButtonMapping KeyCode="DVD" Description="GOTO-DVD" Command="Window Message: CLASS|H2-WM-COMMAND|273|48|0" /> - <ButtonMapping KeyCode="TV" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="Guide" Description="GUIDE" Command="Window Message: CLASS|H2-WM-COMMAND|273|34|0" /> - <ButtonMapping KeyCode="LiveTV" Description="GOTO-TV" Command="Window Message: CLASS|H2-WM-COMMAND|273|49|0" /> - <ButtonMapping KeyCode="PreviousChannel" Description="PREV-CH" Command="Window Message: CLASS|H2-WM-COMMAND|273|33|0" /> - <ButtonMapping KeyCode="_Radio" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - <ButtonMapping KeyCode="_Print" Description="" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> - </ButtonMappings> - </ProgramSettings> - </Programs> - <Events /> + <ButtonMappings> + <ButtonMapping KeyCode="Up" Description="UP" Command="Window Message: CLASS|H2-WM-COMMAND|273|1|0" /> + <ButtonMapping KeyCode="Down" Description="DOWN" Command="Window Message: CLASS|H2-WM-COMMAND|273|2|0" /> + <ButtonMapping KeyCode="Left" Description="LEFT" Command="Window Message: CLASS|H2-WM-COMMAND|273|3|0" /> + <ButtonMapping KeyCode="Right" Description="RIGHT" Command="Window Message: CLASS|H2-WM-COMMAND|273|4|0" /> + <ButtonMapping KeyCode="OK" Description="SELECT" Command="Window Message: CLASS|H2-WM-COMMAND|273|5|0" /> + <ButtonMapping KeyCode="VolumeUp" Description="VOLUP" Command="Window Message: CLASS|H2-WM-COMMAND|273|30|0" /> + <ButtonMapping KeyCode="VolumeDown" Description="VOLDN" Command="Window Message: CLASS|H2-WM-COMMAND|273|31|0" /> + <ButtonMapping KeyCode="ChannelUp" Description="CHANNELUP" Command="Window Message: CLASS|H2-WM-COMMAND|273|7|0" /> + <ButtonMapping KeyCode="ChannelDown" Description="CHANNELDN" Command="Window Message: CLASS|H2-WM-COMMAND|273|8|0" /> + <ButtonMapping KeyCode="Start" Description="HOME" Command="Window Message: CLASS|H2-WM-COMMAND|273|44|0" /> + <ButtonMapping KeyCode="Back" Description="BACK" Command="Window Message: CLASS|H2-WM-COMMAND|273|6|0" /> + <ButtonMapping KeyCode="Info" Description="INFO" Command="Window Message: CLASS|H2-WM-COMMAND|273|36|0" /> + <ButtonMapping KeyCode="Mute" Description="MUTE" Command="Window Message: CLASS|H2-WM-COMMAND|273|32|0" /> + <ButtonMapping KeyCode="Number0" Description="0" Command="Window Message: CLASS|H2-WM-COMMAND|273|10|0" /> + <ButtonMapping KeyCode="Number1" Description="1" Command="Window Message: CLASS|H2-WM-COMMAND|273|11|0" /> + <ButtonMapping KeyCode="Number2" Description="2" Command="Window Message: CLASS|H2-WM-COMMAND|273|12|0" /> + <ButtonMapping KeyCode="Number3" Description="3" Command="Window Message: CLASS|H2-WM-COMMAND|273|13|0" /> + <ButtonMapping KeyCode="Number4" Description="4" Command="Window Message: CLASS|H2-WM-COMMAND|273|14|0" /> + <ButtonMapping KeyCode="Number5" Description="5" Command="Window Message: CLASS|H2-WM-COMMAND|273|15|0" /> + <ButtonMapping KeyCode="Number6" Description="6" Command="Window Message: CLASS|H2-WM-COMMAND|273|16|0" /> + <ButtonMapping KeyCode="Number7" Description="7" Command="Window Message: CLASS|H2-WM-COMMAND|273|17|0" /> + <ButtonMapping KeyCode="Number8" Description="8" Command="Window Message: CLASS|H2-WM-COMMAND|273|18|0" /> + <ButtonMapping KeyCode="Number9" Description="9" Command="Window Message: CLASS|H2-WM-COMMAND|273|19... [truncated message content] |