Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [181] trunk/plugins
|
From: <an...@us...> - 2007-03-11 13:44:58
|
Revision: 181
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=181&view=rev
Author: and-81
Date: 2007-03-11 06:44:57 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs
trunk/plugins/ComSkipLauncher TVE2/Configuration.Designer.cs
trunk/plugins/ComSkipLauncher TVE2/Configuration.cs
trunk/plugins/ComSkipLauncher TVE2/Configuration.resx
trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs
trunk/plugins/ComSkipLauncher TVE3/Configuration.Designer.cs
trunk/plugins/ComSkipLauncher TVE3/Configuration.cs
trunk/plugins/ComSkipLauncher TVE3/Configuration.resx
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
trunk/plugins/MCEReplacementTray/Properties/AssemblyInfo.cs
trunk/plugins/TV3ExtChannelChanger/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/ComSkipLauncher TVE2/
trunk/plugins/ComSkipLauncher TVE3/
Removed Paths:
-------------
trunk/plugins/ComSkipLauncher/
Copied: trunk/plugins/ComSkipLauncher TVE2 (from rev 180, trunk/plugins/ComSkipLauncher)
Modified: trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/ComSkipLauncher.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -22,7 +22,7 @@
public static readonly string MPConfigFile = Config.GetFolder(Config.Dir.Config) + "\\MediaPortal.xml";
public static readonly string DefaultProgram = "C:\\Program Files\\ComSkip\\ComSkip.exe";
- public static readonly string DefaultParameters = "--playnice --zpcut \"{0}\"";
+ public static readonly string DefaultParameters = "--playnice \"{0}\"";
#endregion Constants
@@ -79,10 +79,15 @@
{
LoadSettings();
- Configuration configuration = new Configuration(
- _startProgram, _startParameters, _runAtStart,
- _endProgram, _endParameters, _runAtEnd);
-
+ Configuration configuration = new Configuration();
+ configuration.RunAtStart = _runAtStart;
+ configuration.StartProgram = _startProgram;
+ configuration.StartParameters = _startParameters;
+
+ configuration.RunAtEnd = _runAtEnd;
+ configuration.EndProgram = _endProgram;
+ configuration.EndParameters = _endParameters;
+
if (configuration.ShowDialog() == DialogResult.OK)
{
_runAtStart = configuration.RunAtStart;
@@ -93,7 +98,6 @@
_endProgram = configuration.EndProgram;
_endParameters = configuration.EndParameters;
-
SaveSettings();
}
}
@@ -200,6 +204,10 @@
xmlwriter.SetValueAsBool("ComSkipLauncher", "RunAtStart", _runAtStart);
xmlwriter.SetValue("ComSkipLauncher", "StartProgram", _startProgram);
xmlwriter.SetValue("ComSkipLauncher", "StartParameters", _startParameters);
+
+ xmlwriter.SetValueAsBool("ComSkipLauncher", "RunAtEnd", _runAtEnd);
+ xmlwriter.SetValue("ComSkipLauncher", "EndProgram", _endProgram);
+ xmlwriter.SetValue("ComSkipLauncher", "EndParameters", _endParameters);
}
}
catch (Exception ex)
Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.Designer.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.Designer.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE2/Configuration.Designer.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -68,6 +68,7 @@
//
// 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(216, 288);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(56, 24);
@@ -78,6 +79,7 @@
//
// 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(280, 288);
this.buttonCancel.Name = "buttonCancel";
@@ -93,6 +95,7 @@
//
// buttonTest
//
+ this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonTest.Location = new System.Drawing.Point(272, 24);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(48, 20);
@@ -104,6 +107,8 @@
//
// textBoxTest
//
+ this.textBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxTest.Location = new System.Drawing.Point(8, 24);
this.textBoxTest.Name = "textBoxTest";
this.textBoxTest.Size = new System.Drawing.Size(224, 20);
@@ -112,6 +117,7 @@
//
// buttonFindTestFile
//
+ this.buttonFindTestFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonFindTestFile.Location = new System.Drawing.Point(240, 24);
this.buttonFindTestFile.Name = "buttonFindTestFile";
this.buttonFindTestFile.Size = new System.Drawing.Size(24, 20);
@@ -139,7 +145,6 @@
this.radioButtonStartLaunch.Name = "radioButtonStartLaunch";
this.radioButtonStartLaunch.Size = new System.Drawing.Size(96, 24);
this.radioButtonStartLaunch.TabIndex = 1;
- this.radioButtonStartLaunch.TabStop = true;
this.radioButtonStartLaunch.Text = "Launch:";
this.toolTips.SetToolTip(this.radioButtonStartLaunch, "Launch ComSkip to process the recording after it has finished");
this.radioButtonStartLaunch.UseVisualStyleBackColor = true;
@@ -147,18 +152,21 @@
//
// textBoxEndParameters
//
+ this.textBoxEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxEndParameters.Location = new System.Drawing.Point(8, 80);
this.textBoxEndParameters.Name = "textBoxEndParameters";
this.textBoxEndParameters.Size = new System.Drawing.Size(256, 20);
- this.textBoxEndParameters.TabIndex = 6;
+ this.textBoxEndParameters.TabIndex = 4;
this.toolTips.SetToolTip(this.textBoxEndParameters, "Provide command line parameters for the program");
//
// buttonEndParameters
//
+ this.buttonEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEndParameters.Location = new System.Drawing.Point(272, 80);
this.buttonEndParameters.Name = "buttonEndParameters";
this.buttonEndParameters.Size = new System.Drawing.Size(24, 20);
- this.buttonEndParameters.TabIndex = 7;
+ this.buttonEndParameters.TabIndex = 5;
this.buttonEndParameters.Text = "?";
this.toolTips.SetToolTip(this.buttonEndParameters, "Click here for a list of additional command line parameters");
this.buttonEndParameters.UseVisualStyleBackColor = true;
@@ -166,10 +174,11 @@
//
// buttonEndProgram
//
+ this.buttonEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEndProgram.Location = new System.Drawing.Point(272, 40);
this.buttonEndProgram.Name = "buttonEndProgram";
this.buttonEndProgram.Size = new System.Drawing.Size(24, 20);
- this.buttonEndProgram.TabIndex = 4;
+ this.buttonEndProgram.TabIndex = 2;
this.buttonEndProgram.Text = "...";
this.toolTips.SetToolTip(this.buttonEndProgram, "Locate the program you wish to launch");
this.buttonEndProgram.UseVisualStyleBackColor = true;
@@ -177,14 +186,18 @@
//
// textBoxEndProgram
//
+ this.textBoxEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxEndProgram.Location = new System.Drawing.Point(8, 40);
this.textBoxEndProgram.Name = "textBoxEndProgram";
this.textBoxEndProgram.Size = new System.Drawing.Size(256, 20);
- this.textBoxEndProgram.TabIndex = 3;
+ this.textBoxEndProgram.TabIndex = 1;
this.toolTips.SetToolTip(this.textBoxEndProgram, "The full location of the program to launch");
//
// textBoxStartParameters
//
+ this.textBoxStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxStartParameters.Location = new System.Drawing.Point(8, 80);
this.textBoxStartParameters.Name = "textBoxStartParameters";
this.textBoxStartParameters.Size = new System.Drawing.Size(256, 20);
@@ -193,6 +206,7 @@
//
// buttonStartParameters
//
+ this.buttonStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStartParameters.Location = new System.Drawing.Point(272, 80);
this.buttonStartParameters.Name = "buttonStartParameters";
this.buttonStartParameters.Size = new System.Drawing.Size(24, 20);
@@ -204,6 +218,7 @@
//
// buttonStartProgram
//
+ this.buttonStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStartProgram.Location = new System.Drawing.Point(272, 40);
this.buttonStartProgram.Name = "buttonStartProgram";
this.buttonStartProgram.Size = new System.Drawing.Size(24, 20);
@@ -215,6 +230,8 @@
//
// textBoxStartProgram
//
+ this.textBoxStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxStartProgram.Location = new System.Drawing.Point(8, 40);
this.textBoxStartProgram.Name = "textBoxStartProgram";
this.textBoxStartProgram.Size = new System.Drawing.Size(256, 20);
@@ -237,13 +254,15 @@
this.radioButtonEndLaunch.Name = "radioButtonEndLaunch";
this.radioButtonEndLaunch.Size = new System.Drawing.Size(96, 24);
this.radioButtonEndLaunch.TabIndex = 1;
- this.radioButtonEndLaunch.TabStop = true;
this.radioButtonEndLaunch.Text = "Launch:";
this.radioButtonEndLaunch.UseVisualStyleBackColor = true;
this.radioButtonEndLaunch.CheckedChanged += new System.EventHandler(this.radioButtonEndLaunch_CheckedChanged);
//
// tabControl
//
+ this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl.Controls.Add(this.tabPageStart);
this.tabControl.Controls.Add(this.tabPageEnd);
this.tabControl.Location = new System.Drawing.Point(8, 8);
@@ -262,11 +281,14 @@
this.tabPageStart.Padding = new System.Windows.Forms.Padding(3);
this.tabPageStart.Size = new System.Drawing.Size(320, 182);
this.tabPageStart.TabIndex = 0;
- this.tabPageStart.Text = "When recording starts";
+ this.tabPageStart.Text = "When recording starts ...";
this.tabPageStart.UseVisualStyleBackColor = true;
//
// groupBoxStartProgram
//
+ this.groupBoxStartProgram.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.groupBoxStartProgram.Controls.Add(this.labelStartParameters);
this.groupBoxStartProgram.Controls.Add(this.textBoxStartParameters);
this.groupBoxStartProgram.Controls.Add(this.buttonStartParameters);
@@ -282,6 +304,8 @@
//
// labelStartParameters
//
+ this.labelStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelStartParameters.Location = new System.Drawing.Point(8, 64);
this.labelStartParameters.Name = "labelStartParameters";
this.labelStartParameters.Size = new System.Drawing.Size(256, 16);
@@ -291,6 +315,8 @@
//
// labelStartProgram
//
+ this.labelStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelStartProgram.Location = new System.Drawing.Point(8, 24);
this.labelStartProgram.Name = "labelStartProgram";
this.labelStartProgram.Size = new System.Drawing.Size(256, 16);
@@ -308,11 +334,14 @@
this.tabPageEnd.Padding = new System.Windows.Forms.Padding(3);
this.tabPageEnd.Size = new System.Drawing.Size(320, 182);
this.tabPageEnd.TabIndex = 1;
- this.tabPageEnd.Text = "When recording ends";
+ this.tabPageEnd.Text = "When recording ends ...";
this.tabPageEnd.UseVisualStyleBackColor = true;
//
// groupBoxEndProgram
//
+ this.groupBoxEndProgram.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.groupBoxEndProgram.Controls.Add(this.labelEndParameters);
this.groupBoxEndProgram.Controls.Add(this.textBoxEndParameters);
this.groupBoxEndProgram.Controls.Add(this.buttonEndParameters);
@@ -322,30 +351,36 @@
this.groupBoxEndProgram.Location = new System.Drawing.Point(8, 64);
this.groupBoxEndProgram.Name = "groupBoxEndProgram";
this.groupBoxEndProgram.Size = new System.Drawing.Size(304, 112);
- this.groupBoxEndProgram.TabIndex = 8;
+ this.groupBoxEndProgram.TabIndex = 2;
this.groupBoxEndProgram.TabStop = false;
this.groupBoxEndProgram.Text = "What to do";
//
// labelEndParameters
//
+ this.labelEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelEndParameters.Location = new System.Drawing.Point(8, 64);
this.labelEndParameters.Name = "labelEndParameters";
this.labelEndParameters.Size = new System.Drawing.Size(256, 16);
- this.labelEndParameters.TabIndex = 5;
+ this.labelEndParameters.TabIndex = 3;
this.labelEndParameters.Text = "Parameters:";
this.labelEndParameters.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// labelEndProgram
//
+ this.labelEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelEndProgram.Location = new System.Drawing.Point(8, 24);
this.labelEndProgram.Name = "labelEndProgram";
this.labelEndProgram.Size = new System.Drawing.Size(256, 16);
- this.labelEndProgram.TabIndex = 2;
+ this.labelEndProgram.TabIndex = 0;
this.labelEndProgram.Text = "Program:";
this.labelEndProgram.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// groupBoxTest
//
+ this.groupBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxTest.Controls.Add(this.textBoxTest);
this.groupBoxTest.Controls.Add(this.buttonTest);
this.groupBoxTest.Controls.Add(this.buttonFindTestFile);
@@ -356,7 +391,7 @@
this.groupBoxTest.TabStop = false;
this.groupBoxTest.Text = "Test";
//
- // ExternalProgram
+ // Configuration
//
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -370,7 +405,7 @@
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(360, 356);
- this.Name = "ExternalProgram";
+ this.Name = "Configuration";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -32,50 +32,58 @@
public bool RunAtStart
{
- get { return radioButtonStartLaunch.Checked; }
- set { radioButtonStartLaunch.Checked = value; }
+ get
+ {
+ return radioButtonStartLaunch.Checked;
+ }
+ set
+ {
+ radioButtonStartLaunch.Checked = value;
+ radioButtonStartDoNothing.Checked = !value;
+ }
}
public bool RunAtEnd
{
- get { return radioButtonEndLaunch.Checked; }
- set { radioButtonEndLaunch.Checked = value; }
+ get
+ {
+ return radioButtonEndLaunch.Checked;
+ }
+ set
+ {
+ radioButtonEndLaunch.Checked = value;
+ radioButtonEndDoNothing.Checked = !value;
+ }
}
public string StartProgram
{
get { return textBoxStartProgram.Text; }
+ set { textBoxStartProgram.Text = value; }
}
public string StartParameters
{
get { return textBoxStartParameters.Text; }
+ set { textBoxStartParameters.Text = value; }
}
public string EndProgram
{
get { return textBoxEndProgram.Text; }
+ set { textBoxEndProgram.Text = value; }
}
public string EndParameters
{
get { return textBoxEndParameters.Text; }
+ set { textBoxEndParameters.Text = value; }
}
#endregion Properties
#region Constructors
- public Configuration(
- string startProgram, string startParameters, bool runAtStart,
- string endProgram, string endParameters, bool runAtEnd)
+ public Configuration()
{
InitializeComponent();
-
- radioButtonStartLaunch.Checked = runAtStart;
- textBoxStartProgram.Text = startProgram;
- textBoxStartParameters.Text = startParameters;
-
- radioButtonEndLaunch.Checked = runAtEnd;
- textBoxEndProgram.Text = endProgram;
- textBoxEndParameters.Text = endParameters;
}
#endregion Constructors
@@ -85,7 +93,6 @@
this.DialogResult = DialogResult.OK;
this.Close();
}
-
private void buttonCancel_Click(object sender, EventArgs e)
{
this.DialogResult = DialogResult.Cancel;
Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.resx
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.resx 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE2/Configuration.resx 2007-03-11 13:44:57 UTC (rev 181)
@@ -123,7 +123,4 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>150, 17</value>
</metadata>
- <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>150, 17</value>
- </metadata>
</root>
\ No newline at end of file
Copied: trunk/plugins/ComSkipLauncher TVE3 (from rev 180, trunk/plugins/ComSkipLauncher)
Modified: trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/ComSkipLauncher.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -22,7 +22,7 @@
public static readonly string MPConfigFile = Config.GetFolder(Config.Dir.Config) + "\\MediaPortal.xml";
public static readonly string DefaultProgram = "C:\\Program Files\\ComSkip\\ComSkip.exe";
- public static readonly string DefaultParameters = "--playnice --zpcut \"{0}\"";
+ public static readonly string DefaultParameters = "--playnice \"{0}\"";
#endregion Constants
@@ -79,10 +79,15 @@
{
LoadSettings();
- Configuration configuration = new Configuration(
- _startProgram, _startParameters, _runAtStart,
- _endProgram, _endParameters, _runAtEnd);
-
+ Configuration configuration = new Configuration();
+ configuration.RunAtStart = _runAtStart;
+ configuration.StartProgram = _startProgram;
+ configuration.StartParameters = _startParameters;
+
+ configuration.RunAtEnd = _runAtEnd;
+ configuration.EndProgram = _endProgram;
+ configuration.EndParameters = _endParameters;
+
if (configuration.ShowDialog() == DialogResult.OK)
{
_runAtStart = configuration.RunAtStart;
@@ -93,7 +98,6 @@
_endProgram = configuration.EndProgram;
_endParameters = configuration.EndParameters;
-
SaveSettings();
}
}
@@ -200,6 +204,10 @@
xmlwriter.SetValueAsBool("ComSkipLauncher", "RunAtStart", _runAtStart);
xmlwriter.SetValue("ComSkipLauncher", "StartProgram", _startProgram);
xmlwriter.SetValue("ComSkipLauncher", "StartParameters", _startParameters);
+
+ xmlwriter.SetValueAsBool("ComSkipLauncher", "RunAtEnd", _runAtEnd);
+ xmlwriter.SetValue("ComSkipLauncher", "EndProgram", _endProgram);
+ xmlwriter.SetValue("ComSkipLauncher", "EndParameters", _endParameters);
}
}
catch (Exception ex)
Modified: trunk/plugins/ComSkipLauncher TVE3/Configuration.Designer.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.Designer.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE3/Configuration.Designer.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -68,6 +68,7 @@
//
// 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(216, 288);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(56, 24);
@@ -78,6 +79,7 @@
//
// 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(280, 288);
this.buttonCancel.Name = "buttonCancel";
@@ -93,6 +95,7 @@
//
// buttonTest
//
+ this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonTest.Location = new System.Drawing.Point(272, 24);
this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(48, 20);
@@ -104,6 +107,8 @@
//
// textBoxTest
//
+ this.textBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxTest.Location = new System.Drawing.Point(8, 24);
this.textBoxTest.Name = "textBoxTest";
this.textBoxTest.Size = new System.Drawing.Size(224, 20);
@@ -112,6 +117,7 @@
//
// buttonFindTestFile
//
+ this.buttonFindTestFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonFindTestFile.Location = new System.Drawing.Point(240, 24);
this.buttonFindTestFile.Name = "buttonFindTestFile";
this.buttonFindTestFile.Size = new System.Drawing.Size(24, 20);
@@ -139,7 +145,6 @@
this.radioButtonStartLaunch.Name = "radioButtonStartLaunch";
this.radioButtonStartLaunch.Size = new System.Drawing.Size(96, 24);
this.radioButtonStartLaunch.TabIndex = 1;
- this.radioButtonStartLaunch.TabStop = true;
this.radioButtonStartLaunch.Text = "Launch:";
this.toolTips.SetToolTip(this.radioButtonStartLaunch, "Launch ComSkip to process the recording after it has finished");
this.radioButtonStartLaunch.UseVisualStyleBackColor = true;
@@ -147,18 +152,21 @@
//
// textBoxEndParameters
//
+ this.textBoxEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxEndParameters.Location = new System.Drawing.Point(8, 80);
this.textBoxEndParameters.Name = "textBoxEndParameters";
this.textBoxEndParameters.Size = new System.Drawing.Size(256, 20);
- this.textBoxEndParameters.TabIndex = 6;
+ this.textBoxEndParameters.TabIndex = 4;
this.toolTips.SetToolTip(this.textBoxEndParameters, "Provide command line parameters for the program");
//
// buttonEndParameters
//
+ this.buttonEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEndParameters.Location = new System.Drawing.Point(272, 80);
this.buttonEndParameters.Name = "buttonEndParameters";
this.buttonEndParameters.Size = new System.Drawing.Size(24, 20);
- this.buttonEndParameters.TabIndex = 7;
+ this.buttonEndParameters.TabIndex = 5;
this.buttonEndParameters.Text = "?";
this.toolTips.SetToolTip(this.buttonEndParameters, "Click here for a list of additional command line parameters");
this.buttonEndParameters.UseVisualStyleBackColor = true;
@@ -166,10 +174,11 @@
//
// buttonEndProgram
//
+ this.buttonEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEndProgram.Location = new System.Drawing.Point(272, 40);
this.buttonEndProgram.Name = "buttonEndProgram";
this.buttonEndProgram.Size = new System.Drawing.Size(24, 20);
- this.buttonEndProgram.TabIndex = 4;
+ this.buttonEndProgram.TabIndex = 2;
this.buttonEndProgram.Text = "...";
this.toolTips.SetToolTip(this.buttonEndProgram, "Locate the program you wish to launch");
this.buttonEndProgram.UseVisualStyleBackColor = true;
@@ -177,14 +186,18 @@
//
// textBoxEndProgram
//
+ this.textBoxEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxEndProgram.Location = new System.Drawing.Point(8, 40);
this.textBoxEndProgram.Name = "textBoxEndProgram";
this.textBoxEndProgram.Size = new System.Drawing.Size(256, 20);
- this.textBoxEndProgram.TabIndex = 3;
+ this.textBoxEndProgram.TabIndex = 1;
this.toolTips.SetToolTip(this.textBoxEndProgram, "The full location of the program to launch");
//
// textBoxStartParameters
//
+ this.textBoxStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxStartParameters.Location = new System.Drawing.Point(8, 80);
this.textBoxStartParameters.Name = "textBoxStartParameters";
this.textBoxStartParameters.Size = new System.Drawing.Size(256, 20);
@@ -193,6 +206,7 @@
//
// buttonStartParameters
//
+ this.buttonStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStartParameters.Location = new System.Drawing.Point(272, 80);
this.buttonStartParameters.Name = "buttonStartParameters";
this.buttonStartParameters.Size = new System.Drawing.Size(24, 20);
@@ -204,6 +218,7 @@
//
// buttonStartProgram
//
+ this.buttonStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStartProgram.Location = new System.Drawing.Point(272, 40);
this.buttonStartProgram.Name = "buttonStartProgram";
this.buttonStartProgram.Size = new System.Drawing.Size(24, 20);
@@ -215,6 +230,8 @@
//
// textBoxStartProgram
//
+ this.textBoxStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxStartProgram.Location = new System.Drawing.Point(8, 40);
this.textBoxStartProgram.Name = "textBoxStartProgram";
this.textBoxStartProgram.Size = new System.Drawing.Size(256, 20);
@@ -237,13 +254,15 @@
this.radioButtonEndLaunch.Name = "radioButtonEndLaunch";
this.radioButtonEndLaunch.Size = new System.Drawing.Size(96, 24);
this.radioButtonEndLaunch.TabIndex = 1;
- this.radioButtonEndLaunch.TabStop = true;
this.radioButtonEndLaunch.Text = "Launch:";
this.radioButtonEndLaunch.UseVisualStyleBackColor = true;
this.radioButtonEndLaunch.CheckedChanged += new System.EventHandler(this.radioButtonEndLaunch_CheckedChanged);
//
// tabControl
//
+ this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl.Controls.Add(this.tabPageStart);
this.tabControl.Controls.Add(this.tabPageEnd);
this.tabControl.Location = new System.Drawing.Point(8, 8);
@@ -262,11 +281,14 @@
this.tabPageStart.Padding = new System.Windows.Forms.Padding(3);
this.tabPageStart.Size = new System.Drawing.Size(320, 182);
this.tabPageStart.TabIndex = 0;
- this.tabPageStart.Text = "When recording starts";
+ this.tabPageStart.Text = "When recording starts ...";
this.tabPageStart.UseVisualStyleBackColor = true;
//
// groupBoxStartProgram
//
+ this.groupBoxStartProgram.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.groupBoxStartProgram.Controls.Add(this.labelStartParameters);
this.groupBoxStartProgram.Controls.Add(this.textBoxStartParameters);
this.groupBoxStartProgram.Controls.Add(this.buttonStartParameters);
@@ -282,6 +304,8 @@
//
// labelStartParameters
//
+ this.labelStartParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelStartParameters.Location = new System.Drawing.Point(8, 64);
this.labelStartParameters.Name = "labelStartParameters";
this.labelStartParameters.Size = new System.Drawing.Size(256, 16);
@@ -291,6 +315,8 @@
//
// labelStartProgram
//
+ this.labelStartProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelStartProgram.Location = new System.Drawing.Point(8, 24);
this.labelStartProgram.Name = "labelStartProgram";
this.labelStartProgram.Size = new System.Drawing.Size(256, 16);
@@ -308,11 +334,14 @@
this.tabPageEnd.Padding = new System.Windows.Forms.Padding(3);
this.tabPageEnd.Size = new System.Drawing.Size(320, 182);
this.tabPageEnd.TabIndex = 1;
- this.tabPageEnd.Text = "When recording ends";
+ this.tabPageEnd.Text = "When recording ends ...";
this.tabPageEnd.UseVisualStyleBackColor = true;
//
// groupBoxEndProgram
//
+ this.groupBoxEndProgram.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.groupBoxEndProgram.Controls.Add(this.labelEndParameters);
this.groupBoxEndProgram.Controls.Add(this.textBoxEndParameters);
this.groupBoxEndProgram.Controls.Add(this.buttonEndParameters);
@@ -322,30 +351,36 @@
this.groupBoxEndProgram.Location = new System.Drawing.Point(8, 64);
this.groupBoxEndProgram.Name = "groupBoxEndProgram";
this.groupBoxEndProgram.Size = new System.Drawing.Size(304, 112);
- this.groupBoxEndProgram.TabIndex = 8;
+ this.groupBoxEndProgram.TabIndex = 2;
this.groupBoxEndProgram.TabStop = false;
this.groupBoxEndProgram.Text = "What to do";
//
// labelEndParameters
//
+ this.labelEndParameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelEndParameters.Location = new System.Drawing.Point(8, 64);
this.labelEndParameters.Name = "labelEndParameters";
this.labelEndParameters.Size = new System.Drawing.Size(256, 16);
- this.labelEndParameters.TabIndex = 5;
+ this.labelEndParameters.TabIndex = 3;
this.labelEndParameters.Text = "Parameters:";
this.labelEndParameters.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// labelEndProgram
//
+ this.labelEndProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.labelEndProgram.Location = new System.Drawing.Point(8, 24);
this.labelEndProgram.Name = "labelEndProgram";
this.labelEndProgram.Size = new System.Drawing.Size(256, 16);
- this.labelEndProgram.TabIndex = 2;
+ this.labelEndProgram.TabIndex = 0;
this.labelEndProgram.Text = "Program:";
this.labelEndProgram.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// groupBoxTest
//
+ this.groupBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxTest.Controls.Add(this.textBoxTest);
this.groupBoxTest.Controls.Add(this.buttonTest);
this.groupBoxTest.Controls.Add(this.buttonFindTestFile);
@@ -356,7 +391,7 @@
this.groupBoxTest.TabStop = false;
this.groupBoxTest.Text = "Test";
//
- // ExternalProgram
+ // Configuration
//
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -370,7 +405,7 @@
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(360, 356);
- this.Name = "ExternalProgram";
+ this.Name = "Configuration";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
Modified: trunk/plugins/ComSkipLauncher TVE3/Configuration.cs
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE3/Configuration.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -32,50 +32,58 @@
public bool RunAtStart
{
- get { return radioButtonStartLaunch.Checked; }
- set { radioButtonStartLaunch.Checked = value; }
+ get
+ {
+ return radioButtonStartLaunch.Checked;
+ }
+ set
+ {
+ radioButtonStartLaunch.Checked = value;
+ radioButtonStartDoNothing.Checked = !value;
+ }
}
public bool RunAtEnd
{
- get { return radioButtonEndLaunch.Checked; }
- set { radioButtonEndLaunch.Checked = value; }
+ get
+ {
+ return radioButtonEndLaunch.Checked;
+ }
+ set
+ {
+ radioButtonEndLaunch.Checked = value;
+ radioButtonEndDoNothing.Checked = !value;
+ }
}
public string StartProgram
{
get { return textBoxStartProgram.Text; }
+ set { textBoxStartProgram.Text = value; }
}
public string StartParameters
{
get { return textBoxStartParameters.Text; }
+ set { textBoxStartParameters.Text = value; }
}
public string EndProgram
{
get { return textBoxEndProgram.Text; }
+ set { textBoxEndProgram.Text = value; }
}
public string EndParameters
{
get { return textBoxEndParameters.Text; }
+ set { textBoxEndParameters.Text = value; }
}
#endregion Properties
#region Constructors
- public Configuration(
- string startProgram, string startParameters, bool runAtStart,
- string endProgram, string endParameters, bool runAtEnd)
+ public Configuration()
{
InitializeComponent();
-
- radioButtonStartLaunch.Checked = runAtStart;
- textBoxStartProgram.Text = startProgram;
- textBoxStartParameters.Text = startParameters;
-
- radioButtonEndLaunch.Checked = runAtEnd;
- textBoxEndProgram.Text = endProgram;
- textBoxEndParameters.Text = endParameters;
}
#endregion Constructors
@@ -85,7 +93,6 @@
this.DialogResult = DialogResult.OK;
this.Close();
}
-
private void buttonCancel_Click(object sender, EventArgs e)
{
this.DialogResult = DialogResult.Cancel;
Modified: trunk/plugins/ComSkipLauncher TVE3/Configuration.resx
===================================================================
--- trunk/plugins/ComSkipLauncher/Configuration.resx 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/ComSkipLauncher TVE3/Configuration.resx 2007-03-11 13:44:57 UTC (rev 181)
@@ -123,7 +123,4 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>150, 17</value>
</metadata>
- <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>150, 17</value>
- </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -18,6 +18,25 @@
public partial class MacroEditor : Form
{
+ #region Constants
+
+ public const string RunProgramText = "Run Program";
+ public const string PauseText = "Pause";
+ public const string SerialCommandText = "Serial Command";
+ public const string MessageCommandText = "Message Command";
+ public const string KeystrokesCommandText = "Keystrokes Command";
+ public const string GoToScreenText = "Go To Screen";
+ public const string PopupMessageText = "Popup Message";
+ public const string ForceBlasterPortText = "Force Blaster Port";
+ public const string ForceBlasterSpeedText = "Force Blaster Speed";
+ public const string SetMultiMappingText = "Set Multi-Mapping";
+ public const string SetMouseModeText = "Set Mouse Mode";
+ public const string ToggleInputLayerText = "Toggle Input Handler Layer";
+ public const string ChangeWindowStateText = "Change Window State";
+ public const string GetFocusText = "Get Focus";
+
+ #endregion Constants
+
#region Variables
MceIrApi.BlasterPort _blastPort;
@@ -47,15 +66,20 @@
{
comboBoxCommands.Items.Clear();
- comboBoxCommands.Items.Add("Run Program");
- comboBoxCommands.Items.Add("Pause");
- comboBoxCommands.Items.Add("Serial Command");
- comboBoxCommands.Items.Add("Message Command");
- comboBoxCommands.Items.Add("Keystrokes Command");
- comboBoxCommands.Items.Add("Go To Screen");
- comboBoxCommands.Items.Add("Popup Message");
- comboBoxCommands.Items.Add("Force Blaster Port");
- comboBoxCommands.Items.Add("Force Blaster Speed");
+ comboBoxCommands.Items.Add(RunProgramText);
+ comboBoxCommands.Items.Add(PauseText);
+ comboBoxCommands.Items.Add(SerialCommandText);
+ comboBoxCommands.Items.Add(MessageCommandText);
+ comboBoxCommands.Items.Add(KeystrokesCommandText);
+ comboBoxCommands.Items.Add(GoToScreenText);
+ comboBoxCommands.Items.Add(PopupMessageText);
+ comboBoxCommands.Items.Add(ForceBlasterPortText);
+ comboBoxCommands.Items.Add(ForceBlasterSpeedText);
+ comboBoxCommands.Items.Add(SetMultiMappingText);
+ comboBoxCommands.Items.Add(SetMouseModeText);
+ comboBoxCommands.Items.Add(ToggleInputLayerText);
+ comboBoxCommands.Items.Add(ChangeWindowStateText);
+ comboBoxCommands.Items.Add(GetFocusText);
comboBoxCommands.Items.AddRange(MCEReplacement.GetIRList());
}
@@ -129,6 +153,31 @@
writer.WriteAttributeString("command", "SPEED");
writer.WriteAttributeString("cmdproperty", item.Substring(MCEReplacement.SpeedCommandPrefix.Length));
}
+ else if (item.StartsWith(MCEReplacement.SetMapCommandPrefix))
+ {
+ writer.WriteAttributeString("command", "MULTI_MAPPING");
+ writer.WriteAttributeString("cmdproperty", item.Substring(MCEReplacement.ChangeMMCommandPrefix.Length));
+ }
+ else if (item.StartsWith(MCEReplacement.SetMouseCommandPrefix))
+ {
+ writer.WriteAttributeString("command", "MOUSE_MODE");
+ writer.WriteAttributeString("cmdproperty", item.Substring(MCEReplacement.SetMouseCommandPrefix.Length));
+ }
+ else if (item.StartsWith(MCEReplacement.InputLayerCommand))
+ {
+ writer.WriteAttributeString("command", "INPUT_LAYER");
+ writer.WriteAttributeString("cmdproperty", "TOGGLE");
+ }
+ else if (item.StartsWith(MCEReplacement.WindowStateCommand))
+ {
+ writer.WriteAttributeString("command", "WINDOW_STATE");
+ writer.WriteAttributeString("cmdproperty", "TOGGLE");
+ }
+ else if (item.StartsWith(MCEReplacement.GetFocusCommand))
+ {
+ writer.WriteAttributeString("command", "GET_FOCUS");
+ writer.WriteAttributeString("cmdproperty", "");
+ }
writer.WriteEndElement();
}
@@ -204,6 +253,26 @@
case "SPEED":
listBoxMacro.Items.Add(MCEReplacement.SpeedCommandPrefix + commandProperty);
break;
+
+ case "MULTI_MAPPING":
+ listBoxMacro.Items.Add(MCEReplacement.SetMapCommandPrefix + commandProperty);
+ break;
+
+ case "MOUSE_MODE":
+ listBoxMacro.Items.Add(MCEReplacement.SetMouseCommandPrefix + commandProperty);
+ break;
+
+ case "INPUT_LAYER":
+ listBoxMacro.Items.Add(MCEReplacement.InputLayerCommand);
+ break;
+
+ case "WINDOW_STATE":
+ listBoxMacro.Items.Add(MCEReplacement.WindowStateCommand);
+ break;
+
+ case "GET_FOCUS":
+ listBoxMacro.Items.Add(MCEReplacement.GetFocusCommand);
+ break;
}
}
}
@@ -228,7 +297,7 @@
string selected = (string)comboBoxCommands.SelectedItem;
- if (selected == "Run Program")
+ if (selected == RunProgramText)
{
ExternalProgram externalProgram = new ExternalProgram();
@@ -237,7 +306,7 @@
listBoxMacro.Items.Add(MCEReplacement.RunCommandPrefix + externalProgram.CommandString);
}
- else if (selected == "Pause")
+ else if (selected == PauseText)
{
PauseTime pauseTime = new PauseTime();
@@ -246,7 +315,7 @@
listBoxMacro.Items.Add(MCEReplacement.PauseCommandPrefix + pauseTime.Time.ToString());
}
- else if (selected == "Serial Command")
+ else if (selected == SerialCommandText)
{
SerialCommand serialCommand = new SerialCommand();
if (serialCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -254,7 +323,7 @@
listBoxMacro.Items.Add(MCEReplacement.SerialCommandPrefix + serialCommand.CommandString);
}
- else if (selected == "Message Command")
+ else if (selected == MessageCommandText)
{
MessageCommand messageCommand = new MessageCommand();
if (messageCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -262,7 +331,7 @@
listBoxMacro.Items.Add(MCEReplacement.MessageCommandPrefix + messageCommand.CommandString);
}
- else if (selected == "Keystrokes Command")
+ else if (selected == KeystrokesCommandText)
{
KeysCommand keysCommand = new KeysCommand();
if (keysCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -270,7 +339,7 @@
listBoxMacro.Items.Add(MCEReplacement.KeyCommandPrefix + keysCommand.CommandString);
}
- else if (selected == "Go To Screen")
+ else if (selected == GoToScreenText)
{
GoToScreen goToScreen = new GoToScreen();
if (goToScreen.ShowDialog(this) == DialogResult.Cancel)
@@ -278,7 +347,7 @@
listBoxMacro.Items.Add(MCEReplacement.GoToCommandPrefix + goToScreen.Screen);
}
- else if (selected == "Popup Message")
+ else if (selected == PopupMessageText)
{
PopupMessage popupMessage = new PopupMessage();
if (popupMessage.ShowDialog(this) == DialogResult.Cancel)
@@ -286,7 +355,7 @@
listBoxMacro.Items.Add(MCEReplacement.PopupCommandPrefix + popupMessage.CommandString);
}
- else if (selected == "Force Blaster Port")
+ else if (selected == ForceBlasterPortText)
{
SelectBlasterPort selectBlasterPort = new SelectBlasterPort(_blastPort);
if (selectBlasterPort.ShowDialog(this) == DialogResult.Cancel)
@@ -294,7 +363,7 @@
listBoxMacro.Items.Add(MCEReplacement.PortCommandPrefix + selectBlasterPort.CommandString);
}
- else if (selected == "Force Blaster Speed")
+ else if (selected == ForceBlasterSpeedText)
{
SelectBlasterSpeed selectBlasterSpeed = new SelectBlasterSpeed(_blastSpeed);
if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel)
@@ -302,6 +371,34 @@
listBoxMacro.Items.Add(MCEReplacement.SpeedCommandPrefix + selectBlasterSpeed.CommandString);
}
+ else if (selected == SetMultiMappingText)
+ {
+ //SelectBlasterSpeed selectBlasterSpeed = new SelectBlasterSpeed(_blastSpeed);
+ //if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel)
+ //return;
+
+ listBoxMacro.Items.Add(MCEReplacement.SetMapCommandPrefix + "");
+ }
+ else if (selected == SetMouseModeText)
+ {
+ //SelectBlasterSpeed selectBlasterSpeed = new SelectBlasterSpeed(_blastSpeed);
+ //if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel)
+ //return;
+
+ listBoxMacro.Items.Add(MCEReplacement.SetMouseCommandPrefix + "TOGGLE");
+ }
+ else if (selected == ToggleInputLayerText)
+ {
+ listBoxMacro.Items.Add(MCEReplacement.InputLayerCommand);
+ }
+ else if (selected == ChangeWindowStateText)
+ {
+ listBoxMacro.Items.Add(MCEReplacement.WindowStateCommand);
+ }
+ else if (selected == GetFocusText)
+ {
+ listBoxMacro.Items.Add(MCEReplacement.GetFocusCommand);
+ }
else
{
listBoxMacro.Items.Add(MCEReplacement.BlastCommandPrefix + selected);
Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -86,12 +86,8 @@
numericUpDownButtonHeldDelay.Value = new Decimal(MCEReplacement.ButtonHeldDelay);
// Multi-Mapping ...
- foreach (string button in Enum.GetNames(typeof(RemoteButton)))
- if (button != "None")
- comboBoxMultiButton.Items.Add(button);
-
+ comboBoxMultiButton.Items.AddRange(Enum.GetNames(typeof(RemoteButton)));
comboBoxMultiButton.SelectedItem = Enum.GetName(typeof(RemoteButton), MCEReplacement.MultiMappingButton);
-
foreach (string map in MCEReplacement.MultiMaps)
listBoxMappings.Items.Add(map);
Modified: trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs
===================================================================
--- trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -58,7 +58,11 @@
/// <summary>
/// Get current Layer (Multi-Layer support)
/// </summary>
- public int CurrentLayer { get { return _currentLayer; } }
+ public int CurrentLayer
+ {
+ get { return _currentLayer; }
+ set { _currentLayer = value; }
+ }
/// <summary>
Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs
===================================================================
--- trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-03-11 10:03:18 UTC (rev 180)
+++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-03-11 13:44:57 UTC (rev 181)
@@ -26,7 +26,7 @@
#region Constants
- public const string PluginVersion = "MCE Replacement Plugin 1.0.2.0 for MediaPortal + SVN";
+ public const string PluginVersion = "MCE Replacement Plugin 1.0.3.0 for MediaPortal + SVN";
public const int MessageModeCommand = 0x0018;
@@ -37,6 +37,7 @@
public const string IRExtension = ".IR";
public const string MacroExtension = ".MACRO";
+ // Macro Commands
public const string RunCommandPrefix = "Run: ";
public const string BlastCommandPrefix = "Blast: ";
public const string PauseCommandPrefix = "Pause: ";
@@ -47,6 +48,11 @@
public const string PopupCommandPrefix = "Popup: ";
public const string PortCommandPrefix = "Port: ";
public const string SpeedCommandPrefix = "Speed: ";
+ public const string SetMapCommandPrefix = "Multi-Mapping: ";
+ public const string SetMouseCommandPrefix = "Mouse Mode: ";
+ public const string InputLayerCommand = "Toggle Input Layer";
+ public const string WindowStateCommand = "Toggle Window State";
+ public const string GetFocusCommand = "Get Focus";
public static readonly string AppDataFolder =
Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) +
@@ -870,7 +876,28 @@
ShowNotifyDialog("Multi-Mapping", setName, 2);
}
+ static void ChangeMultiMapping(string multiMapping)
+ {
+ for (int index = 0; index < MultiMaps.Length; index++)
+ {
+ if (MultiMaps[index] == multiMapping)
+ {
+ _multiMappingSet = index;
+ // Show the mapping set name on screen ...
+ string setName = MultiMaps[_multiMappingSet];
+
+ if (LogVerbose)
+ Log.Info("MCEReplacement: Multi-Mapping has changed to \"{0}\"", setName);
+
+ ShowNotifyDialog("Multi-Mapping", setName, 2);
+
+ return;
+ }
+ }
+
+ }
+
static void ShowNotifyDialog(string heading, string text, int timeout)
{
GUIDialogNotify dlgNotify = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
@@ -885,7 +912,7 @@
dlgNotify.SetHeading(heading);
dlgNotify.SetText(text);
dlgNotify.TimeOut = timeout;
- dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
+ dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
}
static void LoadSettings()
@@ -913,7 +940,7 @@
MouseModeEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MouseModeEnabled", false);
MouseModeStep = xmlreader.GetValueAsInt("MCEReplacement", "MouseModeStep", 10);
MouseModeAcceleration = xmlreader.GetValueAsBool("MCEReplacement", "MouseModeAcceleration", true);
-
+
// MediaPortal settings ...
_mpBasicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
_mpMCERemote = xmlreader.GetValueAsBool("remote", "MCE", false);
@@ -965,7 +992,7 @@
try
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(remoteFile))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(remoteFile))
{
int i = 0;
int codeValue;
@@ -1045,44 +1072,44 @@
switch (mappedEvent.Param)
{
- case "Label 1":
- matched = (msg.Label == paramValueString);
+ case "Label 1":
+ matched = (msg.Label == paramValueString);
break;
- case "Label 2":
- matched = (msg.Label2 == paramValueString);
+ case "Label 2":
+ matched = (msg.Label2 == paramValueString);
break;
- case "Label 3":
- matched = (msg.Label3 == paramValueString);
+ case "Label 3":
+ matched = (msg.Label3 == paramValueString);
break;
- case "Label 4":
- matched = (msg.Label4 == paramValueString);
+ case "Label 4":
+ matched = (msg.Label4 == paramValueString);
break;
- case "Parameter 1":
- matched = (msg.Param1 == paramValueInt);
+ case "Parameter 1":
+ matched = (msg.Param1 == paramValueInt);
break;
- case "Parameter 2":
- matched = (msg.Param2 == paramValueInt);
+ case "Parameter 2":
+ matched = (msg.Param2 == paramValueInt);
break;
- case "Parameter 3":
- matched = (msg.Param3 == paramValueInt);
+ case "Parameter 3":
+ matched = (msg.Param3 == paramValueInt);
break;
- case "Parameter 4":
- matched = (msg.Param4 == paramValueInt);
+ case "Parameter 4":
+ matched = (msg.Param4 == paramValueInt);
break;
- case "Sender Control ID":
- matched = (msg.SenderControlId == paramValueInt);
+ case "Sender Control ID":
+ matched = (msg.SenderControlId == paramValueInt);
break;
- case "Send To Target Window":
- matched = (msg.SendToTargetWindow == paramValueBool);
+ case "Send To Target Window":
+ matched = (msg.SendToTargetWindow == paramValueBool);
break;
- case "Target Control ID":
- matched = (msg.TargetControlId == paramValueInt);
+ case "Target Control ID":
+ matched = (msg.TargetControlId == paramValueInt);
break;
- case "Target Window ID":
- matched = (msg.TargetWindowId == paramValueInt);
+ case "Target Window ID":
+ matched = (msg.TargetWindowId == paramValueInt);
break;
- default:
- matched = false;
+ default:
+ matched = false;
break;
}
}
@@ -1118,7 +1145,7 @@
{
if (mappedEvent.MatchParam)
continue;
-
+
if (LogVerbose)
Log.Info("MCEReplacement: Event Mapper - Event \"{0}\"", Enum.GetName(typeof(MappedEvent.MappingEvent), eventType));
@@ -1552,9 +1579,110 @@
break;
}
- /*
+ case "MULTI_MAPPING":
+ {
+ if (InConfiguration)
+ MessageBox.Show(commandProperty, "Change Multi-Mapping Command", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ else if (MultiMappingEnabled)
+ ChangeMultiMapping(commandProperty);
+
+ break;
+ }
+
+ case "MOUSE_MODE":
+ {
+ if (InConfiguration)
+ {
+ MessageBox.Show("Command to toggle the Mouse Mode cannot be processed in configuration.", "Mouse Mode Command", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ break;
+ }
+
+ if (!MouseModeEnabled)
+ break;
+
+ switch (commandProperty)
+ {
+ case "ON":
+ MouseModeActive = true;
+ break;
+
+ case "OFF":
+ MouseModeActive = false;
+ break;
+
+ case "TOGGLE":
+ MouseModeActive = !MouseModeActive;
+ break;
+ }
+
+ string notifyMessage;
+
+ if (MouseModeActive...
[truncated message content] |
