Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1461] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2008-03-14 15:27:25
|
Revision: 1461
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1461&view=rev
Author: and-81
Date: 2008-03-14 08:27:23 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.resx
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-03-14 15:27:23 UTC (rev 1461)
@@ -56,6 +56,7 @@
<LI>Direct Input Plugin: Fixed a detection and configuration bug.</LI>
<LI>Translator: Fixed a critical bug.</LI>
<LI>Translator: Added process priority adjustment (under the new Advanced configuration menu item).</LI>
+<LI>WinLirc Plugin: Changed suspend/resume behaviour to fix a bug with repeated buttons after resume from standby.</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.cs 2008-03-14 15:27:23 UTC (rev 1461)
@@ -104,7 +104,15 @@
{
InitializeComponent();
- checkBoxDisableAutomaticButtons.Checked = !MicrosoftMceTransceiver.CheckAutomaticButtons();
+ // Put this in a try...catch so that if the registry keys don't exist we don't throw an ugly exception.
+ try
+ {
+ checkBoxDisableAutomaticButtons.Checked = !MicrosoftMceTransceiver.CheckAutomaticButtons();
+ }
+ catch
+ {
+ checkBoxDisableAutomaticButtons.Enabled = false;
+ }
}
#endregion Constructor
@@ -113,30 +121,33 @@
private void buttonOK_Click(object sender, EventArgs e)
{
- try
+ if (checkBoxDisableAutomaticButtons.Enabled)
{
- bool changeMade = false;
+ try
+ {
+ bool changeMade = false;
- bool keysExist = MicrosoftMceTransceiver.CheckAutomaticButtons();
+ bool keysExist = MicrosoftMceTransceiver.CheckAutomaticButtons();
- if (checkBoxDisableAutomaticButtons.Checked && keysExist)
- {
- MicrosoftMceTransceiver.DisableAutomaticButtons();
- changeMade = true;
+ if (checkBoxDisableAutomaticButtons.Checked && keysExist)
+ {
+ MicrosoftMceTransceiver.DisableAutomaticButtons();
+ changeMade = true;
+ }
+ else if (!checkBoxDisableAutomaticButtons.Checked && !keysExist)
+ {
+ MicrosoftMceTransceiver.EnableAutomaticButtons();
+ changeMade = true;
+ }
+
+ if (changeMade)
+ MessageBox.Show(this, "You must restart the computer for changes to automatic button handling to take effect", "Restart required", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
- else if (!checkBoxDisableAutomaticButtons.Checked && !keysExist)
+ catch (Exception ex)
{
- MicrosoftMceTransceiver.EnableAutomaticButtons();
- changeMade = true;
+ MessageBox.Show(this, ex.ToString(), "Error modifiying the system registry", MessageBoxButtons.OK);
}
-
- if (changeMade)
- MessageBox.Show(this, "You must restart the computer for changes to automatic button handling to take effect", "Restart required", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
- catch (Exception ex)
- {
- MessageBox.Show(this, ex.ToString(), "Error modifiying the system registry", MessageBoxButtons.OK);
- }
this.DialogResult = DialogResult.OK;
this.Close();
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-03-14 15:27:23 UTC (rev 1461)
@@ -301,7 +301,15 @@
LoadSettings();
- _ignoreAutomaticButtons = CheckAutomaticButtons();
+ // Put this in a try...catch so that if the registry keys don't exist we don't throw an ugly exception.
+ try
+ {
+ _ignoreAutomaticButtons = CheckAutomaticButtons();
+ }
+ catch
+ {
+ _ignoreAutomaticButtons = false;
+ }
if (_disableMceServices)
DisableMceServices();
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs 2008-03-14 15:27:23 UTC (rev 1461)
@@ -104,14 +104,14 @@
/// </summary>
public override void Suspend()
{
- Stop();
+ //Stop();
}
/// <summary>
/// Resume the IR Server plugin when the computer returns from standby.
/// </summary>
public override void Resume()
{
- Start();
+ //Start();
}
/// <summary>
/// Stop the IR Server plugin.
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs 2008-03-14 15:27:23 UTC (rev 1461)
@@ -71,10 +71,10 @@
this.groupBoxStatus = new System.Windows.Forms.GroupBox();
this.labelStatus = new System.Windows.Forms.Label();
this.treeViewRemotes = new System.Windows.Forms.TreeView();
+ this.tabPageMacros = new System.Windows.Forms.TabPage();
+ this.listViewMacro = new System.Windows.Forms.ListView();
this.tabPageIR = new System.Windows.Forms.TabPage();
this.listViewIR = new System.Windows.Forms.ListView();
- this.tabPageMacros = new System.Windows.Forms.TabPage();
- this.listViewMacro = new System.Windows.Forms.ListView();
this.tabPageMultiMapping = new System.Windows.Forms.TabPage();
this.listBoxMappings = new System.Windows.Forms.ListBox();
this.labelButton = new System.Windows.Forms.Label();
@@ -90,12 +90,13 @@
this.groupBoxMouseModeOptions = new System.Windows.Forms.GroupBox();
this.labelMouseModeToggle = new System.Windows.Forms.Label();
this.labelMouseStep = new System.Windows.Forms.Label();
+ this.checkBoxAbstractRemoteMode = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMouseStep)).BeginInit();
this.tabControl.SuspendLayout();
this.tabPageRemotes.SuspendLayout();
this.groupBoxStatus.SuspendLayout();
+ this.tabPageMacros.SuspendLayout();
this.tabPageIR.SuspendLayout();
- this.tabPageMacros.SuspendLayout();
this.tabPageMultiMapping.SuspendLayout();
this.tabPageEventMapper.SuspendLayout();
this.tabPageMouseMode.SuspendLayout();
@@ -251,7 +252,8 @@
this.checkBoxMultiMapping.TabIndex = 0;
this.checkBoxMultiMapping.Text = "Enable";
this.checkBoxMultiMapping.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.toolTips.SetToolTip(this.checkBoxMultiMapping, "Enable the multi-mapping feature, which lets you cycle through remote button mappings");
+ this.toolTips.SetToolTip(this.checkBoxMultiMapping, "Enable the multi-mapping feature, which lets you cycle through remote button mapp" +
+ "ings");
this.checkBoxMultiMapping.UseVisualStyleBackColor = true;
//
// checkBoxEventMapper
@@ -262,7 +264,8 @@
this.checkBoxEventMapper.TabIndex = 0;
this.checkBoxEventMapper.Text = "Enable";
this.checkBoxEventMapper.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.toolTips.SetToolTip(this.checkBoxEventMapper, "Enable the event mapper, which lets you map plugin functions to MediaPortal internal events");
+ this.toolTips.SetToolTip(this.checkBoxEventMapper, "Enable the event mapper, which lets you map plugin functions to MediaPortal inter" +
+ "nal events");
this.checkBoxEventMapper.UseVisualStyleBackColor = true;
//
// buttonSetCommand
@@ -438,7 +441,8 @@
this.checkBoxMouseMode.TabIndex = 0;
this.checkBoxMouseMode.Text = "Enable";
this.checkBoxMouseMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.toolTips.SetToolTip(this.checkBoxMouseMode, "Enable the mouse mode feature, which lets you control the on-screen mouse with your remote");
+ this.toolTips.SetToolTip(this.checkBoxMouseMode, "Enable the mouse mode feature, which lets you control the on-screen mouse with yo" +
+ "ur remote");
this.checkBoxMouseMode.UseVisualStyleBackColor = true;
//
// comboBoxMouseModeButton
@@ -483,7 +487,8 @@
this.checkBoxMouseAcceleration.Size = new System.Drawing.Size(152, 24);
this.checkBoxMouseAcceleration.TabIndex = 4;
this.checkBoxMouseAcceleration.Text = "Use mouse acceleration";
- this.toolTips.SetToolTip(this.checkBoxMouseAcceleration, "Enable mouse acceleration, which makes the mouse move in larger steps when holding the remote button down");
+ this.toolTips.SetToolTip(this.checkBoxMouseAcceleration, "Enable mouse acceleration, which makes the mouse move in larger steps when holdin" +
+ "g the remote button down");
this.checkBoxMouseAcceleration.UseVisualStyleBackColor = true;
//
// buttonClearAll
@@ -542,6 +547,7 @@
//
// tabPageRemotes
//
+ this.tabPageRemotes.Controls.Add(this.checkBoxAbstractRemoteMode);
this.tabPageRemotes.Controls.Add(this.comboBoxRemotePresets);
this.tabPageRemotes.Controls.Add(this.buttonLoadPreset);
this.tabPageRemotes.Controls.Add(this.buttonClearAll);
@@ -598,45 +604,12 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.treeViewRemotes.HideSelection = false;
- this.treeViewRemotes.Location = new System.Drawing.Point(8, 8);
+ this.treeViewRemotes.Location = new System.Drawing.Point(8, 40);
this.treeViewRemotes.Name = "treeViewRemotes";
- this.treeViewRemotes.Size = new System.Drawing.Size(552, 192);
+ this.treeViewRemotes.Size = new System.Drawing.Size(552, 160);
this.treeViewRemotes.TabIndex = 0;
this.treeViewRemotes.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeViewRemotes_KeyDown);
//
- // tabPageIR
- //
- this.tabPageIR.Controls.Add(this.listViewIR);
- this.tabPageIR.Controls.Add(this.buttonNewIR);
- this.tabPageIR.Controls.Add(this.buttonEditIR);
- this.tabPageIR.Controls.Add(this.buttonDeleteIR);
- this.tabPageIR.Location = new System.Drawing.Point(4, 22);
- this.tabPageIR.Name = "tabPageIR";
- this.tabPageIR.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageIR.Size = new System.Drawing.Size(568, 302);
- this.tabPageIR.TabIndex = 2;
- this.tabPageIR.Text = "IR Commands";
- this.tabPageIR.UseVisualStyleBackColor = true;
- //
- // listViewIR
- //
- this.listViewIR.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.listViewIR.FullRowSelect = true;
- this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewIR.HideSelection = false;
- this.listViewIR.LabelEdit = true;
- this.listViewIR.Location = new System.Drawing.Point(8, 8);
- this.listViewIR.MultiSelect = false;
- this.listViewIR.Name = "listViewIR";
- this.listViewIR.Size = new System.Drawing.Size(552, 256);
- this.listViewIR.TabIndex = 0;
- this.listViewIR.UseCompatibleStateImageBehavior = false;
- this.listViewIR.View = System.Windows.Forms.View.List;
- this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
- this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
- //
// tabPageMacros
//
this.tabPageMacros.Controls.Add(this.listViewMacro);
@@ -671,6 +644,39 @@
this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick);
this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit);
//
+ // tabPageIR
+ //
+ this.tabPageIR.Controls.Add(this.listViewIR);
+ this.tabPageIR.Controls.Add(this.buttonNewIR);
+ this.tabPageIR.Controls.Add(this.buttonEditIR);
+ this.tabPageIR.Controls.Add(this.buttonDeleteIR);
+ this.tabPageIR.Location = new System.Drawing.Point(4, 22);
+ this.tabPageIR.Name = "tabPageIR";
+ this.tabPageIR.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageIR.Size = new System.Drawing.Size(568, 302);
+ this.tabPageIR.TabIndex = 2;
+ this.tabPageIR.Text = "IR Commands";
+ this.tabPageIR.UseVisualStyleBackColor = true;
+ //
+ // listViewIR
+ //
+ this.listViewIR.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.listViewIR.FullRowSelect = true;
+ this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewIR.HideSelection = false;
+ this.listViewIR.LabelEdit = true;
+ this.listViewIR.Location = new System.Drawing.Point(8, 8);
+ this.listViewIR.MultiSelect = false;
+ this.listViewIR.Name = "listViewIR";
+ this.listViewIR.Size = new System.Drawing.Size(552, 256);
+ this.listViewIR.TabIndex = 0;
+ this.listViewIR.UseCompatibleStateImageBehavior = false;
+ this.listViewIR.View = System.Windows.Forms.View.List;
+ this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
+ this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
+ //
// tabPageMultiMapping
//
this.tabPageMultiMapping.Controls.Add(this.checkBoxMultiMapping);
@@ -854,6 +860,18 @@
this.labelMouseStep.Text = "Mouse step distance:";
this.labelMouseStep.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
+ // checkBoxAbstractRemoteMode
+ //
+ this.checkBoxAbstractRemoteMode.Enabled = false;
+ this.checkBoxAbstractRemoteMode.Location = new System.Drawing.Point(8, 8);
+ this.checkBoxAbstractRemoteMode.Name = "checkBoxAbstractRemoteMode";
+ this.checkBoxAbstractRemoteMode.Size = new System.Drawing.Size(176, 24);
+ this.checkBoxAbstractRemoteMode.TabIndex = 6;
+ this.checkBoxAbstractRemoteMode.Text = "Use Abstract Remote Model";
+ this.toolTips.SetToolTip(this.checkBoxAbstractRemoteMode, "Use the abstract remote model");
+ this.checkBoxAbstractRemoteMode.UseVisualStyleBackColor = true;
+ this.checkBoxAbstractRemoteMode.CheckedChanged += new System.EventHandler(this.checkBoxAbstractRemoteMode_CheckedChanged);
+ //
// SetupForm
//
this.AcceptButton = this.buttonOK;
@@ -881,8 +899,8 @@
this.tabControl.ResumeLayout(false);
this.tabPageRemotes.ResumeLayout(false);
this.groupBoxStatus.ResumeLayout(false);
+ this.tabPageMacros.ResumeLayout(false);
this.tabPageIR.ResumeLayout(false);
- this.tabPageMacros.ResumeLayout(false);
this.tabPageMultiMapping.ResumeLayout(false);
this.tabPageEventMapper.ResumeLayout(false);
this.tabPageEventMapper.PerformLayout();
@@ -955,5 +973,6 @@
private System.Windows.Forms.GroupBox groupBoxMouseModeOptions;
private System.Windows.Forms.ListView listViewIR;
private System.Windows.Forms.ListView listViewMacro;
+ private System.Windows.Forms.CheckBox checkBoxAbstractRemoteMode;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2008-03-14 15:27:23 UTC (rev 1461)
@@ -1019,6 +1019,11 @@
#endregion Other Controls
+ private void checkBoxAbstractRemoteMode_CheckedChanged(object sender, EventArgs e)
+ {
+ // TODO: Implement proper abstract remote model handling
+ }
+
}
}
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.resx 2008-03-14 09:55:40 UTC (rev 1460)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.resx 2008-03-14 15:27:23 UTC (rev 1461)
@@ -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="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>59</value>
</metadata>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
