From: <an...@us...> - 2007-06-09 11:11:15
|
Revision: 495 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=495&view=rev Author: and-81 Date: 2007-06-09 04:11:13 -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/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -29,20 +29,8 @@ #endregion Properties - #region Constructors + #region Constructor - public BlastCommand(string file) - { - InitializeComponent(); - - labelIRCommandFile.Text = file; - - comboBoxPort.Items.AddRange(Program.TransceiverInformation.Ports); - comboBoxPort.SelectedIndex = 0; - - comboBoxSpeed.Items.AddRange(Program.TransceiverInformation.Speeds); - comboBoxSpeed.SelectedIndex = 0; - } public BlastCommand(string[] commands) { InitializeComponent(); @@ -65,7 +53,7 @@ comboBoxSpeed.SelectedIndex = 0; } - #endregion Constructors + #endregion Constructor #region Buttons Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-06-09 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -242,7 +242,9 @@ } else { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -705,7 +705,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -29,20 +29,8 @@ #endregion Properties - #region Constructors + #region Constructor - public BlastCommand(string file) - { - InitializeComponent(); - - labelIRCommandFile.Text = file; - - comboBoxPort.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Ports); - comboBoxPort.SelectedIndex = 0; - - comboBoxSpeed.Items.AddRange(MPBlastZonePlugin.TransceiverInformation.Speeds); - comboBoxSpeed.SelectedIndex = 0; - } public BlastCommand(string[] commands) { InitializeComponent(); @@ -65,7 +53,7 @@ comboBoxSpeed.SelectedIndex = 0; } - #endregion Constructors + #endregion Constructor #region Buttons 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -324,7 +324,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -265,7 +265,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/BlastCommand.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -29,20 +29,8 @@ #endregion Properties - #region Constructors + #region Constructor - public BlastCommand(string file) - { - InitializeComponent(); - - labelIRCommandFile.Text = file; - - comboBoxPort.Items.AddRange(MPControlPlugin.TransceiverInformation.Ports); - comboBoxPort.SelectedIndex = 0; - - comboBoxSpeed.Items.AddRange(MPControlPlugin.TransceiverInformation.Speeds); - comboBoxSpeed.SelectedIndex = 0; - } public BlastCommand(string[] commands) { InitializeComponent(); @@ -65,7 +53,7 @@ comboBoxSpeed.SelectedIndex = 0; } - #endregion Constructors + #endregion Constructor #region Buttons Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-06-09 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -404,7 +404,9 @@ } else { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); if (blastCommand.ShowDialog(this) == DialogResult.Cancel) return; 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -537,7 +537,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); if (blastCommand.ShowDialog(this) == DialogResult.Cancel) return; @@ -746,7 +748,9 @@ } else if (command.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(commands); if (blastCommand.ShowDialog(this) == DialogResult.Cancel) return; 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -233,7 +233,9 @@ } else { - BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -366,7 +366,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -213,7 +213,9 @@ } else { - BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands); 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 08:11:46 UTC (rev 494) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs 2007-06-09 11:11:13 UTC (rev 495) @@ -390,7 +390,9 @@ } else if (selected.StartsWith(Common.CmdPrefixBlast)) { - BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, selected.Substring(Common.CmdPrefixBlast.Length)); + string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length)); + + BlastCommand blastCommand = new BlastCommand(Common.FolderIRCommands, commands); 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. |