You can subscribe to this list here.
2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
From: <mis...@us...> - 2007-10-13 22:45:00
|
Revision: 998 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=998&view=rev Author: misterd_sf Date: 2007-10-13 15:44:58 -0700 (Sat, 13 Oct 2007) Log Message: ----------- Fixed a typo Fixed osd libary - Not working after resize Fixed Dispose of osd library Modified Paths: -------------- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs trunk/plugins/My MPlayer/My MPlayer.xmp Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -49,18 +49,22 @@ /// Indicates, if the visibility of the window has changed /// </summary> protected bool _visibleChanged; + + /// <summary> + /// List of all elements of the window + /// </summary> + protected UIElementCollection _controlList; #endregion #region protected methods /// <summary> /// Generates the elements of a window, which are stored in the UIElementCollection /// </summary> - /// <param name="collection">Collection of all GUIControls</param> - protected void GenerateElements(UIElementCollection collection) { + protected void GenerateElements() { _elementList = new List<BaseElement>(); GUIControl temp; BaseElement element; - foreach (UIElement uiElement in collection) { + foreach (UIElement uiElement in _controlList) { temp = uiElement as GUIControl; if (temp != null) { element = GenerateElement(temp); Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -50,8 +50,8 @@ /// </summary> public DialogWindow() { _dialogWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU) as GUIDialogMenu; - UIElementCollection collection = _dialogWindow.controlList; - GenerateElements(collection); + _controlList = _dialogWindow.controlList; + GenerateElements(); } #endregion Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -155,7 +155,10 @@ public bool CheckForUpdate() { bool newVisible = _control.Visible; if (newVisible == _wasVisible) { - return CheckElementSpecificForUpdate(); + if (newVisible) { + return CheckElementSpecificForUpdate(); + } + return false; } _wasVisible = newVisible; if (newVisible) { Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -193,9 +193,15 @@ /// Disposes the object /// </summary> public override void Dispose() { - _focusBitmap.Dispose(); - _noFocusBitmap.Dispose(); - _hoverBitmap.Dispose(); + if (_focusBitmap != null) { + _focusBitmap.Dispose(); + } + if (_noFocusBitmap != null) { + _noFocusBitmap.Dispose(); + } + if (_hoverBitmap != null) { + _hoverBitmap.Dispose(); + } _font.Dispose(); } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -180,8 +180,12 @@ /// Disposes the object /// </summary> public override void Dispose() { - _checkFocusBitmap.Dispose(); - _checkNoFocusBitmap.Dispose(); + if (_checkFocusBitmap != null) { + _checkFocusBitmap.Dispose(); + } + if (_checkNoFocusBitmap != null) { + _checkNoFocusBitmap.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -66,8 +66,11 @@ /// </summary> /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { - if (_image.Visible &&!_image.FileName.Equals("black.bmp")) { - DrawElementAlternative(graph,GetImageRectangle()); + if (_image.Visible && !_image.FileName.Equals("black.bmp")) { + if (_image.FileName.Equals("video+2x.png")) { + Log.Debug("DISPLAYING 2X"); + } + DrawElementAlternative(graph, GetImageRectangle()); } } @@ -75,7 +78,9 @@ /// Disposes the object /// </summary> public override void Dispose() { - _bitmap.Dispose(); + if (_bitmap != null) { + _bitmap.Dispose(); + } } /// <summary> @@ -102,7 +107,7 @@ /// </summary> /// <param name="graph">Graphics</param> /// <param name="rectangle">Rectangle of the image</param> - public void DrawElementAlternative(Graphics graph,RectangleF rectangle) { + public void DrawElementAlternative(Graphics graph, RectangleF rectangle) { if (_bitmap != null) { graph.DrawImage(_bitmap, rectangle); } @@ -116,7 +121,7 @@ /// <param name="graph">Graphics</param> /// <param name="cacheFill">Status of the cache</param> public override void DrawCacheStatus(Graphics graph, float cacheFill) { - DrawElementAlternative(graph,GetImageRectangle()); + DrawElementAlternative(graph, GetImageRectangle()); } #endregion } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -124,8 +124,12 @@ /// Disposes the object /// </summary> public override void Dispose() { - _imageFocus.Dispose(); - _imageNonFocus.Dispose(); + if (_imageFocus != null) { + _imageFocus.Dispose(); + } + if (_imageNonFocus != null) { + _imageNonFocus.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -99,10 +99,18 @@ /// Disposes the object /// </summary> public override void Dispose() { - _leftBitmap.Dispose(); - _midBitmap.Dispose(); - _rightBitmap.Dispose(); - _backgroundBitmap.Dispose(); + if (_leftBitmap != null) { + _leftBitmap.Dispose(); + } + if (_midBitmap != null) { + _midBitmap.Dispose(); + } + if (_rightBitmap != null) { + _rightBitmap.Dispose(); + } + if (_backgroundBitmap != null) { + _backgroundBitmap.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -143,9 +143,15 @@ /// Disposes the object /// </summary> public override void Dispose() { - _backgroundBitmap.Dispose(); - _sliderBitmap.Dispose(); - _sliderFocusBitmap.Dispose(); + if (_backgroundBitmap != null) { + _backgroundBitmap.Dispose(); + } + if (_sliderBitmap != null) { + _sliderBitmap.Dispose(); + } + if (_sliderFocusBitmap != null) { + _sliderFocusBitmap.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -188,10 +188,18 @@ /// Disposes the object /// </summary> public override void Dispose() { - _focusBitmap.Dispose(); - _noFocusBitmap.Dispose(); - _altFocusBitmap.Dispose(); - _altNoFocusBitmap.Dispose(); + if (_focusBitmap != null) { + _focusBitmap.Dispose(); + } + if (_noFocusBitmap != null) { + _noFocusBitmap.Dispose(); + } + if (_altFocusBitmap != null) { + _altFocusBitmap.Dispose(); + } + if (_altNoFocusBitmap != null) { + _altNoFocusBitmap.Dispose(); + } _font.Dispose(); } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -122,9 +122,15 @@ /// Disposes the object /// </summary> public override void Dispose() { - _scrollBarBackground.Dispose(); - _scrollBarTop.Dispose(); - _scrollBarBottom.Dispose(); + if (_scrollBarBackground != null) { + _scrollBarBackground.Dispose(); + } + if (_scrollBarTop != null) { + _scrollBarTop.Dispose(); + } + if (_scrollBarBottom != null) { + _scrollBarBottom.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -148,7 +148,9 @@ /// Disposes the object /// </summary> public override void Dispose() { - _bitmap.Dispose(); + if (_bitmap != null) { + _bitmap.Dispose(); + } } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -90,11 +90,11 @@ /// </summary> public FullscreenWindow() { _fullscreenWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO) as GUIVideoFullscreen; - UIElementCollection collection = _fullscreenWindow.controlList; - GenerateElements(collection); + _controlList = _fullscreenWindow.controlList; + GenerateElements(); GUIControl temp; _cacheElements = new List<BaseElement>(); - foreach (UIElement element in collection) { + foreach (UIElement element in _controlList) { temp = element as GUIControl; if (temp.GetID == LABEL_ID) { _label = new LabelElement(temp); Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -28,7 +28,9 @@ using System.Drawing.Drawing2D; using System.Drawing.Text; using System.Threading; +using System.Windows.Forms; using MediaPortal.GUI.Library; +using MediaPortal.Player; namespace ExternalOSDLibrary { @@ -106,6 +108,21 @@ /// Indicates, if an update is needed /// </summary> private bool _needUpdate; + + /// <summary> + /// Event handler for the size changed event + /// </summary> + private EventHandler _sizeChanged; + + /// <summary> + /// MP parent form + /// </summary> + private Form _parentForm; + + /// <summary> + /// Indicates if MP is minimized + /// </summary> + private bool _minimized; #endregion #region ctor @@ -129,6 +146,10 @@ _dialogWindow = new DialogWindow(); _osdForm = new OSDForm(); _osdForm2 = new OSDForm(); + _parentForm = GUIGraphicsContext.form; + _sizeChanged = new EventHandler(parent_SizeChanged); + _parentForm.SizeChanged += _sizeChanged; + _minimized = false; } #endregion @@ -255,6 +276,27 @@ } #endregion + #region private methods + /// <summary> + /// Event handler to adjust this form to the new location/size of the parent + /// </summary> + /// <param name="sender"></param> + /// <param name="args"></param> + private void parent_SizeChanged(Object sender, EventArgs args) { + if (_parentForm.WindowState == FormWindowState.Minimized) { + Log.Debug("MINIMIZING"); + _minimized = true; + return; + } + if (!_minimized ) { + Log.Debug("NOT MINIMIZED. DIPOSING"); + singleton.Dispose(); + } + Log.Debug("RESET MINIMIZED"); + _minimized = false; + } + #endregion + #region IDisposable Member /// <summary> /// Disposes the osd controller @@ -265,6 +307,7 @@ _videoOSDWindow.Dispose(); _osdForm.Dispose(); _osdForm2.Dispose(); + _parentForm.SizeChanged -= _sizeChanged; singleton = null; } #endregion Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -39,13 +39,15 @@ public class OSDForm : Form { #region variables /// <summary> - /// Event handler for the position/location changed event + /// Event handler for the position changed event /// </summary> - private EventHandler _posLocChanged; + private EventHandler _positionChanged; + /// <summary> /// Parent form (MP) /// </summary> private Form _parent; + /// <summary> /// Image to be displayed /// </summary> @@ -58,7 +60,7 @@ /// </summary> public OSDForm() { this.SuspendLayout(); - _posLocChanged = new EventHandler(parent_PositionSizeChanged); + _positionChanged = new EventHandler(parent_PositionChanged); _parent = GUIGraphicsContext.form; this.BackColor = System.Drawing.Color.FromArgb(1, 1, 1); this.TransparencyKey = this.BackColor; @@ -72,9 +74,7 @@ this.ResumeLayout(); this.Opacity = 1; this.GotFocus += new EventHandler(OSDForm_GotFocus); - _parent.LocationChanged += _posLocChanged; - _parent.ClientSizeChanged += _posLocChanged; - _parent.SizeChanged += _posLocChanged; + _parent.LocationChanged += _positionChanged; } #endregion @@ -103,7 +103,7 @@ /// </summary> /// <param name="sender"></param> /// <param name="args"></param> - private void parent_PositionSizeChanged(Object sender, EventArgs args) { + private void parent_PositionChanged(Object sender, EventArgs args) { this.Location = _parent.PointToScreen(new Point(0, 0)); this.Size = _parent.ClientSize; this.BringToFront(); @@ -117,8 +117,8 @@ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> protected override void Dispose(bool disposing) { try { - _parent.LocationChanged -= _posLocChanged; - _parent.SizeChanged -= _posLocChanged; + _parent.LocationChanged -= _positionChanged; + _parent.SizeChanged -= _positionChanged; } catch (Exception ex) { Log.Error(ex); } @@ -149,7 +149,7 @@ public void ShowForm() { this.Enabled = true; this.Show(_parent); - parent_PositionSizeChanged(null, null); + parent_PositionChanged(null, null); this.BringToFront(); _parent.Focus(); this.Enabled = false; Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -50,7 +50,8 @@ /// </summary> public VideoOSDWindow() { _osdWindow = GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_OSD) as GUIVideoOSD; - GenerateElements(_osdWindow.controlList); + _controlList = _osdWindow.controlList; + GenerateElements(); } #endregion Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -607,6 +607,9 @@ _seekStepTimeout = 1500; else _seekStepTimeout = Convert.ToInt16(timeout); + + String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English"); + LocalizeStrings.Load(m_strLanguage); } try { loadXMLData(); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.resx 2007-10-13 22:44:58 UTC (rev 998) @@ -123,8 +123,8 @@ <data name="actionInfoLabel.Text" xml:space="preserve"> <value>For controlling the audio delay during playback. You have to assign the following actions of video fullscreen window (id=2005) to a key and/or a remote key: -- ACTION_AUDIO_DELAY_PLUS: Increases the subtitle delay -- ACTION_AUDIO_DELAY_MINUS: Decreases the subtitle delay +- ACTION_AUDIO_DELAY_PLUS: Increases the audio delay +- ACTION_AUDIO_DELAY_MINUS: Decreases the audio delay </value> </data> </root> \ No newline at end of file Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -107,6 +107,7 @@ /// </summary> public MPlayer_ExtPlayer() { _configManager = ConfigurationManager.getInstance(); + } #endregion Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-10-13 22:44:58 UTC (rev 998) @@ -177,6 +177,8 @@ displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer"); useMyVideoShares = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true); useMyMusicShares = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true); + String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English"); + LocalizeStrings.Load(m_strLanguage); } } #endregion Modified: trunk/plugins/My MPlayer/My MPlayer.xmp =================================================================== --- trunk/plugins/My MPlayer/My MPlayer.xmp 2007-10-13 07:17:48 UTC (rev 997) +++ trunk/plugins/My MPlayer/My MPlayer.xmp 2007-10-13 22:44:58 UTC (rev 998) @@ -8,7 +8,7 @@ <Source>ExternalOSDLibrary\bin\Release\ExternalOSDLibrary.dll</Source> <Id>04010</Id> <Option /> - <Guid>208539bd-cb3d-4403-936b-cc2ac5f9086b</Guid> + <Guid>6795e0e2-9a33-490e-abbd-d4b2ad280480</Guid> </File> <File> <FileName>MPlayer_ExtPlayer.dll</FileName> @@ -17,7 +17,7 @@ <Source>MPlayer_ExtPlayer\bin\Release\MPlayer_ExtPlayer.dll</Source> <Id>01050</Id> <Option /> - <Guid>129d0b43-6858-40ec-89ca-533818efa0cc</Guid> + <Guid>5dc5bf23-4fa7-4f7a-b6f0-4b8710d568d6</Guid> </File> <File> <FileName>MPlayer_ExtPlayer.xml</FileName> @@ -26,7 +26,7 @@ <Source>MPlayer_ExtPlayer\SampleConfiguration\MPlayer_ExtPlayer.xml</Source> <Id>04010</Id> <Option /> - <Guid>e8372d2f-64ea-44ac-9a08-02c357a3fcca</Guid> + <Guid>7ee7969e-9050-42e7-a303-8095710a44b8</Guid> </File> <File> <FileName>MPlayer_GUIPlugin.dll</FileName> @@ -35,7 +35,7 @@ <Source>MPlayer_GUIPlugin\bin\Release\MPlayer_GUIPlugin.dll</Source> <Id>01010</Id> <Option /> - <Guid>d35cb71e-87ba-4840-b18a-d8fc57f6830d</Guid> + <Guid>245d5e37-1414-4fb2-817a-13231dd16f36</Guid> </File> <File> <FileName>MPlayer_GUIPlugin.xml</FileName> @@ -44,7 +44,7 @@ <Source>MPlayer_GUIPlugin\SampleConfiguration\MPlayer_GUIPlugin.xml</Source> <Id>04010</Id> <Option /> - <Guid>a9bc8f02-b1d8-4aca-a9f9-0eb3875e05be</Guid> + <Guid>6dcc5696-13fe-4e2a-a758-49bbef2884bc</Guid> </File> <File> <FileName>MPlayer_Installer.dll</FileName> @@ -62,7 +62,7 @@ <Source>z:\Source-MediaPortal\MP-Plugins\My MPlayer\MPlayer-License.txt</Source> <Id>03010</Id> <Option /> - <Guid>63740cb8-9f67-4d7e-b4ca-4b95779a8539</Guid> + <Guid>924a2496-d3a2-4a81-b833-12d5a3949b5c</Guid> </File> <File> <FileName>myMPlayer.xml</FileName> @@ -71,7 +71,7 @@ <Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 4x3\myMPlayer.xml</Source> <Id>02010</Id> <Option>OutputFileName=|DefaultFile=True|</Option> - <Guid>526a6e68-e375-4d75-9d1c-47e6728b12db</Guid> + <Guid>5a0d8c57-11ce-4b3d-9db1-714737cc2430</Guid> </File> <File> <FileName>myMPlayer.xml</FileName> @@ -80,7 +80,7 @@ <Source>MPlayer_GUIPlugin\SkinFiles\BlueTwo 16x9\myMPlayer.xml</Source> <Id>02010</Id> <Option /> - <Guid>40d8ee5d-6ad2-4fa0-b51b-aff4990060d2</Guid> + <Guid>714afd17-fa2b-48fa-8b66-77c0bd763bae</Guid> </File> <File> <FileName>myMPlayer.xml</FileName> @@ -89,7 +89,7 @@ <Source>MPlayer_GUIPlugin\SkinFiles\PM III\myMPlayer.xml</Source> <Id>02010</Id> <Option /> - <Guid>ef453824-7cd5-4df6-823f-3bd53b6c0d77</Guid> + <Guid>22050ce2-3ad7-435a-9571-060e2e6fb70e</Guid> </File> <File> <FileName>strings_de.xml</FileName> @@ -98,7 +98,7 @@ <Source>MPlayer_ExtPlayer\Language\strings_de.xml</Source> <Id>04010</Id> <Option /> - <Guid>5f064f77-ceb3-481d-8345-b1efcf57763a</Guid> + <Guid>d306c631-541e-4715-b038-3386d45c93fe</Guid> </File> <File> <FileName>strings_en.xml</FileName> @@ -107,7 +107,7 @@ <Source>MPlayer_ExtPlayer\Language\strings_en.xml</Source> <Id>04010</Id> <Option /> - <Guid>4c978042-6d29-4466-ae50-b8a7a3b491c6</Guid> + <Guid>ad78ebba-3a89-4f30-8ff5-19cd4e6a3a0d</Guid> </File> <File> <FileName>strings_es.xml</FileName> @@ -116,7 +116,7 @@ <Source>MPlayer_ExtPlayer\Language\strings_es.xml</Source> <Id>04010</Id> <Option /> - <Guid>1fbbcd8a-2046-477a-ac65-4ff5148fe942</Guid> + <Guid>c0b77982-fb75-4b1e-97f2-a9aaa916d3e4</Guid> </File> <File> <FileName>strings_fr.xml</FileName> @@ -125,7 +125,7 @@ <Source>MPlayer_ExtPlayer\Language\strings_fr.xml</Source> <Id>04010</Id> <Option /> - <Guid>687d49d5-d1cb-43b9-b347-910666909884</Guid> + <Guid>c05f5fe3-df29-4868-a2e4-5272181c03e8</Guid> </File> </FileList> <StringList /> @@ -143,7 +143,7 @@ With the window plugin the user can play more medias like rtsp streams etc. than with the standard plugins of MP. It always uses MPlayer even if normally the internal players or an other external player is used by the other Plugins. -This version also includes a new OSD, which is simulates the OSD of MP.</Description> +This version also includes a new OSD, which simulates the OSD of MP.</Description> <Group>Video/Movies</Group> <Release>Stable </Release> </Option> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-13 07:17:51
|
Revision: 997 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=997&view=rev Author: rsparey Date: 2007-10-13 00:17:48 -0700 (Sat, 13 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-13 07:16:49 UTC (rev 996) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-13 07:17:48 UTC (rev 997) @@ -41,30 +41,9 @@ <animation effect="fade" time="250" delay="2000" >WindowOpen</animation> <animation effect="fade" time="500" delay="5">WindowClose</animation> </control> + <control> <type>image</type> - <decription>mid_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>186</posY> - <width>1390</width> - <height>365</height> - <texture>mid_strip.png</texture> - - </control> - <control> - <type>image</type> - <decription>bottom_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>547</posY> - <width>1390</width> - <height>18</height> - <texture>bottom_strip.png</texture> - - </control> - <control> - <type>image</type> <decription>top-strip</decription> <id>1</id> <posX>-12</posX> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-13 07:16:52
|
Revision: 996 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=996&view=rev Author: rsparey Date: 2007-10-13 00:16:49 -0700 (Sat, 13 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-11 15:32:29 UTC (rev 995) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-13 07:16:49 UTC (rev 996) @@ -41,10 +41,40 @@ <animation effect="fade" time="250" delay="2000" >WindowOpen</animation> <animation effect="fade" time="500" delay="5">WindowClose</animation> </control> + <control> + <type>image</type> + <decription>mid_strip</decription> + <id>1</id> + <posX>-12</posX> + <posY>186</posY> + <width>1390</width> + <height>365</height> + <texture>mid_strip.png</texture> + + </control> + <control> + <type>image</type> + <decription>bottom_strip</decription> + <id>1</id> + <posX>-12</posX> + <posY>547</posY> + <width>1390</width> + <height>18</height> + <texture>bottom_strip.png</texture> + + </control> + <control> + <type>image</type> + <decription>top-strip</decription> + <id>1</id> + <posX>-12</posX> + <posY>155</posY> + <width>1390</width> + <height>36</height> + <texture>top-strip.png</texture> + + </control> - - - <control> <description>home BM Radio</description> <type>button</type> @@ -68,28 +98,28 @@ <animation effect="slide" time="1000" start="-161,0" end="0,0" delay="1000" acceleration="-1" >WindowOpen</animation> <animation effect="fade" time="1000">WindowClose</animation> <animation effect="slide" time="1000" start="0,0" end="-161,0" acceleration="-1" >WindowClose</animation> - <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation> <animation effect="zoom" start="100,100" end="5,5" center="161,450" time="1000" acceleration ="-1" >Control.HasFocus(21)</animation> - - </control> <control> <description>MY LAST FM</description> <type>button</type> <id>21</id> - <posX>111</posX> - <posY>100</posY> - <width>100</width> - <height>200</height> - <textureFocus>Radio.png</textureFocus> - <textureNoFocus>Radio.png</textureNoFocus> + <posY>155</posY> + <posX>12</posX> + <height>36</height> + <width>209</width> + <align>left</align> + <textureFocus>tab_left_corner_down.png</textureFocus> + <textureNoFocus>tab_left_corner_up.png</textureNoFocus> <label>34000</label> <hyperlink>7890</hyperlink> <font>font13</font> <textcolor>white</textcolor> + <onup>11</onup> <ondown>2</ondown> <onleft>22</onleft> @@ -97,12 +127,10 @@ <visible>Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)</visible> <animation effect="fade" time="500" >Visible</animation> <animation effect="fade" time="500" >Hidden</animation> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> + <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> <animation effect="fade" time="400">WindowClose</animation> - <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> - <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation> - - </control> <control> <description>MY RADIO GUIDE</description> @@ -110,7 +138,7 @@ <id>22</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <posY>100</posY> + <posY>155</posY> <posX>221</posX> <label>533</label> <hyperlink>762</hyperlink> @@ -167,14 +195,13 @@ <animation effect="slide" time="1000" start="0,0" end="-422,0" delay="250" acceleration="-1" >Windowclose</animation> <animation effect="zoom" start="100,100" end="120,120" center="422,450" time="1000" acceleration ="-1" >Focus</animation> <animation effect="zoom" start="120,120" end="100,100" center="422,450" time="1000" acceleration ="-1" >Unfocus</animation> - </control> <control> <description>MY TV SERIES</description> <type>button</type> <id>31</id> - <posY>100</posY> + <posY>155</posY> <posX>12</posX> <height>36</height> <width>209</width> @@ -206,7 +233,7 @@ <id>32</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <posY>100</posY> + <posY>155</posY> <posX>221</posX> <label>5906</label> <hyperlink>5900</hyperlink> @@ -269,8 +296,8 @@ <description>Recorded TV</description> <type>button</type> <id>41</id> - <posY>120</posY> - <posX>600</posX> + <posY>155</posY> + <posX>12</posX> <height>36</height> <width>209</width> <align>left</align> @@ -301,7 +328,7 @@ <id>42</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <posY>100</posY> + <posY>155</posY> <posX>221</posX> <label>600</label> <hyperlink>600</hyperlink> @@ -333,7 +360,7 @@ <id>43</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <posY>100</posY> + <posY>155</posY> <posX>430</posX> <label>137</label> <hyperlink>604</hyperlink> @@ -418,7 +445,7 @@ <description>Playing Now</description> <type>button</type> <id>51</id> - <posY>100</posY> + <posY>155</posY> <posX>12</posX> <height>36</height> <width>209</width> @@ -450,7 +477,7 @@ <id>52</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <posY>100</posY> + <posY>155</posY> <posX>221</posX> <label>136</label> <hyperlink>500</hyperlink> @@ -533,7 +560,7 @@ </control> <control> <type>label</type> - <description>current selection Label</description> + <description>Basic Home Label</description> <id>1</id> <posX>251</posX> <posY>68</posY> @@ -554,8 +581,88 @@ + <control> + <description>Other submenu 1</description> + <type>button</type> + <id>71</id> + <posX>100</posX> + <posY>687</posY> + <height>25</height> + <width>200</width> + <align>left</align> + <textureFocus>menu_list_focus.png</textureFocus> + <textureNoFocus>menu_list_nofocus.png</textureNoFocus> + <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> + <label>weather</label> + <hyperlink>2600</hyperlink> + <font>font14</font> + <textcolor>white</textcolor> + + <onup>7</onup> + <ondown>71</ondown> + <onleft>71</onleft> + <onright>72</onright> + <animation effect="fade" time="500" >Visible</animation> + <animation effect="fade" time="500" >Hidden</animation> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> + <animation effect="fade" time="400" delay="500">WindowOpen</animation> + <animation effect="fade" time="400">WindowClose</animation> + </control> + <control> + <description>Other submenu 2</description> + <type>button</type> + <id>72</id> + <posX>299</posX> + <posY>687</posY> + <height>25</height> + <width>200</width> + <align>left</align> + <textureFocus>submenu_focus.png</textureFocus> + <textureNoFocus>submenu.png</textureNoFocus> + <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> + <label>plugins</label> + <hyperlink>34</hyperlink> + <font>font14</font> + <textcolor>white</textcolor> + + <onup>7</onup> + <ondown>72</ondown> + <onleft>71</onleft> + <onright>73</onright> + <animation effect="fade" time="500" >Visible</animation> + <animation effect="fade" time="500" >Hidden</animation> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> + <animation effect="fade" time="400" delay="500">WindowOpen</animation> + <animation effect="fade" time="400">WindowClose</animation> + </control> - + <control> + <description>Other submenu 3</description> + <type>button</type> + <id>73</id> + <posX>498</posX> + <posY>687</posY> + <height>25</height> + <width>200</width> + <align>left</align> + <textureFocus>submenu_focus.png</textureFocus> + <textureNoFocus>submenu.png</textureNoFocus> + <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> + <label>news</label> + <hyperlink>2700</hyperlink> + <font>font14</font> + <textcolor>white</textcolor> + + <onup>7</onup> + <ondown>73</ondown> + <onleft>72</onleft> + <onright>73</onright> + <animation effect="fade" time="500" >Visible</animation> + <animation effect="fade" time="500" >Hidden</animation> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> + <animation effect="fade" time="400" delay="500">WindowOpen</animation> + <animation effect="fade" time="400">WindowClose</animation> + </control> </controls> </window> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-11 15:32:35
|
Revision: 995 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=995&view=rev Author: rsparey Date: 2007-10-11 08:32:29 -0700 (Thu, 11 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.1.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.10.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.11.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.2.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.3.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.4.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.5.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.6.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.7.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.8.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.9.png Added Paths: ----------- trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.12.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.13.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.14.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.15.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.16.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.17.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.18.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.19.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.20.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.21.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.22.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.23.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.24.png Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-10 13:38:44 UTC (rev 994) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-11 15:32:29 UTC (rev 995) @@ -43,18 +43,8 @@ </control> - <control> - <type>image</type> - <decription>top-strip</decription> - <id>1</id> - <posX>12</posX> - <posY>100</posY> - <width>1342</width> - <height>36</height> - <texture>top-strip.png</texture> - - </control> + <control> <description>home BM Radio</description> <type>button</type> @@ -78,28 +68,28 @@ <animation effect="slide" time="1000" start="-161,0" end="0,0" delay="1000" acceleration="-1" >WindowOpen</animation> <animation effect="fade" time="1000">WindowClose</animation> <animation effect="slide" time="1000" start="0,0" end="-161,0" acceleration="-1" >WindowClose</animation> - <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation> <animation effect="zoom" start="100,100" end="5,5" center="161,450" time="1000" acceleration ="-1" >Control.HasFocus(21)</animation> + + </control> <control> <description>MY LAST FM</description> <type>button</type> <id>21</id> - <posY>100</posY> - <posX>12</posX> - <height>36</height> - <width>209</width> - <align>left</align> - <textureFocus>tab_left_corner_down.png</textureFocus> - <textureNoFocus>tab_left_corner_up.png</textureNoFocus> + <posX>111</posX> + <posY>100</posY> + <width>100</width> + <height>200</height> + <textureFocus>Radio.png</textureFocus> + <textureNoFocus>Radio.png</textureNoFocus> <label>34000</label> <hyperlink>7890</hyperlink> <font>font13</font> <textcolor>white</textcolor> - <onup>11</onup> <ondown>2</ondown> <onleft>22</onleft> @@ -107,10 +97,12 @@ <visible>Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)</visible> <animation effect="fade" time="500" >Visible</animation> <animation effect="fade" time="500" >Hidden</animation> - <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> - <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> <animation effect="fade" time="400" delay="500">WindowOpen</animation> <animation effect="fade" time="400">WindowClose</animation> + <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation> + + </control> <control> <description>MY RADIO GUIDE</description> @@ -175,6 +167,7 @@ <animation effect="slide" time="1000" start="0,0" end="-422,0" delay="250" acceleration="-1" >Windowclose</animation> <animation effect="zoom" start="100,100" end="120,120" center="422,450" time="1000" acceleration ="-1" >Focus</animation> <animation effect="zoom" start="120,120" end="100,100" center="422,450" time="1000" acceleration ="-1" >Unfocus</animation> + </control> <control> @@ -276,8 +269,8 @@ <description>Recorded TV</description> <type>button</type> <id>41</id> - <posY>100</posY> - <posX>12</posX> + <posY>120</posY> + <posX>600</posX> <height>36</height> <width>209</width> <align>left</align> @@ -540,7 +533,7 @@ </control> <control> <type>label</type> - <description>Basic Home Label</description> + <description>current selection Label</description> <id>1</id> <posX>251</posX> <posY>68</posY> @@ -561,88 +554,8 @@ - <control> - <description>Other submenu 1</description> - <type>button</type> - <id>71</id> - <posX>100</posX> - <posY>687</posY> - <height>25</height> - <width>200</width> - <align>left</align> - <textureFocus>menu_list_focus.png</textureFocus> - <textureNoFocus>menu_list_nofocus.png</textureNoFocus> - <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> - <label>weather</label> - <hyperlink>2600</hyperlink> - <font>font14</font> - <textcolor>white</textcolor> - - <onup>7</onup> - <ondown>71</ondown> - <onleft>71</onleft> - <onright>72</onright> - <animation effect="fade" time="500" >Visible</animation> - <animation effect="fade" time="500" >Hidden</animation> - <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> - <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <animation effect="fade" time="400">WindowClose</animation> - </control> - <control> - <description>Other submenu 2</description> - <type>button</type> - <id>72</id> - <posX>299</posX> - <posY>687</posY> - <height>25</height> - <width>200</width> - <align>left</align> - <textureFocus>submenu_focus.png</textureFocus> - <textureNoFocus>submenu.png</textureNoFocus> - <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> - <label>plugins</label> - <hyperlink>34</hyperlink> - <font>font14</font> - <textcolor>white</textcolor> - - <onup>7</onup> - <ondown>72</ondown> - <onleft>71</onleft> - <onright>73</onright> - <animation effect="fade" time="500" >Visible</animation> - <animation effect="fade" time="500" >Hidden</animation> - <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> - <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <animation effect="fade" time="400">WindowClose</animation> - </control> - <control> - <description>Other submenu 3</description> - <type>button</type> - <id>73</id> - <posX>498</posX> - <posY>687</posY> - <height>25</height> - <width>200</width> - <align>left</align> - <textureFocus>submenu_focus.png</textureFocus> - <textureNoFocus>submenu.png</textureNoFocus> - <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible> - <label>news</label> - <hyperlink>2700</hyperlink> - <font>font14</font> - <textcolor>white</textcolor> - - <onup>7</onup> - <ondown>73</ondown> - <onleft>72</onleft> - <onright>73</onright> - <animation effect="fade" time="500" >Visible</animation> - <animation effect="fade" time="500" >Hidden</animation> - <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation> - <animation effect="fade" time="400" delay="500">WindowOpen</animation> - <animation effect="fade" time="400">WindowClose</animation> - </control> + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.1.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.10.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.11.png =================================================================== (Binary files differ) Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.12.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.12.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.13.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.13.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.14.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.14.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.15.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.15.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.16.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.17.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.17.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.18.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.18.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.19.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.19.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.2.png =================================================================== (Binary files differ) Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.20.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.20.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.21.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.21.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.22.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.22.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.23.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.23.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.24.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.24.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.3.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.4.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.5.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.6.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.7.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.8.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/common.waiting.9.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-10 13:38:47
|
Revision: 994 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=994&view=rev Author: rsparey Date: 2007-10-10 06:38:44 -0700 (Wed, 10 Oct 2007) Log Message: ----------- added new waiting animation Modified Paths: -------------- trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Waiting Animation Layout.cdr Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Waiting Animation Layout.cdr =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-10 13:34:18
|
Revision: 993 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=993&view=rev Author: rsparey Date: 2007-10-10 06:34:16 -0700 (Wed, 10 Oct 2007) Log Message: ----------- fixed links in my video and dialogfile stacking Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogFileStacking.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogFileStacking.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogFileStacking.xml 2007-10-10 13:20:15 UTC (rev 992) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogFileStacking.xml 2007-10-10 13:34:16 UTC (rev 993) @@ -1,328 +1,365 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<window> - <id>2008</id> - <defaultcontrol>1</defaultcontrol> +<window> + <animation effect="fade" time="400">WindowOpen</animation> + <animation effect="fade" time="400">WindowClose</animation> + + <id>2008</id> + <defaultcontrol>1</defaultcontrol> <allowoverlay>yes</allowoverlay> <controls> - <control> - <description>CD1</description> - <type>button</type> - <id>1</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onleft>20</onleft> - <onright>2</onright> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + + + + + <control> + <type>image</type> + <id>0</id> + <width>1366</width> + <height>768</height> + <texture>black.bmp</texture> + <colordiffuse>60ffffff</colordiffuse> </control> + + <control> + <type>image</type> + <id>0</id> + <posX>292</posX> + <posY>155</posY> + <width>736</width> + <height>420</height> + <texture>context_background.png</texture> + <colordiffuse>ddffffff</colordiffuse> + </control> + <control> - <description>CD2</description> - <type>button</type> - <id>2</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>3</onright> - <onleft>1</onleft> + <description>Disk label</description> + <type>label</type> + <id>5</id> + <posX>550</posX> + <posY>240</posY> + <width>240</width> + <label>Select disk</label> + <font>font22</font> + <align>center</align> + <textcolor>white</textcolor> <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <animation effect="fade" time="200">WindowClose</animation> </control> + <control> - <description>CD3</description> - <type>button</type> - <id>3</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>4</onright> - <onleft>2</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD4</description> - <type>button</type> + <description>Heading text label</description> + <type>label</type> <id>4</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>5</onright> - <onleft>3</onleft> + <posX>520</posX> + <posY>166</posY> + <label>181</label> + <font>font13</font> + <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> + <control> - <description>CD5</description> - <type>button</type> - <id>5</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>6</onright> - <onleft>4</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD6</description> - <type>button</type> - <id>6</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>7</onright> - <onleft>5</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD7</description> - <type>button</type> - <id>7</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>8</onright> - <onleft>6</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD8</description> - <type>button</type> - <id>8</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>9</onright> - <onleft>7</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD9</description> - <type>button</type> - <id>9</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>10</onright> - <onleft>8</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD10</description> - <type>button</type> - <id>10</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>11</onright> - <onleft>9</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD11</description> - <type>button</type> - <id>11</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>12</onright> - <onleft>10</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD12</description> - <type>button</type> - <id>12</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>13</onright> - <onleft>11</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD13</description> - <type>button</type> - <id>13</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>14</onright> - <onleft>12</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD14</description> - <type>button</type> - <id>14</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>15</onright> - <onleft>13</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD15</description> - <type>button</type> - <id>15</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>16</onright> - <onleft>14</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD16</description> - <type>button</type> - <id>16</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>17</onright> - <onleft>15</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD17</description> - <type>button</type> - <id>17</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>18</onright> - <onleft>16</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD18</description> - <type>button</type> - <id>18</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>19</onright> - <onleft>17</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD19</description> - <type>button</type> - <id>19</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>20</onright> - <onleft>18</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> - <description>CD20</description> - <type>button</type> - <id>20</id> - <posX>1252</posX> - <posY>40</posY> - <width>85</width> - <height>85</height> - <label>-</label> - <textureFocus>button-cd-focus.png</textureFocus> - <textureNoFocus>button-cd-nofocus.png</textureNoFocus> - <onright>1</onright> - <onleft>19</onleft> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - </controls> + <description>exit button</description> + <type>button</type> + <id>2</id> + <posX>960</posX> + <posY>135</posY> + <width>70</width> + <height>70</height> + <textureFocus>exit_button_nofocus.png</textureFocus> + <textureNoFocus>exit_button_nofocus.png</textureNoFocus> + <label>-</label> + <onleft>36</onleft> + <onright>34</onright> + <ondown>35</ondown> + <onup>34</onup> + <colordiffuse>ddffffff</colordiffuse> + </control> + + + + + + <control> + <description>CD1</description> + <type>button</type> + <id>101</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onleft>120</onleft> + <onright>102</onright> + </control> + <control> + <description>CD2</description> + <type>button</type> + <id>102</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>103</onright> + <onleft>101</onleft> + </control> + <control> + <description>CD3</description> + <type>button</type> + <id>103</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>104</onright> + <onleft>102</onleft> + </control> + <control> + <description>CD4</description> + <type>button</type> + <id>104</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>105</onright> + <onleft>103</onleft> + </control> + <control> + <description>CD5</description> + <type>button</type> + <id>105</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>106</onright> + <onleft>104</onleft> + </control> + <control> + <description>CD6</description> + <type>button</type> + <id>106</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>107</onright> + <onleft>105</onleft> + </control> + <control> + <description>CD7</description> + <type>button</type> + <id>107</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>108</onright> + <onleft>106</onleft> + </control> + <control> + <description>CD8</description> + <type>button</type> + <id>108</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>109</onright> + <onleft>107</onleft> + </control> + <control> + <description>CD9</description> + <type>button</type> + <id>109</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>110</onright> + <onleft>108</onleft> + </control> + <control> + <description>CD10</description> + <type>button</type> + <id>110</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>111</onright> + <onleft>109</onleft> + </control> + <control> + <description>CD11</description> + <type>button</type> + <id>111</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>112</onright> + <onleft>110</onleft> + </control> + <control> + <description>CD12</description> + <type>button</type> + <id>112</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>113</onright> + <onleft>111</onleft> + </control> + <control> + <description>CD13</description> + <type>button</type> + <id>113</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>114</onright> + <onleft>112</onleft> + </control> + <control> + <description>CD14</description> + <type>button</type> + <id>114</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>115</onright> + <onleft>113</onleft> + </control> + <control> + <description>CD15</description> + <type>button</type> + <id>115</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>116</onright> + <onleft>114</onleft> + </control> + <control> + <description>CD16</description> + <type>button</type> + <id>116</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>117</onright> + <onleft>115</onleft> + </control> + <control> + <description>CD17</description> + <type>button</type> + <id>117</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>118</onright> + <onleft>116</onleft> + </control> + <control> + <description>CD18</description> + <type>button</type> + <id>118</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>119</onright> + <onleft>117</onleft> + </control> + <control> + <description>CD19</description> + <type>button</type> + <id>119</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>120</onright> + <onleft>118</onleft> + </control> + <control> + <description>CD20</description> + <type>button</type> + <id>120</id> + <posX>560</posX> + <posY>0</posY> + <width>150</width> + <height>150</height> + <label>-</label> + <textureFocus>button-cd-focus.png</textureFocus> + <textureNoFocus>button-cd-nofocus.png</textureNoFocus> + <onright>101</onright> + <onleft>109</onleft> + </control> + + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-10-10 13:20:15 UTC (rev 992) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-10-10 13:34:16 UTC (rev 993) @@ -217,7 +217,7 @@ <animation effect="fade" time="400">WindowOpen</animation> <posY>100</posY> <posX>1057</posX> - + <action>33</action> <font>font14</font> <ondown>99</ondown> <width>209</width> @@ -502,6 +502,7 @@ <posY>136</posY> <posX>848</posX> <label>654</label> + <action>100</action> <font>font14</font> <width>209</width> <height>36</height> @@ -525,6 +526,7 @@ <posY>136</posY> <posX>1057</posX> <label>983</label> + <font>font14</font> <width>209</width> <height>36</height> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-10-10 13:20:18
|
Revision: 992 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=992&view=rev Author: and-81 Date: 2007-10-10 06:20:15 -0700 (Wed, 10 Oct 2007) Log Message: ----------- Added Paths: ----------- trunk/plugins/IR Server Suite/Input Service/Input Service/Install.cmd trunk/plugins/IR Server Suite/Input Service/Input Service/Uninstall.cmd Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Install.cmd =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/Install.cmd (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/Install.cmd 2007-10-10 13:20:15 UTC (rev 992) @@ -0,0 +1 @@ +"Input Service.exe" /install \ No newline at end of file Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Uninstall.cmd =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/Uninstall.cmd (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/Uninstall.cmd 2007-10-10 13:20:15 UTC (rev 992) @@ -0,0 +1 @@ +"Input Service.exe" /uninstall \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-10-10 07:53:54
|
Revision: 991 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=991&view=rev Author: and-81 Date: 2007-10-10 00:53:52 -0700 (Wed, 10 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs trunk/plugins/IR Server Suite/IR Server Suite.sln 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.Designer.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/MacroEditor.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 trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.resx trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/MCEReplacement/Forms/LearnIR.cs trunk/plugins/MCEReplacement/Forms/MacroEditor.cs trunk/plugins/MCEReplacement/Forms/SetupForm.Designer.cs trunk/plugins/MCEReplacement/Forms/SetupForm.cs trunk/plugins/MCEReplacement/Forms/SetupForm.resx trunk/plugins/MCEReplacement/MCEReplacement.cs Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -64,7 +64,7 @@ this.buttonBlast.Size = new System.Drawing.Size(64, 24); this.buttonBlast.TabIndex = 1; this.buttonBlast.Text = "Blast IR"; - this.toolTips.SetToolTip(this.buttonBlast, "Blast learned IR code"); + this.toolTips.SetToolTip(this.buttonBlast, "Blast learned IR Command"); this.buttonBlast.UseVisualStyleBackColor = true; this.buttonBlast.Click += new System.EventHandler(this.buttonBlast_Click); // @@ -75,7 +75,7 @@ this.buttonLearnIR.Size = new System.Drawing.Size(64, 24); this.buttonLearnIR.TabIndex = 0; this.buttonLearnIR.Text = "Learn IR"; - this.toolTips.SetToolTip(this.buttonLearnIR, "Learn an IR code"); + this.toolTips.SetToolTip(this.buttonLearnIR, "Learn an IR Command"); this.buttonLearnIR.UseVisualStyleBackColor = true; this.buttonLearnIR.Click += new System.EventHandler(this.buttonLearnIR_Click); // Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -11,6 +11,7 @@ using IrssComms; using IrssUtils; +using IrssUtils.Forms; namespace Translator { @@ -39,7 +40,7 @@ string _description; string _command; - IrssUtils.Forms.LearnIR _learnIR; + LearnIR _learnIR; #endregion Variables @@ -514,7 +515,7 @@ } else if (radioButtonWindowTitle.Checked) { - IrssUtils.Forms.WindowList windowList = new IrssUtils.Forms.WindowList(); + WindowList windowList = new WindowList(); if (windowList.ShowDialog(this) == DialogResult.OK) textBoxMsgTarget.Text = windowList.SelectedWindowTitle; } @@ -567,7 +568,7 @@ private void buttonLearnIR_Click(object sender, EventArgs e) { - _learnIR = new IrssUtils.Forms.LearnIR( + _learnIR = new LearnIR( new LearnIrDelegate(Program.LearnIR), new BlastIrDelegate(Program.BlastIR), Program.TransceiverInformation.Ports); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -386,16 +386,24 @@ private void buttonTest_Click(object sender, EventArgs e) { - string fileName = textBoxName.Text.Trim(); + string name = textBoxName.Text.Trim(); - if (fileName.Length == 0) + if (name.Length == 0) { - MessageBox.Show(this, "You must supply a name for this macro", "Name missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + MessageBox.Show(this, "You must supply a name for this Macro", "Name missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + textBoxName.Focus(); return; } - fileName = Program.FolderMacros + fileName + Common.FileExtensionMacro; + if (!Common.IsValidFileName(name)) + { + MessageBox.Show(this, "You must supply a valid name for this Macro", "Invalid name", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + textBoxName.Focus(); + return; + } + string fileName = Program.FolderMacros + name + Common.FileExtensionMacro; + WriteToFile(fileName); try @@ -416,16 +424,24 @@ private void buttonOK_Click(object sender, EventArgs e) { - string fileName = textBoxName.Text.Trim(); + string name = textBoxName.Text.Trim(); - if (fileName.Length == 0) + if (name.Length == 0) { - MessageBox.Show(this, "You must supply a name for this macro", "Name missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + MessageBox.Show(this, "You must supply a name for this Macro", "Name missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + textBoxName.Focus(); return; } - fileName = Program.FolderMacros + fileName + Common.FileExtensionMacro; + if (!Common.IsValidFileName(name)) + { + MessageBox.Show(this, "You must supply a valid name for this Macro", "Invalid name", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + textBoxName.Focus(); + return; + } + string fileName = Program.FolderMacros + name + Common.FileExtensionMacro; + WriteToFile(fileName); this.DialogResult = DialogResult.OK; Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -504,8 +504,8 @@ // // buttonTestMacro // - this.buttonTestMacro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonTestMacro.Location = new System.Drawing.Point(368, 344); + this.buttonTestMacro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonTestMacro.Location = new System.Drawing.Point(208, 344); this.buttonTestMacro.Name = "buttonTestMacro"; this.buttonTestMacro.Size = new System.Drawing.Size(56, 24); this.buttonTestMacro.TabIndex = 4; Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -1013,7 +1013,7 @@ } private void serverToolStripMenuItem_Click(object sender, EventArgs e) { - IrssUtils.Forms.ServerAddress serverAddress = new IrssUtils.Forms.ServerAddress(Program.Config.ServerHost); + ServerAddress serverAddress = new ServerAddress(Program.Config.ServerHost); if (serverAddress.ShowDialog(this) == DialogResult.OK) { Program.StopClient(); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -315,14 +315,7 @@ IntPtr windowHandle = Win32.FindWindowByTitle(targetWindow); if (windowHandle != IntPtr.Zero) - { - IntPtr result; - Win32.SendMessageTimeout(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData), Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); - int lastError = Marshal.GetLastWin32Error(); - - if (result == IntPtr.Zero && lastError != 0) - throw new Win32Exception(lastError); - } + Win32.SendWindowsMessage(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData)); } static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e) @@ -434,20 +427,6 @@ _notifyIcon.ContextMenuStrip.Items.Add("&Quit", null, new EventHandler(ClickQuit)); } - /**/ - static bool SendMessageToWindow(IntPtr hWnd, Win32.WindowsMessage msg, int wParam, int lParam) - { - IntPtr result; - Win32.SendMessageTimeout(hWnd, (int)msg, new IntPtr(wParam), new IntPtr(lParam), Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); - int lastError = Marshal.GetLastWin32Error(); - - if (result == IntPtr.Zero && lastError != 0) - throw new Win32Exception(lastError); - - return true; - } - /**/ - static void ClickProgram(object sender, EventArgs e) { IrssLog.Info("Click Launch Program"); @@ -528,49 +507,49 @@ switch (menuItem.Text) { case "Next Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_NEXTWINDOW, 0); break; case "Last Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_PREVWINDOW, 0); break; case "Close Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_CLOSE, 0); break; case "Maximize Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_MAXIMIZE, 0); break; case "Minimize Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_MINIMIZE, 0); break; case "Restore Window": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_SYSCOMMAND, + (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_RESTORE, 0); break; @@ -597,25 +576,25 @@ case "Volume Up": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_APPCOMMAND, + (int)Win32.WindowsMessage.WM_APPCOMMAND, (int)Win32.AppCommand.APPCOMMAND_VOLUME_UP, 0); break; case "Volume Down": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_APPCOMMAND, + (int)Win32.WindowsMessage.WM_APPCOMMAND, (int)Win32.AppCommand.APPCOMMAND_VOLUME_DOWN, 0); break; case "Volume Mute": - SendMessageToWindow( + Win32.SendWindowsMessage( _currentForegroundWindow, - Win32.WindowsMessage.WM_APPCOMMAND, + (int)Win32.WindowsMessage.WM_APPCOMMAND, (int)Win32.AppCommand.APPCOMMAND_VOLUME_MUTE, 0); break; @@ -968,12 +947,16 @@ static void Hibernate() { IrssLog.Info("Hibernate"); - Application.SetSuspendState(PowerState.Hibernate, true, false); + + if (!Application.SetSuspendState(PowerState.Hibernate, false, false)) + IrssLog.Warn("Hibernate request was rejected by another application."); } static void Standby() { IrssLog.Info("Standby"); - Application.SetSuspendState(PowerState.Suspend, true, false); + + if (!Application.SetSuspendState(PowerState.Suspend, false, false)) + IrssLog.Warn("Standby request was rejected by another application."); } static void Reboot() { Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -13,6 +13,7 @@ using IrssComms; using IrssUtils; +using IrssUtils.Forms; namespace VirtualRemote { @@ -219,7 +220,7 @@ { Program.StopClient(); - IrssUtils.Forms.ServerAddress serverAddress = new IrssUtils.Forms.ServerAddress(Program.ServerHost); + ServerAddress serverAddress = new ServerAddress(Program.ServerHost); serverAddress.ShowDialog(this); Program.ServerHost = serverAddress.ServerHost; Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -14,6 +14,7 @@ using IrssComms; using IrssUtils; +using IrssUtils.Forms; namespace VirtualRemote { @@ -155,7 +156,7 @@ { if (String.IsNullOrEmpty(_serverHost)) { - IrssUtils.Forms.ServerAddress serverAddress = new IrssUtils.Forms.ServerAddress(); + ServerAddress serverAddress = new ServerAddress(); serverAddress.ShowDialog(); _serverHost = serverAddress.ServerHost; Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -13,6 +13,7 @@ using IrssComms; using IrssUtils; +using IrssUtils.Forms; namespace SkinEditor { @@ -331,7 +332,7 @@ } private void changeServerToolStripMenuItem_Click(object sender, EventArgs e) { - IrssUtils.Forms.ServerAddress serverAddress = new IrssUtils.Forms.ServerAddress(_serverHost); + ServerAddress serverAddress = new ServerAddress(_serverHost); serverAddress.ShowDialog(this); _serverHost = serverAddress.ServerHost; Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -441,14 +441,7 @@ IntPtr wordParam = new IntPtr(int.Parse(commands[3])); IntPtr longParam = new IntPtr(int.Parse(commands[4])); - //Win32.SendMessage(windowHandle, msg, wordParam, longParam); - - IntPtr result = IntPtr.Zero; - Win32.SendMessageTimeout(windowHandle, msg, wordParam, longParam, Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); - int lastError = Marshal.GetLastWin32Error(); - - if (result == IntPtr.Zero && lastError != 0) - throw new Win32Exception(lastError); + Win32.SendWindowsMessage(windowHandle, msg, wordParam, longParam); } /// <summary> Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -185,7 +185,7 @@ try { - string fileName = String.Format("{0}{1}{2}", _baseFolder, name, Common.FileExtensionIR); + string fileName = _baseFolder + name + Common.FileExtensionIR; string port = comboBoxPort.SelectedItem as string; _blastIrDelegate(fileName, port); Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -109,21 +109,28 @@ private void buttonLearn_Click(object sender, EventArgs e) { - string command = textBoxName.Text.Trim(); + string name = textBoxName.Text.Trim(); - if (command.Length == 0) + if (name.Length == 0) { - MessageBox.Show(this, "You must supply a name for this IR code", "Missing name", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + MessageBox.Show(this, "You must supply a name for this IR Command", "Missing name", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); textBoxName.Focus(); return; } + if (!Common.IsValidFileName(name)) + { + MessageBox.Show(this, "You must supply a valid name for this IR Command", "Invalid name", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + textBoxName.Focus(); + return; + } + textBoxName.Enabled = false; buttonLearn.Enabled = false; buttonTest.Enabled = false; buttonDone.Enabled = false; - string fileName = String.Format("{0}{1}{2}", Common.FolderIRCommands, command, Common.FileExtensionIR); + string fileName = Common.FolderIRCommands + name + Common.FileExtensionIR; if (_learnIrDelegate(fileName)) { @@ -157,7 +164,7 @@ try { - string fileName = String.Format("{0}{1}{2}", Common.FolderIRCommands, name, Common.FileExtensionIR); + string fileName = Common.FolderIRCommands + name + Common.FileExtensionIR; string port = comboBoxPort.SelectedItem as string; _blastIrDelegate(fileName, port); Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Mouse.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -25,15 +25,45 @@ [Flags] public enum MouseEvents { + /// <summary> + /// No Event. + /// </summary> None = 0x0000, + /// <summary> + /// Move. + /// </summary> Move = 0x0001, + /// <summary> + /// Left Button Down. + /// </summary> LeftDown = 0x0002, + /// <summary> + /// Left Button Up. + /// </summary> LeftUp = 0x0004, + /// <summary> + /// Right Button Down. + /// </summary> RightDown = 0x0008, + /// <summary> + /// Right Button Up. + /// </summary> RightUp = 0x0010, + /// <summary> + /// Middle Button Down. + /// </summary> MiddleDown = 0x0020, + /// <summary> + /// Middle Button Up. + /// </summary> MiddleUp = 0x0040, + /// <summary> + /// Scroll. + /// </summary> Scroll = 0x0800, + /// <summary> + /// Position Absolute. + /// </summary> Absolute = 0x8000 } @@ -42,8 +72,17 @@ /// </summary> public enum ScrollDir { + /// <summary> + /// No Scroll. + /// </summary> None = 0, + /// <summary> + /// Scroll Up. + /// </summary> Up = 120, + /// <summary> + /// Scroll Down. + /// </summary> Down = -120 } Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -17,337 +17,1251 @@ #region Enumerations + /// <summary> + /// Windows Message types. + /// </summary> public enum WindowsMessage { + /// <summary> + /// WM_ACTIVATE + /// </summary> WM_ACTIVATE = 0x6, + /// <summary> + /// WM_ACTIVATEAPP + /// </summary> WM_ACTIVATEAPP = 0x1C, + /// <summary> + /// WM_AFXFIRST + /// </summary> WM_AFXFIRST = 0x360, + /// <summary> + /// WM_AFXLAST + /// </summary> WM_AFXLAST = 0x37F, + /// <summary> + /// WM_APP + /// </summary> WM_APP = 0x8000, + /// <summary> + /// WM_APPCOMMAND + /// </summary> WM_APPCOMMAND = 0x319, + /// <summary> + /// WM_ASKCBFORMATNAME + /// </summary> WM_ASKCBFORMATNAME = 0x30C, + /// <summary> + /// WM_CANCELJOURNAL + /// </summary> WM_CANCELJOURNAL = 0x4B, + /// <summary> + /// WM_CANCELMODE + /// </summary> WM_CANCELMODE = 0x1F, + /// <summary> + /// WM_CAPTURECHANGED + /// </summary> WM_CAPTURECHANGED = 0x215, + /// <summary> + /// WM_CHANGECBCHAIN + /// </summary> WM_CHANGECBCHAIN = 0x30D, + /// <summary> + /// WM_CHAR + /// </summary> WM_CHAR = 0x102, + /// <summary> + /// + /// </summary> WM_CHARTOITEM = 0x2F, + /// <summary> + /// + /// </summary> WM_CHILDACTIVATE = 0x22, + /// <summary> + /// + /// </summary> WM_CLEAR = 0x303, + /// <summary> + /// + /// </summary> WM_CLOSE = 0x10, + /// <summary> + /// + /// </summary> WM_COMMAND = 0x111, + /// <summary> + /// + /// </summary> WM_COMPACTING = 0x41, + /// <summary> + /// + /// </summary> WM_COMPAREITEM = 0x39, + /// <summary> + /// + /// </summary> WM_CONTEXTMENU = 0x7B, + /// <summary> + /// + /// </summary> WM_COPY = 0x301, + /// <summary> + /// + /// </summary> WM_COPYDATA = 0x4A, + /// <summary> + /// + /// </summary> WM_CREATE = 0x1, + /// <summary> + /// + /// </summary> WM_CTLCOLORBTN = 0x135, + /// <summary> + /// + /// </summary> WM_CTLCOLORDLG = 0x136, + /// <summary> + /// + /// </summary> WM_CTLCOLOREDIT = 0x133, + /// <summary> + /// + /// </summary> WM_CTLCOLORLISTBOX = 0x134, + /// <summary> + /// + /// </summary> WM_CTLCOLORMSGBOX = 0x132, + /// <summary> + /// + /// </summary> WM_CTLCOLORSCROLLBAR = 0x137, + /// <summary> + /// + /// </summary> WM_CTLCOLORSTATIC = 0x138, + /// <summary> + /// + /// </summary> WM_CUT = 0x300, + /// <summary> + /// + /// </summary> WM_DEADCHAR = 0x103, + /// <summary> + /// + /// </summary> WM_DELETEITEM = 0x2D, + /// <summary> + /// + /// </summary> WM_DESTROY = 0x2, + /// <summary> + /// + /// </summary> WM_DESTROYCLIPBOARD = 0x307, + /// <summary> + /// + /// </summary> WM_DEVICECHANGE = 0x219, + /// <summary> + /// + /// </summary> WM_DEVMODECHANGE = 0x1B, + /// <summary> + /// + /// </summary> WM_DISPLAYCHANGE = 0x7E, + /// <summary> + /// + /// </summary> WM_DRAWCLIPBOARD = 0x308, + /// <summary> + /// + /// </summary> WM_DRAWITEM = 0x2B, + /// <summary> + /// + /// </summary> WM_DROPFILES = 0x233, + /// <summary> + /// + /// </summary> WM_ENABLE = 0xA, + /// <summary> + /// + /// </summary> WM_ENDSESSION = 0x16, + /// <summary> + /// + /// </summary> WM_ENTERIDLE = 0x121, + /// <summary> + /// + /// </summary> WM_ENTERMENULOOP = 0x211, + /// <summary> + /// + /// </summary> WM_ENTERSIZEMOVE = 0x231, + /// <summary> + /// + /// </summary> WM_ERASEBKGND = 0x14, + /// <summary> + /// + /// </summary> WM_EXITMENULOOP = 0x212, + /// <summary> + /// + /// </summary> WM_EXITSIZEMOVE = 0x232, + /// <summary> + /// + /// </summary> WM_FONTCHANGE = 0x1D, + /// <summary> + /// + /// </summary> WM_GETDLGCODE = 0x87, + /// <summary> + /// + /// </summary> WM_GETFONT = 0x31, + /// <summary> + /// + /// </summary> WM_GETHOTKEY = 0x33, + /// <summary> + /// + /// </summary> WM_GETICON = 0x7F, + /// <summary> + /// + /// </summary> WM_GETMINMAXINFO = 0x24, + /// <summary> + /// + /// </summary> WM_GETOBJECT = 0x3D, + /// <summary> + /// + /// </summary> WM_GETSYSMENU = 0x313, + /// <summary> + /// + /// </summary> WM_GETTEXT = 0xD, + /// <summary> + /// + /// </summary> WM_GETTEXTLENGTH = 0xE, + /// <summary> + /// + /// </summary> WM_HANDHELDFIRST = 0x358, + /// <summary> + /// + /// </summary> WM_HANDHELDLAST = 0x35F, + /// <summary> + /// + /// </summary> WM_HELP = 0x53, + /// <summary> + /// + /// </summary> WM_HOTKEY = 0x312, + /// <summary> + /// + /// </summary> WM_HSCROLL = 0x114, + /// <summary> + /// + /// </summary> WM_HSCROLLCLIPBOARD = 0x30E, + /// <summary> + /// + /// </summary> WM_ICONERASEBKGND = 0x27, + /// <summary> + /// + /// </summary> WM_IME_CHAR = 0x286, + /// <summary> + /// + /// </summary> WM_IME_COMPOSITION = 0x10F, + /// <summary> + /// + /// </summary> WM_IME_COMPOSITIONFULL = 0x284, + /// <summary> + /// + /// </summary> WM_IME_CONTROL = 0x283, + /// <summary> + /// + /// </summary> WM_IME_ENDCOMPOSITION = 0x10E, + /// <summary> + /// + /// </summary> WM_IME_KEYDOWN = 0x290, + /// <summary> + /// + /// </summary> WM_IME_KEYLAST = 0x10F, + /// <summary> + /// + /// </summary> WM_IME_KEYUP = 0x291, + /// <summary> + /// + /// </summary> WM_IME_NOTIFY = 0x282, + /// <summary> + /// + /// </summary> WM_IME_REQUEST = 0x288, + /// <summary> + /// + /// </summary> WM_IME_SELECT = 0x285, + /// <summary> + /// + /// </summary> WM_IME_SETCONTEXT = 0x281, + /// <summary> + /// + /// </summary> WM_IME_STARTCOMPOSITION = 0x10D, + /// <summary> + /// + /// </summary> WM_INITDIALOG = 0x110, + /// <summary> + /// + /// </summary> WM_INITMENU = 0x116, + /// <summary> + /// + /// </summary> WM_INITMENUPOPUP = 0x117, + /// <summary> + /// + /// </summary> WM_INPUTLANGCHANGE = 0x51, + /// <summary> + /// + /// </summary> WM_INPUTLANGCHANGEREQUEST = 0x50, + /// <summary> + /// + /// </summary> WM_KEYDOWN = 0x100, + /// <summary> + /// + /// </summary> WM_KEYFIRST = 0x100, + /// <summary> + /// + /// </summary> WM_KEYLAST = 0x108, + /// <summary> + /// + /// </summary> WM_KEYUP = 0x101, + /// <summary> + /// + /// </summary> WM_KILLFOCUS = 0x8, + /// <summary> + /// + /// </summary> WM_LBUTTONDBLCLK = 0x203, + /// <summary> + /// + /// </summary> WM_LBUTTONDOWN = 0x201, + /// <summary> + /// + /// </summary> WM_LBUTTONUP = 0x202, + /// <summary> + /// + /// </summary> WM_MBUTTONDBLCLK = 0x209, + /// <summary> + /// + /// </summary> WM_MBUTTONDOWN = 0x207, + /// <summary> + /// + /// </summary> WM_MBUTTONUP = 0x208, + /// <summary> + /// + /// </summary> WM_MDIACTIVATE = 0x222, + /// <summary> + /// + /// </summary> WM_MDICASCADE = 0x227, + /// <summary> + /// + /// </summary> WM_MDICREATE = 0x220, + /// <summary> + /// + /// </summary> WM_MDIDESTROY = 0x221, + /// <summary> + /// + /// </summary> WM_MDIGETACTIVE = 0x229, + /// <summary> + /// + /// </summary> WM_MDIICONARRANGE = 0x228, + /// <summary> + /// + /// </summary> WM_MDIMAXIMIZE = 0x225, + /// <summary> + /// + /// </summary> WM_MDINEXT = 0x224, + /// <summary> + /// + /// </summary> WM_MDIREFRESHMENU = 0x234, + /// <summary> + /// + /// </summary> WM_MDIRESTORE = 0x223, + /// <summary> + /// + /// </summary> WM_MDISETMENU = 0x230, + /// <summary> + /// + /// </summary> WM_MDITILE = 0x226, + /// <summary> + /// + /// </summary> WM_MEASUREITEM = 0x2C, + /// <summary> + /// + /// </summary> WM_MENUCHAR = 0x120, + /// <summary> + /// + /// </summary> WM_MENUCOMMAND = 0x126, + /// <summary> + /// + /// </summary> WM_MENUDRAG = 0x123, + /// <summary> + /// + /// </summary> WM_MENUGETOBJECT = 0x124, + /// <summary> + /// + /// </summary> WM_MENURBUTTONUP = 0x122, + /// <summary> + /// + /// </summary> WM_MENUSELECT = 0x11F, + /// <summary> + /// + /// </summary> WM_MOUSEACTIVATE = 0x21, + /// <summary> + /// + /// </summary> WM_MOUSEFIRST = 0x200, + /// <summary> + /// + /// </summary> WM_MOUSEHOVER = 0x2A1, + /// <summary> + /// + /// </summary> WM_MOUSELAST = 0x20A, + /// <summary> + /// + /// </summary> WM_MOUSELEAVE = 0x2A3, + /// <summary> + /// + /// </summary> WM_MOUSEMOVE = 0x200, + /// <summary> + /// + /// </summary> WM_MOUSEWHEEL = 0x20A, + /// <summary> + /// + /// </summary> WM_MOVE = 0x3, + /// <summary> + /// + /// </summary> WM_MOVING = 0x216, + /// <summary> + /// + /// </summary> WM_NCACTIVATE = 0x86, + /// <summary> + /// + /// </summary> WM_NCCALCSIZE = 0x83, + /// <summary> + /// + /// </summary> WM_NCCREATE = 0x81, + /// <summary> + /// + /// </summary> WM_NCDESTROY = 0x82, + /// <summary> + /// + /// </summary> WM_NCHITTEST = 0x84, + /// <summary> + /// + /// </summary> WM_NCLBUTTONDBLCLK = 0xA3, + /// <summary> + /// + /// </summary> WM_NCLBUTTONDOWN = 0xA1, + /// <summary> + /// + /// </summary> WM_NCLBUTTONUP = 0xA2, + /// <summary> + /// + /// </summary> WM_NCMBUTTONDBLCLK = 0xA9, + /// <summary> + /// + /// </summary> WM_NCMBUTTONDOWN = 0xA7, + /// <summary> + /// + /// </summary> WM_NCMBUTTONUP = 0xA8, + /// <summary> + /// + /// </summary> WM_NCMOUSEHOVER = 0x2A0, + /// <summary> + /// + /// </summary> WM_NCMOUSELEAVE = 0x2A2, + /// <summary> + /// + /// </summary> WM_NCMOUSEMOVE = 0xA0, + /// <summary> + /// + /// </summary> WM_NCPAINT = 0x85, + /// <summary> + /// + /// </summary> WM_NCRBUTTONDBLCLK = 0xA6, + /// <summary> + /// + /// </summary> WM_NCRBUTTONDOWN = 0xA4, + /// <summary> + /// + /// </summary> WM_NCRBUTTONUP = 0xA5, + /// <summary> + /// + /// </summary> WM_NEXTDLGCTL = 0x28, + /// <summary> + /// + /// </summary> WM_NEXTMENU = 0x213, + /// <summary> + /// + /// </summary> WM_NOTIFY = 0x4E, + /// <summary> + /// + /// </summary> WM_NOTIFYFORMAT = 0x55, + /// <summary> + /// + /// </summary> WM_NULL = 0x0, + /// <summary> + /// + /// </summary> WM_PAINT = 0xF, + /// <summary> + /// + /// </summary> WM_PAINTCLIPBOARD = 0x309, + /// <summary> + /// + /// </summary> WM_PAINTICON = 0x26, + /// <summary> + /// + /// </summary> WM_PALETTECHANGED = 0x311, + /// <summary> + /// + /// </summary> WM_PALETTEISCHANGING = 0x310, + /// <summary> + /// + /// </summary> WM_PARENTNOTIFY = 0x210, + /// <summary> + /// + /// </summary> WM_PASTE = 0x302, + /// <summary> + /// + /// </summary> WM_PENWINFIRST = 0x380, + /// <summary> + /// + /// </summary> WM_PENWINLAST = 0x38F, + /// <summary> + /// + /// </summary> WM_POWER = 0x48, + /// <summary> + /// + /// </summary> WM_PRINT = 0x317, + /// <summary> + /// + /// </summary> WM_PRINTCLIENT = 0x318, + /// <summary> + /// + /// </summary> WM_QUERYDRAGICON = 0x37, + /// <summary> + /// + /// </summary> WM_QUERYENDSESSION = 0x11, + /// <summary> + /// + /// </summary> WM_QUERYNEWPALETTE = 0x30F, + /// <summary> + /// + /// </summary> WM_QUERYOPEN = 0x13, + /// <summary> + /// + /// </summary> WM_QUERYUISTATE = 0x129, + /// <summary> + /// + /// </summary> WM_QUEUESYNC = 0x23, + /// <summary> + /// + /// </summary> WM_QUIT = 0x12, + /// <summary> + /// + /// </summary> WM_RBUTTONDBLCLK = 0x206, + /// <summary> + /// + /// </summary> WM_RBUTTONDOWN = 0x204, + /// <summary> + /// + /// </summary> WM_RBUTTONUP = 0x205, + /// <summary> + /// + /// </summary> WM_RENDERALLFORMATS = 0x306, + /// <summary> + /// + /// </summary> WM_RENDERFORMAT = 0x305, + /// <summary> + /// + /// </summary> WM_SETCURSOR = 0x20, + /// <summary> + /// + /// </summary> WM_SETFOCUS = 0x7, + /// <summary> + /// + /// </summary> WM_SETFONT = 0x30, + /// <summary> + /// + /// </summary> WM_SETHOTKEY = 0x32, + /// <summary> + /// + /// </summary> WM_SETICON = 0x80, + /// <summary> + /// + /// </summary> WM_SETREDRAW = 0xB, + /// <summary> + /// + /// </summary> WM_SETTEXT = 0xC, + /// <summary> + /// + /// </summary> WM_SETTINGCHANGE = 0x1A, + /// <summary> + /// + /// </summary> WM_SHOWWINDOW = 0x18, + /// <summary> + /// + /// </summary> WM_SIZE = 0x5, + /// <summary> + /// + /// </summary> WM_SIZECLIPBOARD = 0x30B, + /// <summary> + /// + /// </summary> WM_SIZING = 0x214, + /// <summary> + /// + /// </summary> WM_SPOOLERSTATUS = 0x2A, + /// <summary> + /// + /// </summary> WM_STYLECHANGED = 0x7D, + /// <summary> + /// + /// </summary> WM_STYLECHANGING = 0x7C, + /// <summary> + /// + /// </summary> WM_SYNCPAINT = 0x88, + /// <summary> + /// + /// </summary> WM_SYSCHAR = 0x106, + /// <summary> + /// + /// </summary> WM_SYSCOLORCHANGE = 0x15, + /// <summary> + /// + /// </summary> WM_SYSCOMMAND = 0x112, + /// <summary> + /// + /// </summary> WM_SYSDEADCHAR = 0x107, + /// <summary> + /// + /// </summary> WM_SYSKEYDOWN = 0x104, + /// <summary> + /// + /// </summary> WM_SYSKEYUP = 0x105, - WM_SYSTIMER = 0x118, // undocumented, see http://support.microsoft.com/?id=108938 + /// <summary> + /// WM_SYSTIMER, undocumented, see http://support.microsoft.com/?id=108938 + /// </summary> + WM_SYSTIMER = 0x118, + /// <summary> + /// + /// </summary> WM_TCARD = 0x52, + /// <summary> + /// + /// </summary> WM_TIMECHANGE = 0x1E, + /// <summary> + /// WM_TIMER + /// </summary> WM_TIMER = 0x113, + /// <summary> + /// WM_UNDO + /// </summary> WM_UNDO = 0x304, + /// <summary> + /// WM_UNINITMENUPOPUP + /// </summary> WM_UNINITMENUPOPUP = 0x125, + /// <summary> + /// WM_USER + /// </summary> WM_USER = 0x400, + /// <summary> + /// WM_USERCHANGED + /// </summary> WM_USERCHANGED = 0x54, + /// <summary> + /// WM_VKEYTOITEM + /// </summary> WM_VKEYTOITEM = 0x2E, + /// <summary> + /// WM_VSCROLL + /// </summary> WM_VSCROLL = 0x115, + /// <summary> + /// WM_VSCROLLCLIPBOARD + /// </summary> WM_VSCROLLCLIPBOARD = 0x30A, + /// <summary> + /// WM_WINDOWPOSCHANGED + /// </summary> WM_WINDOWPOSCHANGED = 0x47, + /// <summary> + /// WM_WINDOWPOSCHANGING + /// </summary> WM_WINDOWPOSCHANGING = 0x46, + /// <summary> + /// WM_WININICHANGE + /// </summary> WM_WININICHANGE = 0x1A, + /// <summary> + /// WM_XBUTTONDBLCLK + /// </summary> WM_XBUTTONDBLCLK = 0x20D, + /// <summary> + /// WM_XBUTTONDOWN + /// </summary> WM_XBUTTONDOWN = 0x20B, + /// <summary> + /// WM_XBUTTONUP + /// </summary> WM_XBUTTONUP = 0x20C } + /// <summary> + /// Windows Message System Commands. + /// </summary> public enum SysCommand { + /// <summary> + /// SC_SIZE + /// </summary> SC_SIZE = 0xF000, + /// <summary> + /// SC_MOVE + /// </summary> SC_MOVE = 0xF010, + /// <summary> + /// SC_MINIMIZE + /// </summary> SC_MINIMIZE = 0xF020, + /// <summary> + /// SC_MAXIMIZE + /// </summary> SC_MAXIMIZE = 0xF030, + /// <summary> + /// SC_NEXTWINDOW + /// </summary> SC_NEXTWINDOW = 0xF040, + /// <summary> + /// SC_PREVWINDOW + /// </summary> SC_PREVWINDOW = 0xF050, + /// <summary> + /// SC_CLOSE + /// </summary> SC_CLOSE = 0xF060, + /// <summary> + /// SC_VSCROLL + /// </summary> SC_VSCROLL = 0xF070, + /// <summary> + /// SC_HSCROLL + /// </summary> SC_HSCROLL = 0xF080, + /// <summary> + /// SC_MOUSEMENU + /// </summary> SC_MOUSEMENU = 0xF090, + /// <summary> + /// SC_KEYMENU + /// </summary> SC_KEYMENU = 0xF100, + /// <summary> + /// SC_ARRANGE + /// </summary> SC_ARRANGE = 0xF110, + /// <summary> + /// SC_RESTORE + /// </summary> SC_RESTORE = 0xF120, + /// <summary> + /// SC_TASKLIST + /// </summary> SC_TASKLIST = 0xF130, + /// <summary> + /// SC_SCREENSAVE + /// </summary> SC_SCREENSAVE = 0xF140, + /// <summary> + /// SC_HOTKEY + /// </summary> SC_HOTKEY = 0xF150, + /// <summary> + /// SC_DEFAULT + /// </summary> SC_DEFAULT = 0xF160, + /// <summary> + /// SC_MONITORPOWER + /// </summary> SC_MONITORPOWER = 0xF170, + /// <summary> + /// SC_CONTEXTHELP + /// </summary> SC_CONTEXTHELP = 0xF180, + /// <summary> + /// SC_SEPARATOR + /// </summary> SC_SEPARATOR = 0xF00F, - + + /// <summary> + /// SCF_ISSECURE + /// </summary> SCF_ISSECURE = 0x00000001, - + + /// <summary> + /// SC_ICON + /// </summary> SC_ICON = SC_MINIMIZE, + /// <summary> + /// SC_ZOOM + /// </summary> SC_ZOOM = SC_MAXIMIZE, } + /// <summary> + /// Windows Message App Commands. + /// </summary> public enum AppCommand { + /// <summary> + /// APPCOMMAND_BROWSER_BACKWARD + /// </summary> APPCOMMAND_BROWSER_BACKWARD = 1, + /// <summary> + /// APPCOMMAND_BROWSER_FORWARD + /// </summary> APPCOMMAND_BROWSER_FORWARD = 2, + /// <summary> + /// APPCOMMAND_BROWSER_REFRESH + /// </summary> APPCOMMAND_BROWSER_REFRESH = 3, + /// <summary> + /// APPCOMMAND_BROWSER_STOP + /// </summary> APPCOMMAND_BROWSER_STOP = 4, + /// <summary> + /// APPCOMMAND_BROWSER_SEARCH + /// </summary> APPCOMMAND_BROWSER_SEARCH = 5, + /// <summary> + /// APPCOMMAND_BROWSER_FAVORITES + /// </summary> APPCOMMAND_BROWSER_FAVORITES = 6, + /// <summary> + /// APPCOMMAND_BROWSER_HOME + /// </summary> APPCOMMAND_BROWSER_HOME = 7, + /// <summary> + /// APPCOMMAND_VOLUME_MUTE + /// </summary> APPCOMMAND_VOLUME_MUTE = 8, + /// <summary> + /// APPCOMMAND_VOLUME_DOWN + /// </summary> APPCOMMAND_VOLUME_DOWN = 9, + /// <summary> + /// APPCOMMAND_VOLUME_UP + /// </summary> APPCOMMAND_VOLUME_UP = 10, + /// <summary> + /// APPCOMMAND_MEDIA_NEXTTRACK + /// </summary> APPCOMMAND_MEDIA_NEXTTRACK = 11, + /// <summary> + /// APPCOMMAND_MEDIA_PREVIOUSTRACK + /// </summary> APPCOMMAND_MEDIA_PREVIOUSTRACK = 12, + /// <summary> + /// APPCOMMAND_MEDIA_STOP + /// </summary> APPCOMMAND_MEDIA_STOP = 13, + /// <summary> + /// APPCOMMAND_MEDIA_PLAY_PAUSE + /// </summary> APPCOMMAND_MEDIA_PLAY_PAUSE = 4143, + /// <summary> + /// APPCOMMAND_MEDIA_PLAY + /// </summary> APPCOMMAND_MEDIA_PLAY = 4142, + /// <summary> + /// APPCOMMAND_MEDIA_PAUSE + /// </summary> APPCOMMAND_MEDIA_PAUSE = 4143, + /// <summary> + /// APPCOMMAND_MEDIA_RECORD + /// </summary> APPCOMMAND_MEDIA_RECORD = 4144, + /// <summary> + /// APPCOMMAND_MEDIA_FASTFORWARD + /// </summary> APPCOMMAND_MEDIA_FASTFORWARD = 4145, + /// <summary> + /// APPCOMMAND_MEDIA_REWIND + /// </summary> APPCOMMAND_MEDIA_REWIND = 4146, + /// <summary> + /// APPCOMMAND_MEDIA_CHANNEL_UP + /// </summary> APPCOMMAND_MEDIA_CHANNEL_UP = 4147, + /// <summary> + /// APPCOMMAND_MEDIA_CHANNEL_DOWN + /// </summary> APPCOMMAND_MEDIA_CHANNEL_DOWN = 4148, } + /// <summary> + /// Send Windows Message with Timeout Flags. + /// </summary> [Flags] public enum SendMessageTimeoutFlags { + /// <summary> + /// Normal. + /// </summary> SMTO_NORMAL = 0x0000, + /// <summary> + /// Block. + /// </summary> SMTO_BLOCK = 0x0001, + /// <summary> + /// Abort if hung. + /// </summary> SMTO_ABORTIFHUNG = 0x0002, + /// <summary> + /// To timeout if not hung. + /// </summary> SMTO_NOTIMEOUTIFNOTHUNG = 0x0008, } + /// <summary> + /// Shutdown Reasons. + /// </summary> [Flags] public enum ShutdownReasons { + /// <summary> + /// MajorApplication + /// </summary> MajorApplication = 0x00040000, + /// <summary> + /// MajorHardware + /// </summary> MajorHardware = 0x00010000, + /// <summary> + /// MajorLegacyApi + /// </summary> MajorLegacyApi = 0x00070000, + /// <summary> + /// MajorOperatingSystem + /// </summary> MajorOperatingSystem = 0x00020000, + /// <summary> + /// MajorOther + /// </summary> MajorOther = 0x00000000, + /// <summary> + /// MajorPower + /// </summary> MajorPower = 0x00060000, + /// <summary> + /// MajorSoftware + /// </summary> MajorSoftware = 0x00030000, + /// <summary> + /// MajorSystem + /// </summary> MajorSystem = 0x00050000, + /// <summary> + /// MinorBlueScreen + /// </summary> MinorBlueScreen = 0x0000000F, + /// <summary> + /// MinorCordUnplugged + /// </summary> MinorCordUnplugged = 0x0000000b, + /// <summary> + /// MinorDisk + /// </summary> MinorDisk = 0x00000007, + /// <summary> + /// MinorEnvironment + /// </summary> MinorEnvironment = 0x0000000c, + /// <summary> + /// MinorHardwareDriver + /// </summary> MinorHardwareDriver = 0x0000000d, + /// <summary> + /// MinorHotfix + /// </summary> MinorHotfix = 0x00000011, + /// <summary> + /// MinorHung + /// </summary> MinorHung = 0x00000005, + /// <summary> + /// MinorInstallation + /// </summary> MinorInstallation = 0x00000002, + /// <summary> + /// MinorMaintenance + /// </summary> MinorMaintenance = 0x00000001, + /// <summary> + /// MinorMMC + /// </summary> MinorMMC = 0x00000019, + /// <summary> + /// MinorNetworkConnectivity + /// </summary> MinorNetworkConnectivity = 0x00000014, + /// <summary> + /// MinorNetworkCard + /// </summary> MinorNetworkCard = 0x00000009, + /// <summary> + /// MinorOther + /// </summary> MinorOther = 0x00000000, + /// <summary> + /// MinorOtherDriver + /// </summary> MinorOtherDriver = 0x0000000e, + /// <summary> + /// MinorPowerSupply + /// </summary> MinorPowerSupply = 0x0000000a, + /// <summary> + /// MinorProcessor + /// </summary> MinorProcessor = 0x00000008, + /// <summary> + /// MinorReconfig + /// </summary> MinorReconfig = 0x00000004, + /// <summary> + /// MinorSecurity + /// </summary> MinorSecurity = 0x00000013, + /// <summary> + /// MinorSecurityFix + /// </summary> MinorSecurityFix = 0x00000012, + /// <summary> + /// MinorSecurityFixUninstall + /// </summary> MinorSecurityFixUninstall = 0x00000018, + /// <summary> + /// MinorServicePack + /// </summary> MinorServicePack = 0x00000010, + /// <summary> + /// MinorServicePackUninstall + /// </summary> MinorServicePackUninstall = 0x00000016, + /// <summary> + /// MinorTermSrv + /// </summary> MinorTermSrv = 0x00000020, + /// <summary> + /// MinorUnstable + /// </summary> MinorUnstable = 0x00000006, + /// <summary> + /// MinorUpgrade + /// </summary> MinorUpgrade = 0x00000003, + /// <summary> + /// MinorWMI + /// </summary> MinorWMI = 0x00000015, + /// <summary> + /// FlagUserDefined + /// </summary> FlagUserDefined = 0x40000000, + //FlagPlanned = 0x80000000, } + /// <summary> + /// Exit Windows method. + /// </summary> [Flags] public enum ExitWindows { - // Must include ONE of the following: + /// <summary> + /// LogOff + /// </summary> LogOff = 0x00, + /// <summary> + /// ShutDown + /// </summary> ShutDown = 0x01, + /// <summary> + /// Reboot + /// </summary> Reboot = 0x02, + /// <summary> + /// PowerOff + /// </summary> PowerOff = 0x08, + /// <summary> + /// RestartApps + /// </summary> RestartApps = 0x40, - // Optionally include ONE of the following: + /// <summary> + /// Force + /// </summary> Force = 0x04, + /// <summary> + /// ForceIfHung + /// </summary> ForceIfHung = 0x10, } @@ -410,8 +1324,9 @@ string className, string windowName); + [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] - public static extern IntPtr SendMessageTimeout( + private static extern IntPtr SendMessageTimeout( IntPtr hWnd, int msg, IntPtr wParam, @@ -508,6 +1423,36 @@ #region Methods /// <summary> + /// Send a window message using the SendMessageTimeout method. + /// </summary> + /// <param name="hWnd">The window handle to send to.</param> + /// <param name="msg">The message.</param> + /// <param name="wParam">The wParam.</param> + /// <param name="lParam">The lParam.</param> + public static void SendWindowsMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam) + { + IntPtr result = IntPtr.Zero; + + SendMessageTimeout(hWnd, msg, wParam, lParam, SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); + int lastError = Marshal.GetLastWin32Error(); + + if (result == IntPtr.Zero && lastError != 0) + throw new Win32Exception(lastError); + } + + /// <summary> + /// Send a window message using the SendMessageTimeout method. + /// </summary> + /// <param name="hWnd">The window handle to send to.</param> + /// <param name="msg">The message.</param> + /// <param name="wParam">The wParam.</param> + /// <param name="lParam">The lParam.</param> + public static void SendWindowsMessage(IntPtr hWnd, int msg, int wParam, int lParam) + { + SendWindowsMessage(hWnd, msg, new IntPtr(wParam), new IntPtr(lParam)); + } + + /// <summary> /// Get a handle to the current foreground window. /// </summary> /// <returns>Handle to foreground window.</returns> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-10-10 07:53:52 UTC (rev 991) @@ -40,11 +40,12 @@ <DefineConstants> </DefineConstants> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DebugType>none</DebugType> + <DebugType>full</DebugType> <PlatformTarget>x86</PlatformTarget> <UseVSHostingProcess>false</UseVSHostingProcess> <ErrorReport>prompt</ErrorReport> <DocumentationFile>bin\x86\Debug\IRServerPluginInterface.XML</DocumentationFile> + <DebugSymbols>true</DebugSymbols> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\x86\Release\</OutputPath> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -347,7 +347,7 @@ doc.Load(ConfigurationFile); _irTransRemoteModel = doc.DocumentElement.Attributes["RemoteModel"].Value; - _irTransServerAddress = doc.DocumentElement.Attributes["IrssUtils.Forms.ServerAddress"].Value; + _irTransServerAddress = doc.DocumentElement.Attributes["ServerAddress"].Value; _irTransServerPort = int.Parse(doc.DocumentElement.Attributes["ServerPort"].Value); } #if TRACE @@ -380,7 +380,7 @@ writer.WriteStartElement("settings"); // <settings> writer.WriteAttributeString("RemoteModel", _irTransRemoteModel.ToString()); - writer.WriteAttributeString("IrssUtils.Forms.ServerAddress", _irTransServerAddress.ToString()); + writer.WriteAttributeString("ServerAddress", _irTransServerAddress.ToString()); writer.WriteAttributeString("ServerPort", _irTransServerPort.ToString()); writer.WriteEndElement(); // </settings> Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -236,7 +236,7 @@ /// <summary> /// Send an IR Command. /// </summary> - /// <param name="code">IR code data to send.</param> + /// <param name="code">IR Command data to send.</param> /// <param name="port">IR port to send to.</param> public abstract void Send(IrCode code, uint port); Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-09 21:19:45 UTC (rev 990) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-10 07:53:52 UTC (rev 991) @@ -199,7 +199,7 @@ public override void Start() { #if DEBUG - DebugOpen("MicrosoftMceTransceiver_DriverReplacement.log"); + DebugOpen("\\MicrosoftMceTransceiver_DriverReplacement.log"); DebugWriteLine("DriverReplacement.Start()"); #endif @@ -263,8 +263,8 @@ /// </summary> public override void Suspend() { - //Stop(); - WriteSync(StopPacket); + Stop(); + //WriteSync(StopPacket); } /// <summary> @@ -272,8 +272,8 @@ /// </summary> public override void Resume() { - //Start(); - WriteSync(StartPacket); + Start(); + //WriteSync(StartPacket); } /// <summary> @@ -340,7 +340,7 @@ /// <summary> /// Send an IR Command. /// </summary> - /// <param name="code">IR code data to send.</param> + /// <param name="code">IR Command data to send.</param> /// <param name="port">IR port to send to.</param> public override void Send(IrCode code, uint port) { Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transcei... [truncated message content] |
From: <che...@us...> - 2007-10-09 21:19:55
|
Revision: 990 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=990&view=rev Author: chef_koch Date: 2007-10-09 14:19:45 -0700 (Tue, 09 Oct 2007) Log Message: ----------- changed the readme a bit, what do you think about it? Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/README.txt Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 21:01:38 UTC (rev 989) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 21:19:45 UTC (rev 990) @@ -1,3 +1,46 @@ +============================== +=== MyPrograms Alternative === +============================== + +----------------- +-- Plugin Info -- +----------------- + +Version: 0.1 +Release date: 2007-??-?? + +Author: northern, chefkoch, based on work by weabeard + +Forums: http://forum.team-mediaportal.com/my_programs_update-t21757.html?t=21757 +Download: http://www.team-mediaportal.com/files/Download/MediaPortalInstaller(MPI)/Games/MyProgramsAlt/ + +svn branch: http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/myGUIProgramsAlt/ + +------------------ +-- What's this? -- +------------------ + +......blabla History, changes since old plugin, new features, ... blabla + +------------------ +-- Known Issues -- +------------------ + + +--------------- +-- ChangeLog -- +--------------- +2007-10-09: chefkoch : new readme layout +2007-10-09: chefkoch : fixed navigation in bluetwo skin file + + + + + + +---------------- +-- more infos -- +---------------- WIP on an alternative/update to myprograms. Still features and bugs to fix. Do NOT USE on your real MP-installation, only for tests.. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-09 21:01:51
|
Revision: 989 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=989&view=rev Author: chef_koch Date: 2007-10-09 14:01:38 -0700 (Tue, 09 Oct 2007) Log Message: ----------- added a question/suggestion Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/README.txt Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 20:56:11 UTC (rev 988) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 21:01:38 UTC (rev 989) @@ -54,7 +54,9 @@ .: Things to clear :. --------------------- +Would it be possible to keep the downloaded infos in db, when doing a reimport, and only delete the info for files which does not exists anymore? + Add some more specific emulator support.. - using emulator ids??? yes at some point. this could benefit automatic downloads etc - easier application image assigning together with thumbsdir -> we also could provide icons for most common system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-09 20:56:15
|
Revision: 988 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=988&view=rev Author: chef_koch Date: 2007-10-09 13:56:11 -0700 (Tue, 09 Oct 2007) Log Message: ----------- moved the screenshot a bit down, so that it does not cover the reimport button also uploaded a skin file for project mayhem to it's svn repository Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-10-09 20:35:35 UTC (rev 987) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-10-09 20:56:11 UTC (rev 988) @@ -60,7 +60,7 @@ <animation effect="slide" time="500" end="0,-300">WindowClose</animation> <id>6</id> <posX>60</posX> - <posY>230</posY> + <posY>267</posY> <width>190</width> <height>190</height> <texture /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-09 20:35:42
|
Revision: 987 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=987&view=rev Author: chef_koch Date: 2007-10-09 13:35:35 -0700 (Tue, 09 Oct 2007) Log Message: ----------- fixed navigation Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-10-09 20:35:02 UTC (rev 986) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-10-09 20:35:35 UTC (rev 987) @@ -40,7 +40,7 @@ <id>4</id> <label>457</label> <onright>50</onright> - <ondown>3</ondown> + <ondown>5</ondown> </control> <control> <description>Reimport</description> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-09 20:35:06
|
Revision: 986 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=986&view=rev Author: chef_koch Date: 2007-10-09 13:35:02 -0700 (Tue, 09 Oct 2007) Log Message: ----------- try to catch an exception Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-10-09 20:34:28 UTC (rev 985) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-10-09 20:35:02 UTC (rev 986) @@ -919,14 +919,21 @@ if (btnSortBy != null) btnSortBy.SortChanged += new SortEventHandler(SortChanged); - if (currentApplicationItem != null) + try { - currentApplicationItem = this.dbHandlerInstance.GetAppByID(currentApplicationItem.ApplicationItemId); - prevFilepath = currentApplicationItem.DefaultFilepath(); + if (currentApplicationItem != null) + { + currentApplicationItem = this.dbHandlerInstance.GetAppByID(currentApplicationItem.ApplicationItemId); + prevFilepath = currentApplicationItem.DefaultFilepath(); + } + else + { + prevFilepath = ""; + } } - else + catch (Exception ex) { - prevFilepath = ""; + Log.Error("currentapplication == null error\n{0}\n{1}", ex.Message, ex.StackTrace); } UpdateListControl(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-09 20:34:32
|
Revision: 985 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=985&view=rev Author: chef_koch Date: 2007-10-09 13:34:28 -0700 (Tue, 09 Oct 2007) Log Message: ----------- added a bug and question about logging ;) Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/README.txt Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 16:00:36 UTC (rev 984) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-09 20:34:28 UTC (rev 985) @@ -39,6 +39,10 @@ BUGS: - When starting the configuration and the "myProgramsAltPreconfiguration.xml" is missing, it will throw an exception. + + - Exception when opening the plugin in GUI, something with currentapplication == null, catched it with try{}catch{}-statement + + - when an fileitem without albumtag is focused a logmsg is written -> OK, but should this msg also be logged when it's only a backbutton [..] !? FEATURES: Add some more specific emulator support.. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-09 16:00:42
|
Revision: 984 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=984&view=rev Author: rsparey Date: 2007-10-09 09:00:36 -0700 (Tue, 09 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/obsoulete/Foofaraw Layout1.cdr Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/obsoulete/Foofaraw Layout1.cdr =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-10-09 13:14:05
|
Revision: 983 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=983&view=rev Author: rsparey Date: 2007-10-09 06:14:00 -0700 (Tue, 09 Oct 2007) Log Message: ----------- working with layout fixed text bug in music now playing screen Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogDateTime.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogPictureInfo.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicPlayingNow.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogTvGuide.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmdetails.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmsleeptimer.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mypvrguide.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myrecipes.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mystatusprefs.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvchannel.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvgenre.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml Added Paths: ----------- trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_down_nofocus_dimmed.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_up_nofocus_dimmed.png Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogDateTime.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogDateTime.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogDateTime.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -91,10 +91,10 @@ <onleft>2</onleft> <onright>3</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -113,10 +113,10 @@ <onleft>2</onleft> <onright>3</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -146,10 +146,10 @@ <onleft>4</onleft> <onright>5</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -167,10 +167,10 @@ <onleft>4</onleft> <onright>6</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -189,10 +189,10 @@ <onleft>5</onleft> <onright>7</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -235,10 +235,10 @@ <onleft>7</onleft> <onright>8</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -257,10 +257,10 @@ <onleft>7</onleft> <onright>9</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -290,10 +290,10 @@ <onleft>9</onleft> <onright>10</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -311,10 +311,10 @@ <onleft>9</onleft> <onright>11</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> @@ -333,10 +333,10 @@ <onleft>10</onleft> <onright>11</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogPictureInfo.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogPictureInfo.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogPictureInfo.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -2,7 +2,7 @@ <window> <id>2014</id> <defaultcontrol>21</defaultcontrol> - <allowoverlay>no</allowoverlay> + <allowoverlay>yes</allowoverlay> <controls> @@ -14,9 +14,9 @@ <decription>mid_strip</decription> <id>1</id> <posX>12</posX> - <posY>186</posY> + <posY>136</posY> <width>1342</width> - <height>365</height> + <height>420</height> <texture>mid_strip.png</texture> <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_down_nofocus_dimmed.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_down_nofocus_dimmed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_up_nofocus_dimmed.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/page_up_nofocus_dimmed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicPlayingNow.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicPlayingNow.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicPlayingNow.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -81,7 +81,8 @@ <texture>hover_my music.png</texture> <animation effect="fade" time="500">WindowOpen</animation> </control> - + + <control> <type>image</type> @@ -94,18 +95,29 @@ <texture>-</texture> <centered>yes</centered> <zoom>yes</zoom> + <texture flipY="true" diffuse="Thumb_Mask.png">-</texture> </control> + + <control> + <type>image</type> + <id>1</id> + <posX>850</posX> + <posY>95</posY> + <width>430</width> + <height>385</height> + <texture flipY="true" diffuse="Thumb_Mask.png">cd_box.png</texture> + </control> <control> <type>fadelabel</type> <description>track name</description> <id>0</id> - <posX>433</posX> + <posX>450</posX> <posY>650</posY> - <width>400</width> + <width>450</width> <height>20</height> <label>#Play.Current.Title</label> <font>font18</font> - <align>Center</align> + <align>Left</align> <animation effect="fade" time="500">WindowOpen</animation> </control> <control> @@ -114,7 +126,7 @@ <id>0</id> <posX>262</posX> <posY>650</posY> - <width>600</width> + <width>180</width> <height>26</height> <label>#Play.Current.Artist</label> <font>font16</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -8,7 +8,7 @@ <type>image</type> <id>1</id> <posX>885</posX> - <posY>711</posY> + <posY>720</posY> <width>471</width> <height>36</height> <texture>time_block.png</texture> @@ -18,7 +18,7 @@ <type>label</type> <id>1</id> <posX>1065</posX> - <posY>729</posY> + <posY>738</posY> <label>#date</label> <align>center</align> <font>font14</font> @@ -29,7 +29,7 @@ <type>label</type> <id>1</id> <posX>1294</posX> - <posY>729</posY> + <posY>738</posY> <label>#time</label> <align>center</align> <font>font13</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogTvGuide.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogTvGuide.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/dialogTvGuide.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -95,10 +95,10 @@ <showrange>no</showrange> <orientation>vertical</orientation> <align>center</align> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>6</onleft> <onright>8</onright> <animation effect="fade" time="200">WindowOpen</animation> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -129,10 +129,10 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -170,10 +170,10 @@ <spinPosX>1270</spinPosX> <spinPosY>480</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -214,10 +214,10 @@ <spinPosX>1270</spinPosX> <spinPosY>480</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -343,10 +343,10 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <itemWidth>80</itemWidth> <itemHeight>60</itemHeight> <textureWidth>80</textureWidth> @@ -397,10 +397,10 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <itemWidth>110</itemWidth> <itemHeight>220</itemHeight> <textureWidth>180</textureWidth> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmdetails.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmdetails.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmdetails.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -192,10 +192,10 @@ <onleft>2</onleft> <onright>8</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> <control> <description>alarm time minutes</description> @@ -212,10 +212,10 @@ <onleft>7</onleft> <onright>16</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> <control> <description>Enabled Days</description> @@ -383,10 +383,10 @@ <onleft>16</onleft> <onright>28</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> <control> <description>MM</description> @@ -403,10 +403,10 @@ <onleft>27</onleft> <onright>29</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> <control> <description>YYYY</description> @@ -423,10 +423,10 @@ <onleft>28</onleft> <onright>20</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmsleeptimer.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmsleeptimer.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myalarmsleeptimer.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -79,10 +79,10 @@ <onleft>3</onleft> <onright>5</onright> <!-- <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> --> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> --> </control> <control> <description>fade out volume</description> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -291,10 +291,10 @@ <spinPosX>1240</spinPosX> <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -392,15 +392,15 @@ <posY>220</posY> <width>1400</width> <height>400</height> - <spinWidth>27</spinWidth> - <spinHeight>27</spinHeight> - <spinPosX>1240</spinPosX> + <spinWidth>36</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>1200</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> <textureUp>arrow_round_right_nofocus.png</textureUp> - <textureDown>arrow_round_left_nofocus.png</textureDown> - <textureUpFocus>arrow_round_right_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_left_focus.png</textureDownFocus> + <textureDown>arrow_round_left_nofocus.png</textureDown> + <textureUpFocus>arrow_round_right_focus.png</textureUpFocus> + <textureDownFocus>arrow_round_left_focus.png</textureDownFocus> <itemWidth>240</itemWidth> <itemHeight>200</itemHeight> <textureWidth>440</textureWidth> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -54,34 +54,9 @@ <animation effect="fade" time="1000" end="60" delay="2000">WindowOpen</animation> <animation effect="slide" time="1000" delay="2000" start="-600,0" end="0,0" acceleration="-1">WindowOpen</animation> <animation effect="fade" time="500" start="50">WindowClose</animation> - </control> - - - - - <control> + </control> + <control> <type>image</type> - <decription>mid_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>186</posY> - <width>1390</width> - <height>365</height> - <texture>mid_strip.png</texture> - - </control> - <control> - <type>image</type> - <decription>bottom_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>547</posY> - <width>1390</width> - <height>18</height> - <texture>bottom_strip.png</texture> - - </control> <control> - <type>image</type> <decription>top-strip</decription> <id>1</id> <posX>12</posX> @@ -173,7 +148,7 @@ <id>27</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400">WindowOpen</animation> - <posY>158</posY> + <posY>100</posY> <posX>639</posX> <label>33000</label> @@ -199,7 +174,7 @@ <id>26</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400">WindowOpen</animation> - <posY>158</posY> + <posY>100</posY> <posX>848</posX> <label>4540</label> <font>font14</font> @@ -214,6 +189,10 @@ <textcolor>white</textcolor> <hyperlink>510</hyperlink> </control> + + + + <control> <type>group</type> @@ -240,25 +219,42 @@ <type>listcontrol</type> <subtype>album</subtype> <id>50</id> - <font>font13</font> - <font2>font13</font2> - <selectedColor>FFFF6600</selectedColor> - <textcolor>FFB2D4F5</textcolor> - <selectedColor2>FFFF6600</selectedColor2> - <textcolor2>FFB2D4F5</textcolor2> - <textXOff>36</textXOff> - <textYOff>20</textYOff> - <textXOff2>712</textXOff2> - <textYOff2>80</textYOff2> - <itemWidth>136</itemWidth> - <itemHeight>102</itemHeight> - <spaceBetweenItems>5</spaceBetweenItems> - <textureHeight>132</textureHeight> - <scrollOffset>2</scrollOffset> - <onleft>2</onleft> - <onright>52</onright> - <onup>2</onup> - <ondown>2</ondown> + <posX>542</posX> + <posY>160</posY> + <width>800</width> + <height>520</height> + <spinWidth>27</spinWidth> + <spinHeight>27</spinHeight> + <spinPosX>1240</spinPosX> + <spinPosY>650</spinPosY> + <spinColor>ffffffff</spinColor> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> + <textureFocus>list_sub_focus.png</textureFocus> + <textureNoFocus>list_sub_nofocus.png</textureNoFocus> + <textureHeight>35</textureHeight> + <image>folder_focus.png</image> + <font>font10</font> + <shadedColor>20ffffff</shadedColor> + <selectedColor>FFF8BC70</selectedColor> + <playedColor>ffa0d0ff</playedColor> + <textcolor>ffffffff</textcolor> + <textcolor2>ffffffff</textcolor2> + <textcolor3>ffffffff</textcolor3> + <colordiffuse>ffffffff</colordiffuse> + <remoteColor>ffFFA075</remoteColor> + <downloadColor>ff80ff80</downloadColor> + <textXOff>32</textXOff> + <textYOff>7</textYOff> + <textXOff2>1250</textXOff2> + <textYOff2>7</textYOff2> + <textXOff3>1300</textXOff3> + <textYOff3>7</textYOff3> + <IconXOff>24</IconXOff> + <IconYOff>9</IconYOff> + <suffix>|</suffix> </control> <control> <description>playlist control</description> @@ -268,21 +264,20 @@ <onright>53</onright> <onup>2</onup> <ondown>2</ondown> - <posX>30</posX> - <posY>200</posY> - <width>1190</width> - <height>320</height> + <posY>160</posY> + <width>690</width> + <height>500</height> <spinWidth>27</spinWidth> <spinHeight>27</spinHeight> - <spinPosX>1270</spinPosX> - <spinPosY>480</spinPosY> + <spinPosX>1240</spinPosX> + <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> <textureHeight>35</textureHeight> <image>folder_focus.png</image> - <font>font9</font> + <font>font14</font> <shadedColor>20ffffff</shadedColor> <selectedColor>FFF8BC70</selectedColor> <textcolor>ffffffff</textcolor> @@ -292,11 +287,11 @@ <remoteColor>ffFFA075</remoteColor> <downloadColor>ff80ff80</downloadColor> <textXOff>32</textXOff> - <textYOff>7</textYOff> + <textYOff>3</textYOff> <textXOff2>650</textXOff2> - <textYOff2>7</textYOff2> + <textYOff2>3</textYOff2> <IconXOff>24</IconXOff> - <IconYOff>9</IconYOff> + <IconYOff>3</IconYOff> <suffix>|</suffix> <upBtnWidth>35</upBtnWidth> <downBtnWidth>35</downBtnWidth> @@ -304,16 +299,16 @@ <upBtnHeight>35</upBtnHeight> <downBtnHeight>35</downBtnHeight> <deleteBtnHeight>35</deleteBtnHeight> - <upBtnXOffset>1200</upBtnXOffset> - <downBtnXOffset>1237</downBtnXOffset> - <deleteBtnXOffset>1273</deleteBtnXOffset> + <upBtnXOffset>700</upBtnXOffset> + <downBtnXOffset>735</downBtnXOffset> + <deleteBtnXOffset>773</deleteBtnXOffset> <upBtnYOffset>0</upBtnYOffset> <downBtnYOffset>0</downBtnYOffset> <deleteBtnYOffset>0</deleteBtnYOffset> - <textureMoveUp>arrow_round_up_nofocus.png</textureMoveUp> - <textureMoveUpFocused>arrow_round_up_focus.png</textureMoveUpFocused> - <textureMoveDown>arrow_round_down_nofocus.png</textureMoveDown> - <textureMoveDownFocused>arrow_round_down_focus.png</textureMoveDownFocused> + <textureMoveUp>page_up_nofocus.png</textureMoveUp> + <textureMoveUpFocused>page_up_focus.png</textureMoveUpFocused> + <textureMoveDown>page_down_nofocus.png</textureMoveDown> + <textureMoveDownFocused>page_down_focus.png</textureMoveDownFocused> <textureDelete>dialogue_shutdown_nofocus.png</textureDelete> <textureDeleteFocused>dialogue_shutdown_focus.png</textureDeleteFocused> </control> @@ -341,7 +336,7 @@ <deleteBtnYOffset>0</deleteBtnYOffset> <textureFocus>playlist_sub_focus.png</textureFocus> <textureNoFocus>playlist_sub_nofocus.png</textureNoFocus> - <textureMoveUp>playlist_item_up_nofocus.png</textureMoveUp> + <textureMoveUp>arrowup_nofocus.png</textureMoveUp> <textureMoveUpFocused>playlist_item_up_focus.png</textureMoveUpFocused> <textureMoveDown>playlist_item_down_nofocus.png</textureMoveDown> <textureMoveDownFocused>playlist_item_down_focus.png</textureMoveDownFocused> @@ -367,10 +362,10 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <itemWidth>80</itemWidth> <itemHeight>60</itemHeight> <textureWidth>80</textureWidth> @@ -418,7 +413,7 @@ <id>22</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400">WindowOpen</animation> - <posY>194</posY> + <posY>136</posY> <posX>430</posX> <label>192</label> <font>font14</font> @@ -441,7 +436,7 @@ <id>28</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400">WindowOpen</animation> - <posY>194</posY> + <posY>136</posY> <posX>639</posX> <label>33001</label> <font>font14</font> @@ -465,7 +460,7 @@ <id>29</id> <animation effect="fade" time="400">WindowClose</animation> <animation effect="fade" time="400">WindowOpen</animation> - <posY>230</posY> + <posY>172</posY> <posX>639</posX> <label>Scrobbler: </label> <font>font14</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -291,10 +291,10 @@ <spinPosX>1240</spinPosX> <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -392,15 +392,15 @@ <posY>220</posY> <width>1400</width> <height>400</height> - <spinWidth>27</spinWidth> - <spinHeight>27</spinHeight> - <spinPosX>1240</spinPosX> + <spinWidth>36</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>1200</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> <textureUp>arrow_round_right_nofocus.png</textureUp> - <textureDown>arrow_round_left_nofocus.png</textureDown> - <textureUpFocus>arrow_round_right_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_left_focus.png</textureDownFocus> + <textureDown>arrow_round_left_nofocus.png</textureDown> + <textureUpFocus>arrow_round_right_focus.png</textureUpFocus> + <textureDownFocus>arrow_round_left_focus.png</textureDownFocus> <itemWidth>240</itemWidth> <itemHeight>200</itemHeight> <textureWidth>440</textureWidth> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -246,10 +246,10 @@ <spinPosX>1240</spinPosX> <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -292,10 +292,10 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <itemWidth>80</itemWidth> <itemHeight>60</itemHeight> <textureWidth>80</textureWidth> @@ -346,16 +346,16 @@ <posY>160</posY> <width>1360</width> <height>400</height> - <spinWidth>27</spinWidth> - <spinHeight>27</spinHeight> - <spinPosX>1240</spinPosX> + <spinWidth>36</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>1200</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> - <itemWidth>150</itemWidth> + <textureUp>arrow_round_right_nofocus.png</textureUp> + <textureDown>arrow_round_left_nofocus.png</textureDown> + <textureUpFocus>arrow_round_right_focus.png</textureUpFocus> + <textureDownFocus>arrow_round_left_focus.png</textureDownFocus> + <itemWidth>150</itemWidth> <itemHeight>100</itemHeight> <itemWidth>300</itemWidth> <textureWidth>440</textureWidth> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mypvrguide.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mypvrguide.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mypvrguide.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -91,10 +91,10 @@ <orientation>vertical</orientation> <align>center</align> <reverse>yes</reverse> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>6</onleft> <onright>8</onright> </control> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -226,10 +226,10 @@ <spinPosX>1270</spinPosX> <spinPosY>480</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -274,10 +274,12 @@ <spinPosX>1240</spinPosX> <spinPosY>515</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> + <textureFocus>list_sub_focus.png</textureFocus> + <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <itemWidth>120</itemWidth> <itemHeight>110</itemHeight> <textureWidth>50</textureWidth> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myrecipes.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myrecipes.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myrecipes.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -67,10 +67,10 @@ <showrange>no</showrange> <orientation>horizontal</orientation> <align>center</align> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>2</onleft> <onright>9</onright> </control> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mystatusprefs.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mystatusprefs.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mystatusprefs.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -62,10 +62,10 @@ <onleft>2</onleft> <onright>2</onright> <textcolor>FFFFFFFF</textcolor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> </control> <control> <description>shutdown</description> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -243,10 +243,10 @@ <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>2</onleft> <onright>11</onright> @@ -311,10 +311,10 @@ <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <image>folder_focus.png</image> <font>font12</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvchannel.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvchannel.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvchannel.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -268,10 +268,10 @@ <spinPosX>530</spinPosX> <spinPosY>640</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>2</onleft> <onright>11</onright> <onup>2</onup> @@ -325,10 +325,10 @@ <spinPosX>530</spinPosX> <spinPosY>640</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <image>folder_focus.png</image> <font>font12</font> <shadedColor>20ffffff</shadedColor> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvgenre.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvgenre.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvgenre.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -276,10 +276,10 @@ <spinPosX>530</spinPosX> <spinPosY>640</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <onleft>2</onleft> <onright>11</onright> <onup>2</onup> @@ -332,10 +332,10 @@ <spinPosX>530</spinPosX> <spinPosY>640</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <image>folder_focus.png</image> <font>font12</font> <shadedColor>20ffffff</shadedColor> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -58,32 +58,9 @@ <animation effect="fade" time="1000" end="60" delay="2000">WindowOpen</animation> <animation effect="slide" time="1000" delay="2000" start="-600,0" end="0,0" acceleration="-1">WindowOpen</animation> <animation effect="fade" time="500" start="50">WindowClose</animation> - </control> <control> - <type>image</type> - <decription>mid_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>186</posY> - <width>1388</width> - <height>365</height> - <texture>mid_strip.png</texture> - <animation effect="zoom" start="100,100" end="100,135" center="12,186" time="1000" acceleration ="-1" >WindowOpen</animation> - <animation effect="zoom" start="100,135" end="100,100" center="12,186" time="1000" acceleration ="-1" >WindowClose</animation> - </control> + </control> <control> <type>image</type> - <decription>bottom_strip</decription> - <id>1</id> - <posX>-12</posX> - <posY>547</posY> - <width>1388</width> - <height>18</height> - <texture>bottom_strip.png</texture> - <animation effect="slide" time="1000" start="0,0" end="0,130" acceleration="-1" >WindowOpen</animation> - <animation effect="slide" time="1000" start="0,130" end="0,0" acceleration="-1" >WindowClose</animation> - </control> - <control> - <type>image</type> <decription>top-strip</decription> <id>1</id> <posX>12</posX> @@ -97,7 +74,7 @@ <description>Number of Files Label</description> <type>label</type> <id>12</id> - <posX>493</posX> + <posX>1100</posX> <posY>706</posY> <label>#itemcount</label> <font>font13</font> @@ -108,22 +85,7 @@ <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible> <animation effect="fade" time="250">visiblechange</animation> </control> - <control> - <description>Selected item Label</description> - <type>fadelabel</type> - <id>1</id> - <posX>1252</posX> - <posY>93</posY> - <width>533</width> - <label>#selecteditem</label> - <font>font13</font> - <align>right</align> - <textcolor>ffffffff</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible> - <animation effect="fade" time="250">visiblechange</animation> - </control> + <control> <description>Sort Button</description> @@ -221,8 +183,8 @@ <description>Grey Background</description> <type>image</type> <id>1</id> - <posX>628</posX> - <posY>205</posY> + <posX>20</posX> + <posY>140</posY> <width>715</width> <height>460</height> <texture>grey_background.png</texture> @@ -244,19 +206,19 @@ <onright>2</onright> <onup>2</onup> <ondown>22</ondown> - <posX>30</posX> - <posY>200</posY> - <width>1306</width> - <height>330</height> + <posX>542</posX> + <posY>140</posY> + <width>800</width> + <height>520</height> <spinWidth>27</spinWidth> <spinHeight>27</spinHeight> <spinPosX>1240</spinPosX> - <spinPosY>515</spinPosY> + <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFocus> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> <textureFocus>list_sub_focus.png</textureFocus> <textureNoFocus>list_sub_nofocus.png</textureNoFocus> <textureHeight>35</textureHeight> @@ -270,13 +232,13 @@ <colordiffuse>ffffffff</colordiffuse> <remoteColor>ffFFA075</remoteColor> <downloadColor>ff80ff80</downloadColor> - <textXOff>32</textXOff> - <textYOff>7</textYOff> - <textXOff2>1250</textXOff2> - <textYOff2>7</textYOff2> - <textXOff3>1300</textXOff3> - <textYOff3>7</textYOff3> - <IconXOff>24</IconXOff> + <textXOff>10</textXOff> + <textYOff>2</textYOff> + <textXOff2>780</textXOff2> + <textYOff2>2</textYOff2> + <textXOff3>5</textXOff3> + <textYOff3>5</textYOff3> + <IconXOff>5</IconXOff> <IconYOff>9</IconYOff> <suffix>|</suffix> </control> @@ -284,27 +246,36 @@ <description>scheduler recordings listcontrol</description> <type>listcontrol</type> <id>11</id> - <posX>30</posX> - <posY>200</posY> + + <posX>780</posX> + <posY>140</posY> <subitems> <subitem>=370</subitem> <subitem>=450</subitem> </subitems> <width>566</width> - <height>493</height> - <textXOff>18</textXOff> - <textYOff>2</textYOff> - <textXOff2>400</textXOff2> - <textYOff2>38</textYOff2> + <height>800</height> + <textXOff>5</textXOff> + <textYOff>25</textYOff> + <textXOff2>500</textXOff2> + <textYOff2>5</textYOff2> <textXOff3>189</textXOff3> <textYOff3>38</textYOff3> - <IconXOff>22</IconXOff> - <IconYOff>10</IconYOff> + <IconXOff>5</IconXOff> + <IconYOff>15</IconYOff> <PinIconXOff>45</PinIconXOff> <PinIconYOff>19</PinIconYOff> - <spinPosX>1149</spinPosX> - <spinPosY>557</spinPosY> + <spinWidth>27</spinWidth> + <spinHeight>27</spinHeight> + <spinPosX>1240</spinPosX> + <spinPosY>650</spinPosY> + <spinColor>ffffffff</spinColor> + <textureUp>page_up_nofocus.png</textureUp> + <textureDown>page_down_nofocus.png</textureDown> + <textureUpFocus>page_up_focu.png</textureUpFocus> + <textureDownFocus>page_down_focus.png</textureDownFocus> + <itemWidth>46</itemWidth> <itemHeight>46</itemHeight> <textureFocus>recording_background_focus.png</textureFocus> @@ -324,11 +295,11 @@ <description>Current program title</description> <type>fadelabel</type> <id>13</id> - <posX>493</posX> - <posY>586</posY> + <posX>50</posX> + <posY>180</posY> <width>333</width> <label>#TV.Search.Title</label> - <font>font13</font> + <font>font18</font> <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> @@ -339,8 +310,8 @@ <description>Current program time</description> <type>label</type> <id>14</id> - <posX>493</posX> - <posY>613</posY> + <posX>50</posX> + <posY>150</posY> <label>#TV.Search.Time</label> <align>left</align> <font>font13</font> @@ -355,9 +326,9 @@ <description>Description1</description> <type>textboxscrollup</type> <id>15</id> - <posX>493</posX> - <posY>646</posY> - <width>573</width> + <posX>50</posX> + <posY>280</posY> + <width>450</width> <height>86</height> <label>#TV.Search.Description</label> <font>font13</font> @@ -371,8 +342,8 @@ <description>genre</description> <type>label</type> <id>17</id> - <posX>1252</posX> - <posY>613</posY> + <posX>440</posX> + <posY>150</posY> <label>#TV.Search.Genre</label> <align>right</align> <font>font13</font> @@ -386,7 +357,7 @@ <description>Letter Button</description> <type>selectbutton</type> <id>7</id> - <posY>191</posY> + <posY>136</posY> <posX>639</posX> <label>872</label> <font>font14</font> <width>209</width> @@ -417,7 +388,7 @@ <id>8</id> - <posY>227</posY> + <posY>172</posY> <posX>639</posX> <label>873</label> <font>font14</font> <width>209</width> @@ -445,7 +416,7 @@ <description>Episode button</description> <type>selectbutton</type> <id>9</id> - <posY>263</posY> + <posY>208</posY> <posX>639</posX> <label>874</label> <font>font14</font> <width>209</width> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-10-09 07:36:01 UTC (rev 982) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-10-09 13:14:00 UTC (rev 983) @@ -235,7 +235,7 @@ <type>image</type> <id>1</id> <posX>155</posX> - <posY>180</posY> + <posY>220</posY> <width>280</width> <height>280</height> <texture>cd_art.png</texture> @@ -296,10 +296,10 @@ <spinPosX>1240</spinPosX> <spinPosY>650</spinPosY> <spinColor>ffffffff</spinColor> - <textureUp>arrow_round_up_nofocus.png</textureUp> - <textureDown>arrow_round_down_nofocus.png</textureDown> - <textureUpFocus>arrow_round_up_focus.png</textureUpFocus> - <textureDownFocus>arrow_round_down_focus.png</textureDownFoc... [truncated message content] |
From: <an...@us...> - 2007-10-09 07:36:04
|
Revision: 982 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=982&view=rev Author: and-81 Date: 2007-10-09 00:36:01 -0700 (Tue, 09 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj trunk/plugins/IR Server Suite/Common/IrssComms/Client.cs trunk/plugins/IR Server Suite/Common/IrssComms/ClientManager.cs trunk/plugins/IR Server Suite/Common/IrssComms/GenericPCQueue.cs trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj trunk/plugins/IR Server Suite/Common/IrssComms/IrssMessage.cs trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs trunk/plugins/IR Server Suite/Common/IrssUtils/CDRom.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/BlastCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/EjectCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/LearnIR.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/PauseTime.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/PopupMessage.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/SerialCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ServerAddress.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/TcpMessageCommand.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/WindowList.cs trunk/plugins/IR Server Suite/Common/IrssUtils/IRServerInfo.cs trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Win32ErrorCodes.cs trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IKeyboardReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IMouseReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/ITransmitIR.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/CSocketPacket.cs trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MceDetectionData.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/NotifyWindow.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/RemoteDetectionData.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/NativeMethods.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 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.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/Input Service/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/StbSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/StbSetup.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/MCEReplacement/Forms/StbSetup.cs trunk/plugins/MCEReplacement/MCEReplacement.cs trunk/plugins/MCEReplacement/MCEReplacement.csproj trunk/plugins/MCEReplacement/MappedEvent.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Delete.png trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Plus.png Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -110,9 +110,9 @@ GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposeManagedResources) + protected virtual void Dispose(bool disposing) { - if (disposeManagedResources) + if (disposing) { // Dispose managed resources ... @@ -718,15 +718,31 @@ { foreach (IRServerPluginBase plugin in _pluginReceive) { - if (_pluginTransmit == plugin) - resumedTransmit = true; + try + { + plugin.Resume(); - plugin.Resume(); + if (plugin == _pluginTransmit) + resumedTransmit = true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } } } if (_pluginTransmit != null && !resumedTransmit) - _pluginTransmit.Resume(); + { + try + { + _pluginTransmit.Resume(); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } // Inform clients ... if (_mode == IRServerMode.ServerMode) @@ -747,15 +763,31 @@ { foreach (IRServerPluginBase plugin in _pluginReceive) { - if (_pluginTransmit == plugin) - suspendedTransmit = true; + try + { + plugin.Suspend(); - plugin.Suspend(); + if (plugin == _pluginTransmit) + suspendedTransmit = true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } } } if (_pluginTransmit != null && !suspendedTransmit) - _pluginTransmit.Suspend(); + { + try + { + _pluginTransmit.Suspend(); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } // Inform clients ... if (_mode == IRServerMode.ServerMode) Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -91,7 +91,7 @@ /// </summary> /// <param name="config">Configuration to save.</param> /// <param name="fileName">File to save to.</param> - /// <returns>Success.</returns> + /// <returns>true if successful, otherwise false.</returns> internal static bool Save(Configuration config, string fileName) { try Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -402,7 +402,8 @@ } textBoxCommand.Text = _command = - String.Format("{0}|{1}|{2}|{3}|{4}", + String.Format("{0}{1}|{2}|{3}|{4}|{5}", + Common.CmdPrefixWindowMsg, target, textBoxMsgTarget.Text, numericUpDownMsg.Value.ToString(), Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -57,13 +57,13 @@ this.columnHeaderEvent = new System.Windows.Forms.ColumnHeader(); this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); this.tabPageIRCommands = new System.Windows.Forms.TabPage(); - this.listBoxIR = new System.Windows.Forms.ListBox(); + this.listViewIR = new System.Windows.Forms.ListView(); this.buttonNewIR = new System.Windows.Forms.Button(); this.buttonEditIR = new System.Windows.Forms.Button(); this.buttonDeleteIR = new System.Windows.Forms.Button(); this.tabPageMacro = new System.Windows.Forms.TabPage(); + this.listViewMacro = new System.Windows.Forms.ListView(); this.buttonTestMacro = new System.Windows.Forms.Button(); - this.listBoxMacro = new System.Windows.Forms.ListBox(); this.buttonDeleteMacro = new System.Windows.Forms.Button(); this.buttonNewMacro = new System.Windows.Forms.Button(); this.buttonEditMacro = new System.Windows.Forms.Button(); @@ -136,11 +136,11 @@ // buttonRemoveProgram // this.buttonRemoveProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRemoveProgram.Image = global::Translator.Properties.Resources.Delete; this.buttonRemoveProgram.Location = new System.Drawing.Point(336, 16); this.buttonRemoveProgram.Name = "buttonRemoveProgram"; this.buttonRemoveProgram.Size = new System.Drawing.Size(24, 24); this.buttonRemoveProgram.TabIndex = 2; - this.buttonRemoveProgram.Text = "-"; this.toolTip.SetToolTip(this.buttonRemoveProgram, "Remove the current program from the list"); this.buttonRemoveProgram.UseVisualStyleBackColor = true; this.buttonRemoveProgram.Click += new System.EventHandler(this.buttonRemoveProgram_Click); @@ -148,11 +148,11 @@ // buttonAddProgram // this.buttonAddProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonAddProgram.Image = global::Translator.Properties.Resources.Plus; this.buttonAddProgram.Location = new System.Drawing.Point(304, 16); this.buttonAddProgram.Name = "buttonAddProgram"; this.buttonAddProgram.Size = new System.Drawing.Size(24, 24); this.buttonAddProgram.TabIndex = 1; - this.buttonAddProgram.Text = "+"; this.toolTip.SetToolTip(this.buttonAddProgram, "Add a program to the list"); this.buttonAddProgram.UseVisualStyleBackColor = true; this.buttonAddProgram.Click += new System.EventHandler(this.buttonAddProgram_Click); @@ -249,7 +249,7 @@ this.buttonOK.Location = new System.Drawing.Point(384, 440); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(64, 24); - this.buttonOK.TabIndex = 5; + this.buttonOK.TabIndex = 3; this.buttonOK.Text = "&OK"; this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); @@ -401,7 +401,7 @@ // // tabPageIRCommands // - this.tabPageIRCommands.Controls.Add(this.listBoxIR); + this.tabPageIRCommands.Controls.Add(this.listViewIR); this.tabPageIRCommands.Controls.Add(this.buttonNewIR); this.tabPageIRCommands.Controls.Add(this.buttonEditIR); this.tabPageIRCommands.Controls.Add(this.buttonDeleteIR); @@ -413,18 +413,24 @@ this.tabPageIRCommands.Text = "IR Commands"; this.tabPageIRCommands.UseVisualStyleBackColor = true; // - // listBoxIR + // listViewIR // - this.listBoxIR.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + 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.listBoxIR.FormattingEnabled = true; - this.listBoxIR.IntegralHeight = false; - this.listBoxIR.Location = new System.Drawing.Point(8, 8); - this.listBoxIR.Name = "listBoxIR"; - this.listBoxIR.Size = new System.Drawing.Size(416, 328); - this.listBoxIR.TabIndex = 0; - this.listBoxIR.DoubleClick += new System.EventHandler(this.listBoxIR_DoubleClick); + 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(416, 328); + 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); // // buttonNewIR // @@ -464,8 +470,8 @@ // // tabPageMacro // + this.tabPageMacro.Controls.Add(this.listViewMacro); this.tabPageMacro.Controls.Add(this.buttonTestMacro); - this.tabPageMacro.Controls.Add(this.listBoxMacro); this.tabPageMacro.Controls.Add(this.buttonDeleteMacro); this.tabPageMacro.Controls.Add(this.buttonNewMacro); this.tabPageMacro.Controls.Add(this.buttonEditMacro); @@ -477,6 +483,25 @@ this.tabPageMacro.Text = "Macros"; this.tabPageMacro.UseVisualStyleBackColor = true; // + // listViewMacro + // + this.listViewMacro.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.listViewMacro.FullRowSelect = true; + this.listViewMacro.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.listViewMacro.HideSelection = false; + this.listViewMacro.LabelEdit = true; + this.listViewMacro.Location = new System.Drawing.Point(8, 8); + this.listViewMacro.MultiSelect = false; + this.listViewMacro.Name = "listViewMacro"; + this.listViewMacro.Size = new System.Drawing.Size(416, 328); + this.listViewMacro.TabIndex = 5; + this.listViewMacro.UseCompatibleStateImageBehavior = false; + this.listViewMacro.View = System.Windows.Forms.View.List; + this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick); + this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit); + // // buttonTestMacro // this.buttonTestMacro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -489,19 +514,6 @@ this.buttonTestMacro.UseVisualStyleBackColor = true; this.buttonTestMacro.Click += new System.EventHandler(this.buttonTestMacro_Click); // - // listBoxMacro - // - this.listBoxMacro.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.listBoxMacro.FormattingEnabled = true; - this.listBoxMacro.IntegralHeight = false; - this.listBoxMacro.Location = new System.Drawing.Point(8, 8); - this.listBoxMacro.Name = "listBoxMacro"; - this.listBoxMacro.Size = new System.Drawing.Size(416, 328); - this.listBoxMacro.TabIndex = 0; - this.listBoxMacro.DoubleClick += new System.EventHandler(this.listBoxMacro_DoubleClick); - // // buttonDeleteMacro // this.buttonDeleteMacro.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -541,10 +553,11 @@ // checkBoxAutoRun // this.checkBoxAutoRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkBoxAutoRun.AutoSize = true; this.checkBoxAutoRun.Location = new System.Drawing.Point(16, 440); this.checkBoxAutoRun.Name = "checkBoxAutoRun"; - this.checkBoxAutoRun.Size = new System.Drawing.Size(184, 24); - this.checkBoxAutoRun.TabIndex = 4; + this.checkBoxAutoRun.Size = new System.Drawing.Size(167, 17); + this.checkBoxAutoRun.TabIndex = 2; this.checkBoxAutoRun.Text = "&Start Translator with Windows"; this.toolTip.SetToolTip(this.checkBoxAutoRun, "Set this to make Translator automatically start when you turn the computer on"); this.checkBoxAutoRun.UseVisualStyleBackColor = true; @@ -573,58 +586,58 @@ this.toolStripSeparator2, this.quitToolStripMenuItem}); this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; - this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.configurationToolStripMenuItem.Text = "&File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.newToolStripMenuItem.Text = "&New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.openToolStripMenuItem.Text = "&Open ..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // // importToolStripMenuItem // this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.importToolStripMenuItem.Text = "&Import ..."; this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); // // exportToolStripMenuItem // this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.exportToolStripMenuItem.Text = "&Export ..."; this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(129, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6); // // serverToolStripMenuItem // this.serverToolStripMenuItem.Name = "serverToolStripMenuItem"; - this.serverToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.serverToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.serverToolStripMenuItem.Text = "&Server ..."; this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(129, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6); // // quitToolStripMenuItem // this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; - this.quitToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.quitToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.quitToolStripMenuItem.Text = "&Quit"; this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // @@ -634,20 +647,20 @@ this.translatorHelpToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "&Help"; // // translatorHelpToolStripMenuItem // this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem"; - this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(129, 22); + this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.translatorHelpToolStripMenuItem.Text = "&Contents"; this.translatorHelpToolStripMenuItem.Click += new System.EventHandler(this.translatorHelpToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(129, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(122, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -674,7 +687,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip; this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(464, 475); + this.MinimumSize = new System.Drawing.Size(472, 508); this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Translator"; @@ -711,13 +724,11 @@ private System.Windows.Forms.TabControl tabControl; private System.Windows.Forms.TabPage tabPagePrograms; private System.Windows.Forms.TabPage tabPageIRCommands; - private System.Windows.Forms.ListBox listBoxIR; private System.Windows.Forms.Button buttonNewIR; private System.Windows.Forms.Button buttonEditIR; private System.Windows.Forms.Button buttonDeleteIR; private System.Windows.Forms.TabPage tabPageMacro; private System.Windows.Forms.Button buttonTestMacro; - private System.Windows.Forms.ListBox listBoxMacro; private System.Windows.Forms.Button buttonDeleteMacro; private System.Windows.Forms.Button buttonNewMacro; private System.Windows.Forms.Button buttonEditMacro; @@ -749,6 +760,8 @@ private System.Windows.Forms.ToolStripMenuItem serverToolStripMenuItem; private System.Windows.Forms.OpenFileDialog openFileDialog; private System.Windows.Forms.SaveFileDialog saveFileDialog; + private System.Windows.Forms.ListView listViewIR; + private System.Windows.Forms.ListView listViewMacro; } } Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -189,19 +189,21 @@ } void RefreshIRList() { - listBoxIR.Items.Clear(); + listViewIR.Items.Clear(); string[] irList = Common.GetIRList(false); if (irList != null && irList.Length > 0) - listBoxIR.Items.AddRange(irList); + foreach (string irFile in irList) + listViewIR.Items.Add(irFile); } void RefreshMacroList() { - listBoxMacro.Items.Clear(); + listViewMacro.Items.Clear(); string[] macroList = Program.GetMacroList(false); if (macroList != null && macroList.Length > 0) - listBoxMacro.Items.AddRange(macroList); + foreach (string macroFile in macroList) + listViewMacro.Items.Add(macroFile); Program.UpdateNotifyMenu(); } @@ -251,48 +253,48 @@ void EditIR() { - if (listBoxIR.SelectedIndex != -1) + if (listViewIR.SelectedItems.Count != 1) + return; + + string command = listViewIR.SelectedItems[0].Text; + string fileName = Common.FolderIRCommands + command + Common.FileExtensionIR; + + if (File.Exists(fileName)) { - string command = listBoxIR.SelectedItem as string; - string fileName = Common.FolderIRCommands + command + Common.FileExtensionIR; + _learnIR = new LearnIR( + new LearnIrDelegate(Program.LearnIR), + new BlastIrDelegate(Program.BlastIR), + Program.TransceiverInformation.Ports, + command); - if (File.Exists(fileName)) - { - _learnIR = new LearnIR( - new LearnIrDelegate(Program.LearnIR), - new BlastIrDelegate(Program.BlastIR), - Program.TransceiverInformation.Ports, - command); + _learnIR.ShowDialog(this); - _learnIR.ShowDialog(this); - - _learnIR = null; - } - else - { - MessageBox.Show(this, "File not found: " + fileName, "IR file missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - RefreshIRList(); - } + _learnIR = null; } + else + { + MessageBox.Show(this, "File not found: " + fileName, "IR file missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + RefreshIRList(); + } } void EditMacro() { - if (listBoxMacro.SelectedIndex != -1) + if (listViewMacro.SelectedItems.Count != 1) + return; + + string command = listViewMacro.SelectedItems[0].Text; + string fileName = Program.FolderMacros + command + Common.FileExtensionMacro; + + if (File.Exists(fileName)) { - string command = listBoxMacro.SelectedItem as string; - string fileName = Program.FolderMacros + command + Common.FileExtensionMacro; - - if (File.Exists(fileName)) - { - MacroEditor macroEditor = new MacroEditor(command); - macroEditor.ShowDialog(this); - } - else - { - MessageBox.Show(this, "File not found: " + fileName, "Macro file missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - RefreshMacroList(); - } + MacroEditor macroEditor = new MacroEditor(command); + macroEditor.ShowDialog(this); } + else + { + MessageBox.Show(this, "File not found: " + fileName, "Macro file missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + RefreshMacroList(); + } } void CommitEvents() @@ -349,6 +351,7 @@ } } + // TODO: Move to a notify window protected override void WndProc(ref Message m) { try @@ -365,7 +368,7 @@ byte[] dataBytes = new byte[dataStructure.cbData]; IntPtr lpData = new IntPtr(dataStructure.lpData); System.Runtime.InteropServices.Marshal.Copy(lpData, dataBytes, 0, dataStructure.cbData); - string strData = Encoding.Default.GetString(dataBytes); + string strData = Encoding.ASCII.GetString(dataBytes); Program.ProcessCommand(strData); } @@ -638,32 +641,21 @@ } private void buttonEditIR_Click(object sender, EventArgs e) { - if (listBoxIR.SelectedIndex == -1) - return; - - _learnIR = new LearnIR( - new LearnIrDelegate(Program.LearnIR), - new BlastIrDelegate(Program.BlastIR), - Program.TransceiverInformation.Ports, - listBoxIR.SelectedItem as string); - - _learnIR.ShowDialog(this); - - _learnIR = null; + EditIR(); } private void buttonDeleteIR_Click(object sender, EventArgs e) { - if (listBoxIR.SelectedIndex == -1) + if (listViewIR.SelectedItems.Count != 1) return; - string file = listBoxIR.SelectedItem as string; + string file = listViewIR.SelectedItems[0].Text; string fileName = Common.FolderIRCommands + file + Common.FileExtensionIR; if (File.Exists(fileName)) { if (MessageBox.Show(this, "Are you sure you want to delete \"" + file + "\"?", "Confirm delete", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { File.Delete(fileName); - listBoxIR.Items.Remove(listBoxIR.SelectedItem); + listViewIR.Items.Remove(listViewIR.SelectedItems[0]); } } else @@ -685,17 +677,17 @@ } private void buttonDeleteMacro_Click(object sender, EventArgs e) { - if (listBoxMacro.SelectedIndex == -1) + if (listViewMacro.SelectedItems.Count != 1) return; - string file = listBoxMacro.SelectedItem as string; + string file = listViewMacro.SelectedItems[0].Text; string fileName = Program.FolderMacros + file + Common.FileExtensionMacro; if (File.Exists(fileName)) { if (MessageBox.Show(this, "Are you sure you want to delete \"" + file + "\"?", "Confirm delete", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { File.Delete(fileName); - listBoxMacro.Items.Remove(listBoxMacro.SelectedItem); + listViewMacro.Items.Remove(listViewMacro.SelectedItems[0]); } } else @@ -705,10 +697,10 @@ } private void buttonTestMacro_Click(object sender, EventArgs e) { - if (listBoxMacro.SelectedIndex == -1) + if (listViewMacro.SelectedItems.Count != 1) return; - string fileName = Program.FolderMacros + listBoxMacro.SelectedItem as string + Common.FileExtensionMacro; + string fileName = Program.FolderMacros + listViewMacro.SelectedItems[0].Text + Common.FileExtensionMacro; try { @@ -720,16 +712,86 @@ } } - private void listBoxIR_DoubleClick(object sender, EventArgs e) + private void listViewIR_DoubleClick(object sender, EventArgs e) { EditIR(); } + private void listViewIR_AfterLabelEdit(object sender, LabelEditEventArgs e) + { + ListView origin = sender as ListView; + if (origin == null) + return; - private void listBoxMacro_DoubleClick(object sender, EventArgs e) + ListViewItem originItem = origin.Items[e.Item]; + + string oldFileName = Common.FolderIRCommands + originItem.Text + Common.FileExtensionIR; + if (!File.Exists(oldFileName)) + { + MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + e.CancelEdit = true; + return; + } + + if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label)) + { + MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error); + e.CancelEdit = true; + return; + } + + try + { + string newFileName = Common.FolderIRCommands + e.Label + Common.FileExtensionIR; + + File.Move(oldFileName, newFileName); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void listViewMacro_DoubleClick(object sender, EventArgs e) { EditMacro(); } + private void listViewMacro_AfterLabelEdit(object sender, LabelEditEventArgs e) + { + ListView origin = sender as ListView; + if (origin == null) + return; + ListViewItem originItem = origin.Items[e.Item]; + + string oldFileName = Program.FolderMacros + originItem.Text + Common.FileExtensionMacro; + if (!File.Exists(oldFileName)) + { + MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + e.CancelEdit = true; + return; + } + + if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label)) + { + MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error); + e.CancelEdit = true; + return; + } + + try + { + string newFileName = Program.FolderMacros + e.Label + Common.FileExtensionMacro; + + File.Move(oldFileName, newFileName); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void checkBoxAutoRun_CheckedChanged(object sender, EventArgs e) { if (checkBoxAutoRun.Checked) Added: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Delete.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Plus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Plus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -221,7 +221,7 @@ { try { - IntPtr hWnd = Win32.GetForegroundWindow(); + IntPtr hWnd = Win32.ForegroundWindow(); if (hWnd == IntPtr.Zero) return; @@ -233,16 +233,16 @@ return; /* - string windowTitle = Win32.GetWindowTitle(hWnd); - if (windowTitle.StartsWith("Translator", StringComparison.InvariantCultureIgnoreCase)) - return; + string windowTitle = Win32.GetWindowTitle(hWnd); + if (windowTitle.StartsWith("Translator", StringComparison.InvariantCultureIgnoreCase)) + return; - int procID; - Win32.GetWindowThreadProcessId(hWnd, out procID); - Process proc = Process.GetProcessById(procID); - if (proc.MainModule.ModuleName.Equals("Translator.exe", StringComparison.InvariantCultureIgnoreCase)) - return; - */ + int procID; + Win32.GetWindowThreadProcessId(hWnd, out procID); + Process proc = Process.GetProcessById(procID); + if (proc.MainModule.ModuleName.Equals("Translator.exe", StringComparison.InvariantCultureIgnoreCase)) + return; + */ _currentForegroundWindow = hWnd; } @@ -283,6 +283,10 @@ SendCopyDataMessage("Translator", Common.CmdPrefixHibernate); continue; + case "-logoff": + SendCopyDataMessage("Translator", Common.CmdPrefixLogOff); + continue; + //TODO: Add more command line options. } } @@ -302,22 +306,22 @@ static void SendCopyDataMessage(string targetWindow, string data) { Win32.COPYDATASTRUCT copyData; - + + byte[] dataBytes = Encoding.ASCII.GetBytes(data); + copyData.dwData = 24; - copyData.lpData = Win32.VarPtr(data).ToInt32(); - copyData.cbData = data.Length; + copyData.lpData = Win32.VarPtr(dataBytes).ToInt32(); + copyData.cbData = dataBytes.Length; IntPtr windowHandle = Win32.FindWindowByTitle(targetWindow); if (windowHandle != IntPtr.Zero) { IntPtr result; Win32.SendMessageTimeout(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData), Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); + int lastError = Marshal.GetLastWin32Error(); - if (result == IntPtr.Zero) - { - int lastError = Marshal.GetLastWin32Error(); + if (result == IntPtr.Zero && lastError != 0) throw new Win32Exception(lastError); - } } } @@ -404,7 +408,7 @@ actions.DropDownItems.Add("System Standby", null, new EventHandler(ClickAction)); actions.DropDownItems.Add("System Hibernate", null, new EventHandler(ClickAction)); actions.DropDownItems.Add("System Reboot", null, new EventHandler(ClickAction)); - //actions.DropDownItems.Add("System Logoff", null, new EventHandler(ClickAction)); + actions.DropDownItems.Add("System LogOff", null, new EventHandler(ClickAction)); actions.DropDownItems.Add("System Shutdown", null, new EventHandler(ClickAction)); actions.DropDownItems.Add(new ToolStripSeparator()); @@ -583,11 +587,9 @@ Reboot(); break; - /* - case "System Logoff": + case "System LogOff": LogOff(); break; - */ case "System Shutdown": ShutDown(); @@ -976,17 +978,17 @@ static void Reboot() { IrssLog.Info("Reboot"); - Win32.ExitWindowsEx(Win32.ExitWindows.Reboot | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); + Win32.WindowsExit(Win32.ExitWindows.Reboot | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); } - /*static void LogOff() + static void LogOff() { IrssLog.Info("LogOff"); - Win32.ExitWindowsEx(Win32.ExitWindows.LogOff | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReason.FlagUserDefined); - }*/ + Win32.WindowsExit(Win32.ExitWindows.LogOff | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); + } static void ShutDown() { IrssLog.Info("ShutDown"); - Win32.ExitWindowsEx(Win32.ExitWindows.ShutDown | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); + Win32.WindowsExit(Win32.ExitWindows.ShutDown | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); } static void MapEvent(MappingEvent theEvent) @@ -1170,6 +1172,12 @@ Reboot(); break; } + + case Common.XmlTagLogOff: + { + LogOff(); + break; + } } } } @@ -1183,7 +1191,7 @@ /// Learn an IR command. /// </summary> /// <param name="fileName">File to place learned IR command in.</param> - /// <returns>Success.</returns> + /// <returns>true if successful, otherwise false.</returns> internal static bool LearnIR(string fileName) { try @@ -1301,6 +1309,10 @@ { Hibernate(); } + else if (command.StartsWith(Common.CmdPrefixLogOff)) // LogOff Command + { + LogOff(); + } else if (command.StartsWith(Common.CmdPrefixReboot)) // Reboot Command { Reboot(); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Runtime Version:2.0.50727.312 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -81,6 +81,13 @@ } } + internal static System.Drawing.Bitmap Delete { + get { + object obj = ResourceManager.GetObject("Delete", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Icon Icon16 { get { object obj = ResourceManager.GetObject("Icon16", resourceCulture); @@ -123,6 +130,13 @@ } } + internal static System.Drawing.Bitmap Plus { + get { + object obj = ResourceManager.GetObject("Plus", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap ScrollDown { get { object obj = ResourceManager.GetObject("ScrollDown", resourceCulture); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx 2007-10-09 07:36:01 UTC (rev 982) @@ -127,6 +127,9 @@ <data name="ClickRight" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\graphics\clickright.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="Icon16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Icon16.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -145,6 +148,9 @@ <data name="MoveUp" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\graphics\moveup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Plus" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\graphics\plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="ScrollDown" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\graphics\scrolldown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-10-09 07:36:01 UTC (rev 982) @@ -151,10 +151,12 @@ <Content Include="Graphics\ClickLeft.png" /> <Content Include="Graphics\ClickMiddle.png" /> <Content Include="Graphics\ClickRight.png" /> + <Content Include="Graphics\Delete.png" /> <Content Include="Graphics\MoveDown.png" /> <Content Include="Graphics\MoveLeft.png" /> <Content Include="Graphics\MoveRight.png" /> <Content Include="Graphics\MoveUp.png" /> + <Content Include="Graphics\Plus.png" /> <Content Include="Graphics\ScrollDown.png" /> <Content Include="Graphics\ScrollUp.png" /> </ItemGroup> Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Client.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/Client.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/Client.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -86,6 +86,7 @@ /// Create a TCP communications client. /// </summary> /// <param name="serverEndPoint">IP Address and Port combination of Server.</param> + /// <param name="messageSink">The message sink to call for messages.</param> public Client(IPEndPoint serverEndPoint, ClientMessageSink messageSink) { _serverEndpoint = serverEndPoint; @@ -99,15 +100,22 @@ #region IDisposable + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposeManagedResources) + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> + /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param> + protected virtual void Dispose(bool disposing) { - if (disposeManagedResources) + if (disposing) { // Dispose managed resources ... Stop(); @@ -126,7 +134,7 @@ /// <summary> /// Start the client communications. /// </summary> - /// <returns>Success.</returns> + /// <returns>true if successful, otherwise false.</returns> public bool Start() { if (_processConnectionThread) @@ -186,7 +194,7 @@ /// Send a message to the server. /// </summary> /// <param name="message">Message to send.</param> - /// <returns>Success.</returns> + /// <returns>true if successful, otherwise false.</returns> public bool Send(IrssMessage message) { if (message == null) Modified: trunk/plugins/IR Server Suite/Common/IrssComms/ClientManager.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/ClientManager.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/ClientManager.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -53,15 +53,22 @@ #region IDisposable + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposeManagedResources) + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> + /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param> + protected virtual void Dispose(bool disposing) { - if (disposeManagedResources) + if (disposing) { // Dispose managed resources ... Stop(); Modified: trunk/plugins/IR Server Suite/Common/IrssComms/GenericPCQueue.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/GenericPCQueue.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/GenericPCQueue.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -60,15 +60,22 @@ #region IDisposable + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } - protected virtual void Dispose(bool disposeManagedResources) + /// <summary> + /// Releases unmanaged and - optionally - managed resources + /// </summary> + /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param> + protected virtual void Dispose(bool disposing) { - if (disposeManagedResources) + if (disposing) { // Dispose managed resources ... Stop(); Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2007-10-09 07:36:01 UTC (rev 982) @@ -41,6 +41,7 @@ <UseVSHostingProcess>false</UseVSHostingProcess> <ErrorReport>prompt</ErrorReport> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <DocumentationFile>bin\x86\Debug\IrssComms.XML</DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\x86\Release\</OutputPath> Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssMessage.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/IrssMessage.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssMessage.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -7,59 +7,160 @@ #region Enumerations + /// <summary> + /// Type of message. + /// </summary> public enum MessageType { + /// <summary> + /// Unknown message type. + /// </summary> Unknown, + /// <summary> + /// Register Client. + /// </summary> RegisterClient, + /// <summary> + /// Unregister Client. + /// </summary> UnregisterClient, + /// <summary> + /// Register Repeater. + /// </summary> RegisterRepeater, + /// <summary> + /// Unregister Repeater. + /// </summary> UnregisterRepeater, + /// <summary> + /// Learn IR Command. + /// </summary> LearnIR, + /// <summary> + /// Blast IR Command. + /// </summary> BlastIR, + /// <summary> + /// Error. + /// </summary> Error, + /// <summary> + /// Server Shutdown. + /// </summary> ServerShutdown, + /// <summary> + /// Server Suspend. + /// </summary> ServerSuspend, + /// <summary> + /// Server Resume + /// </summary> ServerResume, + /// <summary> + /// Remote Event. + /// </summary> RemoteEvent, + /// <summary> + /// Keyboard Event. + /// </summary> KeyboardEvent, + /// <summary> + /// Mouse Event. + /// </summary> MouseEvent, + /// <summary> + /// Forward a Remote Event. + /// </summary> ForwardRemoteEvent, + /// <summary> + /// Forward a Keyboard Event. + /// </summary> ForwardKeyboardEvent, + /// <summary> + /// Forward a Mouse Event. + /// </summary> ForwardMouseEvent, + /// <summary> + /// Available Receivers. + /// </summary> AvailableReceivers, + /// <summary> + /// Available Blasters. + /// </summary> AvailableBlasters, + /// <summary> + /// Active Receivers. + /// </summary> ActiveReceivers, + /// <summary> + /// Active Blasters. + /// </summary> ActiveBlasters, + /// <summary> + /// Detected Receivers. + /// </summary> DetectedReceivers, + /// <summary> + /// Detected Blasters. + /// </summary> DetectedBlasters, } + /// <summary> + /// Flags to determine more information about the message. + /// </summary> [Flags] public enum MessageFlags { + /// <summary> + /// No Flags. + /// </summary> None = 0x0000, - + + /// <summary> + /// Message is a Request. + /// </summary> Request = 0x0001, + /// <summary> + /// Message is a Response to a received Message. + /// </summary> Response = 0x0002, + /// <summary> + /// Message is a Notification. + /// </summary> Notify = 0x0004, - + + /// <summary> + /// Operation Success. + /// </summary> Success = 0x0008, + /// <summary> + /// Operation Failure. + /// </summary> Failure = 0x0010, + /// <summary> + /// Operation Time-Out. + /// </summary> Timeout = 0x0020, + //Error = 0x0040, //DataString = 0x0080, //DataBytes = 0x0100, //ForceRespond = 0x0200, + + /// <summary> + /// Force the recipient not to respond. + /// </summary> ForceNotRespond = 0x0400, } @@ -104,6 +205,9 @@ #region Constructors + /// <summary> + /// Initializes a new instance of the <see cref="IrssMessage"/> class. + /// </summary> protected IrssMessage() { _type = MessageType.Unknown; @@ -111,6 +215,11 @@ _data = null; } + /// <summary> + /// Initializes a new instance of the <see cref="IrssMessage"/> class. + /// </summary> + /// <param name="type">The message type.</param> + /// <param name="flags">The message flags.</param> public IrssMessage(MessageType type, MessageFlags flags) : this() { @@ -118,12 +227,24 @@ _flags = flags; } + /// <summary> + /// Initializes a new instance of the <see cref="IrssMessage"/> class. + /// </summary> + /// <param name="type">The message type.</param> + /// <param name="flags">The message flags.</param> + /// <param name="data">The message data.</param> public IrssMessage(MessageType type, MessageFlags flags, byte[] data) : this(type, flags) { SetDataAsBytes(data); } + /// <summary> + /// Initializes a new instance of the <see cref="IrssMessage"/> class. + /// </summary> + /// <param name="type">The message type.</param> + /// <param name="flags">The message flags.</param> + /// <param name="data">The message data.</param> public IrssMessage(MessageType type, MessageFlags flags, string data) : this(type, flags) { Modified: trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs 2007-10-07 17:28:41 UTC (rev 981) +++ trunk/plugins/IR Server Suite/Common/IrssComms/MessageManagerCombo.cs 2007-10-09 07:36:01 UTC (rev 982) @@ -73,7 +73,7 @@ /// <summary> /// Indicates whether the current object is equal to another object of the same type. /// </summary> - /// <param name="obj">An object to compare with this object.</param> + /// <param name="other">An object to compare with this object.</param> /// <returns>true if the current object is equal to the other parameter; otherwise, false.</returns> public bool Equals(MessageManagerCombo other) { @@ -83,8 +83,11 @@ /// <summary> /// Indicates whether the current object is equal to another object of the same type. /// </summary> - /// <param name="obj">An object to compare with this object.</param> - /// <returns>true if the current object is equal to the other parameter; otherwise, false.</returns> + /// <param name="obj1">First object to compare.</param> + /// <param name="obj2">Second object to compare.</pa... [truncated message content] |
From: <an...@us...> - 2007-10-07 17:28:43
|
Revision: 981 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=981&view=rev Author: and-81 Date: 2007-10-07 10:28:41 -0700 (Sun, 07 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.resx trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -356,7 +356,6 @@ #endregion Debug - } } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -223,6 +223,7 @@ _notifyWindow.UnregisterDeviceRemoval(); _notifyWindow.Dispose(); + _notifyWindow = null; CloseDevice(); Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -539,6 +539,7 @@ _notifyWindow.UnregisterDeviceRemoval(); _notifyWindow.Dispose(); + _notifyWindow = null; CloseDevice(); Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -217,6 +217,7 @@ _notifyWindow.UnregisterDeviceRemoval(); _notifyWindow.Dispose(); + _notifyWindow = null; CloseDevice(); Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -26,20 +26,20 @@ #region Enumerations /// <summary> - /// Describes the operation mode of the IR Server. + /// Describes the operation mode of the Input Service. /// </summary> - public enum IRServerMode + public enum InputServiceMode { /// <summary> - /// Acts as a standard IR Server (Default). + /// Acts as a standard Server (Default). /// </summary> ServerMode = 0, /// <summary> - /// Relays button presses to another IR Server. + /// Relays button presses to another Input Service. /// </summary> RelayMode = 1, /// <summary> - /// Acts as a repeater for another IR Server's IR blasting. + /// Acts as a repeater for another Input Service's blasting. /// </summary> RepeaterMode = 2, } @@ -63,7 +63,7 @@ Server _server; Client _client; - IRServerMode _mode; + InputServiceMode _mode; string _hostComputer; bool _registered; // Used for relay and repeater modes. @@ -96,22 +96,24 @@ #region IDisposable - protected override void Dispose(bool disposing) + protected override void Dispose(bool disposeManagedResources) { try { - if (disposing) + if (disposeManagedResources) { - if (_server != null) - _server.Dispose(); + // Dispose managed resources ... - if (_client != null) - _client.Dispose(); + StopServer(); + StopClient(); } + + // Free native resources ... + } finally { - base.Dispose(disposing); + base.Dispose(disposeManagedResources); } } @@ -127,7 +129,7 @@ try { - IrssLog.Info("Starting IR Server ..."); + IrssLog.Info("Starting Input Service ..."); LoadSettings(); @@ -184,19 +186,19 @@ // Mode select ... switch (_mode) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: StartServer(); IrssLog.Info("Started in Server Mode"); break; - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: if (StartRelay()) IrssLog.Info("Started in Relay Mode"); else IrssLog.Error("Failed to start in Relay Mode"); break; - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: if (StartRepeater()) IrssLog.Info("Started in Repeater Mode"); else @@ -268,7 +270,7 @@ } - IrssLog.Info("IR Server started"); + IrssLog.Info("Input Service started"); } catch (Exception ex) { @@ -278,9 +280,9 @@ protected override void OnStop() { - IrssLog.Info("Stopping IR Server ..."); + IrssLog.Info("Stopping Input Service ..."); - if (_mode == IRServerMode.ServerMode) + if (_mode == InputServiceMode.ServerMode) { IrssMessage message = new IrssMessage(MessageType.ServerShutdown, MessageFlags.Notify); SendToAll(message); @@ -340,20 +342,20 @@ IrssLog.Error(ex.ToString()); } - // Stop Server + // Stop Service try { switch (_mode) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: StopServer(); break; - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: StopRelay(); break; - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: StopRepeater(); break; } @@ -375,6 +377,8 @@ { switch (powerStatus) { + + #region Suspend case PowerBroadcastStatus.Suspend: IrssLog.Info("Entering standby ..."); @@ -384,24 +388,42 @@ { foreach (IRServerPluginBase plugin in _pluginReceive) { - if (plugin == _pluginTransmit) - suspendedTransmit = true; - - plugin.Suspend(); + try + { + plugin.Suspend(); + + if (plugin == _pluginTransmit) + suspendedTransmit = true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } } } if (_pluginTransmit != null && !suspendedTransmit) - _pluginTransmit.Suspend(); + { + try + { + _pluginTransmit.Suspend(); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } // Inform clients ... - if (_mode == IRServerMode.ServerMode) + if (_mode == InputServiceMode.ServerMode) { - IrssMessage message = new IrssMessage(MessageType.ServerShutdown, MessageFlags.Notify); + IrssMessage message = new IrssMessage(MessageType.ServerSuspend, MessageFlags.Notify); SendToAll(message); } break; + #endregion Suspend + #region Resume case PowerBroadcastStatus.ResumeAutomatic: case PowerBroadcastStatus.ResumeCritical: case PowerBroadcastStatus.ResumeSuspend: @@ -413,18 +435,41 @@ { foreach (IRServerPluginBase plugin in _pluginReceive) { - if (plugin == _pluginTransmit) - resumedTransmit = true; + try + { + plugin.Resume(); - plugin.Resume(); + if (plugin == _pluginTransmit) + resumedTransmit = true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } } } if (_pluginTransmit != null && !resumedTransmit) - _pluginTransmit.Resume(); + { + try + { + _pluginTransmit.Resume(); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } - // TODO: Inform clients ? + // Inform clients ... + if (_mode == InputServiceMode.ServerMode) + { + IrssMessage message = new IrssMessage(MessageType.ServerResume, MessageFlags.Notify); + SendToAll(message); + } break; + #endregion Resume + } return true; @@ -519,12 +564,14 @@ IrssLog.Error("Communications failure"); StopClient(); + + IrssLog.Error("Please report this error"); } void Connected(object obj) { IrssLog.Info("Connected to another server"); - if (_mode == IRServerMode.RepeaterMode) + if (_mode == InputServiceMode.RepeaterMode) { IrssMessage message = new IrssMessage(MessageType.RegisterRepeater, MessageFlags.Request); _client.Send(message); @@ -658,23 +705,23 @@ switch (_mode) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: { IrssMessage message = new IrssMessage(MessageType.RemoteEvent, MessageFlags.Notify, bytes); SendToAll(message); break; } - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: { IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, bytes); _client.Send(message); break; } - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: { - IrssLog.Debug("Remote event ignored, IR Server is in Repeater Mode."); + IrssLog.Debug("Remote event ignored, Input Service is in Repeater Mode."); break; } } @@ -690,23 +737,23 @@ switch (_mode) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: { IrssMessage message = new IrssMessage(MessageType.KeyboardEvent, MessageFlags.Notify, bytes); SendToAll(message); break; } - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: { IrssMessage message = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, bytes); _client.Send(message); break; } - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: { - IrssLog.Debug("Keyboard event ignored, IR Server is in Repeater Mode."); + IrssLog.Debug("Keyboard event ignored, Input Service is in Repeater Mode."); break; } } @@ -723,23 +770,23 @@ switch (_mode) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: { IrssMessage message = new IrssMessage(MessageType.MouseEvent, MessageFlags.Notify, bytes); SendToAll(message); break; } - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: { IrssMessage message = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, bytes); _client.Send(message); break; } - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: { - IrssLog.Debug("Mouse event ignored, IR Server is in Repeater Mode."); + IrssLog.Debug("Mouse event ignored, Input Service is in Repeater Mode."); break; } } @@ -979,7 +1026,7 @@ #region ForwardRemoteEvent case MessageType.ForwardRemoteEvent: - if (_mode == IRServerMode.RelayMode) + if (_mode == InputServiceMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); _client.Send(forward); @@ -994,7 +1041,7 @@ #region ForwardKeyboardEvent case MessageType.ForwardKeyboardEvent: - if (_mode == IRServerMode.RelayMode) + if (_mode == InputServiceMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); _client.Send(forward); @@ -1009,7 +1056,7 @@ #region ForwardMouseEvent case MessageType.ForwardMouseEvent: - if (_mode == IRServerMode.RelayMode) + if (_mode == InputServiceMode.RelayMode) { IrssMessage forward = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); _client.Send(forward); @@ -1027,7 +1074,7 @@ { IrssMessage response = new IrssMessage(MessageType.BlastIR, MessageFlags.Response); - if (_mode == IRServerMode.RelayMode) + if (_mode == InputServiceMode.RelayMode) { response.Flags |= MessageFlags.Failure; } @@ -1054,7 +1101,7 @@ { IrssMessage response = new IrssMessage(MessageType.LearnIR, MessageFlags.Response); - if (_mode == IRServerMode.RelayMode) + if (_mode == InputServiceMode.RelayMode) { response.Flags |= MessageFlags.Failure; } @@ -1372,7 +1419,7 @@ void LoadSettings() { - _mode = IRServerMode.ServerMode; + _mode = InputServiceMode.ServerMode; _hostComputer = String.Empty; _pluginNameReceive = null; _pluginNameTransmit = String.Empty; @@ -1408,7 +1455,7 @@ return; } - try { _mode = (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); } + try { _mode = (InputServiceMode)Enum.Parse(typeof(InputServiceMode), doc.DocumentElement.Attributes["Mode"].Value, true); } catch (Exception ex) { IrssLog.Warn(ex.ToString()); } try { _hostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; } @@ -1440,7 +1487,7 @@ writer.WriteStartDocument(true); writer.WriteStartElement("settings"); // <settings> - writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), _mode)); + writer.WriteAttributeString("Mode", Enum.GetName(typeof(InputServiceMode), _mode)); writer.WriteAttributeString("HostComputer", _hostComputer); writer.WriteAttributeString("PluginTransmit", _pluginNameTransmit); Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -54,7 +54,7 @@ } /// <summary> - /// Retreives a list of available IR Server plugins. + /// Retreives a list of available Input Service plugins. /// </summary> /// <returns>Array of plugin instances.</returns> internal static IRServerPluginBase[] AvailablePlugins() @@ -89,11 +89,11 @@ } catch (BadImageFormatException) { - // Ignore Bad Image Format Exceptions, just keep checking for IR Server Plugins + // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins } catch (TypeLoadException) { - // Ignore Type Load Exceptions, just keep checking for IR Server Plugins + // Ignore Type Load Exceptions, just keep checking for Input Service Plugins } } Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -56,7 +56,7 @@ this.groupBoxMode.Size = new System.Drawing.Size(384, 120); this.groupBoxMode.TabIndex = 0; this.groupBoxMode.TabStop = false; - this.groupBoxMode.Text = "IR Server Mode"; + this.groupBoxMode.Text = "Input Service Mode"; // // labelComputer // @@ -78,7 +78,7 @@ this.radioButtonRepeater.TabIndex = 2; this.radioButtonRepeater.TabStop = true; this.radioButtonRepeater.Text = "Repeater mode"; - this.toolTips.SetToolTip(this.radioButtonRepeater, "All output commands from a host IR Server are repeated"); + this.toolTips.SetToolTip(this.radioButtonRepeater, "All output commands from a host Input Service are repeated"); this.radioButtonRepeater.UseVisualStyleBackColor = true; this.radioButtonRepeater.CheckedChanged += new System.EventHandler(this.radioButtonRepeater_CheckedChanged); // @@ -91,7 +91,7 @@ this.radioButtonRelay.TabIndex = 1; this.radioButtonRelay.TabStop = true; this.radioButtonRelay.Text = "Input relay mode"; - this.toolTips.SetToolTip(this.radioButtonRelay, "All input is relayed to another IR Server instance"); + this.toolTips.SetToolTip(this.radioButtonRelay, "All input is relayed to another Input Service instance"); this.radioButtonRelay.UseVisualStyleBackColor = true; this.radioButtonRelay.CheckedChanged += new System.EventHandler(this.radioButtonRelay_CheckedChanged); // @@ -104,7 +104,7 @@ this.radioButtonServer.TabIndex = 0; this.radioButtonServer.TabStop = true; this.radioButtonServer.Text = "Server mode (default)"; - this.toolTips.SetToolTip(this.radioButtonServer, "IR Server operates as a device server (default)"); + this.toolTips.SetToolTip(this.radioButtonServer, "Input Service operates as a device server (default)"); this.radioButtonServer.UseVisualStyleBackColor = true; this.radioButtonServer.CheckedChanged += new System.EventHandler(this.radioButtonServer_CheckedChanged); // @@ -158,7 +158,7 @@ this.MinimumSize = new System.Drawing.Size(418, 213); this.Name = "Advanced"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "IR Server - Advanced Configuration"; + this.Text = "Input Service Configuration - Advanced"; this.groupBoxMode.ResumeLayout(false); this.groupBoxMode.PerformLayout(); this.ResumeLayout(false); Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -15,30 +15,30 @@ #region Properties - public IRServerMode Mode + public InputServiceMode Mode { get { if (radioButtonRelay.Checked) - return IRServerMode.RelayMode; + return InputServiceMode.RelayMode; else if (radioButtonRepeater.Checked) - return IRServerMode.RepeaterMode; + return InputServiceMode.RepeaterMode; else - return IRServerMode.ServerMode; + return InputServiceMode.ServerMode; } set { switch (value) { - case IRServerMode.ServerMode: + case InputServiceMode.ServerMode: radioButtonServer.Checked = true; break; - case IRServerMode.RelayMode: + case InputServiceMode.RelayMode: radioButtonRelay.Checked = true; break; - case IRServerMode.RepeaterMode: + case InputServiceMode.RepeaterMode: radioButtonRepeater.Checked = true; break; } Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.resx =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.resx 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.resx 2007-10-07 17:28:41 UTC (rev 981) @@ -123,49 +123,158 @@ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> - AAABAAIAICAAAAEACACoCAAAJgAAABAQEAABAAQAKAEAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAE - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwADA3MAA8MqmANTw - /wCx4v8AjtT/AGvG/wBIuP8AJar/AACq/wAAktwAAHq5AABilgAASnMAADJQANTj/wCxx/8Ajqv/AGuP - /wBIc/8AJVf/AABV/wAASdwAAD25AAAxlgAAJXMAABlQANTU/wCxsf8Ajo7/AGtr/wBISP8AJSX/AAAA - /gAAANwAAAC5AAAAlgAAAHMAAABQAOPU/wDHsf8Aq47/AI9r/wBzSP8AVyX/AFUA/wBJANwAPQC5ADEA - lgAlAHMAGQBQAPDU/wDisf8A1I7/AMZr/wC4SP8AqiX/AKoA/wCSANwAegC5AGIAlgBKAHMAMgBQAP/U - /wD/sf8A/47/AP9r/wD/SP8A/yX/AP4A/gDcANwAuQC5AJYAlgBzAHMAUABQAP/U8AD/seIA/47UAP9r - xgD/SLgA/yWqAP8AqgDcAJIAuQB6AJYAYgBzAEoAUAAyAP/U4wD/sccA/46rAP9rjwD/SHMA/yVXAP8A - VQDcAEkAuQA9AJYAMQBzACUAUAAZAP/U1AD/sbEA/46OAP9rawD/SEgA/yUlAP4AAADcAAAAuQAAAJYA - AABzAAAAUAAAAP/j1AD/x7EA/6uOAP+PawD/c0gA/1clAP9VAADcSQAAuT0AAJYxAABzJQAAUBkAAP/w - 1AD/4rEA/9SOAP/GawD/uEgA/6olAP+qAADckgAAuXoAAJZiAABzSgAAUDIAAP//1AD//7EA//+OAP// - awD//0gA//8lAP7+AADc3AAAubkAAJaWAABzcwAAUFAAAPD/1ADi/7EA1P+OAMb/awC4/0gAqv8lAKr/ - AACS3AAAerkAAGKWAABKcwAAMlAAAOP/1ADH/7EAq/+OAI//awBz/0gAV/8lAFX/AABJ3AAAPbkAADGW - AAAlcwAAGVAAANT/1ACx/7EAjv+OAGv/awBI/0gAJf8lAAD+AAAA3AAAALkAAACWAAAAcwAAAFAAANT/ - 4wCx/8cAjv+rAGv/jwBI/3MAJf9XAAD/VQAA3EkAALk9AACWMQAAcyUAAFAZANT/8ACx/+IAjv/UAGv/ - xgBI/7gAJf+qAAD/qgAA3JIAALl6AACWYgAAc0oAAFAyANT//wCx//8Ajv//AGv//wBI//8AJf//AAD+ - /gAA3NwAALm5AACWlgAAc3MAAFBQAPLy8gDm5uYA2traAM7OzgDCwsIAtra2AKqqqgCenp4AkpKSAIaG - hgB6enoAbm5uAGJiYgBWVlYASkpKAD4+PgAyMjIAJiYmABoaGgAODg4A8Pv/AKSgoACAgIAAAAD/AAD/ - AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAABAAQAICAAAAEACACoCAAARgAAABAQAAABAAgAaAUAAO4IAAAgIAAAAQAgAKgQAABWDgAAEBAAAAEA + IABoBAAA/h4AACgAAAAgAAAAQAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgYGBAIWF + hQCIiIgAjo6OAJGRkQCVlZUAmpqaAJucnACdnZ0AoaKiAKWmpgCnqKgAqKmpAKusrACsra0AsbGxALW1 + tQC4ubkAu7y8ALy9vQDDw8MAxcXFAMnJyQDNzs4A0dLSANPU1ADV1dUA2NnZAN3d3QDg4OAA5OXlAOjp + 6QDu7u4A8fHxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - /PwAAPz8/PwA/AAA/AAAAPwAAAD8/Pz8APwAAPwAAAAAAPwA/AAAAAD8AAD8AAD8APwAAPwAAAAA/AAA - /AAAAAAA/AD8AAAAAPwAAPwAAPwA/AAA/AAAAAD8AAD8AAAAAAD8APwAAAAA/AAA/AD8AAAA/AD8AAAA - APwAAPwAAAAAAPwA/AAAAAD8AAD8APwAAAD8APwAAAAA/AAA/AAAAPz8AAD8/PwAAPz8/AAA/AAAAPwA - /Pz8AAD8/PwAAAD8AAAAAPwAAAAA/AAA/AD8AAAA/AD8AAAAAPwAAPwAAPwAAAAA/AAAAAD8AAD8APwA - AAD8APwAAAAA/AAA/AAA/AAAAAD8AAAAAPwAAPwA/AAAAPwA/AAAAAD8AAD8AAD8AAAAAPwAAAAA/AAA - /AD8AAAA/AD8AAAAAPwAAPwAAAD8/AAA/Pz8/AD8/PwAAPwAAAD8APz8/PwA/Pz8AAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - APn5+fn5+fn5AAAA+fn5AAAAAAD5+fkAAAAAAAAAAAAAAPn5+fn5+QAAAAAA+fkAAAAAAPn5AAAAAAAA - AAAAAAAAAAD5+QAAAAAAAAD5+QAAAAAA+fkAAAAAAAAAAAAAAAAAAPn5AAAAAAAAAPn5+fn5+fn5AAAA - AAAAAAAAAAAAAAAA+fkAAAAAAAAA+fn5+fn5+fkAAAAAAAAAAAAAAAAAAAD5+QAAAAAAAAD5+QAAAAAA - +fkAAAAAAAAAAAAAAAAAAPn5AAAAAAAAAPn5AAAAAAD5+QAAAAAAAAAAAAAAAAAA+fkAAAAAAAAA+fkA - AAAAAPn5AAAAAAAAAAAAAAAA+fn5+fn5AAAAAAD5+fn5+fn5+fkAAAAAAAAAAAAAAPn5+fn5+fn5AAAA - +fn5+fn5+fn5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////AAAAAP/////MLdwt9e2t7fXtre317XXt9e117cxj - dGO97XXtve117b3tde297XXtzCN0I//////////////////////gHHx/8D58//z+fP/8/gH//P4B//z+ - fP/8/nz//P58//A+AP/gHAH///////////8AAAAf/////ygAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD/ - /wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAKq77t2ZzAAAAAAAAAAAAAAAAAAAAAAAAAzMDAwAwAAAAA - wMDAwMAAAMzAzADAwAAAwADAwMDAAADMwMwAwMAAAAAAAAAAAAAAmZCQCQAAAAAJAJCQAAAAAAkAmQAA - AAAACQCQkAAAAACZkJmQAAAAAAAAAAAAAAD//wAAgAcAAP//AAD//wAAxW8AAPVXAADE1wAA3VcAAMTX - AAD//wAAxb8AAO1/AADs/wAA7X8AAMR/AAD//wAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAABcQAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASGRgEAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAMDAEABgIbGwUBAAAIAQAAAAAAAAAAAAAAAAAAAAAAAB4WDwQSGBgbGBEC + BxgVAAAAAAAAAAAAAAAAAAAAAAAAHhcVFRUWGBgYHhwYGxgAAAAAAAAAAAAAAAAAAAAAAAAAERMTExUW + GBYcGxgUBgAAAAAAAAAAAAAAAAAAAAAAAAATERETFxseGx4YFRIBAAAAAAAAAAAAAAAAAAAAAAADBA8P + EBUAAAAAHhsTEgIAAAAAAAAAAAAAAAAAAAAADwEBAQMPBQAAAAAbHhMRDwcFAAAACAgIAwEAAAAAAAAO + CAgDAQIBAAAAAAAbGxMQEBUAABAODA4KCAEAAAAAEA4MDAoGAQEAAAAADBMSGxQXHgAAFQ4ODg4KCAAA + AAAVDg4ODgoFAQEBAwQQCwsVBwAAAAAQDg4ODg4MAAAAABAODg4ODgoBCAcJCwkJCwgAAAAAABAODg4O + Dg4AAAAAEA4ODg4ODgQFBgYHBwcJBgEAAAAAEA4ODg4ODgAAAAAQDg4ODg4OBAUFBQUKDgkHBwAAAAAQ + Dg4ODg4OAAAAABAODg4ODg4FDwUFCgwAEBASAAAAABAODg4ODg4AAAAAEA4ODg4ODgASBwUCAAADAQAA + AAAAEA4ODg4ODgAAAAAQDg4ODg4OAAAVCgUKCggGAQAAAAAQDg4ODg4OAAAAABAODg4ODg4AABcUDg4O + DgwIAwAAABAODg4ODg4AAAAAEA4ODg4ODgAAABAODg4ODg4IAwAAEA4ODg4ODgAAAAAQDg4ODg4OAAAX + Dg4QICISDgwKAAAQDg4ODg4OAAAAABAODg4ODg4AABsODhv//x4ODg4AABAODg4ODg4AAAAAEA4ODg4O + DgAAHA4OFf//Gw4OEAAAEg4ODg4OEgAAAAASDg4ODg4SAAAgEA4OEhUODg4SAAAcEA4ODhASAAAAABwO + Dg4OEBIAAAAbEA4ODg4OFQAAAAAcFBIVHAAAAAAAABwSEBUbAAAAAAAcEhAOEBcAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAHh4gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + ///////////4////8P///iBn//4AB//+AAf//wAH//8AB//8Dwf/+A8BwfgPgYDwDwGA8AAHgPAAD4Dw + AAeA8AAHgPAAR4DwEM+A8BgHgPAYA4DwHAGA8BgBgPAYAYDwGAGA8BgBgPAcA8H4Pgf///+P//////// + ////////KAAAABAAAAAgAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDhIQAhoaGAIuL + iwCWl5cAmZqaAJ2dnQChoqIAo6SkAKWmpgCnqKgAqampAKusrACtrq4AsbKyALa3twC3uLgAuLm5ALu8 + vADCw8MAxcXFAMnKygDLzMwAz8/PANbX1wDZ2dkA4eHhAOXl5QDv7+8AAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAABIHAAAAAAAAAAAAAAAABwQSEgMHBAAAAAAAAAAAABMTFBUZFQAAAAAAAAAA + AAAOExUAGBMDAAAAAwAAAA4DAQMAABQUCwUACwoDAAAOCwcBAAALEw4AFAsLCwAACwsLBAQGBgUAABQL + CwsAAAsLCwUEBAcJCwAUCwsLAAALCwsEDgMDAwAAFAsLCwAACwsLBAAOCwsFABQLCwsAAAsLCwQACxkb + CwQYCwsLAAAOCwsHAAsVGAsLABIOFAAAGQ4SAAAZDQsUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA//8AAP/PAAD/AQAA/wMAAP8RAADcMAAAjDEAAAwDAAAMAQAADAMAAAwhAAAMIAAADCAAAIxh + AAD//wAA//8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAJAAAAEwAAAA4AAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAABsbGwIODg4FBgYGCxoZGVAWFRVyBQQEUgAAABUCAgIGBgYGAwMDAwEAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAQEBAknJycNS0tLElZWVh9oZ2c/zsfI/rivsf9aWFixOTk5PkBAQB4nJycSEBAQCQIC + AgcAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAADAwMUExISUisrK1FnZ2c7dXV1SH98fIjezNH/3cfP/4F5edZPT09taWlpRWdn + Zy4rKys3AwMDQgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAMzExA2NgYI2ppKT3SEZFri4uLnRYVFSef3Fw3OTP1v/gyNH/mYuM80hE + Q640NDR3Pj09bomFhdFQTk63AAAARwAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACuqagl6eHi/djBxv+8qq3/lIWF88e0uP/cxs3/4MfP/+HI + 0P/dxs7/wbG1/4N3eOmhk5Xy2sfO/8e9wP4+PDt5AwMDBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADUzc2U3snM/9i9wf/Zv8P/2r/E/9vB + xv/cwsj/3cPJ/+DJz//q2+D/5NPY/9/Hz//jy9P/0cfJ7iopKScAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtHRxrFtLP51bq7/9W6 + vP/Wu73/173A/9vDxv/dxMj/28HF/+bU2P/jzdL/3cPJ/8+8v/9APDuMBwcHDwAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkCAgIUW1dWetS/ + vv/QtLP/0bW1/9e9vv/azMz80snIwt3U1L/h1tb67N7g/+HMzv/ZvsL/yra5/0I+PacAAAAsAAAADAAA + AAUAAAAAAAAAAAAAAAAAAAAFAAAADAAAAAoAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAfHR0GDQ0NRyUj + I4OIe3nex62q/8qtqv/Nsa//z8G/+EVCQk4AAAAAAAAAANnS0TPh2Njx5NPU/9S5uv/Qt7n/em9v3woK + Cm4AAABWAAAAOAAAAAABAQECAAAAGQQEBEMLCwtdAAAAUgAAADYAAAAPAAAAAAAAAAAAAAAAAAAAAIN/ + fkK0raz+hnh1/4h5dv+KdXL/oYmF/8Stqv9ya2q5BwcHFAAAAAAAAAAAAAAAAL61tIvs4eH/176+/9C0 + tP/Aq6v/ppeX/piSkfEtLCx7AAAAAAsLCx5jY2Okl5iY7piZmfp8fX3jMTIymQAAAEcAAAAMAAAAAAAA + AAAAAAAAS0lJVa2rqv+enJz/mJiY/4yJiP96bmr/lYWB/0xHRrEAAAApAAAAAgAAAAAZGBcCbGZlfOPT + 0f/k1NP/1Lu5/86ysP/Ps7L/08TD/0dFRHgjIyMGkJGRsqytrf+nqKj/qKmp/6Ojo/+YmJj+OTk5mgAA + ACoAAAABAAAAACkpKQeWlpa6q6ys/6eoqP+nqKj/oaKi/5eXl/9/dHL/amRi5AMCAl4AAAAtAAAAGgIC + AiyflZPR1L25/9G4tP/i0tD/z7u5/9jLyfXg2djKgX19L3R1dTvCwsL+qqqq/6mqqv+pqqr/qaqq/6Wm + pv+QkZHsAQEBPwAAAAMAAAAAg4ODRMDBwf6pqqr/qaqq/6mqqv+pqqr/pKSk/5iVlP+Qgn7/Z2Bf1iUj + I5EoJiaKeXFwzcm1r//DpJ3/xKWe/9bCvv91bGqrSkdGDAAAAAAAAAAAsrOzebO0tP+pqqr/qaqq/6mq + qv+pqqr/qaqq/6eoqP4UFBRQAAAABAAAAADKysp3s7Oz/6mqqv+pqqr/qaqq/6mqqv+oqan/p6en/5B5 + cP+1nJL/rZuU/7KfmP/Ap57/vZ6U/7+flf/AoZj/r5uW+x4cHGMDAwIMAAAAAAAAAACztLR9sbKy/6mq + qv+pqqr/qaqq/6mqqv+pqqr/qamp/xYWFlEAAAAEAAAAANXW1nyxsrL/qaqq/6mqqv+pqqr/qaqq/6mq + qv+pqan/no2G/7OThP+3loj/uJeJ/7mYi/+6mY3/u5qO/7yckf+plY7+LSsqlQAAADAAAAACAAAAALOz + s32xsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+pqan/FhYWUQAAAAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mq + qv+pqqr/qaqq/6ipqf+aiID/sZCA/7ORgf+zkoL/tpWG/8Cjl//ErKL/vZ+T/7aZjf+jmpfyFRQUQgEB + AQIAAAAAs7OzfbGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6mpqf8WFhZRAAAABAAAAADV1tZ8sbGx/6mq + qv+pqqr/qaqq/6mqqv+pqqr/qKio/nx3dsK8qqL0s5KB/7KRgP+1oJf4joSBtFZRT3S0qaXowrKq/6+p + p9ApKCcUAAAAAAAAAACzs7N9sbGx/6mqqv+pqqr/qaqq/6mqqv+pqqr/qamp/xYWFlEAAAAEAAAAANXW + 1nyxsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+oqKj9Dw8PRoyEgZG4mon/r5GA/2BXVb0KCgpZKCgofzU1 + NZRcW1rADAsLWgEBASUAAAAFAAAAALOzs32xsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+pqan/FhYWUQAA + AAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6ioqP0PDw9GgX18Y9PCt/+zopj/jo2N6KGh + ofifoKD/m5yc/5WVlfxmZmbPDw8PcAAAAC0AAAADs7OzfbGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6mp + qf8WFhZRAAAABAAAAADV1tZ8sbGx/6mqqv+pqqr/qaqq/6mqqv+pqqr/qKio/Q8PD0ZSUE8bnJiXiL69 + vfWqq6v/qKmp/6mqqv+pqqr/p6io/56env+DhITrDg4OaQAAABezs7N9sbGx/6mqqv+pqqr/qaqq/6mq + qv+pqqr/qamp/xYWFlEAAAAEAAAAANXW1nyxsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+oqKj9Dw8PRiEg + IAN1dnZutre3/6mqqv+pqqr/qKmp/6ipqf+pqqr/qamp/5+fn/9kZWXEAAAAM7Ozs32xsbH/qaqq/6mq + qv+pqqr/qaqq/6mqqv+pqan/FhYWUQAAAAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6io + qP0PDw9GMzQ0BLm6usesra3/qaqq/7Gysv/q6ur/8PDw/7y9vf+pqqr/p6io/56envgHBwdHtLS0fLGx + sf+pqqr/qaqq/6mqqv+pqqr/qaqq/6mpqf8WFhZRAAAABAAAAADW1tZ8sbKy/6mqqv+pqqr/qaqq/6mq + qv+pqqr/qKmp/Q8PD0VHR0cE0NHR6KusrP+pqqr/09PT////////////5ufn/6mqqv+pqqr/qaqq/xwd + HVTMzc18srOz/6mqqv+pqqr/qaqq/6mqqv+pqqr/q6ur/xcXF0sAAAACAAAAANrb23uysrL/qaqq/6mq + qv+pqqr/qaqq/6mqqv+rrKz9Dw8PP1VVVQLV1tbcrK2t/6mqqv/DxMT//v7+///////W19f/qaqq/6mq + qv+ys7P+GBgYO+Pk5F69vr7/qaqq/6mqqv+pqqr/qaqq/6qqqv+3uLj6ERERKQAAAAAAAAAA4uLiY7u7 + u/+pqqr/qaqq/6mqqv+pqqr/qqqq/7W1tfQLCwshAAAAAODh4Zi0tbX/qaqq/6ipqf+8vb3/wsPD/6mq + qv+pqqr/q6ys/6ysrNkREREQ5OTkDNrb2+ewsbH/qaqq/6mqqv+qq6v/s7Oz/5qbm68lJSUHAAAAAAAA + AADk5OQW19fX8a+vr/+pqqr/qaqq/6qrq/+0tLT/k5SUpSQlJQYAAAAA5OTkIdXV1fGvsLD/qaqq/6mq + qv+pqqr/qaqq/6usrP/BwsL+ZmZmWioqKgEAAAAA5ebmPNvb2+q/wMD/t7i4/8PDw//Q0NDHfn5+FwAA + AAAAAAAAAAAAAAAAAADm5uZM2NjY8ry9vf+2trb/wsPD/8vMzMR5enoUAAAAAAAAAAAAAAAA5OXlQtjZ + 2ey6urr/sLCw/6+vr/+ztLT/ysvL+rCxsXJra2sBAAAAAAAAAAAAAAAA5+fnEOfo6F7n5+d14eLiStLS + 0gMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADm5+cZ5+joaubm5n7h4eFMzs7OAwAAAAAAAAAAAAAAAAAA + AAAAAAAA5eXlFebm5nnd3t6z29zct9/g4IzY2dkpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA///4f///wA///wAD//4AA//8AAH//AAB//4AA//+AAP/+AAA4fAGAIDwBwCAcAIAACAAAAAg + AAMAIAADACAAAQAgAAEAIAADACAAAQAgAAAAIAAAACAAAAAgAAAAIAAAACAAAABgCAAAYAgAgPAcAcH4 + Pgf///////////////8oAAAAEAAAACAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgoKAQgICBkGBgY5AAAABwICAgEAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEFGhoaLl9fXy2lnp+xnJKU4UxMTEMyMjIgAQEBGAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAi4eHbaKVl+h4b3DByLS59s64v/xwaGnDkYeJzFVR + Up0AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAImFhSvUvb/9173A/9vBxf/dxMn/5tTY/9vE + yv9RTU1sAAAAAAAAAAAAAAABAAAABQAAAAAAAAAAAAAAAAsKChVDPj18zbOx/9G5uP2dlZWD29LSe+TV + 1vvSubv/MS4tiAAAACgFBQUIPz8/fEhISKMMDAxJAAAAAwAAAACMiIelkYmI/4x9ev+GeXbaAwICEAAA + AAC+tLPB2MDA/8Gqqf54cnG4ent7fKmqqv+nqKj/gYKC4QAAABs1NTUSq6ur7aipqf+hoqL/hHx5+CMh + IX0pJiZnwKum89O8uP+ajoyrsKqpPrKzs72pqqr/qaqq/6ipqf4KCgoqlJWVPK2urv+pqqr/qamp/5+W + kv+zmIz/uZ2T/7yckf+1m5P+ExISTQAAAACysrK+qaqq/6mqqv+pqan/CwsLKp6enj6trq7/qaqq/6mq + qv+alJLvtZeJ/LSWiP2aiYLJuqWc+WRgXoYAAAAAsrKyvqmqqv+pqqr/qamp/wsLCyqenp4+ra6u/6mq + qv+pqqr/W1xcoqaXj7yUhn7oXV1dtHBwcNQgICBvAAAADbKysr6pqqr/qaqq/6mpqf8LCwsqnp6ePq2u + rv+pqqr/qaqq/1tcXKJhX19FsrKy/Kipqf+oqan/mpub+hwcHF6ys7O9qaqq/6mqqv+pqan/CwsLKp6f + nz6trq7/qaqq/6mqqv9bXFyigYGBbqqrq//b29v/5OTk/6ipqf9bW1ukyMjItqmqqv+pqqr/ra6u/QoK + Ch6kpaU3sLCw/6mqqv+pqqr/Xl9flJiZmV2sra3/ysrK/9DR0f+pqqr/YmJiiN3e3ky9vr75s7S0/6en + p6MUFRUBi4uLBdHR0cyxsrL/u7u78FdXVzCNjo4I0NHRx6+wsP+trq7/urq62kNDQxcAAAAAs7OzG7q6 + ujAAAAAAAAAAAAAAAACYmJgGvL29OqanpxQAAAAAAAAAAJiYmAXIyclLxMXFUJmamgoAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+D + nEH+AZxB/gCcQf4BnEGcAJxBBBCcQQAAnEEAAZxBAAGcQQAAnEEAAJxBAACcQQAAnEEAAJxBnGGcQf// + nEE= </value> </data> </root> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -22,14 +22,14 @@ IRServerPluginBase[] _transceivers; - IRServerMode _mode = IRServerMode.ServerMode; + InputServiceMode _mode = InputServiceMode.ServerMode; string _hostComputer = String.Empty; #endregion Variables #region Properties - public IRServerMode Mode + public InputServiceMode Mode { get { return _mode; } set { _mode = value; } @@ -120,7 +120,7 @@ _transceivers = Program.AvailablePlugins(); if (_transceivers == null || _transceivers.Length == 0) { - MessageBox.Show(this, "No IR Server Plugins found!", "IR Server Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(this, "No Input Service Plugins found!", "Input Service Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error); } else { @@ -299,7 +299,7 @@ { try { - Help.ShowHelp(this, SystemRegistry.GetInstallFolder() + "\\IR Server Suite.chm", HelpNavigator.Topic, "IR Server\\index.html"); + Help.ShowHelp(this, SystemRegistry.GetInstallFolder() + "\\Input Service.chm", HelpNavigator.Topic, "Input Service\\index.html"); } catch (Exception ex) { Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs 2007-10-07 12:28:20 UTC (rev 980) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs 2007-10-07 17:28:41 UTC (rev 981) @@ -16,20 +16,20 @@ #region Enumerations /// <summary> - /// Describes the operation mode of the IR Server. + /// Describes the operation mode of the Input Service. /// </summary> - public enum IRServerMode + public enum InputServiceMode { /// <summary> - /// Acts as a standard IR Server (Default). + /// Acts as a standard Server (Default). /// </summary> ServerMode = 0, /// <summary> - /// Relays button presses to another IR Server. + /// Relays button presses to another Input Service. /// </summary> RelayMode = 1, /// <summary> - /// Acts as a repeater for another IR Server's IR blasting. + /// Acts as a repeater for another Input Service's blasting. /// </summary> RepeaterMode = 2, } @@ -47,7 +47,7 @@ #region Variables - static IRServerMode _mode; + static InputServiceMode _mode; static string _hostComputer; static string[] _pluginNameReceive; static string _pluginNameTransmit; @@ -108,7 +108,7 @@ { IrssLog.Info("Loading settings ..."); - _mode = IRServerMode.ServerMode; + _mode = InputServiceMode.ServerMode; _hostComputer = String.Empty; _pluginNameReceive = null; _pluginNameTransmit = String.Empty; @@ -144,7 +144,7 @@ return; } - try { _mode = (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); } + try { _mode = (InputServiceMode)Enum.Parse(typeof(InputServiceMode), doc.DocumentElement.Attributes["Mode"].Value, true); } catch (Exception ex) { IrssLog.Warn(ex.ToString()); } try { _hostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; } @@ -178,7 +178,7 @@ writer.WriteStartDocument(true); writer.WriteStartElement("settings"); // <settings> - writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), _mode)); + writer.WriteAttributeString("Mode", Enum.GetName(typeof(InputServiceMode), _mode)); writer.WriteAttributeString("HostComputer", _hostComputer); writer.WriteAttributeString("PluginTransmit", _pluginNameTransmit); @@ -239,7 +239,7 @@ } /// <summary> - /// Retreives a list of available IR Server plugins. + /// Retreives a list of available Input Service plugins. /// </summary> /// <returns>Array of plugin instances.</returns> internal static IRServerPluginBase[] AvailablePlugins() @@ -274,11 +274,11 @@ } catch (BadImageFormatException) { - // Ignore Bad Image Format Exceptions, just keep checking for IR Server Plugins + // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins } catch (TypeLoadException) { - // Ignore Type Load Exceptions, just keep checking for IR Server Plugins + // Ignore Type Load Exceptions, just keep checking for Input Service Plugins } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-10-07 12:28:22
|
Revision: 980 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=980&view=rev Author: chef_koch Date: 2007-10-07 05:28:20 -0700 (Sun, 07 Oct 2007) Log Message: ----------- just added a minor bug note Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/README.txt Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-06 22:11:51 UTC (rev 979) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-10-07 12:28:20 UTC (rev 980) @@ -38,9 +38,8 @@ -Change graphics for fileinfobackground (it says mymovies...) BUGS: + - When starting the configuration and the "myProgramsAltPreconfiguration.xml" is missing, it will throw an exception. -- goes here.. - FEATURES: Add some more specific emulator support.. - bring/keep the profiles up-to-date This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mis...@us...> - 2007-10-06 22:11:53
|
Revision: 979 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=979&view=rev Author: misterd_sf Date: 2007-10-06 15:11:51 -0700 (Sat, 06 Oct 2007) Log Message: ----------- - Improved performance of the external osd library. Now only an update occures, if it is needed. - Fixed Labels in external osd library - Suspend and resume layout of MP form while adding/removing elements Modified Paths: -------------- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/BaseWindow.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -39,6 +39,16 @@ /// List of all elements of the window /// </summary> protected List<BaseElement> _elementList; + + /// <summary> + /// Indicates, if the window is visible + /// </summary> + private bool _visible; + + /// <summary> + /// Indicates, if the visibility of the window has changed + /// </summary> + protected bool _visibleChanged; #endregion #region protected methods @@ -114,7 +124,7 @@ /// <param name="graph">Graphics of the bitmap</param> public void DrawWindow(Graphics graph) { try { - if (IsWindowVisible()) { + if (_visible) { foreach (BaseElement element in _elementList) { element.DrawElement(graph); } @@ -123,6 +133,38 @@ Log.Error(ex); } } + + /// <summary> + /// Indicates if the window is currently visible + /// </summary> + /// <returns>true, if window is visible; false otherwise</returns> + public bool CheckVisibility() { + bool result = CheckSpecificVisibility(); + if (result != _visible) { + _visible = result; + _visibleChanged = true; + } + return result; + } + + /// <summary> + /// Checks, if an update is needed for this window + /// </summary> + /// <returns>true, if an update is needed; false otherwise</returns> + public bool CheckForUpdate() { + CheckVisibility(); + bool result = false; + if (_visibleChanged) { + _visibleChanged = false; + result = true; + } + if (_visible) { + foreach (BaseElement element in _elementList) { + result = result | element.CheckForUpdate(); + } + } + return result; + } #endregion #region abstract methods @@ -130,7 +172,7 @@ /// Indicates if the window is currently visible /// </summary> /// <returns>true, if window is visible; false otherwise</returns> - public abstract bool IsWindowVisible(); + protected abstract bool CheckSpecificVisibility(); #endregion #region IDisposable Member Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/DialogWindow.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -60,7 +60,7 @@ /// Indicates if the window is currently visible /// </summary> /// <returns>true, if window is visible; false otherwise</returns> - public override bool IsWindowVisible() { + protected override bool CheckSpecificVisibility() { return GUIWindowManager.RoutedWindow == _dialogWindow.GetID; } #endregion Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -34,13 +34,41 @@ /// <summary> /// Base class for all gui elements /// </summary> - public abstract class BaseElement : IDisposable{ + public abstract class BaseElement : IDisposable { + #region variables + /// <summary> + /// Indicates, if the element was visible + /// </summary> + protected bool _wasVisible; + + /// <summary> + /// Control of the base element + /// </summary> + protected GUIControl _control; + #endregion + + #region ctor + /// <summary> + /// Initialize the base element + /// </summary> + /// <param name="control">GUIControl</param> + public BaseElement(GUIControl control) { + _control = control; + } + #endregion + #region abstract methods /// <summary> /// Draws the element on the given graphics /// </summary> /// <param name="graph">Graphics</param> public abstract void DrawElement(Graphics graph); + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected abstract bool CheckElementSpecificForUpdate(); #endregion #region protected methods @@ -119,6 +147,22 @@ /// <param name="cacheFill">Status of the cache</param> public virtual void DrawCacheStatus(Graphics graph, float cacheFill) { } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + public bool CheckForUpdate() { + bool newVisible = _control.Visible; + if (newVisible == _wasVisible) { + return CheckElementSpecificForUpdate(); + } + _wasVisible = newVisible; + if (newVisible) { + CheckElementSpecificForUpdate(); + } + return true; + } #endregion #region IDisposable Member Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -96,6 +96,16 @@ /// Height of the hover image /// </summary> private int _hoverHeight; + + /// <summary> + /// Indicates, if the button is focused + /// </summary> + private bool _focus; + + /// <summary> + /// Label of the button + /// </summary> + private String _label; #endregion #region ctor @@ -103,7 +113,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public ButtonElement(GUIControl control) { + public ButtonElement(GUIControl control) + : base(control) { _button = control as GUIButtonControl; _font = getFont(_button.FontName); _focusBitmap = loadBitmap(_button.TexutureFocusName); @@ -129,6 +140,8 @@ FieldInfo hoverHeightFieldInfo = buttonType.GetField("_hoverHeight", BindingFlags.NonPublic | BindingFlags.Instance); _hoverHeight = Int32.Parse(hoverHeightFieldInfo.GetValue(_button).ToString()); + _label = _button.Label; + _focus = _button.Focus; Log.Debug("VideoPlayerOSD: Found button element: " + _button.GetID); } #endregion @@ -140,7 +153,7 @@ /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { if (_button.Visible) { - if (_button.Focus) { + if (_focus) { if (_focusBitmap != null) { graph.DrawImage(_focusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height); } @@ -171,8 +184,7 @@ break; } Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height); - String label = _button.Label; - graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic); + graph.DrawString(_label, _font, brush, rectangle, StringFormat.GenericTypographic); brush.Dispose(); } } @@ -186,6 +198,24 @@ _hoverBitmap.Dispose(); _font.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_button.Label); + if (!newLabel.Equals(_label)) { + _label = newLabel; + result = true; + } + if (_button.Focus != _focus) { + _focus = _button.Focus; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -76,6 +76,26 @@ /// Text color /// </summary> private Color _textColor; + + /// <summary> + /// Indicates, if the checkmark is focused + /// </summary> + private bool _focus; + + /// <summary> + /// Indicates, if the checkmark is selected + /// </summary> + private bool _selected; + + /// <summary> + /// Indicates, if the checkmark is disabled + /// </summary> + private bool _disabled; + + /// <summary> + /// Label of the button + /// </summary> + private String _label; #endregion #region ctor @@ -83,7 +103,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public CheckMarkElement(GUIControl control) { + public CheckMarkElement(GUIControl control) + : base(control) { _checkMark = control as GUICheckMarkControl; Type buttonType = typeof(GUICheckMarkControl); FieldInfo checkFocusFieldInfo = buttonType.GetField("_checkMarkFocusTextureName", @@ -101,6 +122,10 @@ _font = getFont(_checkMark.FontName); _disabledColor = GetColor(_checkMark.DisabledColor); _textColor = GetColor(_checkMark.TextColor); + _focus = _checkMark.Focus; + _selected = _checkMark.Selected; + _disabled = _checkMark.Disabled; + _label = _checkMark.Label; Log.Debug("VideoPlayerOSD: Found checkMark element: " + _checkMark.GetID); } #endregion @@ -114,37 +139,36 @@ if (_checkMark.Visible) { int dwTextPosX = _checkMark.XPosition; int dwCheckMarkPosX = _checkMark.XPosition; - Rectangle _rectangle = new Rectangle() ; + Rectangle _rectangle = new Rectangle(); _rectangle.X = _checkMark.YPosition; _rectangle.Y = _checkMark.YPosition; _rectangle.Height = _checkFocusBitmap.Height; if (null != _font) { - SizeF sizeF ; + SizeF sizeF; if (_checkMark.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) { - sizeF = graph.MeasureString(_checkMark.Label, _font); + sizeF = graph.MeasureString(GUIPropertyManager.Parse(_label), _font); dwCheckMarkPosX += ((int)(sizeF.Width) + 5); } else { dwTextPosX = (dwCheckMarkPosX + _checkFocusBitmap.Width + 5); - sizeF = graph.MeasureString(_checkMark.Label, _font); + sizeF = graph.MeasureString(GUIPropertyManager.Parse(_label), _font); } - if (_checkMark.Disabled) { + if (_disabled) { SolidBrush brush = new SolidBrush(_disabledColor); - graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition); + graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition); brush.Dispose(); } else { - if (_checkMark.Focus) { + if (_focus) { SolidBrush brush = new SolidBrush(_textColor); - graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition); + graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition); brush.Dispose(); - } - else { + } else { SolidBrush brush = new SolidBrush(_disabledColor); - graph.DrawString(_checkMark.Label, _font, brush, dwTextPosX, _checkMark.YPosition); + graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, dwTextPosX, _checkMark.YPosition); brush.Dispose(); } } } - if (_checkMark.Selected) { + if (_selected) { graph.DrawImage(_checkFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition); } else { graph.DrawImage(_checkNoFocusBitmap, dwCheckMarkPosX, _checkMark.YPosition); @@ -159,6 +183,32 @@ _checkFocusBitmap.Dispose(); _checkNoFocusBitmap.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_checkMark.Label); + if (!newLabel.Equals(_label)) { + _label = newLabel; + result = true; + } + if (_checkMark.Focus != _focus) { + _focus = _checkMark.Focus; + result = true; + } + if (_checkMark.Disabled != _disabled) { + _disabled = _checkMark.Disabled; + result = true; + } + if (_checkMark.Selected != _selected) { + _selected = _checkMark.Selected; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/FadeLabelElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -48,6 +48,11 @@ /// Brush /// </summary> private Brush _brush; + + /// <summary> + /// Label of the fade label + /// </summary> + private String _labelString; #endregion #region ctor @@ -55,10 +60,12 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public FadeLabelElement(GUIControl control) { + public FadeLabelElement(GUIControl control) + : base(control) { _label = control as GUIFadeLabel; _font = getFont(_label.FontName); _brush = new SolidBrush(GetColor(_label.TextColor)); + _labelString = _label.Label; Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name); } #endregion @@ -92,6 +99,20 @@ _font.Dispose(); _brush.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_label.Label); + if (!newLabel.Equals(_labelString)) { + _labelString = newLabel; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ImageElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -52,7 +52,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public ImageElement(GUIControl control) { + public ImageElement(GUIControl control) + : base(control) { _image = control as GUIImage; _bitmap = loadBitmap(_image.FileName); Log.Debug("VideoPlayerOSD: Found image element: " + _image.FileName); @@ -76,6 +77,15 @@ public override void Dispose() { _bitmap.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + return false; + } + #endregion #region public methods Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/LabelElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -48,6 +48,11 @@ /// Brush /// </summary> private Brush _brush; + + /// <summary> + /// Label String + /// </summary> + private String _labelString; #endregion #region ctor @@ -55,10 +60,12 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public LabelElement(GUIControl control) { + public LabelElement(GUIControl control) + : base(control) { _label = control as GUILabelControl; _font = getFont(_label.FontName); _brush = new SolidBrush(GetColor(_label.TextColor)); + _labelString = _label.Label; Log.Debug("VideoPlayerOSD: Found label element: " + _label.Name + "/" + _font.Name); } #endregion @@ -70,7 +77,7 @@ /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { if (_label.Visible) { - DrawStandard(graph, _label.Label); + DrawStandard(graph, _labelString); } } @@ -80,6 +87,20 @@ public override void Dispose() { _font.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_label.Label); + if (!newLabel.Equals(_labelString)) { + _labelString = newLabel; + result = true; + } + return result; + } #endregion #region public methods @@ -96,7 +117,7 @@ FontStyle style = _font.Style | FontStyle.Strikeout; temp = new Font(_font.FontFamily.Name, _font.Size, style); } - graph.DrawString(GUIPropertyManager.Parse(label), temp, _brush, rectangle, StringFormat.GenericTypographic); + graph.DrawString(label, temp, _brush, rectangle, StringFormat.GenericTypographic); } /// <summary> @@ -106,7 +127,7 @@ /// <param name="label">Label</param> /// <returns>Rectangle</returns> public RectangleF GetStringRectangle(Graphics graph, String label) { - SizeF size = graph.MeasureString(label, _font); + SizeF size = graph.MeasureString(label, _font); return new RectangleF((float)_label.Location.X, (float)_label.Location.Y, size.Width, _label.Height); } #endregion @@ -118,7 +139,7 @@ /// <param name="graph">Graphics</param> /// <param name="cacheFill">Status of the cache</param> public override void DrawCacheStatus(Graphics graph, float cacheFill) { - if(_label.Label.Contains("#currentremaining")){ + if (_label.Label.Contains("#currentremaining")) { DrawStandard(graph, String.Format("{0:00.00}", cacheFill) + " %"); } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -74,6 +74,11 @@ /// Height /// </summary> private float _height; + + /// <summary> + /// Indicates if an update is needed + /// </summary> + private bool needUpdate; #endregion #region ctor @@ -86,7 +91,8 @@ /// <param name="height">Height</param> /// <param name="buttonFocusName">FileName of the focus image</param> /// <param name="buttonNonFocusName">FileName of the non focus image</param> - public ListButtonElement(int positionX, int positionY, float width, float height, String buttonFocusName, String buttonNonFocusName) { + public ListButtonElement(int positionX, int positionY, float width, float height, String buttonFocusName, String buttonNonFocusName) + : base(null) { _imageFocus = loadBitmap(buttonFocusName); _imageNonFocus = loadBitmap(buttonNonFocusName); _positionX = positionX; @@ -121,6 +127,18 @@ _imageFocus.Dispose(); _imageNonFocus.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = needUpdate; + if (needUpdate) { + needUpdate = false; + } + return result; + } #endregion #region properties @@ -129,7 +147,12 @@ /// </summary> public bool Focus { get { return _focus; } - set { _focus = value; } + set { + if (_focus != value) { + needUpdate = true; + } + _focus = value; + } } #endregion @@ -197,7 +220,8 @@ /// <summary> /// Creates the element /// </summary> - public ListLabelElement() { + public ListLabelElement() + : base(null) { _xPosition = 0f; _yPosition = 0f; _width = 0f; @@ -231,6 +255,14 @@ _brush.Dispose(); _font.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + return false; + } #endregion #region properties @@ -417,6 +449,11 @@ /// VerticalScrollbarElement /// </summary> private VerticalScrollBarElement _verticalScrollBarElement; + + /// <summary> + /// Indicates, if the list is focused + /// </summary> + private bool _focus; #endregion #region ctor @@ -424,7 +461,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public ListElement(GUIControl control) { + public ListElement(GUIControl control) + : base(control) { _list = control as GUIListControl; Type listType = typeof(GUIListControl); FieldInfo alignmentFieldInfo = listType.GetField("_textAlignment", @@ -479,6 +517,9 @@ BindingFlags.NonPublic | BindingFlags.Instance); initializeLabels(); _verticalScrollBarElement = new VerticalScrollBarElement(_list.Scrollbar); + _offset = (int)_offsetFieldInfo.GetValue(_list); + _cursorX = (int)_cursorXFieldInfo.GetValue(_list); + _focus = _list.IsFocused; Log.Debug("VideoPlayerOSD: Found list element: "); } #endregion @@ -491,8 +532,6 @@ public override void DrawElement(Graphics graph) { if (_list.Visible) { _listItems = _listItemsFieldInfo.GetValue(_list) as List<GUIListItem>; - _offset = (int)_offsetFieldInfo.GetValue(_list); - _cursorX = (int)_cursorXFieldInfo.GetValue(_list); int dwPosY = _list.YPosition; // Render the buttons first. for (int i = 0; i < _itemsPerPage; i++) { @@ -567,6 +606,29 @@ element.Dispose(); } } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + int newOffset = (int)_offsetFieldInfo.GetValue(_list); + int newCursorX = (int)_cursorXFieldInfo.GetValue(_list); + if (_offset!=newOffset) { + _offset = newOffset; + result = true; + } + if (newCursorX !=_cursorX) { + _cursorX = newCursorX; + result = true; + } + if (_list.IsFocused != _focus) { + _focus = _list.IsFocused; + result = true; + } + return result; + } #endregion #region private methods Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ProgressControlElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -59,6 +59,11 @@ /// Background image /// </summary> private Bitmap _backgroundBitmap; + + /// <summary> + /// Percentage of the progress control + /// </summary> + private int _percentage; #endregion #region ctor @@ -66,12 +71,14 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public ProgressControlElement(GUIControl control) { + public ProgressControlElement(GUIControl control) + : base(control) { _progressControl = control as GUIProgressControl; _leftBitmap = loadBitmap(_progressControl.BackTextureLeftName); _midBitmap = loadBitmap(_progressControl.BackTextureMidName); _rightBitmap = loadBitmap(_progressControl.BackTextureRightName); _backgroundBitmap = loadBitmap(_progressControl.BackGroundTextureName); + _percentage = GetPercentage(); Log.Debug("VideoPlayerOSD: Found progess control"); } #endregion @@ -83,11 +90,8 @@ /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { if (_progressControl.Visible) { - int percent = 0; - Int32.TryParse(GUIPropertyManager.Parse(_progressControl.Property), out percent); - if (percent > 100) percent = 100; - float fWidth = (float)percent; - DrawProgressBar(graph,fWidth,percent); + float fWidth = (float)_percentage; + DrawProgressBar(graph,fWidth,_percentage); } } @@ -100,6 +104,20 @@ _rightBitmap.Dispose(); _backgroundBitmap.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + int newPercentage = GetPercentage(); + if (newPercentage != _percentage) { + _percentage = newPercentage; + result = true; + } + return result; + } #endregion #region public overrides methods @@ -152,6 +170,17 @@ graph.DrawImage(_rightBitmap, iXPos, iYPos, iWidthRight, iHeightRight); } } + + /// <summary> + /// Calculates the percentage of the control + /// </summary> + /// <returns></returns> + private int GetPercentage() { + int percent = 0; + Int32.TryParse(GUIPropertyManager.Parse(_progressControl.Property), out percent); + if (percent > 100) percent = 100; + return percent; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -41,21 +41,36 @@ /// GUISliderControl /// </summary> private GUISliderControl _slider; - + /// <summary> /// Background image /// </summary> private Bitmap _backgroundBitmap; - + /// <summary> /// Slider image /// </summary> private Bitmap _sliderBitmap; - + /// <summary> /// Slider focus image /// </summary> private Bitmap _sliderFocusBitmap; + + /// <summary> + /// String value of the slider element + /// </summary> + private String _strValue; + + /// <summary> + /// Percentage of the slider element + /// </summary> + private int _percentage; + + /// <summary> + /// Indicates, if the element is focused + /// </summary> + private bool _focus; #endregion #region ctor @@ -63,7 +78,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public SliderElement(GUIControl control) { + public SliderElement(GUIControl control) + : base(control) { _slider = control as GUISliderControl; Type buttonType = typeof(GUISliderControl); FieldInfo backgroundBitmapFieldInfo = buttonType.GetField("_backgroundTextureName", @@ -75,6 +91,9 @@ FieldInfo sliderFocusBitmapFieldInfo = buttonType.GetField("_sliderFocusTextureName", BindingFlags.NonPublic | BindingFlags.Instance); _sliderFocusBitmap = loadBitmap(sliderFocusBitmapFieldInfo.GetValue(_slider).ToString()); + _focus = _slider.Focus; + _percentage = _slider.Percentage; + _strValue = getStringValue(); Log.Debug("VideoPlayerOSD: Found slider element: " + _slider.GetID); } #endregion @@ -89,31 +108,14 @@ string strValue = ""; float fPos = 0.0f; Font font = getFont("font13"); - float backgroundPositionX = (float) _slider.XPosition; + float backgroundPositionX = (float)_slider.XPosition; float backgroundPositionY = (float)_slider.YPosition; - switch (_slider.SpinType) { - // Float based slider - case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_FLOAT: - strValue = String.Format("{0}", _slider.FloatValue); - if (null != font) { - SolidBrush brush = new SolidBrush(Color.FromArgb(255,255,255,255)); - graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition); - brush.Dispose(); - } - backgroundPositionX += 60; - break; - - // Integer based slider - case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_INT: - strValue = String.Format("{0}/{1}", _slider.IntValue, 100); - if (null != font) { - SolidBrush brush = new SolidBrush(Color.FromArgb(255, 255, 255, 255)); - graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition); - brush.Dispose(); - } - backgroundPositionX += 60; - break; + if (null != font) { + SolidBrush brush = new SolidBrush(Color.FromArgb(255, 255, 255, 255)); + graph.DrawString(GUIPropertyManager.Parse(strValue), font, brush, (float)_slider.XPosition, (float)_slider.YPosition); + brush.Dispose(); } + backgroundPositionX += 60; //int iHeight=25; graph.DrawImage(_backgroundBitmap, backgroundPositionX, backgroundPositionY, _backgroundBitmap.Width, _backgroundBitmap.Height); @@ -122,7 +124,7 @@ float _width = _backgroundBitmap.Width + 60; float fWidth = (float)(_backgroundBitmap.Width - _sliderBitmap.Width); //-20.0f; - fPos = (float)_slider.Percentage; + fPos = (float)_percentage; fPos /= 100.0f; fPos *= fWidth; fPos += backgroundPositionX; @@ -145,6 +147,45 @@ _sliderBitmap.Dispose(); _sliderFocusBitmap.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + if (_slider.Percentage != _percentage) { + _percentage = _slider.Percentage; + result = true; + } + if (_slider.Focus != _focus) { + _focus = _slider.Focus; + result = true; + } + String newStrValue = getStringValue(); + if (newStrValue != _strValue) { + _strValue = newStrValue; + result = true; + } + return result; + } #endregion + + #region private methods + private String getStringValue() { + String strValue = String.Empty; + switch (_slider.SpinType) { + // Float based slider + case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_FLOAT: + strValue = String.Format("{0}", _slider.FloatValue); + break; + // Integer based slider + case GUISpinControl.SpinType.SPIN_CONTROL_TYPE_INT: + strValue = String.Format("{0}/{1}", _slider.IntValue, 100); + break; + } + return strValue; + } + #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -56,6 +56,11 @@ /// Alignment of the message /// </summary> private GUIControl.Alignment _alignment; + + /// <summary> + /// Label of the text scrollup element + /// </summary> + private String _label; #endregion #region ctor @@ -63,7 +68,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public TextScrollUpElement(GUIControl control) { + public TextScrollUpElement(GUIControl control) + : base(control) { _textScrollUp = control as GUITextScrollUpControl; Type textScrollUpType = typeof(GUITextScrollUpControl); FieldInfo fontNameFieldInfo = textScrollUpType.GetField("_fontName", @@ -73,6 +79,7 @@ FieldInfo alignmentFieldInfo = textScrollUpType.GetField("_textAlignment", BindingFlags.NonPublic | BindingFlags.Instance); _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_textScrollUp); + _label = _textScrollUp.Property; Log.Debug("VideoPlayerOSD: Found textScrollUp element: " + _textScrollUp.GetID); } #endregion @@ -84,8 +91,7 @@ /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { if (_textScrollUp.Visible) { - String label = _textScrollUp.Property; - SizeF textSize = graph.MeasureString(label, _font); + SizeF textSize = graph.MeasureString(_label, _font); RectangleF rectangle; if (_alignment == GUIControl.Alignment.ALIGN_LEFT) { rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height); @@ -94,7 +100,7 @@ } else { rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, _textScrollUp.Height); } - graph.DrawString(GUIPropertyManager.Parse(label), _font, _brush, rectangle, StringFormat.GenericTypographic); + graph.DrawString(GUIPropertyManager.Parse(_label), _font, _brush, rectangle, StringFormat.GenericTypographic); } } @@ -105,6 +111,20 @@ _font.Dispose(); _brush.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_textScrollUp.Property); + if (!newLabel.Equals(_label)) { + _label = _textScrollUp.Property; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -81,6 +81,21 @@ /// Disabled color /// </summary> private Color _disabledColor; + + /// <summary> + /// Indicates, if the toogle button is focused + /// </summary> + private bool _focus; + + /// <summary> + /// Indicates, if the toogle button is selected + /// </summary> + private bool _selected; + + /// <summary> + /// Label of the toggle button + /// </summary> + private String _label; #endregion #region ctor @@ -88,7 +103,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public ToggleButtonElement(GUIControl control) { + public ToggleButtonElement(GUIControl control) + : base(control) { _button = control as GUIToggleButtonControl; _font = getFont(_button.FontName); Type buttonType = typeof(GUIToggleButtonControl); @@ -109,6 +125,9 @@ _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_button); _textColor = GetColor(_button.TextColor); _disabledColor = GetColor(_button.DisabledColor); + _focus = _button.Focus; + _selected = _button.Selected; + _label = _button.Label; Log.Debug("VideoPlayerOSD: Found toggle button element: " + _button.GetID); } #endregion @@ -160,8 +179,7 @@ } Rectangle rectangle = new Rectangle(x, _button.YPosition + _button.TextOffsetY, labelWidth, _button.Height); - String label = _button.Label; - graph.DrawString(GUIPropertyManager.Parse(label), _font, brush, rectangle, StringFormat.GenericTypographic); + graph.DrawString(GUIPropertyManager.Parse(_label), _font, brush, rectangle, StringFormat.GenericTypographic); brush.Dispose(); } } @@ -176,6 +194,28 @@ _altNoFocusBitmap.Dispose(); _font.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + String newLabel = GUIPropertyManager.Parse(_button.Label); + if (!newLabel.Equals(_label)) { + _label = newLabel; + result = true; + } + if (_button.Focus != _focus) { + _focus = _button.Focus; + result = true; + } + if (_button.Selected != _selected) { + _selected = _button.Selected; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -39,21 +39,26 @@ /// GUIVerticalScrollbar /// </summary> private GUIVerticalScrollbar _verticalScrollBar; - + /// <summary> /// Background image of the scrollbar /// </summary> private Bitmap _scrollBarBackground; - + /// <summary> /// Top image of the scrollbar /// </summary> private Bitmap _scrollBarTop; - + /// <summary> /// Bottom image of the scrollbar /// </summary> private Bitmap _scrollBarBottom; + + /// <summary> + /// Percentage + /// </summary> + private float _percentage; #endregion #region ctor @@ -61,7 +66,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public VerticalScrollBarElement(GUIControl control) { + public VerticalScrollBarElement(GUIControl control) + : base(control) { _verticalScrollBar = control as GUIVerticalScrollbar; Type verticalScrollBarType = typeof(GUIVerticalScrollbar); FieldInfo scrollBarBgFieldInfo = verticalScrollBarType.GetField("_scrollbarBackgroundName", @@ -75,7 +81,7 @@ FieldInfo scrollBarBottomFieldInfo = verticalScrollBarType.GetField("_scrollbarBottomTextureName", BindingFlags.NonPublic | BindingFlags.Instance); _scrollBarBottom = loadBitmap(scrollBarBottomFieldInfo.GetValue(_verticalScrollBar).ToString()); ; - + _percentage = _verticalScrollBar.Percentage; Log.Debug("VideoPlayerOSD: Found vertical scroll bar element "); } #endregion @@ -92,7 +98,7 @@ graph.DrawImage(_scrollBarBackground, _verticalScrollBar.XPosition, _verticalScrollBar.YPosition, _verticalScrollBar.Width, iHeight); - float fPercent = (float)_verticalScrollBar.Percentage; + float fPercent = _percentage; float fPosYOff = (fPercent / 100.0f); int _startPositionY = _verticalScrollBar.YPosition; @@ -120,6 +126,21 @@ _scrollBarTop.Dispose(); _scrollBarBottom.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + int oldPercentage = (int)_percentage; + int newPercentage = (int)_verticalScrollBar.Percentage; + if (oldPercentage != newPercentage) { + _percentage = _verticalScrollBar.Percentage; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -51,6 +51,26 @@ /// Alignment of the volume bar /// </summary> private GUIControl.Alignment _alignment; + + /// <summary> + /// Index of the first image + /// </summary> + private int _image1; + + /// <summary> + /// Index of the second image + /// </summary> + private int _image2; + + /// <summary> + /// Maximum value of the volume + /// </summary> + private int _maximum; + + /// <summary> + /// Current value of the volume + /// </summary> + private int _current; #endregion #region ctor @@ -58,7 +78,8 @@ /// Creates the element and retrieves all information from the control /// </summary> /// <param name="control">GUIControl</param> - public VolumeBarElement(GUIControl control) { + public VolumeBarElement(GUIControl control) + : base(control) { _volumeBar = control as GUIVolumeBar; Type volumeBarType = typeof(GUIVolumeBar); FieldInfo textureNameFieldInfo = volumeBarType.GetField("_textureName", @@ -68,6 +89,10 @@ String textureFileName = textureNameFieldInfo.GetValue(_volumeBar).ToString(); _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_volumeBar); _bitmap = loadBitmap(textureFileName); + _image1 = _volumeBar.Image1; + _image2 = _volumeBar.Image2; + _maximum = _volumeBar.Maximum; + _current = _volumeBar.Current; Log.Debug("VideoPlayerOSD: Found volume bar element: " + textureFileName); } #endregion @@ -125,6 +150,31 @@ public override void Dispose() { _bitmap.Dispose(); } + + /// <summary> + /// Checks, if an update for the element is needed + /// </summary> + /// <returns>true, if an update is needed</returns> + protected override bool CheckElementSpecificForUpdate() { + bool result = false; + if (_volumeBar.Image1 != _image1) { + _image1 = _volumeBar.Image1; + result = true; + } + if (_volumeBar.Image2 != _image2) { + _image2 = _volumeBar.Image2; + result = true; + } + if (_volumeBar.Current != _current) { + _current = _volumeBar.Current; + result = true; + } + if (_volumeBar.Maximum!= _maximum) { + _maximum= _volumeBar.Maximum; + result = true; + } + return result; + } #endregion } } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/FullscreenWindow.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -114,7 +114,7 @@ /// Indicates if the window is currently visible /// </summary> /// <returns>true, if window is visible; false otherwise</returns> - public override bool IsWindowVisible() { + protected override bool CheckSpecificVisibility() { return GUIWindowManager.ActiveWindow == _fullscreenWindow.GetID; } #endregion Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -26,6 +26,7 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Drawing2D; +using System.Drawing.Text; using System.Threading; using MediaPortal.GUI.Library; @@ -100,6 +101,11 @@ /// Indicates, if the init label should be displayed /// </summary> private bool _showInit; + + /// <summary> + /// Indicates, if an update is needed + /// </summary> + private bool _needUpdate; #endregion #region ctor @@ -140,39 +146,43 @@ /// Performs an update on the osd, should be called from the process method of the player /// </summary> public void UpdateGUI() { - Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height); - Graphics graph = Graphics.FromImage(image); - if (GUIGraphicsContext.Fullscreen) { - graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0, 0, _osdForm.Width, _osdForm.Height)); + bool update = _needUpdate | _videoOSDWindow.CheckForUpdate() | _dialogWindow.CheckForUpdate() | _fullscreenWindow.CheckForUpdate(); + if(_needUpdate){ + _needUpdate=false; + }else{ + if (_showAdditionalOSD) { + TimeSpan ts = DateTime.Now - _lastUpdate; + if (ts.Seconds >= 3){ + _showAdditionalOSD = false; + update = true; + } + } } - graph.SmoothingMode = SmoothingMode.AntiAlias; - if (_showAdditionalOSD) { - TimeSpan ts = DateTime.Now - _lastUpdate; - if (ts.Seconds < 3) { - _fullscreenWindow.DrawAlternativeOSD(graph, _label, _strikeOut); - } else { - _showAdditionalOSD = false; + if (update) { + Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height); + Graphics graph = Graphics.FromImage(image); + if (GUIGraphicsContext.Fullscreen) { + graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0,0,_osdForm.Size.Width,_osdForm.Size.Height)); } - } - if (_showInit) { - _fullscreenWindow.DrawAlternativeOSD(graph, _label, false); - } - if (_showCacheStatus) { - _fullscreenWindow.DrawCacheStatus(graph, _cacheFill); - } - if (_fullscreenWindow.IsWindowVisible()) { + graph.TextRenderingHint = TextRenderingHint.AntiAlias; + graph.SmoothingMode = SmoothingMode.AntiAlias; + if (_showAdditionalOSD) { + _fullscreenWindow.DrawAlternativeOSD(graph, _label, _strikeOut); + } + if (_showInit) { + _fullscreenWindow.DrawAlternativeOSD(graph, _label, false); + } + if (_showCacheStatus) { + _fullscreenWindow.DrawCacheStatus(graph, _cacheFill); + } _fullscreenWindow.DrawWindow(graph); - } - if (_videoOSDWindow.IsWindowVisible()) { _videoOSDWindow.DrawWindow(graph); - } - if (_dialogWindow.IsWindowVisible()) { _dialogWindow.DrawWindow(graph); + _osdForm.Image = image; + _osdForm.Refresh(); + _osdForm2.Image = image; + _osdForm2.Refresh(); } - _osdForm.Image = image; - _osdForm.Refresh(); - _osdForm2.Image = image; - _osdForm2.Refresh(); } /// <summary> @@ -188,7 +198,7 @@ /// </summary> /// <returns></returns> public bool IsOSDVisible() { - return _videoOSDWindow.IsWindowVisible(); + return _videoOSDWindow.CheckVisibility(); } /// <summary> @@ -202,6 +212,7 @@ _lastUpdate = DateTime.Now; _showAdditionalOSD = true; _showCacheStatus = false; + _needUpdate = true; } /// <summary> @@ -212,6 +223,7 @@ _cacheFill = cacheFill; _showAdditionalOSD = false; _showCacheStatus = true; + _needUpdate = true; } /// <summary> @@ -219,6 +231,7 @@ /// </summary> public void HideCacheStatus() { _showCacheStatus = false; + _needUpdate = true; } /// <summary> @@ -230,6 +243,7 @@ _showInit = true; _showCacheStatus = false; _showAdditionalOSD = false; + _needUpdate = true; } /// <summary> @@ -237,6 +251,7 @@ /// </summary> public void HideInit() { _showInit = false; + _needUpdate = true; } #endregion Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDForm.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -73,6 +73,7 @@ this.Opacity = 1; this.GotFocus += new EventHandler(OSDForm_GotFocus); _parent.LocationChanged += _posLocChanged; + _parent.ClientSizeChanged += _posLocChanged; _parent.SizeChanged += _posLocChanged; } #endregion @@ -105,6 +106,7 @@ private void parent_PositionSizeChanged(Object sender, EventArgs args) { this.Location = _parent.PointToScreen(new Point(0, 0)); this.Size = _parent.ClientSize; + this.BringToFront(); } #endregion @@ -117,8 +119,6 @@ try { _parent.LocationChanged -= _posLocChanged; _parent.SizeChanged -= _posLocChanged; - this.BringToFront(); - this.Refresh(); } catch (Exception ex) { Log.Error(ex); } @@ -149,8 +149,8 @@ public void ShowForm() { this.Enabled = true; this.Show(_parent); + parent_PositionSizeChanged(null, null); this.BringToFront(); - parent_PositionSizeChanged(null, null); _parent.Focus(); this.Enabled = false; } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDWindow.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -59,7 +59,7 @@ /// Indicates if the window is currently visible /// </summary> /// <returns>true, if window is visible; false otherwise</returns> - public override bool IsWindowVisible() { + protected override bool CheckSpecificVisibility() { return GUIWindowManager.VisibleOsd == GUIWindow.Window.WINDOW_OSD; } #endregion Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2007-10-05 16:35:46 UTC (rev 978) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/VideoHandler.cs 2007-10-06 22:11:51 UTC (rev 979) @@ -451,16 +451,20 @@ /// Adss the video window to the mediaportal form /// </summary> public void AddVideoWindowToForm() { + GUIGraphicsContext.form.SuspendLayout(); GUIGraphicsContext.form.Controls.Add(_mplayerBackgroundPanel); GUIGraphicsContext.form.Controls.Add(_mplayerOuterPanel); + GUIGraphicsContext.form.ResumeLayout(); } /// <summary> /// Removes the video window from the mediaportal form /// </summary> public void RemoveVideoWindowToForm() { + GUIGraphicsContext.form.SuspendLayout(); GUIGraphicsContext.form.Controls.Remove(_mplayerBackgroundPanel); GUIGraphicsContext.form.Controls.Remove(_mplayerOuterPanel); + GUIGraphicsContext.form.ResumeLayout(); } #endregion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-10-05 16:35:48
|
Revision: 978 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=978&view=rev Author: and-81 Date: 2007-10-05 09:35:46 -0700 (Fri, 05 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Icon.ico trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -194,7 +194,7 @@ { IrssLog.Error(ex.ToString()); - _serverHost = String.Empty; + _serverHost = "localhost"; _programFile = String.Empty; _launchOnLoad = false; _launchKeyCode = DefaultKeyCode; Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -228,7 +228,7 @@ { IrssLog.Error(ex.ToString()); - _serverHost = String.Empty; + _serverHost = "localhost"; _remoteSkin = DefaultSkin; } } Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -486,7 +486,7 @@ { IrssLog.Error(ex.ToString()); - _serverHost = String.Empty; + _serverHost = "localhost"; } } void SaveSettings() 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-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -88,18 +88,18 @@ Driver _driver; - IrProtocol _lastRemoteButtonCodeType = IrProtocol.None; - uint _lastRemoteButtonKeyCode = 0; - DateTime _lastRemoteButtonTime = DateTime.Now; - bool _remoteButtonRepeated = false; + IrProtocol _lastRemoteButtonCodeType = IrProtocol.None; + uint _lastRemoteButtonKeyCode = 0; + DateTime _lastRemoteButtonTime = DateTime.Now; + bool _remoteButtonRepeated = false; - bool _keyboardKeyRepeated = false; - DateTime _lastKeyboardKeyTime = DateTime.Now; + bool _keyboardKeyRepeated = false; + DateTime _lastKeyboardKeyTime = DateTime.Now; - uint _lastKeyboardKeyCode = 0; - uint _lastKeyboardModifiers = 0; + uint _lastKeyboardKeyCode = 0; + uint _lastKeyboardModifiers = 0; - Mouse.MouseEvents _mouseButtons = Mouse.MouseEvents.None; + Mouse.MouseEvents _mouseButtons = Mouse.MouseEvents.None; RemoteHandler _remoteHandler; KeyboardHandler _keyboardHandler; Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-10-05 16:35:46 UTC (rev 978) @@ -211,185 +211,334 @@ Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Input Service", "Input Service\Input Service.csproj", "{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{327F54E5-D1DC-4297-BF2F-4283EB30FFB1}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{327F54E5-D1DC-4297-BF2F-4283EB30FFB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{DDB52A4D-A670-411A-8273-8B1707C67028}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{DDB52A4D-A670-411A-8273-8B1707C67028}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCEReplacement", "..\MCEReplacement\MCEReplacement.csproj", "{B45E87BC-AC5A-4923-A911-79C95DCC5602}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCEReplacement", "..\MCEReplacement\MCEReplacement.csproj", "{B45E87BC-AC5A-4923-A911-79C95DCC5602}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serial IR Blaster", "IR Server Plugins\Serial IR Blaster\Serial IR Blaster.csproj", "{1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serial IR Blaster", "IR Server Plugins\Serial IR Blaster\Serial IR Blaster.csproj", "{1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input Service", "Input Service", "{DEE5AAD1-0110-4681-8FF9-662CEA72FD94}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Input Service", "Input Service\Input Service\Input Service.csproj", "{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "Input Service\Input Service Configuration\Configuration.csproj", "{DC79E2EC-7D1B-4359-A285-38AC8154166B}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.ActiveCfg = Debug|x86 {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.Build.0 = Debug|x86 + {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.Build.0 = Release|Any CPU {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.ActiveCfg = Release|x86 {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.Build.0 = Release|x86 + {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.ActiveCfg = Debug|x86 {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.Build.0 = Debug|x86 + {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|Any CPU.Build.0 = Release|Any CPU {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.ActiveCfg = Release|x86 {0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Release|x86.Build.0 = Release|x86 + {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.ActiveCfg = Debug|x86 {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Debug|x86.Build.0 = Debug|x86 + {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|Any CPU.Build.0 = Release|Any CPU {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|x86.ActiveCfg = Release|x86 {4CD051F4-F2B5-47B3-8647-F47C2E4DC131}.Release|x86.Build.0 = Release|x86 + {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|x86.ActiveCfg = Debug|x86 {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Debug|x86.Build.0 = Debug|x86 + {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|Any CPU.Build.0 = Release|Any CPU {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|x86.ActiveCfg = Release|x86 {A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}.Release|x86.Build.0 = Release|x86 + {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|Any CPU.Build.0 = Debug|Any CPU {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|x86.ActiveCfg = Debug|x86 {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Debug|x86.Build.0 = Debug|x86 + {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|Any CPU.Build.0 = Release|Any CPU {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|x86.ActiveCfg = Release|x86 {46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}.Release|x86.Build.0 = Release|x86 + {D871AB9A-71B3-4D63-8320-084BAD75064E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D871AB9A-71B3-4D63-8320-084BAD75064E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D871AB9A-71B3-4D63-8320-084BAD75064E}.Debug|x86.ActiveCfg = Debug|x86 {D871AB9A-71B3-4D63-8320-084BAD75064E}.Debug|x86.Build.0 = Debug|x86 + {D871AB9A-71B3-4D63-8320-084BAD75064E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D871AB9A-71B3-4D63-8320-084BAD75064E}.Release|Any CPU.Build.0 = Release|Any CPU {D871AB9A-71B3-4D63-8320-084BAD75064E}.Release|x86.ActiveCfg = Release|x86 {D871AB9A-71B3-4D63-8320-084BAD75064E}.Release|x86.Build.0 = Release|x86 + {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Debug|x86.ActiveCfg = Debug|x86 {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Debug|x86.Build.0 = Debug|x86 + {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Release|Any CPU.Build.0 = Release|Any CPU {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Release|x86.ActiveCfg = Release|x86 {E8BEBBCC-1EE0-488D-8806-98ADCB7F0479}.Release|x86.Build.0 = Release|x86 + {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Debug|Any CPU.Build.0 = Debug|Any CPU {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Debug|x86.ActiveCfg = Debug|x86 {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Debug|x86.Build.0 = Debug|x86 + {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Release|Any CPU.Build.0 = Release|Any CPU {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Release|x86.ActiveCfg = Release|x86 {7946D42A-4BCB-4D79-80EB-BA9B17CE2E90}.Release|x86.Build.0 = Release|x86 + {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|x86.ActiveCfg = Debug|x86 {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Debug|x86.Build.0 = Debug|x86 + {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|Any CPU.Build.0 = Release|Any CPU {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|x86.ActiveCfg = Release|x86 {CD395FC2-70E2-42C4-8A20-5469A0C5EB50}.Release|x86.Build.0 = Release|x86 + {A4023992-CCD6-461E-8E14-219A496734C5}.Debug|Any CPU.ActiveCfg = Debug|x86 {A4023992-CCD6-461E-8E14-219A496734C5}.Debug|x86.ActiveCfg = Debug|x86 {A4023992-CCD6-461E-8E14-219A496734C5}.Debug|x86.Build.0 = Debug|x86 + {A4023992-CCD6-461E-8E14-219A496734C5}.Release|Any CPU.ActiveCfg = Release|x86 {A4023992-CCD6-461E-8E14-219A496734C5}.Release|x86.ActiveCfg = Release|x86 {A4023992-CCD6-461E-8E14-219A496734C5}.Release|x86.Build.0 = Release|x86 + {7C686499-7517-4338-8837-7E8617549D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C686499-7517-4338-8837-7E8617549D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C686499-7517-4338-8837-7E8617549D9A}.Debug|x86.ActiveCfg = Debug|x86 {7C686499-7517-4338-8837-7E8617549D9A}.Debug|x86.Build.0 = Debug|x86 + {7C686499-7517-4338-8837-7E8617549D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C686499-7517-4338-8837-7E8617549D9A}.Release|Any CPU.Build.0 = Release|Any CPU {7C686499-7517-4338-8837-7E8617549D9A}.Release|x86.ActiveCfg = Release|x86 {7C686499-7517-4338-8837-7E8617549D9A}.Release|x86.Build.0 = Release|x86 + {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Debug|x86.ActiveCfg = Debug|x86 {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Debug|x86.Build.0 = Debug|x86 + {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Release|Any CPU.Build.0 = Release|Any CPU {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Release|x86.ActiveCfg = Release|x86 {BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}.Release|x86.Build.0 = Release|x86 + {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Debug|x86.ActiveCfg = Debug|x86 {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Debug|x86.Build.0 = Debug|x86 + {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Release|Any CPU.Build.0 = Release|Any CPU {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Release|x86.ActiveCfg = Release|x86 {99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}.Release|x86.Build.0 = Release|x86 + {4CBA81F9-F0C2-4242-8D72-204597285042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CBA81F9-F0C2-4242-8D72-204597285042}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CBA81F9-F0C2-4242-8D72-204597285042}.Debug|x86.ActiveCfg = Debug|x86 {4CBA81F9-F0C2-4242-8D72-204597285042}.Debug|x86.Build.0 = Debug|x86 + {4CBA81F9-F0C2-4242-8D72-204597285042}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CBA81F9-F0C2-4242-8D72-204597285042}.Release|Any CPU.Build.0 = Release|Any CPU {4CBA81F9-F0C2-4242-8D72-204597285042}.Release|x86.ActiveCfg = Release|x86 {4CBA81F9-F0C2-4242-8D72-204597285042}.Release|x86.Build.0 = Release|x86 + {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Debug|Any CPU.Build.0 = Debug|Any CPU {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Debug|x86.ActiveCfg = Debug|x86 {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Debug|x86.Build.0 = Debug|x86 + {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Release|Any CPU.Build.0 = Release|Any CPU {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Release|x86.ActiveCfg = Release|x86 {2B9C6BE9-98D0-4D69-B041-57EE5D2DFB97}.Release|x86.Build.0 = Release|x86 + {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Debug|Any CPU.Build.0 = Debug|Any CPU {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Debug|x86.ActiveCfg = Debug|x86 {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Debug|x86.Build.0 = Debug|x86 + {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Release|Any CPU.ActiveCfg = Release|Any CPU + {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Release|Any CPU.Build.0 = Release|Any CPU {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Release|x86.ActiveCfg = Release|x86 {907DCA39-A5E0-4EFA-B1F6-5FBE2C1BCD25}.Release|x86.Build.0 = Release|x86 + {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Debug|Any CPU.Build.0 = Debug|Any CPU {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Debug|x86.ActiveCfg = Debug|x86 {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Debug|x86.Build.0 = Debug|x86 + {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Release|Any CPU.Build.0 = Release|Any CPU {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Release|x86.ActiveCfg = Release|x86 {883913F6-F4A7-4DE2-846A-C2102FAF499E}.Release|x86.Build.0 = Release|x86 + {253FFB14-AB8E-49AB-A005-A42428C3F452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {253FFB14-AB8E-49AB-A005-A42428C3F452}.Debug|Any CPU.Build.0 = Debug|Any CPU {253FFB14-AB8E-49AB-A005-A42428C3F452}.Debug|x86.ActiveCfg = Debug|x86 {253FFB14-AB8E-49AB-A005-A42428C3F452}.Debug|x86.Build.0 = Debug|x86 + {253FFB14-AB8E-49AB-A005-A42428C3F452}.Release|Any CPU.ActiveCfg = Release|Any CPU + {253FFB14-AB8E-49AB-A005-A42428C3F452}.Release|Any CPU.Build.0 = Release|Any CPU {253FFB14-AB8E-49AB-A005-A42428C3F452}.Release|x86.ActiveCfg = Release|x86 {253FFB14-AB8E-49AB-A005-A42428C3F452}.Release|x86.Build.0 = Release|x86 + {9FDD649E-0502-4FED-9AC1-AA0346394375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FDD649E-0502-4FED-9AC1-AA0346394375}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FDD649E-0502-4FED-9AC1-AA0346394375}.Debug|x86.ActiveCfg = Debug|x86 {9FDD649E-0502-4FED-9AC1-AA0346394375}.Debug|x86.Build.0 = Debug|x86 + {9FDD649E-0502-4FED-9AC1-AA0346394375}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FDD649E-0502-4FED-9AC1-AA0346394375}.Release|Any CPU.Build.0 = Release|Any CPU {9FDD649E-0502-4FED-9AC1-AA0346394375}.Release|x86.ActiveCfg = Release|x86 {9FDD649E-0502-4FED-9AC1-AA0346394375}.Release|x86.Build.0 = Release|x86 + {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|x86.ActiveCfg = Debug|x86 {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Debug|x86.Build.0 = Debug|x86 + {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Release|Any CPU.Build.0 = Release|Any CPU {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Release|x86.ActiveCfg = Release|x86 {CA15769C-232E-4CA7-94FD-206A06CA3ABB}.Release|x86.Build.0 = Release|x86 + {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Debug|Any CPU.Build.0 = Debug|Any CPU {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Debug|x86.ActiveCfg = Debug|x86 {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Debug|x86.Build.0 = Debug|x86 + {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Release|Any CPU.Build.0 = Release|Any CPU {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Release|x86.ActiveCfg = Release|x86 {08F57DD7-2C6E-484E-9CC5-835F70C5BC64}.Release|x86.Build.0 = Release|x86 + {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Debug|x86.ActiveCfg = Debug|x86 {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Debug|x86.Build.0 = Debug|x86 + {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Release|Any CPU.Build.0 = Release|Any CPU {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Release|x86.ActiveCfg = Release|x86 {D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}.Release|x86.Build.0 = Release|x86 + {0F6576B4-C88E-4E79-B7E9-9480498C5A32}.Debug|Any CPU.ActiveCfg = Debug|x86 {0F6576B4-C88E-4E79-B7E9-9480498C5A32}.Debug|x86.ActiveCfg = Debug|x86 {0F6576B4-C88E-4E79-B7E9-9480498C5A32}.Debug|x86.Build.0 = Debug|x86 + {0F6576B4-C88E-4E79-B7E9-9480498C5A32}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F6576B4-C88E-4E79-B7E9-9480498C5A32}.Release|x86.ActiveCfg = Release|Any CPU + {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Debug|x86.ActiveCfg = Debug|x86 {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Debug|x86.Build.0 = Debug|x86 + {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Release|Any CPU.Build.0 = Release|Any CPU {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Release|x86.ActiveCfg = Release|x86 {C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}.Release|x86.Build.0 = Release|x86 + {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Debug|Any CPU.Build.0 = Debug|Any CPU {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Debug|x86.ActiveCfg = Debug|x86 {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Debug|x86.Build.0 = Debug|x86 + {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|Any CPU.Build.0 = Release|Any CPU {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.ActiveCfg = Release|x86 {54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}.Release|x86.Build.0 = Release|x86 + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.ActiveCfg = Debug|x86 {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.Build.0 = Debug|x86 + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.Build.0 = Release|Any CPU {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.ActiveCfg = Release|x86 {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.Build.0 = Release|x86 + {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.ActiveCfg = Debug|x86 {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.ActiveCfg = Debug|x86 {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.Build.0 = Debug|x86 + {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.ActiveCfg = Release|x86 {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.ActiveCfg = Release|x86 {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|x86.Build.0 = Release|x86 + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|Any CPU.ActiveCfg = Debug|x86 {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|x86.ActiveCfg = Debug|x86 {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Debug|x86.Build.0 = Debug|x86 + {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|Any CPU.ActiveCfg = Release|x86 {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.ActiveCfg = Release|x86 {B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}.Release|x86.Build.0 = Release|x86 + {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Debug|Any CPU.ActiveCfg = Debug|x86 {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Debug|x86.ActiveCfg = Debug|x86 {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Debug|x86.Build.0 = Debug|x86 + {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|Any CPU.ActiveCfg = Release|x86 {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|x86.ActiveCfg = Release|x86 {EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}.Release|x86.Build.0 = Release|x86 + {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Debug|x86.ActiveCfg = Debug|x86 {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Debug|x86.Build.0 = Debug|x86 + {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Release|Any CPU.Build.0 = Release|Any CPU {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Release|x86.ActiveCfg = Release|x86 {E6A68244-8C31-44A9-9F85-B4A102B5F209}.Release|x86.Build.0 = Release|x86 + {0C291BE9-5D15-4097-9119-4FFE19C23113}.Debug|Any CPU.ActiveCfg = Debug|x86 {0C291BE9-5D15-4097-9119-4FFE19C23113}.Debug|x86.ActiveCfg = Debug|x86 {0C291BE9-5D15-4097-9119-4FFE19C23113}.Debug|x86.Build.0 = Debug|x86 + {0C291BE9-5D15-4097-9119-4FFE19C23113}.Release|Any CPU.ActiveCfg = Release|x86 {0C291BE9-5D15-4097-9119-4FFE19C23113}.Release|x86.ActiveCfg = Release|x86 {0C291BE9-5D15-4097-9119-4FFE19C23113}.Release|x86.Build.0 = Release|x86 - {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|x86.ActiveCfg = Debug|x86 - {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|x86.Build.0 = Debug|x86 - {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.ActiveCfg = Release|x86 - {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.Build.0 = Release|x86 + {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Debug|Any CPU.ActiveCfg = Debug|x86 {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Debug|x86.ActiveCfg = Debug|x86 {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Debug|x86.Build.0 = Debug|x86 + {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|Any CPU.ActiveCfg = Release|x86 {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|x86.ActiveCfg = Release|x86 {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|x86.Build.0 = Release|x86 + {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|Any CPU.ActiveCfg = Debug|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|x86.ActiveCfg = Debug|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|x86.Build.0 = Debug|x86 + {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|Any CPU.ActiveCfg = Release|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|x86.ActiveCfg = Release|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|x86.Build.0 = Release|x86 + {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Debug|Any CPU.Build.0 = Debug|Any CPU {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Debug|x86.ActiveCfg = Debug|x86 {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Debug|x86.Build.0 = Debug|x86 + {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Release|Any CPU.Build.0 = Release|Any CPU {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Release|x86.ActiveCfg = Release|x86 {B45E87BC-AC5A-4923-A911-79C95DCC5602}.Release|x86.Build.0 = Release|x86 + {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Debug|x86.ActiveCfg = Debug|x86 {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Debug|x86.Build.0 = Debug|x86 + {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Release|Any CPU.Build.0 = Release|Any CPU {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Release|x86.ActiveCfg = Release|x86 {1D4B9ABE-F37D-4C38-9BC5-EDD43F271F4E}.Release|x86.Build.0 = Release|x86 + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|x86.ActiveCfg = Debug|x86 + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Debug|x86.Build.0 = Debug|x86 + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|Any CPU.Build.0 = Release|Any CPU + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.ActiveCfg = Release|x86 + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.Build.0 = Release|x86 + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Debug|x86.ActiveCfg = Debug|Any CPU + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Release|Any CPU.Build.0 = Release|Any CPU + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Release|x86.ActiveCfg = Release|x86 + {DC79E2EC-7D1B-4359-A285-38AC8154166B}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -429,5 +578,7 @@ {BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03} {327F54E5-D1DC-4297-BF2F-4283EB30FFB1} = {E757F80C-23C5-4AD6-B178-16799E337E03} {DDB52A4D-A670-411A-8273-8B1707C67028} = {E757F80C-23C5-4AD6-B178-16799E337E03} + {8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} + {DC79E2EC-7D1B-4359-A285-38AC8154166B} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94} EndGlobalSection EndGlobal Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -471,6 +471,8 @@ #endregion Service Methods + #region Implementation + void StartServer() { if (_server != null) @@ -1469,6 +1471,8 @@ } } + #endregion Implementation + } } Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -33,7 +33,6 @@ this.buttonOK = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.toolTips = new System.Windows.Forms.ToolTip(this.components); - this.checkBoxRunAtBoot = new System.Windows.Forms.CheckBox(); this.buttonAdvanced = new System.Windows.Forms.Button(); this.buttonDetect = new System.Windows.Forms.Button(); this.groupBoxTransceiver = new System.Windows.Forms.GroupBox(); @@ -45,10 +44,10 @@ // 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(352, 304); + this.buttonOK.Location = new System.Drawing.Point(352, 272); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(64, 24); - this.buttonOK.TabIndex = 5; + this.buttonOK.TabIndex = 4; this.buttonOK.Text = "OK"; this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); @@ -57,33 +56,21 @@ // 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(424, 304); + this.buttonCancel.Location = new System.Drawing.Point(424, 272); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(64, 24); - this.buttonCancel.TabIndex = 6; + this.buttonCancel.TabIndex = 5; this.buttonCancel.Text = "Cancel"; this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // - // checkBoxRunAtBoot - // - this.checkBoxRunAtBoot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.checkBoxRunAtBoot.AutoSize = true; - this.checkBoxRunAtBoot.Location = new System.Drawing.Point(8, 272); - this.checkBoxRunAtBoot.Name = "checkBoxRunAtBoot"; - this.checkBoxRunAtBoot.Size = new System.Drawing.Size(165, 17); - this.checkBoxRunAtBoot.TabIndex = 1; - this.checkBoxRunAtBoot.Text = "&Start IR Server with Windows"; - this.toolTips.SetToolTip(this.checkBoxRunAtBoot, "Run IR Server when windows boots up?"); - this.checkBoxRunAtBoot.UseVisualStyleBackColor = true; - // // buttonAdvanced // this.buttonAdvanced.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonAdvanced.Location = new System.Drawing.Point(80, 304); + this.buttonAdvanced.Location = new System.Drawing.Point(80, 272); this.buttonAdvanced.Name = "buttonAdvanced"; this.buttonAdvanced.Size = new System.Drawing.Size(64, 24); - this.buttonAdvanced.TabIndex = 3; + this.buttonAdvanced.TabIndex = 2; this.buttonAdvanced.Text = "Advanced"; this.toolTips.SetToolTip(this.buttonAdvanced, "Click here for advanced options"); this.buttonAdvanced.UseVisualStyleBackColor = true; @@ -92,10 +79,10 @@ // buttonDetect // this.buttonDetect.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.buttonDetect.Location = new System.Drawing.Point(216, 304); + this.buttonDetect.Location = new System.Drawing.Point(216, 272); this.buttonDetect.Name = "buttonDetect"; this.buttonDetect.Size = new System.Drawing.Size(80, 24); - this.buttonDetect.TabIndex = 4; + this.buttonDetect.TabIndex = 3; this.buttonDetect.Text = "Auto-Detect"; this.toolTips.SetToolTip(this.buttonDetect, "Click here to automatically detect attached devices"); this.buttonDetect.UseVisualStyleBackColor = true; @@ -103,8 +90,7 @@ // // groupBoxTransceiver // - this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxTransceiver.Controls.Add(this.gridPlugins); this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 8); @@ -133,10 +119,10 @@ // buttonHelp // this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonHelp.Location = new System.Drawing.Point(8, 304); + this.buttonHelp.Location = new System.Drawing.Point(8, 272); this.buttonHelp.Name = "buttonHelp"; this.buttonHelp.Size = new System.Drawing.Size(64, 24); - this.buttonHelp.TabIndex = 2; + this.buttonHelp.TabIndex = 1; this.buttonHelp.Text = "Help"; this.buttonHelp.UseVisualStyleBackColor = true; this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click); @@ -145,22 +131,20 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(496, 343); + this.ClientSize = new System.Drawing.Size(496, 306); this.Controls.Add(this.buttonDetect); this.Controls.Add(this.buttonAdvanced); this.Controls.Add(this.buttonHelp); - this.Controls.Add(this.checkBoxRunAtBoot); this.Controls.Add(this.groupBoxTransceiver); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(504, 370); + this.MinimumSize = new System.Drawing.Size(512, 342); this.Name = "Config"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "IR Server - Configuration"; + this.Text = "Input Service Configuration"; this.groupBoxTransceiver.ResumeLayout(false); this.ResumeLayout(false); - this.PerformLayout(); } @@ -170,7 +154,6 @@ private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.ToolTip toolTips; private System.Windows.Forms.GroupBox groupBoxTransceiver; - private System.Windows.Forms.CheckBox checkBoxRunAtBoot; private System.Windows.Forms.Button buttonHelp; private SourceGrid.Grid gridPlugins; private System.Windows.Forms.Button buttonAdvanced; Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2007-10-05 16:35:46 UTC (rev 978) @@ -126,15 +126,6 @@ { CreateGrid(); } - - try - { - checkBoxRunAtBoot.Checked = SystemRegistry.GetAutoRun("IR Server"); - } - catch (Exception ex) - { - IrssLog.Error(ex.ToString()); - } } #endregion Constructor @@ -234,18 +225,6 @@ private void buttonOK_Click(object sender, EventArgs e) { - try - { - if (checkBoxRunAtBoot.Checked) - SystemRegistry.SetAutoRun("IR Server", Application.ExecutablePath); - else - SystemRegistry.RemoveAutoRun("IR Server"); - } - catch (Exception ex) - { - IrssLog.Error(ex.ToString()); - } - this.DialogResult = DialogResult.OK; this.Close(); } Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx 2007-10-05 16:35:46 UTC (rev 978) @@ -123,49 +123,158 @@ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> - AAABAAIAICAAAAEACACoCAAAJgAAABAQEAABAAQAKAEAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAE - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwADA3MAA8MqmANTw - /wCx4v8AjtT/AGvG/wBIuP8AJar/AACq/wAAktwAAHq5AABilgAASnMAADJQANTj/wCxx/8Ajqv/AGuP - /wBIc/8AJVf/AABV/wAASdwAAD25AAAxlgAAJXMAABlQANTU/wCxsf8Ajo7/AGtr/wBISP8AJSX/AAAA - /gAAANwAAAC5AAAAlgAAAHMAAABQAOPU/wDHsf8Aq47/AI9r/wBzSP8AVyX/AFUA/wBJANwAPQC5ADEA - lgAlAHMAGQBQAPDU/wDisf8A1I7/AMZr/wC4SP8AqiX/AKoA/wCSANwAegC5AGIAlgBKAHMAMgBQAP/U - /wD/sf8A/47/AP9r/wD/SP8A/yX/AP4A/gDcANwAuQC5AJYAlgBzAHMAUABQAP/U8AD/seIA/47UAP9r - xgD/SLgA/yWqAP8AqgDcAJIAuQB6AJYAYgBzAEoAUAAyAP/U4wD/sccA/46rAP9rjwD/SHMA/yVXAP8A - VQDcAEkAuQA9AJYAMQBzACUAUAAZAP/U1AD/sbEA/46OAP9rawD/SEgA/yUlAP4AAADcAAAAuQAAAJYA - AABzAAAAUAAAAP/j1AD/x7EA/6uOAP+PawD/c0gA/1clAP9VAADcSQAAuT0AAJYxAABzJQAAUBkAAP/w - 1AD/4rEA/9SOAP/GawD/uEgA/6olAP+qAADckgAAuXoAAJZiAABzSgAAUDIAAP//1AD//7EA//+OAP// - awD//0gA//8lAP7+AADc3AAAubkAAJaWAABzcwAAUFAAAPD/1ADi/7EA1P+OAMb/awC4/0gAqv8lAKr/ - AACS3AAAerkAAGKWAABKcwAAMlAAAOP/1ADH/7EAq/+OAI//awBz/0gAV/8lAFX/AABJ3AAAPbkAADGW - AAAlcwAAGVAAANT/1ACx/7EAjv+OAGv/awBI/0gAJf8lAAD+AAAA3AAAALkAAACWAAAAcwAAAFAAANT/ - 4wCx/8cAjv+rAGv/jwBI/3MAJf9XAAD/VQAA3EkAALk9AACWMQAAcyUAAFAZANT/8ACx/+IAjv/UAGv/ - xgBI/7gAJf+qAAD/qgAA3JIAALl6AACWYgAAc0oAAFAyANT//wCx//8Ajv//AGv//wBI//8AJf//AAD+ - /gAA3NwAALm5AACWlgAAc3MAAFBQAPLy8gDm5uYA2traAM7OzgDCwsIAtra2AKqqqgCenp4AkpKSAIaG - hgB6enoAbm5uAGJiYgBWVlYASkpKAD4+PgAyMjIAJiYmABoaGgAODg4A8Pv/AKSgoACAgIAAAAD/AAD/ - AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAABAAQAICAAAAEACACoCAAARgAAABAQAAABAAgAaAUAAO4IAAAgIAAAAQAgAKgQAABWDgAAEBAAAAEA + IABoBAAA/h4AACgAAAAgAAAAQAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgYGBAIWF + hQCIiIgAjo6OAJGRkQCVlZUAmpqaAJucnACdnZ0AoaKiAKWmpgCnqKgAqKmpAKusrACsra0AsbGxALW1 + tQC4ubkAu7y8ALy9vQDDw8MAxcXFAMnJyQDNzs4A0dLSANPU1ADV1dUA2NnZAN3d3QDg4OAA5OXlAOjp + 6QDu7u4A8fHxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - /PwAAPz8/PwA/AAA/AAAAPwAAAD8/Pz8APwAAPwAAAAAAPwA/AAAAAD8AAD8AAD8APwAAPwAAAAA/AAA - /AAAAAAA/AD8AAAAAPwAAPwAAPwA/AAA/AAAAAD8AAD8AAAAAAD8APwAAAAA/AAA/AD8AAAA/AD8AAAA - APwAAPwAAAAAAPwA/AAAAAD8AAD8APwAAAD8APwAAAAA/AAA/AAAAPz8AAD8/PwAAPz8/AAA/AAAAPwA - /Pz8AAD8/PwAAAD8AAAAAPwAAAAA/AAA/AD8AAAA/AD8AAAAAPwAAPwAAPwAAAAA/AAAAAD8AAD8APwA - AAD8APwAAAAA/AAA/AAA/AAAAAD8AAAAAPwAAPwA/AAAAPwA/AAAAAD8AAD8AAD8AAAAAPwAAAAA/AAA - /AD8AAAA/AD8AAAAAPwAAPwAAAD8/AAA/Pz8/AD8/PwAAPwAAAD8APz8/PwA/Pz8AAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - APn5+fn5+fn5AAAA+fn5AAAAAAD5+fkAAAAAAAAAAAAAAPn5+fn5+QAAAAAA+fkAAAAAAPn5AAAAAAAA - AAAAAAAAAAD5+QAAAAAAAAD5+QAAAAAA+fkAAAAAAAAAAAAAAAAAAPn5AAAAAAAAAPn5+fn5+fn5AAAA - AAAAAAAAAAAAAAAA+fkAAAAAAAAA+fn5+fn5+fkAAAAAAAAAAAAAAAAAAAD5+QAAAAAAAAD5+QAAAAAA - +fkAAAAAAAAAAAAAAAAAAPn5AAAAAAAAAPn5AAAAAAD5+QAAAAAAAAAAAAAAAAAA+fkAAAAAAAAA+fkA - AAAAAPn5AAAAAAAAAAAAAAAA+fn5+fn5AAAAAAD5+fn5+fn5+fkAAAAAAAAAAAAAAPn5+fn5+fn5AAAA - +fn5+fn5+fn5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+AAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////AAAAAP/////MLdwt9e2t7fXtre317XXt9e117cxj - dGO97XXtve117b3tde297XXtzCN0I//////////////////////gHHx/8D58//z+fP/8/gH//P4B//z+ - fP/8/nz//P58//A+AP/gHAH///////////8AAAAf/////ygAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD/ - /wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAKq77t2ZzAAAAAAAAAAAAAAAAAAAAAAAAAzMDAwAwAAAAA - wMDAwMAAAMzAzADAwAAAwADAwMDAAADMwMwAwMAAAAAAAAAAAAAAmZCQCQAAAAAJAJCQAAAAAAkAmQAA - AAAACQCQkAAAAACZkJmQAAAAAAAAAAAAAAD//wAAgAcAAP//AAD//wAAxW8AAPVXAADE1wAA3VcAAMTX - AAD//wAAxb8AAO1/AADs/wAA7X8AAMR/AAD//wAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAACQYGAgMAAAAAAAAJBgYCAAAAAAAAAAAAAAAAAAAAAA8PDAwMBgMAAAAADw8MDAkG + AwAAAAAAAAAAAAAAAAAAFg8PDw8MBgAAAAAWDw8PDwwGAAAAAAAAAAAAAAAAAAARDw8PDw8MAAAAABEP + Dw8PDwwAAAAAAAAAAAAAAAAAABEPDw8PDw8AAAAAEQ8PDw8PDwAAAAAAAAAAAAAAAAAAEQ8PDw8PDwAA + AAARDw8PDw8PAAAAAAAAAAAAAAAAAAARDw8PDw8PAAAAABEPDw8PDw8AAAAAAAAAAAAAAAAAABEPDw8P + Dw8AAAAAEQ8PDw8PDwAAAAAAAAAAAAAAAAAAEQ8PDw8PDwAAAAARDw8PDw8PAAAAAAkJCQkGAgAAAAAR + Dw8PDw8PAAAAABEPDw8PDw8AAAAPDwwPDwwJAwAAABEPDw8PDw8AAAAAEQ8PDw8PDwAAABIPDw8PDw8J + AgAAEQ8PDw8PDwAAAAARDw8PDw8PAAAWDw8PHh8RDwwJAAARDw8PDw8PAAAAABEPDw8PDw8AABoPDxr/ + /x8PDw8AABEPDw8PDw8AAAAAEQ8PDw8PDwAAHg8PF///Hg8PEQAAEg8PDw8PEQAAAAASDw8PDw8RAAAg + EQ8PFhcPDw8SAAAeDw8PDxESAAAAABoPDw8PERIAAAAaDw8PDw8PEgAAAAAaEhESGgAAAAAAABoRERIa + AAAAAAAaEQ8PERYaAAAAAAAAIAAAAAAAAAAAACIgAAAAAAAAAAAgHx4gAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + ////////////////////////////////////////wfh//4DwH/+A8B//gPAf/4DwH/+A8B//gPAf/4Dw + H/+A8B4HgPAcA4DwHAGA8BgBgPAYAYDwGAGA8BgBgPAcA8H4PgP3/P8P//////////////////////// + ////////KAAAABAAAAAgAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDhIQAhoaGAIuL + iwCWl5cAmZqaAJ2dnQChoqIAo6SkAKWmpgCnqKgAqampAKusrACtrq4AsbKyALa3twC3uLgAuLm5ALu8 + vADCw8MAxcXFAMnKygDLzMwAz8/PANbX1wDZ2dkA4eHhAOXl5QDv7+8AAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEAwAA + CAUCAAAAAAAAABMLCwgAAA4LCgQAAAAAAAATCwsLAAALCwsEAAAAAAAAEwsLCwAACwsLBAAAAAAAABML + CwsAAAsLCwQACAgFAgATCwsLAAALCwsEAAsQEggEFQsLCwAACwsLBQALGxwLBRsLCw4AABILCwAADg4O + CwAAGxkAAAAAGBsAAAAVFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA//8AAP//AAD//wAA//8AAIx/AAAMPwAADD8AAAw/AAAMIQAADCAAAAwgAAAMYQAAnnMAAP// + AAD//wAA//8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABwAA + AAYAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAGAAAABQAAAAEAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAEwAA + ADYAAABMAAAASAAAACwAAAAKAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAATAAAANgAAAEkAAABDAAAAJwAA + AAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcH + BxZMTEyLh4iI3ZGRkfBqa2vSISEhhwAAAEAAAAAJAAAAAAAAAAAAAAAABgcHGEtLS4yCg4PZioqK6WJi + YskZGRl+AAAAOgAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAgICAFfH19nK6vr/+mp6f/pqen/6Chof+UlZX7KysrjQAAACYAAAAAAAAAACUlJQWCg4Olra6u/6Wm + pv+lpqb/n5+f/5GRkfchISGBAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAGVlZTDExMT9qqqq/6mqqv+pqqr/qaqq/6SkpP+JiormAAAAPQAAAAMAAAAAdXV1OcPD + w/6qqqr/qaqq/6mqqv+pqqr/oqOj/3+AgNsAAAA3AAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAsLGxdrS1tf+pqqr/qaqq/6mqqv+pqqr/qamp/6anp/4SEhJOAAAABAAA + AADExcV0tLS0/6mqqv+pqqr/qaqq/6mqqv+oqan/paam+woKCkIAAAADAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACztLR9sbKy/6mqqv+pqqr/qaqq/6mqqv+pqqr/qKmp/xYW + FlEAAAAEAAAAANXW1nyxsrL/qaqq/6mqqv+pqqr/qaqq/6mqqv+oqan9Dw8PRgAAAAMAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALOzs32xsbH/qaqq/6mqqv+pqqr/qaqq/6mq + qv+pqan/FhYWUQAAAAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6ioqP0PDw9GAAAAAwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAs7OzfbGxsf+pqqr/qaqq/6mq + qv+pqqr/qaqq/6mpqf8WFhZRAAAABAAAAADV1tZ8sbGx/6mqqv+pqqr/qaqq/6mqqv+pqqr/qKio/Q8P + D0YAAAADAAAAAAAAAAAAAAAAAAAABAAAAA0AAAASAAAADwAAAAYAAAAAAAAAAAAAAACzs7N9sbGx/6mq + qv+pqqr/qaqq/6mqqv+pqqr/qamp/xYWFlEAAAAEAAAAANXW1nyxsbH/qaqq/6mqqv+pqqr/qaqq/6mq + qv+oqKj9Dw8PRgAAAAMAAAAAAQEBAQAAABQBAQE9FBQUZhYWFnEDBARcAAAARAAAAB0AAAADAAAAALOz + s32xsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+pqan/FhYWUQAAAAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mq + qv+pqqr/qaqq/6ioqP0PDw9GAAAAAwAAAAAGBgYaU1NTkpaXl+uen5/+mpqa/o2NjfRTVFS8BwcHZAAA + ACYAAAACs7OzfbGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6mpqf8WFhZRAAAABAAAAADV1tZ8sbGx/6mq + qv+pqqr/qaqq/6mqqv+pqqr/qKio/Q8PD0YCAgIDFxcXC4ODg62srKz/p6io/6mpqf+pqan/pqen/5uc + nP94eHjgCAgIXwAAABSzs7N9sbGx/6mqqv+pqqr/qaqq/6mqqv+pqqr/qamp/xYWFlEAAAAEAAAAANXW + 1nyxsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+oqKj9Dw8PRhISEgNjZGRfuLm5/qmqqv+pqqr/qaqq/6mp + qf+pqqr/qKmp/52env9aWlq6AAAAMLOzs32xsbH/qaqq/6mqqv+pqqr/qaqq/6mqqv+pqan/FhYWUQAA + AAQAAAAA1dbWfLGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6ioqP0PDw9GMDAwBLKzs76sra3/qaqq/62u + rv/f39//5eXl/7a3t/+pqqr/p6io/5qamvQFBQVEs7S0fbGxsf+pqqr/qaqq/6mqqv+pqqr/qaqq/6mp + qf8WFhZRAAAABAAAAADV1tZ8sbGx/6mqqv+pqqr/qaqq/6mqqv+pqqr/qKio/Q8PD0ZFRUUEz9DQ56us + rP+pqqr/0dHR////////////5OXl/6mqqv+pqqr/qKmp/hsbG1THyMh8srKy/6mqqv+pqqr/qaqq/6mq + qv+pqqr/qqur/xcXF0wAAAADAAAAANna2nuysrL/qaqq/6mqqv+pqqr/qaqq/6mqqv+qq6v9Dw8PQFNU + VALU1dXgrK2t/6mqqv/Jycn////////////c3Nz/qaqq/6mqqv+xsbH+GhoaQOLj42a7vLz/qaqq/6mq + qv+pqqr/qaqq/6mqqv+1trb8ExMTLwAAAAAAAAAA4eLiabm5uf+pqqr/qaqq/6mqqv+pqqr/qaqq/7S1 + tfcLCwsmAAAAAN7f36Sys7P/qaqq/6mqqv/Hx8f/zc7O/6ytrf+pqqr/qqur/7CxseIPDw8U4+TkE9bX + 1/Gur6//qaqq/6mqqv+pqqr/sLCw/6Slpb8fHx8JAAAAAAAAAADk5OQg09PT+K2urv+pqqr/qaqq/6mq + qv+wsbH/m5yctR8fHwgAAAAA5OTkL9DR0fmtrq7/qaqq/6mqqv+pqqr/qaqq/6qrq/+8vb3/b3Bwbykp + KQIAAAAA5ebmU9XW1va5ubn/s7Oz/7u8vP/Pz8/deHl5JQAAAAAAAAAAAAAAAAAAAADm5+dl0dLS+7a3 + t/+ysrL/u7y8/8vMzNp1dnYgAAAAAAAAAAAAAAAA5eXlW9LS0ve0tbX/ra6u/6ytrf+wsbH/xMTE/ra3 + t5FnZ2cDAAAAAAAAAAAAAAAA5ufnI+bn537k5eWV4uLias/Q0A0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AADm5+cw5ubmiuLj453h4uJsysvLDQAAAAAAAAAAAAAAAAAAAAAAAAAA5eXlKuTk5Jna2trT19jY193d + 3azZ2tpFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA////////////////////////////////4fw//4DwH/+AcA//AGAP/wAgB/8AIAf/ACAH/wAg + B/8AIAcHACAEAQAgBAAAIAAAACAAAAAgAAAAIAAAACAAAABgCAAAYAgAgPAcAcH4Pgf///////////// + //////////////////8oAAAAEAAAACAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAABMAAAAoAAAADgAAAAAAAAAAAAAABQAAACIAAAAcAAAAAgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAACorKy6KiorZkJGR8Dg4OJQAAAAMDAwMAWBhYZKWlpbwa2trzwgICDkAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAACjpKSoqaqq/6mqqv+foKD4BAQEJGhoaCuys7P+qaqq/6eoqP9LTEyUAAAAAQAA + AAAAAAAAAAAAAAAAAAAAAAAAsrOzvqmqqv+pqqr/qamp/wsLCyqdnp4+ra6u/6mqqv+pqqr/W1xcogAA + AAEAAAAAAAAAAAAAAAAAAAAAAAAAALKysr6pqqr/qaqq/6mpqf8LCwsqnp6ePq2urv+pqqr/qaqq/1tc + XKIAAAABAAAABQUFBS0GBgY8AAAAGgAAAACysrK+qaqq/6mqqv+pqan/CwsLKp6enj6trq7/qaqq/6mq + qv9bXFyiCAgIBGJiYpahoqL5nZ6e/FtcXMACAgInsrKyvqmqqv+pqqr/qamp/wsLCyqenp4+ra6u/6mq + qv+pqqr/W1xcolZWVkmurq7+t7i4/7u8vP+lpqb/Pj4+ibe4uL2pqqr/qaqq/6mqqv8LCwspoKCgPq2u + rv+pqqr/qaqq/1xcXKCPkJBzqqur/+bm5v/v7+//qaqq/2NkZKTW1taaqqur/6mqqv+tra3uDQ0NDqOk + pCK4ubn9qaqq/6usrP9eX193nJycNLa3t/2wsbH/s7Oz/66vr/9WVlZavL29FNfX16bNzc2/qqurRAAA + AAAAAAAA4eLiZMzNzcnMzc2UTExMCAAAAADg4eFfyMjI2sTFxeDExcV1AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + nEH//5xB//+cQYw/nEEAP5xBAB+cQQAfnEEAAZxBAACcQQAAnEEAAJxBAACcQQwhnEH//5xB//+cQf// + nEE= </value> </data> </root> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj 2007-10-05 15:41:56 UTC (rev 977) +++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj 2007-10-05 16:35:46 UTC (rev 978) @@ -33,6 +33,22 @@ <PlatformTarget>x86</PlatformTarget> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <Optimize>true</Optimize> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <UseVSHostingProcess>true</UseVSHostingProcess> + </PropertyGroup> <ItemGroup> <Reference Include="DevAge.Core, Version=4.6.2660.128, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> @@ -49,6 +65,7 @@ <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> + <Reference Include="System.ServiceProcess" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> </ItemGroup> @@ -93,6 +110,11 @@ <Name>IR Server Plugin Interface</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <Content Include="Input Service Configuration.exe.manifest"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process,... [truncated message content] |
From: <an...@us...> - 2007-10-05 15:41:57
|
Revision: 977 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=977&view=rev Author: and-81 Date: 2007-10-05 08:41:56 -0700 (Fri, 05 Oct 2007) Log Message: ----------- Added Paths: ----------- trunk/plugins/IR Server Suite/Input Service/Input Service/ trunk/plugins/IR Server Suite/Input Service/Input Service/Icon.ico trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs trunk/plugins/IR Server Suite/Input Service/Input Service/Properties/ trunk/plugins/IR Server Suite/Input Service/Input Service/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.Designer.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.resx trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.Designer.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.resx trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Icon.ico trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/DevAge.Core.dll trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/DevAge.Windows.Forms.dll trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/SourceGrid.License.txt trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/SourceGrid.dll Removed Paths: ------------- trunk/plugins/IR Server Suite/Input Service/Icon.ico trunk/plugins/IR Server Suite/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/InputServiceInstaller.cs trunk/plugins/IR Server Suite/Input Service/Program.cs Deleted: trunk/plugins/IR Server Suite/Input Service/Icon.ico =================================================================== (Binary files differ) Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Icon.ico =================================================================== (Binary files differ) Property changes on: trunk/plugins/IR Server Suite/Input Service/Input Service/Icon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj 2007-10-05 15:41:56 UTC (rev 977) @@ -0,0 +1,102 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}</ProjectGuid> + <OutputType>WinExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>InputService</RootNamespace> + <AssemblyName>Input Service</AssemblyName> + <StartupObject>InputService.Program</StartupObject> + <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> + <ApplicationIcon>Icon.ico</ApplicationIcon> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <UseVSHostingProcess>false</UseVSHostingProcess> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants> + </DefineConstants> + <DebugType>none</DebugType> + <PlatformTarget>x86</PlatformTarget> + <UseVSHostingProcess>false</UseVSHostingProcess> + <ErrorReport>prompt</ErrorReport> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <Optimize>true</Optimize> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Configuration.Install" /> + <Reference Include="System.Data" /> + <Reference Include="System.Management" /> + <Reference Include="System.ServiceProcess" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="InputService.cs"> + <SubType>Component</SubType> + </Compile> + <Compile Include="InputServiceInstaller.cs"> + <SubType>Component</SubType> + </Compile> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj"> + <Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project> + <Name>IrssComms</Name> + </ProjectReference> + <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> + <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> + <Name>IrssUtils</Name> + </ProjectReference> + <ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> + <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> + <Name>IR Server Plugin Interface</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Content Include="Icon.ico" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> + <PropertyGroup> + <PostBuildEvent>copy "*.*" "\MediaPortal Development\Plugin Releases\IR Server Suite\$(ProjectName)\"</PostBuildEvent> + </PropertyGroup> +</Project> \ No newline at end of file Added: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2007-10-05 15:41:56 UTC (rev 977) @@ -0,0 +1,1474 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Reflection; +using System.ServiceProcess; +using System.Text; +using System.Threading; +using System.Xml; + +using Microsoft.Win32; +using Microsoft.Win32.SafeHandles; + +using IRServerPluginInterface; +using IrssComms; +using IrssUtils; + +namespace InputService +{ + + #region Enumerations + + /// <summary> + /// Describes the operation mode of the IR Server. + /// </summary> + public enum IRServerMode + { + /// <summary> + /// Acts as a standard IR Server (Default). + /// </summary> + ServerMode = 0, + /// <summary> + /// Relays button presses to another IR Server. + /// </summary> + RelayMode = 1, + /// <summary> + /// Acts as a repeater for another IR Server's IR blasting. + /// </summary> + RepeaterMode = 2, + } + + #endregion Enumerations + + public class InputService : ServiceBase + { + + #region Constants + + static readonly string ConfigurationFile = Common.FolderAppData + "Input Service\\Input Service.xml"; + + #endregion Constants + + #region Variables + + List<ClientManager> _registeredClients; + List<ClientManager> _registeredRepeaters; + + Server _server; + Client _client; + + IRServerMode _mode; + string _hostComputer; + + bool _registered; // Used for relay and repeater modes. + + string[] _pluginNameReceive; + IRServerPluginBase[] _pluginReceive; + + string _pluginNameTransmit; + IRServerPluginBase _pluginTransmit; + + #endregion Variables + + #region Constructor / Destructor + + public InputService() + { + this.ServiceName = Program.ServiceName; + + //this.EventLog.Log = "Application"; + //this.AutoLog = true; + + this.CanHandlePowerEvent = true; + this.CanHandleSessionChangeEvent = false; + this.CanPauseAndContinue = false; + this.CanShutdown = true; + this.CanStop = true; + } + + #endregion Constructor / Destructor + + #region IDisposable + + protected override void Dispose(bool disposing) + { + try + { + if (disposing) + { + if (_server != null) + _server.Dispose(); + + if (_client != null) + _client.Dispose(); + } + } + finally + { + base.Dispose(disposing); + } + } + + #endregion IDisposable + + #region Service Methods + + protected override void OnStart(string[] args) + { + // TODO: Change log level to info for release. + IrssLog.LogLevel = IrssLog.Level.Debug; + IrssLog.Open(Common.FolderIrssLogs + "Input Service.log"); + + try + { + IrssLog.Info("Starting IR Server ..."); + + LoadSettings(); + + // Load IR Plugins ... + _pluginReceive = null; + _pluginTransmit = null; + + if (_pluginNameReceive == null && String.IsNullOrEmpty(_pluginNameTransmit)) + { + IrssLog.Warn("No transmit or receive plugins loaded"); + } + else + { + if (_pluginNameReceive == null) + { + IrssLog.Warn("No receiver plugins loaded"); + } + else + { + List<IRServerPluginBase> plugins = new List<IRServerPluginBase>(_pluginNameReceive.Length); + + for (int index = 0; index < _pluginNameReceive.Length; index++) + { + string pluginName = _pluginNameReceive[index]; + + IRServerPluginBase plugin = Program.GetPlugin(pluginName); + + if (plugin == null) + { + IrssLog.Warn("Receiver plugin not found: {0}", pluginName); + } + else + { + plugins.Add(plugin); + + if (!String.IsNullOrEmpty(_pluginNameTransmit) && plugin.Name.Equals(_pluginNameTransmit)) + _pluginTransmit = plugin; + } + } + + _pluginReceive = plugins.ToArray(); + } + + if (String.IsNullOrEmpty(_pluginNameTransmit)) + { + IrssLog.Warn("No transmit plugin loaded"); + } + else if (_pluginTransmit == null) + { + _pluginTransmit = Program.GetPlugin(_pluginNameTransmit); + } + } + + // Mode select ... + switch (_mode) + { + case IRServerMode.ServerMode: + StartServer(); + IrssLog.Info("Started in Server Mode"); + break; + + case IRServerMode.RelayMode: + if (StartRelay()) + IrssLog.Info("Started in Relay Mode"); + else + IrssLog.Error("Failed to start in Relay Mode"); + break; + + case IRServerMode.RepeaterMode: + if (StartRepeater()) + IrssLog.Info("Started in Repeater Mode"); + else + IrssLog.Error("Failed to start in Repeater Mode"); + break; + } + + // Start plugin(s) ... + + bool startedTransmit = false; + + if (_pluginReceive != null) + { + foreach (IRServerPluginBase plugin in _pluginReceive) + { + try + { + if (plugin.Start()) + { + IRemoteReceiver remoteReceiver = plugin as IRemoteReceiver; + if (remoteReceiver != null) + remoteReceiver.RemoteCallback += new RemoteHandler(RemoteHandlerCallback); + + IKeyboardReceiver keyboardReceiver = plugin as IKeyboardReceiver; + if (keyboardReceiver != null) + keyboardReceiver.KeyboardCallback += new KeyboardHandler(KeyboardHandlerCallback); + + IMouseReceiver mouseReceiver = plugin as IMouseReceiver; + if (mouseReceiver != null) + mouseReceiver.MouseCallback += new MouseHandler(MouseHandlerCallback); + + if (plugin.Name.Equals(_pluginTransmit.Name)) + { + startedTransmit = true; + IrssLog.Info("Transmit and Receive plugin started: \"{0}\"", plugin.Name); + } + else + { + IrssLog.Info("Receiver plugin started: \"{0}\"", plugin.Name); + } + } + else + { + IrssLog.Error("Failed to start receive plugin: \"{0}\"", plugin.Name); + } + } + catch (Exception ex) + { + IrssLog.Error("Failed to start receive plugin: \"{0}\"", plugin.Name); + IrssLog.Error(ex.ToString()); + } + } + } + + if (_pluginTransmit != null && !startedTransmit) + { + try + { + if (_pluginTransmit.Start()) + IrssLog.Info("Transmit plugin started: \"{0}\"", _pluginNameTransmit); + else + IrssLog.Error("Failed to start transmit plugin: \"{0}\"", _pluginNameTransmit); + } + catch (Exception ex) + { + IrssLog.Error("Failed to start transmit plugin: \"{0}\"", _pluginNameTransmit); + IrssLog.Error(ex.ToString()); + } + } + + + IrssLog.Info("IR Server started"); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } + + protected override void OnStop() + { + IrssLog.Info("Stopping IR Server ..."); + + if (_mode == IRServerMode.ServerMode) + { + IrssMessage message = new IrssMessage(MessageType.ServerShutdown, MessageFlags.Notify); + SendToAll(message); + } + + // Stop Plugin(s) ... + bool stoppedTransmit = false; + + if (_pluginReceive != null) + { + foreach (IRServerPluginBase plugin in _pluginReceive) + { + try + { + IRemoteReceiver remoteReceiver = plugin as IRemoteReceiver; + if (remoteReceiver != null) + remoteReceiver.RemoteCallback -= new RemoteHandler(RemoteHandlerCallback); + + IKeyboardReceiver keyboardReceiver = plugin as IKeyboardReceiver; + if (keyboardReceiver != null) + keyboardReceiver.KeyboardCallback -= new KeyboardHandler(KeyboardHandlerCallback); + + IMouseReceiver mouseReceiver = plugin as IMouseReceiver; + if (mouseReceiver != null) + mouseReceiver.MouseCallback -= new MouseHandler(MouseHandlerCallback); + + plugin.Stop(); + + if (plugin == _pluginTransmit) + { + stoppedTransmit = true; + IrssLog.Info("Transmit and Receive plugin stopped: \"{0}\"", plugin.Name); + } + else + { + IrssLog.Info("Receiver plugin stopped: \"{0}\"", plugin.Name); + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } + + _pluginReceive = null; + } + + try + { + if (_pluginTransmit != null && !stoppedTransmit) + _pluginTransmit.Stop(); + + _pluginTransmit = null; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + + // Stop Server + try + { + switch (_mode) + { + case IRServerMode.ServerMode: + StopServer(); + break; + + case IRServerMode.RelayMode: + StopRelay(); + break; + + case IRServerMode.RepeaterMode: + StopRepeater(); + break; + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + + IrssLog.Close(); + } + + protected override void OnShutdown() + { + OnStop(); + } + + protected override bool OnPowerEvent(PowerBroadcastStatus powerStatus) + { + switch (powerStatus) + { + case PowerBroadcastStatus.Suspend: + IrssLog.Info("Entering standby ..."); + + bool suspendedTransmit = false; + + if (_pluginReceive != null) + { + foreach (IRServerPluginBase plugin in _pluginReceive) + { + if (plugin == _pluginTransmit) + suspendedTransmit = true; + + plugin.Suspend(); + } + } + + if (_pluginTransmit != null && !suspendedTransmit) + _pluginTransmit.Suspend(); + + // Inform clients ... + if (_mode == IRServerMode.ServerMode) + { + IrssMessage message = new IrssMessage(MessageType.ServerShutdown, MessageFlags.Notify); + SendToAll(message); + } + break; + + case PowerBroadcastStatus.ResumeAutomatic: + case PowerBroadcastStatus.ResumeCritical: + case PowerBroadcastStatus.ResumeSuspend: + IrssLog.Info("Resume from standby ..."); + + bool resumedTransmit = false; + + if (_pluginReceive != null) + { + foreach (IRServerPluginBase plugin in _pluginReceive) + { + if (plugin == _pluginTransmit) + resumedTransmit = true; + + plugin.Resume(); + } + } + + if (_pluginTransmit != null && !resumedTransmit) + _pluginTransmit.Resume(); + + // TODO: Inform clients ? + break; + } + + return true; + } + + #region Unused + + protected override void OnPause() + { + base.OnPause(); + } + + protected override void OnContinue() + { + base.OnContinue(); + } + + protected override void OnSessionChange(SessionChangeDescription changeDescription) + { + switch (changeDescription.Reason) + { + case SessionChangeReason.SessionLogon: + break; + + case SessionChangeReason.SessionLogoff: + break; + } + + base.OnSessionChange(changeDescription); + } + + protected override void OnCustomCommand(int command) + { + switch (command) + { + case 128: + break; + } + + base.OnCustomCommand(command); + } + + #endregion Unused + + #endregion Service Methods + + void StartServer() + { + if (_server != null) + return; + + // Initialize registered client lists ... + _registeredClients = new List<ClientManager>(); + _registeredRepeaters = new List<ClientManager>(); + + ServerMessageSink sink = new ServerMessageSink(ServerReceivedMessage); + _server = new Server(Server.DefaultPort, sink); + _server.ClientDisconnectCallback = new WaitCallback(ClientDisconnect); + + _server.Start(); + } + void StopServer() + { + if (_server != null) + { + _server.Dispose(); + _server = null; + } + + if (_registeredClients != null) + { + _registeredClients.Clear(); + _registeredClients = null; + } + + if (_registeredRepeaters != null) + { + _registeredRepeaters.Clear(); + _registeredRepeaters = null; + } + } + + void CommsFailure(object obj) + { + Exception ex = obj as Exception; + + if (ex != null) + IrssLog.Error("Communications failure: {0}", ex.Message); + else + IrssLog.Error("Communications failure"); + + StopClient(); + } + void Connected(object obj) + { + IrssLog.Info("Connected to another server"); + + if (_mode == IRServerMode.RepeaterMode) + { + IrssMessage message = new IrssMessage(MessageType.RegisterRepeater, MessageFlags.Request); + _client.Send(message); + } + } + void Disconnected(object obj) + { + IrssLog.Warn("Communications with other server has been lost"); + + Thread.Sleep(1000); + } + + void ClientDisconnect(object obj) + { + ClientManager clientManager = obj as ClientManager; + + if (clientManager != null) + { + UnregisterClient(clientManager); + UnregisterRepeater(clientManager); + } + } + + bool StartClient(IPEndPoint endPoint) + { + if (_client != null) + return false; + + ClientMessageSink sink = new ClientMessageSink(ClientReceivedMessage); + + _client = new Client(endPoint, sink); + _client.CommsFailureCallback = new WaitCallback(CommsFailure); + _client.ConnectCallback = new WaitCallback(Connected); + _client.DisconnectCallback = new WaitCallback(Disconnected); + + if (_client.Start()) + { + return true; + } + else + { + _client = null; + return false; + } + } + void StopClient() + { + if (_client != null) + { + _client.Dispose(); + _client = null; + } + } + + bool StartRelay() + { + try + { + StartServer(); + + IPAddress serverIP = Client.GetIPFromName(_hostComputer); + IPEndPoint endPoint = new IPEndPoint(serverIP, IrssComms.Server.DefaultPort); + + StartClient(endPoint); + + return true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + return false; + } + } + void StopRelay() + { + try + { + StopServer(); + StopClient(); + } + catch { } + } + + bool StartRepeater() + { + try + { + StartServer(); + + IPAddress serverIP = Client.GetIPFromName(_hostComputer); + IPEndPoint endPoint = new IPEndPoint(serverIP, IrssComms.Server.DefaultPort); + + StartClient(endPoint); + + return true; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + return false; + } + } + void StopRepeater() + { + try + { + if (_registered) + { + _registered = false; + + IrssMessage message = new IrssMessage(MessageType.UnregisterRepeater, MessageFlags.Request); + _client.Send(message); + } + } + catch + { + throw; + } + finally + { + StopServer(); + StopClient(); + } + } + + void RemoteHandlerCallback(string keyCode) + { + IrssLog.Debug("Remote Event: {0}", keyCode); + + byte[] bytes = Encoding.ASCII.GetBytes(keyCode); + + switch (_mode) + { + case IRServerMode.ServerMode: + { + IrssMessage message = new IrssMessage(MessageType.RemoteEvent, MessageFlags.Notify, bytes); + SendToAll(message); + break; + } + + case IRServerMode.RelayMode: + { + IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, bytes); + _client.Send(message); + break; + } + + case IRServerMode.RepeaterMode: + { + IrssLog.Debug("Remote event ignored, IR Server is in Repeater Mode."); + break; + } + } + } + + void KeyboardHandlerCallback(int vKey, bool keyUp) + { + IrssLog.Debug("Keyboard Event: {0}, keyUp: {1}", vKey, keyUp); + + byte[] bytes = new byte[8]; + BitConverter.GetBytes(vKey).CopyTo(bytes, 0); + BitConverter.GetBytes(keyUp).CopyTo(bytes, 4); + + switch (_mode) + { + case IRServerMode.ServerMode: + { + IrssMessage message = new IrssMessage(MessageType.KeyboardEvent, MessageFlags.Notify, bytes); + SendToAll(message); + break; + } + + case IRServerMode.RelayMode: + { + IrssMessage message = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, bytes); + _client.Send(message); + break; + } + + case IRServerMode.RepeaterMode: + { + IrssLog.Debug("Keyboard event ignored, IR Server is in Repeater Mode."); + break; + } + } + } + + void MouseHandlerCallback(int deltaX, int deltaY, int buttons) + { + IrssLog.Debug("Mouse Event - deltaX: {0}, deltaY: {1}, buttons: {2}", deltaX, deltaY, buttons); + + byte[] bytes = new byte[12]; + BitConverter.GetBytes(deltaX).CopyTo(bytes, 0); + BitConverter.GetBytes(deltaY).CopyTo(bytes, 4); + BitConverter.GetBytes(buttons).CopyTo(bytes, 8); + + switch (_mode) + { + case IRServerMode.ServerMode: + { + IrssMessage message = new IrssMessage(MessageType.MouseEvent, MessageFlags.Notify, bytes); + SendToAll(message); + break; + } + + case IRServerMode.RelayMode: + { + IrssMessage message = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, bytes); + _client.Send(message); + break; + } + + case IRServerMode.RepeaterMode: + { + IrssLog.Debug("Mouse event ignored, IR Server is in Repeater Mode."); + break; + } + } + } + + void SendToAll(IrssMessage message) + { + IrssLog.Debug("SendToAll({0}, {1})", message.Type, message.Flags); + + List<ClientManager> unregister = new List<ClientManager>(); + + lock (_registeredClients) + { + foreach (ClientManager client in _registeredClients) + { + if (!_server.Send(client, message)) + { + IrssLog.Warn("Failed to send message to a client, unregistering client"); + + // If a message doesn't get through then unregister that client + unregister.Add(client); + } + } + + // Unregistering clients must be done as a two part process because otherwise the + // foreach statement above would fail if you modified the _registeredClients list + // while enumerating it. + foreach (ClientManager client in unregister) + { + UnregisterClient(client); + } + } + } + void SendToAllExcept(ClientManager exceptClient, IrssMessage message) + { + IrssLog.Debug("SendToAllExcept({0}, {1})", message.Type, message.Flags); + + List<ClientManager> unregister = new List<ClientManager>(); + + lock (_registeredClients) + { + foreach (ClientManager client in _registeredClients) + { + if (client == exceptClient) + continue; + + if (!_server.Send(client, message)) + { + IrssLog.Warn("Failed to send message to a client, unregistering client"); + + // If a message doesn't get through then unregister that client + unregister.Add(client); + } + } + + // Unregistering clients must be done as a two part process because otherwise the + // foreach statement above would fail if you modified the _registeredClients list + // while enumerating it. + foreach (ClientManager client in unregister) + { + UnregisterClient(client); + } + } + } + void SendTo(ClientManager receiver, IrssMessage message) + { + IrssLog.Debug("SendTo({0}, {1})", message.Type, message.Flags); + + if (!_server.Send(receiver, message)) + { + IrssLog.Warn("Failed to send message to a client, unregistering client"); + + // If a message doesn't get through then unregister that client + UnregisterClient(receiver); + } + } + void SendToRepeaters(IrssMessage message) + { + IrssLog.Debug("SendToRepeaters({0}, {1})", message.Type, message.Flags); + + List<ClientManager> unregister = new List<ClientManager>(); + + lock (_registeredRepeaters) + { + foreach (ClientManager client in _registeredRepeaters) + { + if (!_server.Send(client, message)) + { + IrssLog.Warn("Failed to send message to a repeater, unregistering repeater"); + + // If a message doesn't get through then unregister that repeater + unregister.Add(client); + } + } + + // Unregistering repeaters must be done as a two part process because otherwise the + // foreach statement above would fail if you modified the _registeredRepeaters list + // while enumerating it. + foreach (ClientManager repeater in unregister) + { + UnregisterRepeater(repeater); + } + } + } + + bool RegisterClient(ClientManager addClient) + { + lock (_registeredClients) + { + if (!_registeredClients.Contains(addClient)) + _registeredClients.Add(addClient); + } + + IrssLog.Info("Registered a client"); + return true; + } + bool UnregisterClient(ClientManager removeClient) + { + lock (_registeredClients) + { + if (!_registeredClients.Contains(removeClient)) + return false; + + _registeredClients.Remove(removeClient); + } + + IrssLog.Info("Unregistered a client"); + return true; + } + + bool RegisterRepeater(ClientManager addRepeater) + { + lock (_registeredRepeaters) + { + if (!_registeredRepeaters.Contains(addRepeater)) + _registeredRepeaters.Add(addRepeater); + } + + IrssLog.Info("Registered a repeater"); + return true; + } + bool UnregisterRepeater(ClientManager removeRepeater) + { + lock (_registeredRepeaters) + { + if (!_registeredRepeaters.Contains(removeRepeater)) + return false; + + _registeredRepeaters.Remove(removeRepeater); + } + + IrssLog.Info("Unregistered a repeater"); + return true; + } + + bool BlastIR(byte[] data) + { + try + { + IrssLog.Debug("Blast IR"); + + if (_pluginTransmit == null || !(_pluginTransmit is ITransmitIR)) + return false; + + string port = "Default"; + + int portLen = BitConverter.ToInt32(data, 0); + if (portLen > 0) + port = Encoding.ASCII.GetString(data, 4, portLen); + + byte[] codeData = new byte[data.Length - (4 + portLen)]; + Array.Copy(data, 4 + portLen, codeData, 0, codeData.Length); + + return (_pluginTransmit as ITransmitIR).Transmit(port, codeData); + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + return false; + } + } + LearnStatus LearnIR(out byte[] data) + { + IrssLog.Debug("Learn IR"); + + data = null; + + if (_pluginTransmit == null) + { + IrssLog.Debug("No transmit plugin loaded, can't learn"); + return LearnStatus.Failure; + } + else if (!(_pluginTransmit is ILearnIR)) + { + IrssLog.Debug("Active transmit plugin doesn't support learn"); + return LearnStatus.Failure; + } + + Thread.Sleep(250); + + LearnStatus status = LearnStatus.Failure; + + try + { + status = (_pluginTransmit as ILearnIR).Learn(out data); + switch (status) + { + case LearnStatus.Success: + IrssLog.Info("Learn IR success"); + break; + + case LearnStatus.Failure: + IrssLog.Error("Failed to learn IR Code"); + break; + + case LearnStatus.Timeout: + IrssLog.Warn("IR Code learn timed out"); + break; + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + + return status; + } + + void ServerReceivedMessage(MessageManagerCombo combo) + { + IrssLog.Debug("Server message received: {0}, {1}", combo.Message.Type, combo.Message.Flags); + + try + { + switch (combo.Message.Type) + { + + #region ForwardRemoteEvent + case MessageType.ForwardRemoteEvent: + if (_mode == IRServerMode.RelayMode) + { + IrssMessage forward = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); + _client.Send(forward); + } + else + { + IrssMessage forward = new IrssMessage(MessageType.RemoteEvent, MessageFlags.Notify, combo.Message.GetDataAsBytes()); + SendToAllExcept(combo.Manager, forward); + } + break; + #endregion ForwardRemoteEvent + + #region ForwardKeyboardEvent + case MessageType.ForwardKeyboardEvent: + if (_mode == IRServerMode.RelayMode) + { + IrssMessage forward = new IrssMessage(MessageType.ForwardKeyboardEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); + _client.Send(forward); + } + else + { + IrssMessage forward = new IrssMessage(MessageType.KeyboardEvent, MessageFlags.Notify, combo.Message.GetDataAsBytes()); + SendToAllExcept(combo.Manager, forward); + } + break; + #endregion ForwardKeyboardEvent + + #region ForwardMouseEvent + case MessageType.ForwardMouseEvent: + if (_mode == IRServerMode.RelayMode) + { + IrssMessage forward = new IrssMessage(MessageType.ForwardMouseEvent, MessageFlags.Request, combo.Message.GetDataAsBytes()); + _client.Send(forward); + } + else + { + IrssMessage forward = new IrssMessage(MessageType.MouseEvent, MessageFlags.Notify, combo.Message.GetDataAsBytes()); + SendToAllExcept(combo.Manager, forward); + } + break; + #endregion ForwardMouseEvent + + #region BlastIR + case MessageType.BlastIR: + { + IrssMessage response = new IrssMessage(MessageType.BlastIR, MessageFlags.Response); + + if (_mode == IRServerMode.RelayMode) + { + response.Flags |= MessageFlags.Failure; + } + else + { + if (_registeredRepeaters.Count > 0) + SendToRepeaters(combo.Message); + + if (BlastIR(combo.Message.GetDataAsBytes())) + response.Flags |= MessageFlags.Success; + else + response.Flags |= MessageFlags.Failure; + } + + if ((combo.Message.Flags & MessageFlags.ForceNotRespond) != MessageFlags.ForceNotRespond) + SendTo(combo.Manager, response); + + break; + } + #endregion BlastIR + + #region LearnIR + case MessageType.LearnIR: + { + IrssMessage response = new IrssMessage(MessageType.LearnIR, MessageFlags.Response); + + if (_mode == IRServerMode.RelayMode) + { + response.Flags |= MessageFlags.Failure; + } + else + { + byte[] bytes = null; + + LearnStatus status = LearnIR(out bytes); + + switch (status) + { + case LearnStatus.Success: + response.Flags |= MessageFlags.Success; + response.SetDataAsBytes(bytes); + break; + + case LearnStatus.Failure: + response.Flags |= MessageFlags.Failure; + break; + + case LearnStatus.Timeout: + response.Flags |= MessageFlags.Timeout; + break; + } + } + + SendTo(combo.Manager, response); + break; + } + #endregion LearnIR + + #region ServerShutdown + case MessageType.ServerShutdown: + if ((combo.Message.Flags & MessageFlags.Request) == MessageFlags.Request) + { + IrssLog.Info("Shutdown command received"); + Stop(); + } + break; + #endregion ServerShutdown + + #region RegisterClient + case MessageType.RegisterClient: + { + IrssMessage response = new IrssMessage(MessageType.RegisterClient, MessageFlags.Response); + + if (RegisterClient(combo.Manager)) + { + IRServerInfo irServerInfo = new IRServerInfo(); + + if (_pluginReceive != null) + irServerInfo.CanReceive = true; + + if (_pluginTransmit != null) + { + irServerInfo.CanLearn = (_pluginTransmit is ILearnIR); + irServerInfo.CanTransmit = true; + irServerInfo.Ports = (_pluginTransmit as ITransmitIR).AvailablePorts; + } + + response.SetDataAsBytes(irServerInfo.ToBytes()); + response.Flags |= MessageFlags.Success; + } + else + { + response.Flags |= MessageFlags.Failure; + } + + SendTo(combo.Manager, response); + break; + } + #endregion RegisterClient + + #region UnregisterClient + case MessageType.UnregisterClient: + UnregisterClient(combo.Manager); + break; + #endregion UnregisterClient + + #region RegisterRepeater + case MessageType.RegisterRepeater: + { + IrssMessage response = new IrssMessage(MessageType.RegisterRepeater, MessageFlags.Response); + + if (RegisterRepeater(combo.Manager)) + response.Flags |= MessageFlags.Success; + else + response.Flags |= MessageFlags.Failure; + + SendTo(combo.Manager, response); + break; + } + #endregion RegisterRepeater + + #region UnregisterRepeater + case MessageType.UnregisterRepeater: + UnregisterRepeater(combo.Manager); + break; + #endregion UnregisterRepeater + + #region ActiveBlasters + case MessageType.ActiveBlasters: + { + IrssMessage response = new IrssMessage(MessageType.ActiveBlasters, MessageFlags.Response); + response.SetDataAsString(_pluginNameTransmit); + + SendTo(combo.Manager, response); + break; + } + #endregion ActiveBlasters + + #region ActiveReceivers + case MessageType.ActiveReceivers: + { + IrssMessage response = new IrssMessage(MessageType.ActiveReceivers, MessageFlags.Response); + + if (_pluginNameReceive != null) + { + StringBuilder receivers = new StringBuilder(); + for (int index = 0; index < _pluginNameReceive.Length; index++) + { + receivers.Append(_pluginNameReceive[index]); + + if (index < _pluginNameReceive.Length - 1) + receivers.Append(','); + } + + response.SetDataAsString(receivers.ToString()); + } + else + { + response.SetDataAsString(null); + } + + SendTo(combo.Manager, response); + break; + } + #endregion ActiveReceivers + + #region AvailableBlasters + case MessageType.AvailableBlasters: + { + IrssMessage response = new IrssMessage(MessageType.AvailableBlasters, MessageFlags.Response); + + IRServerPluginBase[] plugins = Program.AvailablePlugins(); + StringBuilder blasters = new StringBuilder(); + + for (int index = 0; index < plugins.Length; index++) + { + IRServerPluginBase plugin = plugins[index]; + + if (plugin is ITransmitIR) + { + blasters.Append(plugin.Name); + blasters.Append(','); + } + } + + if (blasters.Length == 0) + { + response.SetDataAsString(null); + } + else + { + blasters.Remove(blasters.Length - 1, 1); + response.SetDataAsString(blasters.ToString()); + } + + SendTo(combo.Manager, response); + break; + } + #endregion AvailableBlasters + + #region AvailableReceivers + case MessageType.AvailableReceivers: + { + IrssMessage response = new IrssMessage(MessageType.AvailableReceivers, MessageFlags.Response); + + IRServerPluginBase[] plugins = Program.AvailablePlugins(); + StringBuilder receivers = new StringBuilder(); + + for (int index = 0; index < plugins.Length; index++) + { + IRServerPluginBase plugin = plugins[index]; + + if (plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) + { + receivers.Append(plugin.Name); + receivers.Append(','); + } + } + + if (receivers.Length == 0) + { + response.SetDataAsString(null); + } + else + { + receivers.Remove(receivers.Length - 1, 1); + response.SetDataAsString(receivers.ToString()); + } + + SendTo(combo.Manager, response); + break; + } + #endregion AvailableReceivers + + #region DetectedBlasters + case MessageType.DetectedBlasters: + { + IrssMessage response = new IrssMessage(MessageType.DetectedBlasters, MessageFlags.Response); + string[] detectedBlasters = Program.DetectBlasters(); + + if (detectedBlasters != null) + { + StringBuilder blasters = new StringBuilder(); + for (int index = 0; index < detectedBlasters.Length; index++) + { + blasters.Append(detectedBlasters[index]); + + if (index < detectedBlasters.Length - 1) + blasters.Append(','); + } + + response.SetDataAsString(blasters.ToString()); + } + else + { + response.SetDataAsString(null); + } + + SendTo(combo.Manager, response); + break; + } + #endregion DetectedBlasters + + #region DetectedReceivers + case MessageType.DetectedReceivers: + { + IrssMessage response = new IrssMessage(MessageType.DetectedReceivers, MessageFlags.Response); + string[] detectedReceivers = Program.DetectReceivers(); + + if (detectedReceivers != null) + { + StringBuilder receivers = new StringBuilder(); + for (int index = 0; index < detectedReceivers.Length; index++) + { + receivers.Append(detectedReceivers[index]); + + if (index < detectedReceivers.Length - 1) + receivers.Append(','); + } + + response.SetDataAsString(receivers.ToString()); + } + else + { + response.SetDataAsString(null); + } + + SendTo(combo.Manager, response); + break; + } + #endregion DetectedReceivers + + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + IrssMessage response = new IrssMessage(MessageType.Error, MessageFlags.Notify, ex.Message); + SendTo(combo.Manager, response); + } + } + void ClientReceivedMessage(IrssMessage received) + { + IrssLog.Debug("Client message received: {0}, {1}", received.Type, received.Flags); + + try + { + switch (received.Type) + { + case MessageType.RegisterClient: + if ((received.Flags & MessageFlags.Response) == MessageFlags.Response) + { + if ((received.Flags & MessageFlags.Success) == MessageFlags.Success) + { + IrssLog.Info("Registered with host server"); + _registered = true; + } + else + { + IrssLog.Warn("Host server refused registration"); + _registered = false; + } + } + break; + + case MessageType.ServerShutdown: + if ((received.Flags & MessageFlags.Notify) == MessageFlags.Notify) + { + IrssLog.Warn("Host server has shut down"); + _registered = false; + } + break; + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + IrssMessage response = new IrssMessage(MessageType.Error, MessageFlags.Notify, ex.Message); + _client.Send(response); + } + } + + void LoadSettings() + { + _mode = IRServerMode.ServerMode; + _hostComputer = String.Empty; + _pluginNameReceive = null; + _pluginNameTransmit = String.Empty; + + XmlDocument doc = new XmlDocument(); + + try + { + doc.Load(ConfigurationFile); + } + catch (FileNotFoundException) + { + IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile); + + string[] blasters = Program.DetectBlasters(); + if (blasters == null) + _pluginNameTransmit = String.Empty; + else + _pluginNameTransmit = blasters[0]; + + string[] receivers = Program.DetectReceivers(); + if (receivers == null) + _pluginNameReceive = null; + else + _pluginNameReceive = receivers; + + SaveSettings(); + return; + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + return; + } + + try { _mode = (IRServerMode)Enum.Parse(typeof(IRServerMode), doc.DocumentElement.Attributes["Mode"].Value, true); } + catch (Exception ex) { IrssLog.Warn(ex.ToString()); } + + try { _hostComputer = doc.DocumentElement.Attributes["HostComputer"].Value; } + catch (Exception ex) { IrssLog.Warn(ex.ToString()); } + + try { _pluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value; } + catch (Exception ex) { IrssLog.Warn(ex.ToString()); } + + try + { + string receivers = doc.DocumentElement.Attributes["PluginReceive"].Value; + if (!String.IsNullOrEmpty(receivers)) + _pluginNameReceive = receivers.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + } + catch (Exception ex) + { + IrssLog.Warn(ex.ToString()); + } + } + void SaveSettings() + { + try + { + using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, System.Text.Encoding.UTF8)) + { + writer.Formatting = Formatting.Indented; + writer.Indentation = 1; + writer.IndentChar = (char)9; + writer.WriteStartDocument(true); + writer.WriteStartElement("settings"); // <settings> + + writer.WriteAttributeString("Mode", Enum.GetName(typeof(IRServerMode), _mode)); + writer.WriteAttributeString("HostComputer", _hostComputer); + writer.WriteAttributeString("PluginTransmit", _pluginNameTransmit); + + if (_pluginNameReceive != null) + { + StringBuilder receivers = new StringBuilder(); + for (int index = 0; index < _pluginNameReceive.Length; index++) + { + receivers.Append(_pluginNameReceive[index]); + + if (index < _pluginNameReceive.Length - 1) + receivers.Append(','); + } + writer.WriteAttributeString("PluginReceive", receivers.ToString()); + } + else + { + writer.WriteAttributeString("PluginReceive", String.Empty); + } + + writer.WriteEndElement(); // </settings> + writer.WriteEndDocument(); + } + } + catch (Exception ex) + { + IrssLog.Error(ex.ToString()); + } + } + + } + +} Added: trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs 2007-10-05 15:41:56 UTC (rev 977) @@ -0,0 +1,91 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Configuration.Install; +using System.Diagnostics; +using System.Management; +using System.ServiceProcess; + +namespace InputService +{ + + [RunInstaller(true)] + public class InputServiceInstaller : Installer + { + + public InputServiceInstaller() + { + //this.Committing += new InstallEventHandler(InputServiceInstaller_Committing); + this.AfterInstall += new InstallEventHandler(InputServiceInstaller_AfterInstall); + + ServiceProcessInstaller serviceProcessInstaller = new ServiceProcessInstaller(); + ServiceInstaller serviceInstaller = new ServiceInstaller(); + + // Service Account Information + serviceProcessInstaller.Account = ServiceAccount.LocalSystem; + serviceProcessInstaller.Username = null; + serviceProcessInstaller.Password = null; + + // Service Information + serviceInstaller.ServiceName = Program.ServiceName; + serviceInstaller.DisplayName = Program.ServiceDisplayName; + serviceInstaller.Description = Program.ServiceDescription; + serviceInstaller.StartType = ServiceStartMode.Automatic; + + this.Installers.Add(serviceProcessInstaller); + this.Installers.Add(serviceInstaller); + } + + /// <summary> + /// Code to execute after the install has completed. + /// </summary> + void InputServiceInstaller_AfterInstall(object sender, InstallEventArgs e) + { + // Start the service ... + using (ServiceController serviceController = new ServiceController(Program.ServiceName)) + serviceController.Start(); + } + + /// <summary> + /// Used to set the "Allow service to interact with the desktop" setting. + /// </summary> + /* + void InputServiceInstaller_Committing(object sender, InstallEventArgs e) + { + ManagementBaseObject InParam = null; + ManagementBaseObject OutParam = null; + + try + { + ConnectionOptions coOptions = new ConnectionOptions(); + coOptions.Impersonation = ImpersonationLevel.Impersonate; + + ManagementScope mgmtScope = new ManagementScope(@"root\CIMV2", coOptions); + mgmtScope.Connect(); + + string path = string.Format("Win32_Service.Name='{0}'", Program.ServiceName); + + using (ManagementObject wmiService = new ManagementObject(path)) + { + InParam = wmiService.GetMethodParameters("Change"); + InParam["DesktopInteract"] = true; + OutParam = wmiService.InvokeMethod("Change", InParam, null); + } + } + catch + { + throw; + } + finally + { + if (InParam != null) + InParam.Dispose(); + + if (OutParam != null) + OutParam.Dispose(); + } + } + */ + } + +} Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs (rev 0) +++ trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2007-10-05 15:41:56 UTC (rev 977) @@ -0,0 +1,203 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Configuration.Install; +using System.Diagnostics; +using System.IO; +using System.Reflection; +using System.ServiceProcess; +using System.Text; + +using Microsoft.Win32; + +using IRServerPluginInterface; +using IrssUtils; + +namespace InputService +{ + + static class Program + { + + #region Constants + + public const string ServiceName = "MPInputService"; + public const string ServiceDisplayName = "MediaPortal Input Service"; + public const string ServiceDescription = "Provides access to input devices"; + + #endregion Constants + + static void Main(string[] args) + { + if (args.Length >= 1) + { + TransactedInstaller transactedInstaller = new TransactedInstaller(); + InputServiceInstaller inputServiceInstaller = new InputServiceInstaller(); + transactedInstaller.Installers.Add(inputServiceInstaller); + + String path = String.Format("/assemblypath={0}", Assembly.GetExecutingAssembly().Location); + String[] cmdline = { path }; + + InstallContext installContext = new InstallContext(String.Empty, cmdline); + transactedInstaller.Context = installContext; + + if (args[0].Equals("/install", System.StringComparison.InvariantCultureIgnoreCase)) + transactedInstaller.Install(new Hashtable()); + else if (args[0].Equals("/uninstall", System.StringComparison.InvariantCultureIgnoreCase)) + transactedInstaller.Uninstall(null); + + return; + } + + InputService inputService = new InputService(); + ServiceBase.Run(inputService); + } + + /// <summary> + /// Retreives a list of available IR Server plugins. + /// </summary> + /// <returns>Array of plugin instances.</returns> + internal static IRServerPluginBase[] AvailablePlugins() + { + try + { + List<IRServerPluginBase> plugins = new List<IRServerPluginBase>(); + + string installFolder = SystemRegistry.GetInstallFolder(); + if (String.IsNullOrEmpty(installFolder)) + return null; + + string[] files = Directory.GetFiles(installFolder + "\\IR Server Plugins\\", "*.dll", SearchOption.TopDirectoryOnly); + + foreach (string file in files) + { + try + { + Assembly assembly = Assembly.LoadFrom(file); + Type[] types = assembly.GetExportedTypes(); + + foreach (Type type in types) + { + if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(IRServerPluginBase))) + { + IRServerPluginBase plugin = (IRServerPluginBase)assembly.CreateInstance(type.FullName); + + if (plugin != null) + plugins.Add(plugin); + } + } + } + catch (BadImageFormatException) + { + // Ignore Bad Image Format Exceptions, just keep checking for IR Server Plugins + } + catch (TypeLoadException) + { + // Ignore Type Load Exceptions, just keep checking for IR Server Plugins + } + } + + return plugins.ToArray(); + } +#if TRACE + catch (Exception ex) + { + Trace.WriteLine("IRServer: " + ex.ToString()); +#else + catch + { +#endif + return null; + } + } + + /// <summary> + /// Retreives a plugin instance given the plugin name. + /// </summary> + /// <param name="pluginName">Name of plugin to instantiate.</param> + /// <returns>Plugin instance.</returns> + internal static IRServerPluginBase GetPlugin(string pluginName) + { + if (String.IsNullOrEmpty(pluginName)) + throw new ArgumentNullException("pluginName"); + + IRServerPluginBase[] serverPlugins = AvailablePlugins(); + if (serverPlugins == null) + throw new FileNotFoundException("No available plugins found"); + + foreach (IRServerPluginBase plugin in serverPlugins) + if (plugin.Name.Equals(pluginName, StringComparison.InvariantCultureIgnoreCase)) + return plugin; + + return null; + } + + /// <summary> + /// Retreives a list of detected Receiver plugins. + /// </summary> + /// <returns>String array of plugin names.</returns> + internal static string[] DetectReceivers() + { + try + { + IRServerPluginBase[] plugins = AvailablePlugins(); + + List<string> receivers = new List<string>(); + + foreach (IRServerPluginBase plugin in plugins) + if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect()) + receivers.Add(plugin.Name); + + if (receivers.Count > 0) + return receivers.ToArray(); + } +#if TRACE + catch (Exception ex) + { + Trace.WriteLine("IRServer: " + ex.ToString()); + } +#else + catch + { + } +#endif + + return null; + } + + /// <summary> + /// Retreives a list of detected Blaster plugins. + /// </summary> + /// <returns>String array of plugin names.</returns> + internal static string[] DetectBlasters() + { + try + { + IRServerPluginBase[] plugins = Program.AvailablePlugins(); + + List<string> blasters = new List<string>(); + + foreach (IRServerPluginBase plugin in plugins) + if (plugin is ITransmitIR && plugin.Detect()) + blasters.Add(plugin.Name); + + if (blasters.Count > 0) + return blasters.ToArray(); + } +#if TRACE + catch (Exception ex) + { + Tra... [truncated message content] |
From: <an...@us...> - 2007-10-05 15:22:53
|
Revision: 976 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=976&view=rev Author: and-81 Date: 2007-10-05 08:22:40 -0700 (Fri, 05 Oct 2007) Log Message: ----------- Removed Paths: ------------- trunk/plugins/IR Server Suite/Input Service/Properties/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-10-05 14:43:45
|
Revision: 975 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=975&view=rev Author: and-81 Date: 2007-10-05 07:43:44 -0700 (Fri, 05 Oct 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.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/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs trunk/plugins/MCEReplacement/Forms/MacroEditor.cs trunk/plugins/MCEReplacement/MCEReplacement.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -105,12 +105,12 @@ #region Variables - Client _client = null; + Client _client; string _serverHost = "localhost"; string _learnIRFilename = null; - bool _registered = false; + bool _registered; IRServerInfo _irServerInfo = new IRServerInfo(); Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -21,9 +21,9 @@ #region Variables - static Client _client = null; + static Client _client; - static bool _registered = false; + static bool _registered; static string _serverHost = null; Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -22,9 +22,9 @@ #region Variables - static Client _client = null; + static Client _client; - static bool _registered = false; + static bool _registered; static string _serverHost = null; Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-10-05 14:43:44 UTC (rev 975) @@ -120,6 +120,9 @@ <ItemGroup> <Content Include="Icon.ico" /> <Content Include="Icon16.ico" /> + <Content Include="IRServer.exe.manifest"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Advanced.resx"> Added: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2007-10-05 14:43:44 UTC (rev 975) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" > + <assemblyIdentity version="1.0.3.4" processorArchitecture="X86" name="IRServer" type="win32" /> + <description>Provides multiple connections for local and network access to a remote control transceiver</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="requireAdministrator" /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -164,8 +164,23 @@ List<string> receivers = new List<string>(); foreach (IRServerPluginBase plugin in plugins) - if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect()) - receivers.Add(plugin.Name); + { + try + { + if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect()) + receivers.Add(plugin.Name); + } +#if TRACE + catch (Exception ex) + { + Trace.WriteLine("IRServer: " + ex.ToString()); + } +#else + catch + { + } +#endif + } if (receivers.Count > 0) return receivers.ToArray(); Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -2,7 +2,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -//using System.Security.Permissions; +using System.Security.Permissions; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -39,4 +39,4 @@ [assembly: CLSCompliant(true)] -//[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)] +[assembly: SecurityPermission(SecurityAction.RequestMinimum, Unrestricted = true)] Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -67,7 +67,11 @@ comboBoxCommands.Items.Add(Common.UITextHibernate); comboBoxCommands.Items.Add(Common.UITextReboot); comboBoxCommands.Items.Add(Common.UITextShutdown); - + + string[] macroList = Program.GetMacroList(true); + if (macroList != null && macroList.Length > 0) + comboBoxCommands.Items.AddRange(macroList); + string[] irList = Common.GetIRList(true); if (irList != null && irList.Length > 0) comboBoxCommands.Items.AddRange(irList); @@ -93,8 +97,13 @@ { writer.WriteStartElement("action"); - if (item.StartsWith(Common.CmdPrefixBlast)) + if (item.StartsWith(Common.CmdPrefixMacro)) { + writer.WriteAttributeString("command", Common.XmlTagMacro); + writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMacro.Length)); + } + else if (item.StartsWith(Common.CmdPrefixBlast)) + { writer.WriteAttributeString("command", Common.XmlTagBlast); writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixBlast.Length)); } @@ -193,6 +202,10 @@ switch (item.Attributes["command"].Value) { + case Common.XmlTagMacro: + listBoxMacro.Items.Add(Common.CmdPrefixMacro + commandProperty); + break; + case Common.XmlTagBlast: listBoxMacro.Items.Add(Common.CmdPrefixBlast + commandProperty); break; @@ -332,6 +345,10 @@ if (blastCommand.ShowDialog(this) == DialogResult.OK) listBoxMacro.Items.Add(Common.CmdPrefixBlast + blastCommand.CommandString); } + else if (selected.StartsWith(Common.CmdPrefixMacro)) + { + listBoxMacro.Items.Add(selected); + } else { throw new ApplicationException(String.Format("Unknown command in macro command list \"{0}\"", selected)); Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -33,13 +33,13 @@ #region Variables - static Client _client = null; + static Client _client; static Configuration _config; static string _learnIRFilename = null; - static bool _registered = false; + static bool _registered; static bool _firstConnection = true; @@ -52,6 +52,8 @@ //static Thread _focusWatcher; static IntPtr _currentForegroundWindow = IntPtr.Zero; + static List<string> _macroStack; + #endregion Variables #region Properties @@ -290,7 +292,7 @@ { UpdateForegroundWindow(); - //Program._mainForm.Focus(); + //_mainForm.Focus(); _notifyIcon.ContextMenuStrip.Show(Screen.PrimaryScreen.Bounds.Width / 4, Screen.PrimaryScreen.Bounds.Height / 4); @@ -433,13 +435,10 @@ { IntPtr result; Win32.SendMessageTimeout(hWnd, (int)msg, new IntPtr(wParam), new IntPtr(lParam), Win32.SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out result); + int lastError = Marshal.GetLastWin32Error(); - if (result == IntPtr.Zero) - { - int lastError = Marshal.GetLastWin32Error(); - if (lastError != 0) - throw new Win32Exception(lastError); - } + if (result == IntPtr.Zero && lastError != 0) + throw new Win32Exception(lastError); return true; } @@ -500,11 +499,11 @@ if (menuItem == null) return; - string fileName = Program.FolderMacros + menuItem.Text + Common.FileExtensionMacro; + string fileName = FolderMacros + menuItem.Text + Common.FileExtensionMacro; try { - Program.ProcessMacro(fileName); + ProcessMacro(fileName); } catch (Exception ex) { @@ -990,7 +989,6 @@ Win32.ExitWindowsEx(Win32.ExitWindows.ShutDown | Win32.ExitWindows.ForceIfHung, Win32.ShutdownReasons.FlagUserDefined); } - static void MapEvent(MappingEvent theEvent) { if (_inConfiguration) @@ -1023,108 +1021,162 @@ } } + static void MacroStackAdd(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack == null) + { + _macroStack = new List<string>(); + } + else if (_macroStack.Contains(lowerCasedFileName)) + { + StringBuilder macroStackTrace = new StringBuilder(); + macroStackTrace.AppendLine("Macro infinite loop detected!"); + macroStackTrace.AppendLine(); + macroStackTrace.AppendLine("Stack trace:"); + + foreach (string macro in _macroStack) + { + if (macro.Equals(lowerCasedFileName)) + macroStackTrace.AppendLine(String.Format("--> {0}", macro)); + else + macroStackTrace.AppendLine(macro); + } + + macroStackTrace.AppendLine(String.Format("--> {0}", lowerCasedFileName)); + + throw new ApplicationException(macroStackTrace.ToString()); + } + + _macroStack.Add(lowerCasedFileName); + } + static void MacroStackRemove(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack.Contains(lowerCasedFileName)) + _macroStack.Remove(lowerCasedFileName); + + if (_macroStack.Count == 0) + _macroStack = null; + } + /// <summary> /// Process the supplied Macro file. /// </summary> /// <param name="fileName">Macro file to process (absolute path).</param> internal static void ProcessMacro(string fileName) { - XmlDocument doc = new XmlDocument(); - doc.Load(fileName); + MacroStackAdd(fileName); - if (doc.DocumentElement.InnerText.Contains(Common.XmlTagBlast) && !_registered) - throw new ApplicationException("Cannot process Macro with Blast commands when not registered to an active IR Server"); + try + { + XmlDocument doc = new XmlDocument(); + doc.Load(fileName); - XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); - string commandProperty; - string commandName; + if (doc.DocumentElement.InnerText.Contains(Common.XmlTagBlast) && !_registered) + throw new ApplicationException("Cannot process Macro with Blast commands when not registered to an active IR Server"); - foreach (XmlNode item in commandSequence) - { - commandName = item.Attributes["command"].Value; - commandProperty = item.Attributes["cmdproperty"].Value; + XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); + string commandProperty; - switch (commandName) + foreach (XmlNode item in commandSequence) { - case Common.XmlTagBlast: - { - string[] commands = Common.SplitBlastCommand(commandProperty); - BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); - break; - } + commandProperty = item.Attributes["cmdproperty"].Value; - case Common.XmlTagPause: - { - int sleep = int.Parse(commandProperty); - Thread.Sleep(sleep); - break; - } + switch (item.Attributes["command"].Value) + { + case Common.XmlTagMacro: + { + ProcessMacro(FolderMacros + commandProperty + Common.FileExtensionMacro); + break; + } - case Common.XmlTagRun: - { - string[] commands = Common.SplitRunCommand(commandProperty); - Common.ProcessRunCommand(commands); - break; - } + case Common.XmlTagBlast: + { + string[] commands = Common.SplitBlastCommand(commandProperty); + BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); + break; + } - case Common.XmlTagSerial: - { - string[] commands = Common.SplitSerialCommand(commandProperty); - Common.ProcessSerialCommand(commands); - break; - } + case Common.XmlTagPause: + { + int sleep = int.Parse(commandProperty); + Thread.Sleep(sleep); + break; + } - case Common.XmlTagWindowMsg: - { - string[] commands = Common.SplitWindowMessageCommand(commandProperty); - Common.ProcessWindowMessageCommand(commands); - break; - } + case Common.XmlTagRun: + { + string[] commands = Common.SplitRunCommand(commandProperty); + Common.ProcessRunCommand(commands); + break; + } - case Common.XmlTagTcpMsg: - { - string[] commands = Common.SplitTcpMessageCommand(commandProperty); - Common.ProcessTcpMessageCommand(commands); - break; - } + case Common.XmlTagSerial: + { + string[] commands = Common.SplitSerialCommand(commandProperty); + Common.ProcessSerialCommand(commands); + break; + } - case Common.XmlTagKeys: - { - Common.ProcessKeyCommand(commandProperty); - break; - } + case Common.XmlTagWindowMsg: + { + string[] commands = Common.SplitWindowMessageCommand(commandProperty); + Common.ProcessWindowMessageCommand(commands); + break; + } - case Common.XmlTagEject: - { - Common.ProcessEjectCommand(commandProperty); - break; - } + case Common.XmlTagTcpMsg: + { + string[] commands = Common.SplitTcpMessageCommand(commandProperty); + Common.ProcessTcpMessageCommand(commands); + break; + } - case Common.XmlTagStandby: - { - Standby(); - break; - } + case Common.XmlTagKeys: + { + Common.ProcessKeyCommand(commandProperty); + break; + } - case Common.XmlTagHibernate: - { - Hibernate(); - break; - } + case Common.XmlTagEject: + { + Common.ProcessEjectCommand(commandProperty); + break; + } - case Common.XmlTagShutdown: - { - ShutDown(); - break; - } + case Common.XmlTagStandby: + { + Standby(); + break; + } - case Common.XmlTagReboot: - { - Reboot(); - break; - } + case Common.XmlTagHibernate: + { + Hibernate(); + break; + } + + case Common.XmlTagShutdown: + { + ShutDown(); + break; + } + + case Common.XmlTagReboot: + { + Reboot(); + break; + } + } } } + finally + { + MacroStackRemove(fileName); + } } /// <summary> Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.ComponentModel; using System.Diagnostics; using System.IO; using System.IO.Ports; @@ -115,6 +116,7 @@ #region XML Tags + public const string XmlTagMacro = "MACRO"; public const string XmlTagBlast = "BLAST"; public const string XmlTagPause = "PAUSE"; public const string XmlTagRun = "RUN"; @@ -427,7 +429,7 @@ int lastError = Marshal.GetLastWin32Error(); if (result == IntPtr.Zero) - Marshal.ThrowExceptionForHR(lastError); + throw new Win32Exception(lastError); } /// <summary> Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs =================================================================== --- trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -70,7 +70,7 @@ if (String.IsNullOrEmpty(name)) throw new ArgumentNullException("name"); - Registry.SetValue(AutoRunPath, name, null); + Registry.SetValue(AutoRunPath, name, String.Empty, RegistryValueKind.String); } #endregion Methods Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -204,12 +204,19 @@ public override bool Detect() { - Guid hidGuid = new Guid(); - HidD_GetHidGuid(ref hidGuid); + try + { + Guid hidGuid = new Guid(); + HidD_GetHidGuid(ref hidGuid); - string devicePath = FindDevice(hidGuid, DeviceID); + string devicePath = FindDevice(hidGuid, DeviceID); - return (devicePath != null); + return (devicePath != null); + } + catch + { + return false; + } } public override bool Start() Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Advanced.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -12,18 +12,20 @@ namespace MicrosoftMceTransceiver { + [RegistryPermission(SecurityAction.Demand, + Read = "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\HidIr", + Write = "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\HidIr")] partial class Advanced : Form { #region Constants - const string HidIrRegKey = "SYSTEM\\CurrentControlSet\\Services\\HidIr"; + const string RegKey = "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\HidIr"; + const string RegValue = "Start"; - const string StartValue = "Start"; + const int SetEnabled = 3; + const int SetDisabled = 4; - const int HidIrEnabled = 3; - const int HidIrDisabled = 4; - #endregion Constants #region Constructor @@ -32,46 +34,42 @@ { InitializeComponent(); - using (RegistryKey regKey = Registry.LocalMachine.CreateSubKey(HidIrRegKey)) - { - if ((int)regKey.GetValue(StartValue, HidIrDisabled) == HidIrDisabled) - radioButtonDisabled.Checked = true; - else - radioButtonEnabled.Checked = true; - } + int currentValue = (int)Registry.GetValue(RegKey, RegValue, SetDisabled); + + if (currentValue == SetDisabled) + radioButtonDisabled.Checked = true; + else + radioButtonEnabled.Checked = true; } #endregion Constructor private void buttonOK_Click(object sender, EventArgs e) { - using (RegistryKey regKey = Registry.LocalMachine.CreateSubKey(HidIrRegKey)) - { - int currentValue = (int)regKey.GetValue(StartValue, HidIrDisabled); + int currentValue = (int)Registry.GetValue(RegKey, RegValue, SetDisabled); - bool changedValue = false; + bool changedValue = false; - if (radioButtonEnabled.Checked) + if (radioButtonEnabled.Checked) + { + if (currentValue == SetDisabled) { - if (currentValue == HidIrDisabled) - { - regKey.SetValue(StartValue, HidIrEnabled); - changedValue = true; - } + Registry.SetValue(RegKey, RegValue, SetEnabled, RegistryValueKind.DWord); + changedValue = true; } - else if (radioButtonDisabled.Checked) + } + else if (radioButtonDisabled.Checked) + { + if (currentValue != SetDisabled) { - if (currentValue != HidIrDisabled) - { - regKey.SetValue(StartValue, HidIrDisabled); - changedValue = true; - } + Registry.SetValue(RegKey, RegValue, SetDisabled, RegistryValueKind.DWord); + changedValue = true; } - - if (changedValue) - MessageBox.Show(this, "You must reboot for changes to take effect", "Reboot required", MessageBoxButtons.OK, MessageBoxIcon.Information); } + if (changedValue) + MessageBox.Show(this, "You must reboot for changes to take effect", "Reboot required", MessageBoxButtons.OK, MessageBoxIcon.Information); + this.Close(); } Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -611,14 +611,14 @@ _learningCode = null; return status; } - + public override void Send(IrCode code, uint port) { byte[] data = DataPacket(code); TransmitIR(data, code.Carrier, port); } - + #endregion Driver overrides #region Implementation 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-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -116,10 +116,17 @@ public override bool Detect() { - Guid deviceGuid; - string devicePath; + try + { + Guid deviceGuid; + string devicePath; - return FindDevice(out deviceGuid, out devicePath); + return FindDevice(out deviceGuid, out devicePath); + } + catch + { + return false; + } } public override bool Start() Modified: trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -125,7 +125,9 @@ return true; } } - catch { } + catch + { + } return false; } 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 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -46,7 +46,14 @@ public override bool Detect() { - return WinLircServer.IsServerRunning(); + try + { + return WinLircServer.IsServerRunning(); + } + catch + { + return false; + } } public override bool Start() Modified: trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -48,19 +48,18 @@ try { test = new X10Interface(); - if (test == null) - return false; + if (test != null) + return true; } catch { - return false; } finally { test = null; } - return true; + return false; } public override bool Start() Modified: trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -204,12 +204,19 @@ public override bool Detect() { - Guid guid = new Guid(); - HidD_GetHidGuid(ref guid); + try + { + Guid guid = new Guid(); + HidD_GetHidGuid(ref guid); - string devicePath = FindDevice(guid); + string devicePath = FindDevice(guid); - return (devicePath != null); + return (devicePath != null); + } + catch + { + return false; + } } public override bool Start() 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-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -73,9 +73,9 @@ comboBoxCommands.Items.Add(Common.UITextReboot); comboBoxCommands.Items.Add(Common.UITextShutdown); - string[] irList = Common.GetIRList(true); - if (irList != null && irList.Length > 0) - comboBoxCommands.Items.AddRange(irList); + string[] fileList = MPBlastZonePlugin.GetFileList(true); + if (fileList != null && fileList.Length > 0) + comboBoxCommands.Items.AddRange(fileList); } /// <summary> @@ -98,8 +98,13 @@ { writer.WriteStartElement("action"); - if (item.StartsWith(Common.CmdPrefixBlast)) + if (item.StartsWith(Common.CmdPrefixMacro)) { + writer.WriteAttributeString("command", Common.XmlTagMacro); + writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMacro.Length)); + } + else if (item.StartsWith(Common.CmdPrefixBlast)) + { writer.WriteAttributeString("command", Common.XmlTagBlast); writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixBlast.Length)); } @@ -134,11 +139,11 @@ writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixPopup.Length)); } /* - else if (item.StartsWith(Common.CmdPrefixWindowState)) - { - writer.WriteAttributeString("command", Common.XmlTagWindowState); - writer.WriteAttributeString("cmdproperty", String.Empty); - } + else if (item.StartsWith(Common.CmdPrefixWindowState)) + { + writer.WriteAttributeString("command", Common.XmlTagWindowState); + writer.WriteAttributeString("cmdproperty", String.Empty); + } */ else if (item.StartsWith(Common.CmdPrefixFocus)) { @@ -210,6 +215,10 @@ switch (item.Attributes["command"].Value) { + case Common.XmlTagMacro: + listBoxMacro.Items.Add(Common.CmdPrefixMacro + commandProperty); + break; + case Common.XmlTagBlast: listBoxMacro.Items.Add(Common.CmdPrefixBlast + commandProperty); break; @@ -323,10 +332,10 @@ listBoxMacro.Items.Add(Common.CmdPrefixPopup + popupMessage.CommandString); } /* - else if (selected == Common.UITextWindowState) - { - listBoxMacro.Items.Add(Common.CmdPrefixWindowState); - } + else if (selected == Common.UITextWindowState) + { + listBoxMacro.Items.Add(Common.CmdPrefixWindowState); + } */ else if (selected == Common.UITextFocus) { @@ -363,6 +372,10 @@ if (blastCommand.ShowDialog(this) == DialogResult.OK) listBoxMacro.Items.Add(Common.CmdPrefixBlast + blastCommand.CommandString); } + else if (selected.StartsWith(Common.CmdPrefixMacro)) + { + listBoxMacro.Items.Add(selected); + } else { throw new ApplicationException(String.Format("Unknown command in macro command list \"{0}\"", selected)); Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs =================================================================== --- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -72,6 +72,8 @@ static IRServerInfo _irServerInfo = new IRServerInfo(); + static List<string> _macroStack; + #endregion Variables #region Properties @@ -505,180 +507,236 @@ } } + static void MacroStackAdd(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack == null) + { + _macroStack = new List<string>(); + } + else if (_macroStack.Contains(lowerCasedFileName)) + { + StringBuilder macroStackTrace = new StringBuilder(); + macroStackTrace.AppendLine("Macro infinite loop detected!"); + macroStackTrace.AppendLine(); + macroStackTrace.AppendLine("Stack trace:"); + + foreach (string macro in _macroStack) + { + if (macro.Equals(lowerCasedFileName)) + macroStackTrace.AppendLine(String.Format("--> {0}", macro)); + else + macroStackTrace.AppendLine(macro); + } + + macroStackTrace.AppendLine(String.Format("--> {0}", lowerCasedFileName)); + + throw new ApplicationException(macroStackTrace.ToString()); + } + + _macroStack.Add(lowerCasedFileName); + } + static void MacroStackRemove(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack.Contains(lowerCasedFileName)) + _macroStack.Remove(lowerCasedFileName); + + if (_macroStack.Count == 0) + _macroStack = null; + } + /// <summary> /// Process the supplied Macro file. /// </summary> /// <param name="fileName">Macro file to process (absolute path).</param> internal static void ProcessMacro(string fileName) { - XmlDocument doc = new XmlDocument(); - doc.Load(fileName); + MacroStackAdd(fileName); - XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); - string commandProperty; - string commandName; - - foreach (XmlNode item in commandSequence) + try { - commandName = item.Attributes["command"].Value; - commandProperty = item.Attributes["cmdproperty"].Value; + XmlDocument doc = new XmlDocument(); + doc.Load(fileName); - switch (commandName) + XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); + string commandProperty; + string commandName; + + foreach (XmlNode item in commandSequence) { - case Common.XmlTagBlast: - { - string[] commands = Common.SplitBlastCommand(commandProperty); - BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); - break; - } + commandName = item.Attributes["command"].Value; + commandProperty = item.Attributes["cmdproperty"].Value; - case Common.XmlTagPause: - { - int sleep = int.Parse(commandProperty); - Thread.Sleep(sleep); - break; - } + switch (commandName) + { + case Common.XmlTagMacro: + { + ProcessMacro(FolderMacros + commandProperty + Common.FileExtensionMacro); + break; + } - case Common.XmlTagRun: - { - string[] commands = Common.SplitRunCommand(commandProperty); - Common.ProcessRunCommand(commands); - break; - } + case Common.XmlTagBlast: + { + string[] commands = Common.SplitBlastCommand(commandProperty); + BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); + break; + } - case Common.XmlTagSerial: - { - string[] commands = Common.SplitSerialCommand(commandProperty); - Common.ProcessSerialCommand(commands); - break; - } + case Common.XmlTagPause: + { + int sleep = int.Parse(commandProperty); + Thread.Sleep(sleep); + break; + } - case Common.XmlTagGoto: - { - if (InConfiguration) - MessageBox.Show(commandProperty, "Go To Window", MessageBoxButtons.OK, MessageBoxIcon.Information); - else - MPCommands.ProcessGoTo(commandProperty, MP_BasicHome); - break; - } + case Common.XmlTagRun: + { + string[] commands = Common.SplitRunCommand(commandProperty); + Common.ProcessRunCommand(commands); + break; + } - case Common.XmlTagPopup: - { - string[] commands = Common.SplitPopupCommand(commandProperty); + case Common.XmlTagSerial: + { + string[] commands = Common.SplitSerialCommand(commandProperty); + Common.ProcessSerialCommand(commands); + break; + } - if (InConfiguration) - MessageBox.Show(commands[1], commands[0], MessageBoxButtons.OK, MessageBoxIcon.Information); - else - MPCommands.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2])); + case Common.XmlTagGoto: + { + if (InConfiguration) + MessageBox.Show(commandProperty, "Go To Window", MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommands.ProcessGoTo(commandProperty, MP_BasicHome); + break; + } - break; - } + case Common.XmlTagPopup: + { + string[] commands = Common.SplitPopupCommand(commandProperty); - case Common.XmlTagWindowMsg: - { - string[] commands = Common.SplitWindowMessageCommand(commandProperty); - Common.ProcessWindowMessageCommand(commands); - break; - } + if (InConfiguration) + MessageBox.Show(commands[1], commands[0], MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommands.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2])); - /* - 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; - } + break; + } - 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; - - GUIWindowManager.SendMessage(msg); - break; - } - */ - case Common.XmlTagFocus: - { - if (InConfiguration) + case Common.XmlTagWindowMsg: { - MessageBox.Show("Command to get focus cannot be processed in configuration.", "Get Focus Command", MessageBoxButtons.OK, MessageBoxIcon.Information); + string[] commands = Common.SplitWindowMessageCommand(commandProperty); + Common.ProcessWindowMessageCommand(commands); break; } - GUIGraphicsContext.ResetLastActivity(); - GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GETFOCUS, 0, 0, 0, 0, 0, null); - GUIWindowManager.SendThreadMessage(msg); - 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.XmlTagExit: - { - if (!InConfiguration) - GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_EXIT, 0, 0)); - break; - } + GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null); - case Common.XmlTagStandby: - { - if (!InConfiguration) + if (GUIGraphicsContext.DX9Device.PresentationParameters.Windowed) + msg.Param1 = 1; + + GUIWindowManager.SendMessage(msg); + break; + } + */ + case Common.XmlTagFocus: { + if (InConfiguration) + { + MessageBox.Show("Command to get focus cannot be processed in configuration.", "Get Focus Command", MessageBoxButtons.OK, MessageBoxIcon.Information); + break; + } + GUIGraphicsContext.ResetLastActivity(); - // Stop all media before suspending or hibernating - g_Player.Stop(); + GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GETFOCUS, 0, 0, 0, 0, 0, null); + GUIWindowManager.SendThreadMessage(msg); + break; + } - GUIMessage msg; + case Common.XmlTagExit: + { + if (!InConfiguration) + GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_EXIT, 0, 0)); + break; + } - if (_mpBasicHome) - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); - else - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); + case Common.XmlTagStandby: + { + if (!InConfiguration) + { + GUIGraphicsContext.ResetLastActivity(); + // Stop all media before suspending or hibernating + g_Player.Stop(); - GUIWindowManager.SendThreadMessage(msg); + GUIMessage msg; - WindowsController.ExitWindows(RestartOptions.Suspend, true); + if (_mpBasicHome) + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); + else + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); + + GUIWindowManager.SendThreadMessage(msg); + + WindowsController.ExitWindows(RestartOptions.Suspend, true); + } + break; } - break; - } - case Common.XmlTagHibernate: - { - if (!InConfiguration) + case Common.XmlTagHibernate: { - GUIGraphicsContext.ResetLastActivity(); - // Stop all media before suspending or hibernating - g_Player.Stop(); + if (!InConfiguration) + { + GUIGraphicsContext.ResetLastActivity(); + // Stop all media before suspending or hibernating + g_Player.Stop(); - GUIMessage msg; + GUIMessage msg; - if (_mpBasicHome) - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); - else - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); + if (_mpBasicHome) + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); + else + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); - GUIWindowManager.SendThreadMessage(msg); + GUIWindowManager.SendThreadMessage(msg); - WindowsController.ExitWindows(RestartOptions.Hibernate, true); + WindowsController.ExitWindows(RestartOptions.Hibernate, true); + } + break; } - break; - } - case Common.XmlTagReboot: - { - if (!InConfiguration) - GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_REBOOT, 0, 0)); - break; - } + case Common.XmlTagReboot: + { + if (!InConfiguration) + GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_REBOOT, 0, 0)); + break; + } - case Common.XmlTagShutdown: - { - if (!InConfiguration) - GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0)); - break; - } + case Common.XmlTagShutdown: + { + if (!InConfiguration) + GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0)); + break; + } + } } } + finally + { + MacroStackRemove(fileName); + } } /// <summary> 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-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -77,9 +77,9 @@ comboBoxCommands.Items.Add(Common.UITextReboot); comboBoxCommands.Items.Add(Common.UITextShutdown); - string[] irList = Common.GetIRList(true); - if (irList != null && irList.Length > 0) - comboBoxCommands.Items.AddRange(irList); + string[] fileList = MPControlPlugin.GetFileList(true); + if (fileList != null && fileList.Length > 0) + comboBoxCommands.Items.AddRange(fileList); } /// <summary> @@ -102,8 +102,13 @@ { writer.WriteStartElement("action"); - if (item.StartsWith(Common.CmdPrefixBlast)) + if (item.StartsWith(Common.CmdPrefixMacro)) { + writer.WriteAttributeString("command", Common.XmlTagMacro); + writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMacro.Length)); + } + else if (item.StartsWith(Common.CmdPrefixBlast)) + { writer.WriteAttributeString("command", Common.XmlTagBlast); writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixBlast.Length)); } @@ -158,11 +163,11 @@ writer.WriteAttributeString("cmdproperty", String.Empty); } /* - else if (item.StartsWith(Common.CmdPrefixWindowState)) - { - writer.WriteAttributeString("command", Common.XmlTagWindowState); - writer.WriteAttributeString("cmdproperty", String.Empty); - } + else if (item.StartsWith(Common.CmdPrefixWindowState)) + { + writer.WriteAttributeString("command", Common.XmlTagWindowState); + writer.WriteAttributeString("cmdproperty", String.Empty); + } */ else if (item.StartsWith(Common.CmdPrefixFocus)) { @@ -234,6 +239,10 @@ switch (item.Attributes["command"].Value) { + case Common.XmlTagMacro: + listBoxMacro.Items.Add(Common.CmdPrefixMacro + commandProperty); + break; + case Common.XmlTagBlast: listBoxMacro.Items.Add(Common.CmdPrefixBlast + commandProperty); break; @@ -389,10 +398,10 @@ listBoxMacro.Items.Add(Common.CmdPrefixInputLayer); } /* - else if (selected == Common.UITextWindowState) - { - listBoxMacro.Items.Add(Common.CmdPrefixWindowState); - } + else if (selected == Common.UITextWindowState) + { + listBoxMacro.Items.Add(Common.CmdPrefixWindowState); + } */ else if (selected == Common.UITextFocus) { @@ -429,6 +438,10 @@ if (blastCommand.ShowDialog(this) == DialogResult.OK) listBoxMacro.Items.Add(Common.CmdPrefixBlast + blastCommand.CommandString); } + else if (selected.StartsWith(Common.CmdPrefixMacro)) + { + listBoxMacro.Items.Add(selected); + } else { throw new ApplicationException(String.Format("Unknown command in macro command list \"{0}\"", selected)); 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-10-04 20:30:23 UTC (rev 974) +++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-10-05 14:43:44 UTC (rev 975) @@ -53,12 +53,12 @@ #region Variables - static Client _client = null; + static Client _client; static string _serverHost; static string _learnIRFilename = null; - static bool _registered = false; + static bool _registered; static bool _logVerbose; static bool _requireFocus; @@ -97,6 +97,8 @@ static IRServerInfo _irServerInfo = new IRServerInfo(); + static List<string> _macroStack; + #endregion Variables #region Properties @@ -1045,281 +1047,337 @@ MapEvent(MappedEvent.MappingEvent.PC_Resume); } + static void MacroStackAdd(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack == null) + { + _macroStack = new List<string>(); + } + else if (_macroStack.Contains(lowerCasedFileName)) + { + StringBuilder macroStackTrace = new StringBuilder(); + macroStackTrace.AppendLine("Macro infinite loop detected!"); + macroStackTrace.AppendLine(); + macroStackTrace.AppendLine("Stack trace:"); + + foreach (string macro in _macroStack) + { + if (macro.Equals(lowerCasedFileName)) + macroStackTrace.AppendLine(String.Format("--> {0}", macro)); + else + macroStackTrace.AppendLine(macro); + } + + macroStackTrace.AppendLine(String.Format("--> {0}", lowerCasedFileName)); + + throw new ApplicationException(macroStackTrace.ToString()); + } + + _macroStack.Add(lowerCasedFileName); + } + static void MacroStackRemove(string fileName) + { + string lowerCasedFileName = fileName.ToLowerInvariant(); + + if (_macroStack.Contains(lowerCasedFileName)) + _macroStack.Remove(lowerCasedFileName); + + if (_macroStack.Count == 0) + _macroStack = null; + } + /// <summary> /// Process the supplied Macro file. /// </summary> /// <param name="fileName">Macro file to process (absolute path).</param> internal static void ProcessMacro(string fileName) { - XmlDocument doc = new XmlDocument(); - doc.Load(fileName); + MacroStackAdd(fileName); - XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); - string commandProperty; - string commandName; - - foreach (XmlNode item in commandSequence) + try { - commandName = item.Attributes["command"].Value; - commandProperty = item.Attributes["cmdproperty"].Value; + XmlDocument doc = new XmlDocument(); + doc.Load(fileName); - switch (commandName) + XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("action"); + string commandProperty; + string commandName; + + foreach (XmlNode item in commandSequence) { - case Common.XmlTagBlast: - { - string[] commands = Common.SplitBlastCommand(commandProperty); - BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); - break; - } + commandName = item.Attributes["command"].Value; + commandProperty = item.Attributes["cmdproperty"].Value; - case Common.XmlTagPause: - { - int sleep = int.Parse(commandProperty); - Thread.Sleep(sleep); - break; - } + switch (commandName) + { + case Common.XmlTagMacro: + { + ProcessMacro(FolderMacros + commandProperty + Common.FileExtensionMacro); + break; + } - case Common.XmlTagRun: - { - string[] commands = Common.SplitRunCommand(commandProperty); - Common.ProcessRunCommand(commands); - break; - } + case Common.XmlTagBlast: + { + string[] commands = Common.SplitBlastCommand(commandProperty); + BlastIR(Common.FolderIRCommands + commands[0] + Common.FileExtensionIR, commands[1]); + break; + } - case Common.XmlTagSerial: - { - string[] commands = Common.SplitSerialCommand(commandProperty); - Common.ProcessSerialCommand(commands); - break; - } + case Common.XmlTagPause: + { + int sleep = int.Parse(commandProperty); + Thread.Sleep(sleep); + break; + } - case Common.XmlTagGoto: - { - if (InConfiguration) - MessageBox.Show(commandProperty, "Go To Window", MessageBoxButtons.OK, MessageBoxIcon.Information); - else - MPCommands.ProcessGoTo(commandProperty, MP_BasicHome); - break; - } + case Common.XmlTagRun: + { + string[] commands = Common.SplitRunCommand(commandProperty); + Common.ProcessRunCommand(commands); + break; + } - case Common.XmlTagPopup: - { - string[] commands = Common.SplitPopupCommand(commandProperty); + case Common.XmlTagSerial: + { + string[] commands = Common.SplitSerialCommand(commandProperty); + Common.ProcessSerialCommand(commands); + break; + } - if (InConfiguration) - MessageBox.Show(commands[1], commands[0], MessageBoxButtons.OK, MessageBoxIcon.Information); - else - MPCommands.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2])); + case Common.XmlTagGoto: + { + if (InConfiguration) + MessageBox.Show(commandProperty, "Go To Window", MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommands.ProcessGoTo(commandProperty, MP_BasicHome); + break; + } - break; - } + case Common.XmlTagPopup: + { + string[] commands = Common.SplitPopupCommand(commandProperty); - case Common.XmlTagWindowMsg: - { - string[] commands = Common.SplitWindowMessageCommand(commandProperty); - Common.ProcessWindowMessageCommand(commands); - break; - } + if (InConfiguration) + MessageBox.Show(commands[1], commands[0], MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommands.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2])); - case Common.XmlTagKeys: - { - if (InConfiguration) - MessageBox.Show(commandProperty, "Keystroke Command", MessageBoxButtons.OK, MessageBoxIcon.Information); - else - Common.ProcessKeyCommand(commandProperty); - break; - } + break; + } - case Common.XmlTagMultiMap: - { - if (InConfiguration) - ... [truncated message content] |
From: <mis...@us...> - 2007-10-04 20:30:50
|
Revision: 974 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=974&view=rev Author: misterd_sf Date: 2007-10-04 13:30:23 -0700 (Thu, 04 Oct 2007) Log Message: ----------- Bugfix for volume osd handling Bugify for configuration option Audio/Subtitle delay step Modified Paths: -------------- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -67,6 +67,11 @@ // audioDelayStep // this.audioDelayStep.Location = new System.Drawing.Point(129, 96); + this.audioDelayStep.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); this.audioDelayStep.Name = "audioDelayStep"; this.audioDelayStep.Size = new System.Drawing.Size(260, 20); this.audioDelayStep.TabIndex = 69; Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -87,6 +87,11 @@ // subtitleDelayStep // this.subtitleDelayStep.Location = new System.Drawing.Point(129, 94); + this.subtitleDelayStep.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); this.subtitleDelayStep.Name = "subtitleDelayStep"; this.subtitleDelayStep.Size = new System.Drawing.Size(260, 20); this.subtitleDelayStep.TabIndex = 79; Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ExternalOSDLibrary.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -65,7 +65,7 @@ public ExternalOSDLibrary(MPlayer_ExtPlayer player) { _showingCacheStatus = false; _player = player; - _internalOSDHandler = new InternalOSDHandler(player); + _internalOSDHandler = new InternalOSDHandler(player,false); using (WaitCursor cursor = new WaitCursor()) { Thread thread = new Thread(osdGetInstance); thread.Start(); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/InternalOSDHandler.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -85,15 +85,18 @@ /// Constructor which initialises the internal osd handler /// </summary> /// <param name="player">Instance of external player</param> - public InternalOSDHandler(MPlayer_ExtPlayer player) { + /// <param name="playerUse">Indicates, if this instance will be used by the player class</param> + public InternalOSDHandler(MPlayer_ExtPlayer player, bool playerUse) { _player = player; _configManager = ConfigurationManager.getInstance(); _displayDuration = 2000; _osdVisible = false; _osdVisibleForPause = false; _mpVolumeHandler = VolumeHandler.Instance; - _mpMessageHandler = new SendMessageHandler(OnMessage); - GUIWindowManager.Receivers += _mpMessageHandler; + if (playerUse) { + _mpMessageHandler = new SendMessageHandler(OnMessage); + GUIWindowManager.Receivers += _mpMessageHandler; + } } /// <summary> Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-04 07:02:56 UTC (rev 973) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-10-04 20:30:23 UTC (rev 974) @@ -409,7 +409,7 @@ private void initSystem() { _playState = PlayState.Playing; if (_configManager.OsdMode == OSDMode.InternalMPlayer) { - _osdHandler = new InternalOSDHandler(this); + _osdHandler = new InternalOSDHandler(this,true); } else if (_configManager.OsdMode == OSDMode.ExternalOSDLibrary) { _osdHandler = new ExternalOSDLibrary(this); } @@ -426,7 +426,7 @@ } #endregion - #region UpdateGUI Handling + #region MPlayer process communication /// <summary> /// Occures, when the mplayer process exists /// </summary> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |