Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [492] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-06-08 13:33:16
|
Revision: 492
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=492&view=rev
Author: and-81
Date: 2007-06-08 06:33:09 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
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 2007-06-06 23:20:39 UTC (rev 491)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-06-08 13:33:09 UTC (rev 492)
@@ -387,7 +387,7 @@
ServiceController[] services = ServiceController.GetServices();
foreach (ServiceController service in services)
{
- if (service.ServiceName == "ehRecvr")
+ if (service.ServiceName.Equals("ehRecvr", StringComparison.InvariantCultureIgnoreCase))
{
if (service.Status != ServiceControllerStatus.Stopped && service.Status != ServiceControllerStatus.StopPending)
{
@@ -395,13 +395,21 @@
}
}
- if (service.ServiceName == "ehSched")
+ if (service.ServiceName.Equals("ehSched", StringComparison.InvariantCultureIgnoreCase))
{
if (service.Status != ServiceControllerStatus.Stopped && service.Status != ServiceControllerStatus.StopPending)
{
service.Stop();
}
}
+
+ if (service.ServiceName.Equals("mcrdsvc", StringComparison.InvariantCultureIgnoreCase))
+ {
+ if (service.Status != ServiceControllerStatus.Stopped && service.Status != ServiceControllerStatus.StopPending)
+ {
+ service.Stop();
+ }
+ }
}
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs 2007-06-06 23:20:39 UTC (rev 491)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs 2007-06-08 13:33:09 UTC (rev 492)
@@ -291,8 +291,9 @@
// treeMapping
//
this.treeMapping.AllowDrop = true;
- this.treeMapping.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
+ this.treeMapping.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.treeMapping.FullRowSelect = true;
this.treeMapping.HideSelection = false;
this.treeMapping.Location = new System.Drawing.Point(16, 56);
@@ -303,6 +304,7 @@
//
// labelExpand
//
+ this.labelExpand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelExpand.AutoSize = true;
this.labelExpand.Location = new System.Drawing.Point(328, 374);
this.labelExpand.Name = "labelExpand";
@@ -313,7 +315,7 @@
//
// buttonDefault
//
- this.buttonDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDefault.Location = new System.Drawing.Point(268, 442);
this.buttonDefault.Name = "buttonDefault";
this.buttonDefault.Size = new System.Drawing.Size(75, 23);
@@ -732,6 +734,7 @@
this.Controls.Add(this.groupBoxCondition);
this.Controls.Add(this.groupBoxLayer);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MinimumSize = new System.Drawing.Size(598, 509);
this.Name = "InputMappingForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
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-06 23:20:39 UTC (rev 491)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-06-08 13:33:09 UTC (rev 492)
@@ -1400,22 +1400,22 @@
break;
}
/*
- case Common.XmlTagWindowState:
- {
- if (InConfiguration)
- {
- MessageBox.Show("Command to toggle the window state cannot be processed in configuration.", "Window State Toggle Command", MessageBoxButtons.OK, MessageBoxIcon.Information);
- break;
- }
+ case Common.XmlTagWindowState:
+ {
+ if (InConfiguration)
+ {
+ MessageBox.Show("Command to toggle the window state cannot be processed in configuration.", "Window State Toggle Command", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ break;
+ }
- GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null);
+ GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null);
- if (GUIGraphicsContext.DX9Device.PresentationParameters.Windowed)
- msg.Param1 = 1;
+ if (GUIGraphicsContext.DX9Device.PresentationParameters.Windowed)
+ msg.Param1 = 1;
- GUIWindowManager.SendMessage(msg);
- break;
- }
+ GUIWindowManager.SendMessage(msg);
+ break;
+ }
*/
case Common.XmlTagFocus:
{
@@ -1539,34 +1539,34 @@
if (String.IsNullOrEmpty(command))
throw new ArgumentException("Null or empty argument", "command");
- if (command.StartsWith(Common.CmdPrefixMacro)) // Macro
+ if (command.StartsWith(Common.CmdPrefixMacro, StringComparison.InvariantCultureIgnoreCase)) // Macro
{
string fileName = FolderMacros + command.Substring(Common.CmdPrefixMacro.Length) + Common.FileExtensionMacro;
ProcessMacro(fileName);
}
- else if (command.StartsWith(Common.CmdPrefixBlast)) // IR Code
+ else if (command.StartsWith(Common.CmdPrefixBlast, StringComparison.InvariantCultureIgnoreCase)) // IR Code
{
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length));
string fileName = Common.FolderIRCommands + commands[0] + Common.FileExtensionIR;
BlastIR(fileName, commands[1], commands[2]);
}
- else if (command.StartsWith(Common.CmdPrefixRun)) // External Program
+ else if (command.StartsWith(Common.CmdPrefixRun, StringComparison.InvariantCultureIgnoreCase)) // External Program
{
string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length));
Common.ProcessRunCommand(commands);
}
- else if (command.StartsWith(Common.CmdPrefixSerial)) // Serial Port Command
+ else if (command.StartsWith(Common.CmdPrefixSerial, StringComparison.InvariantCultureIgnoreCase)) // Serial Port Command
{
string[] commands = Common.SplitSerialCommand(command.Substring(Common.CmdPrefixSerial.Length));
Common.ProcessSerialCommand(commands);
}
- else if (command.StartsWith(Common.CmdPrefixMessage)) // Message Command
+ else if (command.StartsWith(Common.CmdPrefixMessage, StringComparison.InvariantCultureIgnoreCase)) // Message Command
{
string[] commands = Common.SplitMessageCommand(command.Substring(Common.CmdPrefixMessage.Length));
Common.ProcessMessageCommand(commands);
}
- else if (command.StartsWith(Common.CmdPrefixKeys)) // Keystroke Command
+ else if (command.StartsWith(Common.CmdPrefixKeys, StringComparison.InvariantCultureIgnoreCase)) // Keystroke Command
{
string keyCommand = command.Substring(Common.CmdPrefixKeys.Length);
if (InConfiguration)
@@ -1574,7 +1574,7 @@
else
Common.ProcessKeyCommand(keyCommand);
}
- else if (command.StartsWith(Common.CmdPrefixGoto)) // Go To Screen
+ else if (command.StartsWith(Common.CmdPrefixGoto, StringComparison.InvariantCultureIgnoreCase)) // Go To Screen
{
MPCommands.ProcessGoTo(command.Substring(Common.CmdPrefixGoto.Length), MP_BasicHome);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
