Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [496] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-06-09 16:50:18
|
Revision: 496
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=496&view=rev
Author: and-81
Date: 2007-06-09 09:50:16 -0700 (Sat, 09 Jun 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -29,32 +29,45 @@
#endregion Properties
- #region Constructor
+ #region Constructors
+ public BlastCommand(string file)
+ {
+ InitializeComponent();
+
+ SetupPortsAndSpeeds();
+
+ labelIRCommandFile.Text = file;
+ }
public BlastCommand(string[] commands)
{
InitializeComponent();
+ SetupPortsAndSpeeds();
+
if (commands == null)
return;
labelIRCommandFile.Text = commands[0];
- comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
if (comboBoxPort.Items.Contains(commands[1]))
comboBoxPort.SelectedItem = commands[1];
- else
- comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
if (comboBoxSpeed.Items.Contains(commands[2]))
comboBoxSpeed.SelectedItem = commands[2];
- else
- comboBoxSpeed.SelectedIndex = 0;
}
- #endregion Constructor
+ #endregion Constructors
+ void SetupPortsAndSpeeds()
+ {
+ comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports);
+ comboBoxPort.SelectedIndex = 0;
+
+ comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds);
+ comboBoxSpeed.SelectedIndex = 0;
+ }
+
#region Buttons
private void buttonOK_Click(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -242,9 +242,7 @@
}
else
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(commands);
+ BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -705,9 +705,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(commands);
+ BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -29,32 +29,45 @@
#endregion Properties
- #region Constructor
+ #region Constructors
+ public BlastCommand(string file)
+ {
+ InitializeComponent();
+
+ SetupPortsAndSpeeds();
+
+ labelIRCommandFile.Text = file;
+ }
public BlastCommand(string[] commands)
{
InitializeComponent();
+ SetupPortsAndSpeeds();
+
if (commands == null)
return;
labelIRCommandFile.Text = commands[0];
- comboBoxPort.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Ports);
if (comboBoxPort.Items.Contains(commands[1]))
comboBoxPort.SelectedItem = commands[1];
- else
- comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Speeds);
if (comboBoxSpeed.Items.Contains(commands[2]))
comboBoxSpeed.SelectedItem = commands[2];
- else
- comboBoxSpeed.SelectedIndex = 0;
}
- #endregion Constructor
+ #endregion Constructors
+ void SetupPortsAndSpeeds()
+ {
+ comboBoxPort.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Ports);
+ comboBoxPort.SelectedIndex = 0;
+
+ comboBoxSpeed.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Speeds);
+ comboBoxSpeed.SelectedIndex = 0;
+ }
+
#region Buttons
private void buttonOK_Click(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -324,9 +324,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(commands);
+ BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixBlast + blastCommand.CommandString);
}
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -265,9 +265,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(commands);
+ BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -29,32 +29,45 @@
#endregion Properties
- #region Constructor
+ #region Constructors
+ public BlastCommand(string file)
+ {
+ InitializeComponent();
+
+ SetupPortsAndSpeeds();
+
+ labelIRCommandFile.Text = file;
+ }
public BlastCommand(string[] commands)
{
InitializeComponent();
+ SetupPortsAndSpeeds();
+
if (commands == null)
return;
labelIRCommandFile.Text = commands[0];
-
- comboBoxPort.Items.AddRange(MPControlPlugin.TransceiverInformation.Ports);
+
if (comboBoxPort.Items.Contains(commands[1]))
comboBoxPort.SelectedItem = commands[1];
- else
- comboBoxPort.SelectedIndex = 0;
- comboBoxSpeed.Items.AddRange(MPControlPlugin.TransceiverInformation.Speeds);
if (comboBoxSpeed.Items.Contains(commands[2]))
comboBoxSpeed.SelectedItem = commands[2];
- else
- comboBoxSpeed.SelectedIndex = 0;
}
#endregion Constructor
+ void SetupPortsAndSpeeds()
+ {
+ comboBoxPort.Items.AddRange(MPControlPlugin.TransceiverInformation.Ports);
+ comboBoxPort.SelectedIndex = 0;
+
+ comboBoxSpeed.Items.AddRange(MPControlPlugin.TransceiverInformation.Speeds);
+ comboBoxSpeed.SelectedIndex = 0;
+ }
+
#region Buttons
private void buttonOK_Click(object sender, EventArgs e)
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 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -537,9 +537,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(commands);
+ BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -39,7 +39,7 @@
#region Constants
- internal const string PluginVersion = "MP Control Plugin 1.0.3.1 for IR Server";
+ internal const string PluginVersion = "MP Control Plugin 1.0.3.2 for IR Server";
internal static readonly string CustomInputDevice = Config.GetFolder(Config.Dir.CustomInputDevice) + "\\";
internal static readonly string CustomInputDefault = Config.GetFolder(Config.Dir.CustomInputDefault) + "\\";
@@ -975,7 +975,7 @@
ServerHost = xmlreader.GetValueAsString("MPControlPlugin", "ServerHost", String.Empty);
LogVerbose = xmlreader.GetValueAsBool("MPControlPlugin", "LogVerbose", false);
- RequireFocus = xmlreader.GetValueAsBool("MPControlPlugin", "RequireFocus", false);
+ RequireFocus = xmlreader.GetValueAsBool("MPControlPlugin", "RequireFocus", true);
MultiMappingEnabled = xmlreader.GetValueAsBool("MPControlPlugin", "MultiMappingEnabled", false);
MultiMappingButton = (RemoteButton)xmlreader.GetValueAsInt("MPControlPlugin", "MultiMappingButton", (int)RemoteButton.Start);
EventMapperEnabled = xmlreader.GetValueAsBool("MPControlPlugin", "EventMapperEnabled", false);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.1")]
-[assembly: AssemblyFileVersionAttribute("1.0.3.1")]
+[assembly: AssemblyVersion("1.0.3.2")]
+[assembly: AssemblyFileVersionAttribute("1.0.3.2")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -233,9 +233,7 @@
}
else
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands);
+ BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -366,9 +366,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands);
+ BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -213,9 +213,7 @@
}
else
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands);
+ BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 11:11:13 UTC (rev 495)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 16:50:16 UTC (rev 496)
@@ -390,9 +390,7 @@
}
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
- string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
-
- BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands);
+ BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length));
if (blastCommand.ShowDialog(this) == DialogResult.Cancel)
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
