Menu
▾
▴
mp-plugins-svn
|
From: <che...@us...> - 2008-03-25 10:05:09
|
Revision: 1519
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1519&view=rev
Author: chef_koch
Date: 2008-03-25 03:05:07 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
components page: disable the plugins if mp or tvserver is not installed
Modified Paths:
--------------
trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup.nsi
Modified: trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh
===================================================================
--- trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh 2008-03-25 09:15:11 UTC (rev 1518)
+++ trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh 2008-03-25 10:05:07 UTC (rev 1519)
@@ -23,10 +23,11 @@
#endregion
+
+
#**********************************************************************************************************#
#
-# This original header file is taken from: http://nsis.sourceforge.net/Add/Remove_Functionality
-# and modified for our needs.
+# different useful macros
#
#**********************************************************************************************************#
@@ -88,8 +89,16 @@
!insertmacro "Remove_${${SecName}}"
!macroend
+!macro DisableComponent SectionName AddText
+ !insertmacro UnselectSection "${SectionName}"
+ ; Make the unselected section read only
+ !insertmacro SetSectionFlag "${SectionName}" 16
+ SectionGetText ${SectionName} $R0
+ SectionSetText ${SectionName} "$R0${AddText}"
+!macroend
+
#**********************************************************************************************************#
#
# Useful macros for MediaPortal and addtional Software which can be used like other LogicLib expressions.
@@ -190,6 +199,14 @@
+#**********************************************************************************************************#
+#
+# common language strings
+#
+#**********************************************************************************************************#
+LangString TEXT_MP_NOT_INSTALLED ${LANG_ENGLISH} "MediaPortal not installed"
+LangString TEXT_TVSERVER_NOT_INSTALLED ${LANG_ENGLISH} "TVServer not installed"
+
/*
; Section flag test
!macro _MPIsInstalled _a _b _t _f
Modified: trunk/plugins/IR Server Suite/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup.nsi 2008-03-25 09:15:11 UTC (rev 1518)
+++ trunk/plugins/IR Server Suite/setup.nsi 2008-03-25 10:05:07 UTC (rev 1519)
@@ -109,6 +109,7 @@
!insertmacro MUI_PAGE_WELCOME
Page custom PageReinstall PageLeaveReinstall
!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ComponentsPre
!insertmacro MUI_PAGE_COMPONENTS
; Main app install path
@@ -1119,6 +1120,25 @@
;======================================
+Function ComponentsPre
+ ${IfNot} ${MP023IsInstalled}
+ ${AndIfNot} ${MPIsInstalled}
+ !insertmacro DisableComponent "${SectionGroupMP}" " ($(TEXT_MP_NOT_INSTALLED))"
+ !insertmacro DisableComponent "${SectionMPCommon}" ""
+ !insertmacro DisableComponent "${SectionMPControlPlugin}" ""
+ !insertmacro DisableComponent "${SectionMPBlastZonePlugin}" ""
+ !insertmacro DisableComponent "${SectionTV2BlasterPlugin}" ""
+ ${EndIf}
+
+ ${IfNot} ${TVServerIsInstalled}
+ !insertmacro DisableComponent "${SectionGroupTV3}" " ($(TEXT_TVSERVER_NOT_INSTALLED))"
+ !insertmacro DisableComponent "${SectionTV3Common}" ""
+ !insertmacro DisableComponent "${SectionTV3BlasterPlugin}" ""
+ ${EndIf}
+FunctionEnd
+
+;======================================
+
Function DirectoryPreMP
SectionGetFlags 3 $R0
IntOp $R0 $R0 & ${SF_SELECTED}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-25 13:54:48
|
Revision: 1523
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1523&view=rev
Author: and-81
Date: 2008-03-25 06:54:43 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon.ico
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon16.ico
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon16Connecting.ico
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon32.ico
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-03-25 13:31:40 UTC (rev 1522)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-03-25 13:54:43 UTC (rev 1523)
@@ -7,12 +7,6 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server", "Applications\IR Server\IR Server.csproj", "{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tray Launcher", "Applications\Tray Launcher\Tray Launcher.csproj", "{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -283,12 +277,6 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sage Setup", "Applications\SageSetup\Sage Setup.csproj", "{905131F8-F8AC-4A65-A722-37783902D7B8}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dbox Tuner", "Applications\Dbox Tuner\Dbox Tuner.csproj", "{F8CC05AA-6306-459E-BD32-40C02489EFEC}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -313,12 +301,6 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractor", "Applications\Abstractor\Abstractor.csproj", "{66F37FF9-0398-4954-812D-065C2D153746}"
- ProjectSection(WebsiteProperties) = preProject
- Debug.AspNetCompiler.Debug = "True"
- Release.AspNetCompiler.Debug = "False"
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacMini Receiver", "IR Server Plugins\MacMini Receiver\MacMini Receiver.csproj", "{FCE5308F-C451-4113-B7F2-BB6212EA7FAD}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
@@ -385,10 +367,6 @@
Release|Any CPU = Release|Any CPU
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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.Build.0 = Release|Any CPU
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -553,10 +531,6 @@
{A2702ACF-C59E-4564-8A4A-5CBFF21C1E66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2702ACF-C59E-4564-8A4A-5CBFF21C1E66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2702ACF-C59E-4564-8A4A-5CBFF21C1E66}.Release|Any CPU.Build.0 = Release|Any CPU
- {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {905131F8-F8AC-4A65-A722-37783902D7B8}.Release|Any CPU.Build.0 = Release|Any CPU
{F8CC05AA-6306-459E-BD32-40C02489EFEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8CC05AA-6306-459E-BD32-40C02489EFEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8CC05AA-6306-459E-BD32-40C02489EFEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -573,10 +547,6 @@
{C9DB6BFE-4AA7-43D6-8B5D-3B27A2FA4B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9DB6BFE-4AA7-43D6-8B5D-3B27A2FA4B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9DB6BFE-4AA7-43D6-8B5D-3B27A2FA4B1A}.Release|Any CPU.Build.0 = Release|Any CPU
- {66F37FF9-0398-4954-812D-065C2D153746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {66F37FF9-0398-4954-812D-065C2D153746}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {66F37FF9-0398-4954-812D-065C2D153746}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {66F37FF9-0398-4954-812D-065C2D153746}.Release|Any CPU.Build.0 = Release|Any CPU
{FCE5308F-C451-4113-B7F2-BB6212EA7FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCE5308F-C451-4113-B7F2-BB6212EA7FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCE5308F-C451-4113-B7F2-BB6212EA7FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -628,7 +598,6 @@
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
@@ -638,9 +607,7 @@
{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{CCDBA239-8E8E-4F5F-A098-7132EED5F160} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
- {905131F8-F8AC-4A65-A722-37783902D7B8} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{F8CC05AA-6306-459E-BD32-40C02489EFEC} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
- {66F37FF9-0398-4954-812D-065C2D153746} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{EDE4F0AC-CA13-4E4F-8466-EF0519B7B0EF} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{48839540-780F-4323-8F50-68E2A2385502} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{3BB1C204-D08E-43E5-AC68-DCDD624404A5} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon.ico
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon16.ico
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon16Connecting.ico
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Icon32.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-26 01:56:15
|
Revision: 1527
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1527&view=rev
Author: and-81
Date: 2008-03-25 18:56:06 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/ExternalChannelConfig.cs
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs 2008-03-25 21:21:38 UTC (rev 1526)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/ExternalChannelConfig.cs 2008-03-26 01:56:06 UTC (rev 1527)
@@ -17,12 +17,12 @@
const int DefaultCardID = 0;
- const int DefaultPauseTime = 250;
+ const int DefaultPauseTime = 500;
const bool DefaultSendSelect = false;
const bool DefaultDoubleChannelSelect = false;
const int DefaultRepeatChannelCommands = 0;
const int DefaultChannelDigits = 0;
- const int DefaultRepeatPauseTime = 1000;
+ const int DefaultRepeatPauseTime = 2000;
const bool DefaultUsePreChangeCommand = false;
#endregion Constants
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/ExternalChannelConfig.cs
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/ExternalChannelConfig.cs 2008-03-25 21:21:38 UTC (rev 1526)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/ExternalChannelConfig.cs 2008-03-26 01:56:06 UTC (rev 1527)
@@ -8,22 +8,22 @@
{
/// <summary>
- /// External Channel Changing configuration file for tuning Set Top Boxes in MediaPortal.
+ /// External Channel Changing configuration file for tuning Set Top Boxes.
/// </summary>
public class ExternalChannelConfig
{
#region Constants
- const int DefaultCardID = 0;
+ const int DefaultCardID = 0;
- const int DefaultPauseTime = 250;
- const bool DefaultSendSelect = false;
- const bool DefaultDoubleChannelSelect = false;
- const int DefaultRepeatChannelCommands = 0;
- const int DefaultChannelDigits = 0;
- const int DefaultRepeatPauseTime = 1000;
- const bool DefaultUsePreChangeCommand = false;
+ const int DefaultPauseTime = 500;
+ const bool DefaultSendSelect = false;
+ const bool DefaultDoubleChannelSelect = false;
+ const int DefaultRepeatChannelCommands = 0;
+ const int DefaultChannelDigits = 0;
+ const int DefaultRepeatPauseTime = 2000;
+ const bool DefaultUsePreChangeCommand = false;
#endregion Constants
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-26 15:52:16
|
Revision: 1535
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1535&view=rev
Author: and-81
Date: 2008-03-26 08:52:11 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Forms/SetupForm.resx
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Media Center Connection.csproj
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/References/MSASState.dll.config
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-26 15:52:11 UTC (rev 1535)
@@ -381,7 +381,8 @@
bool detected = plugin.Detect();
- IrssLog.Info("Found: {0}", plugin.Name);
+ if (detected)
+ IrssLog.Info("Found: {0}", plugin.Name);
// Receive
checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox;
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-03-26 15:52:11 UTC (rev 1535)
@@ -68,6 +68,8 @@
public Tray()
{
ContextMenuStrip contextMenu = new ContextMenuStrip();
+ contextMenu.Items.Add(new ToolStripLabel("Tray Launcher"));
+ contextMenu.Items.Add(new ToolStripSeparator());
contextMenu.Items.Add(new ToolStripMenuItem("&Launch", null, new EventHandler(ClickLaunch)));
contextMenu.Items.Add(new ToolStripMenuItem("&Setup", null, new EventHandler(ClickSetup)));
contextMenu.Items.Add(new ToolStripMenuItem("&Quit", null, new EventHandler(ClickQuit)));
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 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2008-03-26 15:52:11 UTC (rev 1535)
@@ -417,7 +417,8 @@
bool detected = plugin.Detect();
- IrssLog.Info("Found: {0}", plugin.Name);
+ if (detected)
+ IrssLog.Info("Found: {0}", plugin.Name);
// Receive
checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox;
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Forms/SetupForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Forms/SetupForm.resx 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Forms/SetupForm.resx 2008-03-26 15:52:11 UTC (rev 1535)
@@ -126,7 +126,7 @@
<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>
- AAABAAIAICAAAAEACACoCAAAJgAAABAQAAABAAgAaAUAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAE
+ AAABAAIAICAAAAEACACoCAAAJgAAABAQAAABAAgAaAUAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwADA3MAA8MqmANTw
/wCx4v8AjtT/AGvG/wBIuP8AJar/AACq/wAAktwAAHq5AABilgAASnMAADJQANTj/wCxx/8Ajqv/AGuP
/wBIc/8AJVf/AABV/wAASdwAAD25AAAxlgAAJXMAABlQANTU/wCxsf8Ajo7/AGtr/wBISP8AJSX/AAAA
@@ -148,22 +148,22 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPr6AAD8/AAA/v4AAPj4AAD6+gAA/PwAAP7+AAD4+AAA
+voAAPz8AAD+/gAA+PgAAPr6AAD8/AAA/v4AAPj4+fkAAPv7AAD9/QAA//8AAPn5AAD7+wAA/f0AAP//
AAD5+QAA+/sAAP39AAD//wAA+fkAAPv7AAD9/QAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAEAAAEAAAEBAAABAAABAAA
- BAQEAAQAAAQAAAAEAAAAAAQAAAQABAAABAAEAAAEAAQAAAAABAAABAAAAAQAAAAABAAABAAEAAAEAAQA
- AAQABAAAAAAEAAAEAAAABAAAAAAEAAAEAAQAAAQABAAABAAEAAAAAAQAAAQAAAAEAAAAAAQAAAQABAAA
- BAAEAAAEAAQAAAAABAAABAAAAAQAAAAABAQEBAAEAAAEAAQABAQABAAAAAAEBAQEAAAABAAAAAAEAAAE
- AAQAAAQABAQEBAAEAAAAAAQAAAQAAAAEAAAAAAQAAAQABAAABAAEBAAEAAQAAAAABAAABAAAAAQAAAAA
- BAAABAAEAAAEAAQAAAQABAAAAAAEAAAEAAAABAAAAAAABAQAAAQAAAQABAAABAAABAQEAAQAAAQAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAD5+fkAAPkAAPkAAAAAAPwAAAD8APwA/AD8AAD8AAAAAAD5AAAA+QAA+QAAAAAA/AAAAPwA
- /AD8APwAAPwAAAAAAPkAAAD5+fkAAAAAAAD8AAAA/PwAAPz8/AAA/AAAAAAA+QAAAPkAAPkAAAAAAPwA
- AAD8APwA/AD8APz8/AAAAAD5AAAA+QAA+QAAAAAA/AAAAPwA/AD8APwA/AD8AAAA+fn5AAD5+fkAAAAA
- /Pz8/PwA/PwAAAD8AAD8APwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD6+voAAPoAAPoAAPoA
+ +gAA+gD6+voA+vr6AAD6AAAAAPoAAAD6APoA+gAA+gD6AAD6APoAAAD6AAAAAPoAAAAA+gAAAPoA+gD6
+ APr6APoA+voA+voAAPoAAAAA+gAAAAD6AAAA+gD6APr6APoA+voA+gD6AAAA+gAAAAD6AAAAAPr6+gAA
+ +gAA+gAA+gD6AAD6APr6+gD6+voA+vr6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////8zMzMzMzMzMMzMzMzMzMzP//////////4Wz
- bFu9rWvbva1r272ta9u9rWvbvC1Lw72tC9u9rSvbva1r275tbFv/////////////////////xt91W+7f
- dVvuP3Mb7t91Ue7fdVXGPBO1/////////////////////ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD5+QAAAAAA+fkAAAAA+fn5+fkAAAAAAPn5
+ +fn5AAAAAPn5AAAAAAD5+QAAAPn5+fn5+fkAAAD5+fn5+fn5AAAA+fkAAAAAAPn5AAAA+fkAAAAAAAAA
+ APn5AAAAAAAAAAD5+QAAAAAA+fkAAAD5+QAAAAAAAAAA+fkAAAAAAAAAAPn5AAAAAAD5+QAAAPn5AAAA
+ AAAAAAD5+fn5+fkAAAAA+fkAAPkAAPn5AAAA+fkAAAAAAAAAAPn5+fn5+QAAAAD5+QD5+fkA+fkAAAD5
+ +QAAAAAAAAAA+fkAAAAAAAAAAPn5+fkA+fn5+QAAAPn5AAAAAAAAAAD5+QAAAAAAAAAA+fn5AAAA+fn5
+ AAAA+fn5+fn5+QAAAPn5+fn5+fkAAAD5+QAAAAAA+fkAAAAA+fn5+fkAAAAAAPn5+fn5AAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////8zMzMzMzMzMMzMzMzMzMzP/////////////
+ //////////////////+NtaI3urWu97qlJve6lK73jbWiI/////////////////////+fPB8HnzgOA585
+ /n+fOf5/nzn+B5s5/geROf5/hDn+f444DgOfPB8H/////ygAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYA1PD/ALHi
/wCO1P8Aa8b/AEi4/wAlqv8AAKr/AACS3AAAerkAAGKWAABKcwAAMlAA1OP/ALHH/wCOq/8Aa4//AEhz
/wAlV/8AAFX/AABJ3AAAPbkAADGWAAAlcwAAGVAA1NT/ALGx/wCOjv8Aa2v/AEhI/wAlJf8AAAD+AAAA
@@ -182,11 +182,11 @@
3AAAubkAAJaWAABzcwAAUFAA8vLyAObm5gDa2toAzs7OAMLCwgC2trYAqqqqAJ6engCSkpIAhoaGAHp6
egBubm4AYmJiAFZWVgBKSkoAPj4+ADIyMgAmJiYAGhoaAA4ODgDw+/8ApKCgAICAgAAAAP8AAP8AAAD/
/wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAD6APwA/gD4APoA/AD+APj5APsA/QD/APkA
- +wD9AP8AAAAAAAAAAAAAAAAAAAAAAAAEAAAEAAQABAAEAAAEAAAABAAABAAEAAQABAAABAAAAAQAAAQE
- AAAEBAQAAAQAAAAEAAAEAAQABAAEAAQABAAEBAQABAQAAAAEAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAA
- APn5+QAA+QAA+QAAAAAAAAAA+QAAAPkAAPkAAAAAAAAAAPkAAAD5+fkAAAAAAAAAAAD5AAAA+QAA+QAA
- AAAAAAD5+fkAAPn5+QAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AACqqgAAVVUAAP//AAC1WwAAtVsAALMb
- AAC1VQAAE7UAAP//AADjbwAA928AAPcfAAD3bwAA4x8AAP//AAA=
+ +wD9AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAC5ubkAAAAAAAAAAAAAAAAAuQAAALm5AAAAAAAAubm5ubkA
+ AAC5ubm5ubm5uQAAAAC5AAAAubkAAAAAAAAAAAAAubm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAo
+ AAAAKAAAKCgoACgoKAAAKAAAACgAKAAAAAAoAAAAACgAKAAoACgAAAAAKCgAAAAoACgAKAAoAAAAACgA
+ AAAAKCgAKCgAACgoKAAoKCgAAAAAAAAAAAAAAAAAAAAAAP//AACqqgAAVVUAAP//AADx/wAA9z8AAAcA
+ AAD3PwAA8f8AAP//AAC7EQAAuvcAAKrzAACq9wAAkxEAAP//AAA=
</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Media Center Connection.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Media Center Connection.csproj 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Media Center Connection.csproj 2008-03-26 15:52:11 UTC (rev 1535)
@@ -62,14 +62,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>References\MediaState.dll</HintPath>
</Reference>
- <Reference Include="MemMapFile, Version=1.0.1740.26562, Culture=neutral, PublicKeyToken=0ef790d706f73a80">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>References\MemMapFile.dll</HintPath>
- </Reference>
- <Reference Include="MSASState, Version=1.0.1740.26563, Culture=neutral, PublicKeyToken=a097a53b6b26c493">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>References\MSASState.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
Deleted: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/References/MSASState.dll.config
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/References/MSASState.dll.config 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/References/MSASState.dll.config 2008-03-26 15:52:11 UTC (rev 1535)
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<logFile>MSASState.log</logFile>
-</configuration>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs 2008-03-26 13:57:48 UTC (rev 1534)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs 2008-03-26 15:52:11 UTC (rev 1535)
@@ -129,6 +129,8 @@
public Tray()
{
ContextMenuStrip contextMenu = new ContextMenuStrip();
+ contextMenu.Items.Add(new ToolStripLabel("Media Center Connection"));
+ contextMenu.Items.Add(new ToolStripSeparator());
contextMenu.Items.Add(new ToolStripMenuItem("&Setup", null, new EventHandler(ClickSetup)));
contextMenu.Items.Add(new ToolStripMenuItem("&Quit", null, new EventHandler(ClickQuit)));
@@ -143,13 +145,10 @@
#region Implementation
- void ms_OnMSASEvent(object state, MediaStatusEventArgs args)
+ void OnMSASEvent(object state, MediaStatusEventArgs args)
{
//MediaState typedState = (MediaState)state;
-
- string strOut = String.Format("ms_OnMSASEvent: {0} {1} {2} {3}", args.Session, args.SessionID, args.Tag, args.Value);
-
- IrssLog.Info(strOut);
+ IrssLog.Info("OnMSASEvent: {0} {1} {2} {3}", args.Session, args.SessionID, args.Tag, args.Value);
}
void TV_MediaChanged(object sender, EventArgs e)
@@ -228,7 +227,7 @@
_notifyIcon.Visible = true;
_mediaState = new MediaState();
- _mediaState.OnMSASEvent += new MediaState.MSASEventHandler(ms_OnMSASEvent);
+ _mediaState.OnMSASEvent += new MediaState.MSASEventHandler(OnMSASEvent);
_mediaState.TV.MediaChanged += new EventHandler(TV_MediaChanged);
_mediaState.Connect();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-26 16:12:44
|
Revision: 1537
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1537&view=rev
Author: and-81
Date: 2008-03-26 09:12:29 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-26 15:54:50 UTC (rev 1536)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-26 16:12:29 UTC (rev 1537)
@@ -56,7 +56,6 @@
static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, "IR Server\\IR Server.xml");
static readonly string AbstractRemoteMapFolder = Path.Combine(Common.FolderAppData, "Input Service\\Abstract Remote Maps");
-
static readonly string AbstractRemoteSchemaFile = Path.Combine(Common.FolderAppData, "Input Service\\Abstract Remote Maps\\RemoteTable.xsd");
#endregion Constants
@@ -1825,9 +1824,14 @@
if (String.IsNullOrEmpty(device))
return false;
+ IrssLog.Info("Load Abstract Device Files: {0}", device);
+
string path = Path.Combine(AbstractRemoteMapFolder, device);
- if (Directory.Exists(path))
+ if (!Directory.Exists(path))
+ {
+ IrssLog.Debug("No Abstract Remote Tables for \"{0}\" were found", device);
return false;
+ }
try
{
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-26 15:54:50 UTC (rev 1536)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-26 16:12:29 UTC (rev 1537)
@@ -1313,7 +1313,7 @@
if ((combo.Message.Flags & MessageFlags.Request) == MessageFlags.Request)
{
IrssLog.Info("Shutdown command received");
- this.Stop();
+ Stop();
}
break;
#endregion ServerShutdown
@@ -1764,9 +1764,14 @@
if (String.IsNullOrEmpty(device))
return false;
+ IrssLog.Info("Load Abstract Device Files: {0}", device);
+
string path = Path.Combine(AbstractRemoteMapFolder, device);
- if (Directory.Exists(path))
+ if (!Directory.Exists(path))
+ {
+ IrssLog.Debug("No Abstract Remote Tables for \"{0}\" were found", device);
return false;
+ }
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-29 12:41:12
|
Revision: 1555
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1555&view=rev
Author: and-81
Date: 2008-03-29 05:41:00 -0700 (Sat, 29 Mar 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Microsoft MCE/Bush LSD33 C.xml
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite.nsi
Deleted: trunk/plugins/IR Server Suite/IR Server Suite.nsi
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi 2008-03-29 12:26:25 UTC (rev 1554)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi 2008-03-29 12:41:00 UTC (rev 1555)
@@ -1,995 +0,0 @@
-;======================================
-; IR Server Suite.nsi
-;
-; (C) Copyright Aaron Dinnage, 2008
-;======================================
-!define DEBUG
-
-!ifdef DEBUG
- !define BuildType "Debug"
-!else
- !define BuildType "Release"
-!endif
-
-!include "x64.nsh"
-!include "MUI.nsh"
-
-!define PRODUCT_NAME "IR Server Suite"
-!define PRODUCT_VERSION "1.0.4.2"
-!define PRODUCT_PUBLISHER "and-81"
-!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
-
-Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
-InstallDir ""
-!ifdef DEBUG
- ShowInstDetails show
- ShowUninstDetails show
-!else
- ShowInstDetails hide
- ShowUninstDetails hide
-!endif
-BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
-SetCompressor /SOLID /FINAL lzma
-CRCCheck On
-
-; Variables
-var DIR_INSTALL
-var DIR_MEDIAPORTAL
-var DIR_TVSERVER
-
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
-!insertmacro MUI_PAGE_COMPONENTS
-
-; Main app install path
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
-!insertmacro MUI_PAGE_DIRECTORY
-
-; MediaPortal install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
-!insertmacro MUI_PAGE_DIRECTORY
-
-; TV Server install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
-!insertmacro MUI_PAGE_DIRECTORY
-
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-;======================================
-;======================================
-
-!macro initRegKeys
- ${If} ${RunningX64}
-
- SetRegView 64
-
- ${DisableX64FSRedirection}
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${EnableX64FSRedirection}
-
- ${Else}
-
- SetRegView 32
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${Endif}
-!macroend
-
-;======================================
-;======================================
-
-Function .onInit
-
-!insertmacro initRegKeys
-
-FunctionEnd
-
-;======================================
-
-Function .onInstSuccess
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
-
-StartInputService:
- Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
-
-SkipStartInputService:
-
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreMP
- SectionGetFlags 3 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 4 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 5 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- Abort
-
-EndDirectoryPreMP:
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreTV
- SectionGetFlags 6 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
-
- Abort
-
-EndDirectoryPreTV:
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowApp
- !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowMP
- !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowTV
- !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveApp
- StrCpy $DIR_INSTALL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveMP
- StrCpy $DIR_MEDIAPORTAL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveTV
- StrCpy $DIR_TVSERVER $INSTDIR
-FunctionEnd
-
-;======================================
-
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
-
-Function DumpLog
- Exch $5
- Push $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $6
-
- FindWindow $0 "#32770" "" $HWNDPARENT
- GetDlgItem $0 $0 1016
- StrCmp $0 0 exit
- FileOpen $5 $5 "w"
- StrCmp $5 "" exit
- SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
- System::Alloc ${NSIS_MAX_STRLEN}
- Pop $3
- StrCpy $2 0
- System::Call "*(i, i, i, i, i, i, i, i, i) i \
- (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
- loop: StrCmp $2 $6 done
- System::Call "User32::SendMessageA(i, i, i, i) i \
- ($0, ${LVM_GETITEMTEXT}, $2, r1)"
- System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
- FileWrite $5 "$4$\r$\n"
- IntOp $2 $2 + 1
- Goto loop
- done:
- FileClose $5
- System::Free $1
- System::Free $3
- exit:
- Pop $6
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Pop $0
- Exch $5
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "-Prepare"
-
- DetailPrint "Preparing to install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
-
-StopInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
-
-SkipStopInputService:
- Sleep 100
-
-SectionEnd
-
-;======================================
-
-Section "-Core"
-
- DetailPrint "Setting up paths and installing core files ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create install directory
- CreateDirectory "$DIR_INSTALL"
-
- ; Write the installation paths into the registry
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
-
- ; Write documentation
-!ifdef DEBUG
- DetailPrint "Warning: Documentation is not included in debug builds"
-!else
- SetOutPath "$DIR_INSTALL"
- SetOverwrite ifnewer
- File "Documentation\${PRODUCT_NAME}.chm"
-!endif
-
- ; Create app data directories
- CreateDirectory "$APPDATA\${PRODUCT_NAME}"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
-
- ; Copy known set top boxes
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOverwrite ifnewer
- File /r /x .svn "Set Top Boxes\*.*"
-
- ; Create a start menu shortcut folder
- CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-
-SectionEnd
-
-;======================================
-
-Section "Input Service" SectionInputService
-
- DetailPrint "Installing Input Service ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Installing Input Service
- CreateDirectory "$DIR_INSTALL\Input Service"
- SetOutPath "$DIR_INSTALL\Input Service"
- SetOverwrite ifnewer
- File "Input Service\Input Service\bin\${BuildType}\*.*"
-
- ; Installing Input Service Configuration
- CreateDirectory "$DIR_INSTALL\Input Service Configuration"
- SetOutPath "$DIR_INSTALL\Input Service Configuration"
- SetOverwrite ifnewer
- File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
-
- ; Install IR Server Plugins ...
- DetailPrint "Installing IR Server Plugins ..."
- CreateDirectory "$DIR_INSTALL\IR Server Plugins"
- SetOutPath "$DIR_INSTALL\IR Server Plugins"
- SetOverwrite ifnewer
-
- File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
- File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
- File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
- File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
- File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
- File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
- File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
- ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
- File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
- ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
- File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
- File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
- ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
- File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
- File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
- File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
- ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
- File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
- File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
- ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
- File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
- ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
- File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
- File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
- File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
- File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
- File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
- File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
-
- ; Create App Data Folder for IR Server configuration files
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
-
- ; Copy Abstract Remote maps
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOverwrite ifnewer
- File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
- File "Input Service\Input Service\RemoteTable.xsd"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
-
- ; Launch Input Service
- DetailPrint "Starting Input Service ..."
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
-
-SectionEnd
-
-;======================================
-
-Section "MP Control Plugin" SectionMPControlPlugin
-
- DetailPrint "Installing MP Control Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
-
- ; Write input mapping
- SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOverwrite ifnewer
- File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!else
-Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!endif
-
- DetailPrint "Installing MP Blast Zone Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOverwrite off
- File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
-
- ; Write skin files
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!else
-Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!endif
-
- DetailPrint "Installing TV2 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
-
- DetailPrint "Installing TV3 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_TVSERVER\Plugins"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section "Translator" SectionTranslator
-
- DetailPrint "Installing Translator ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Translator"
- SetOutPath "$DIR_INSTALL\Translator"
- SetOverwrite ifnewer
- File "Applications\Translator\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
-
- ; Copy in default settings files
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
- SetOverwrite ifnewer
- File "Applications\Translator\Default Settings\*.xml"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Tray Launcher" SectionTrayLauncher
-!else
-Section /o "Tray Launcher" SectionTrayLauncher
-!endif
-
- DetailPrint "Installing Tray Launcher ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Tray Launcher"
- SetOutPath "$DIR_INSTALL\Tray Launcher"
- SetOverwrite ifnewer
- File "Applications\Tray Launcher\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "Virtual Remote" SectionVirtualRemote
-
- DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Virtual Remote and Web Remote
- CreateDirectory "$DIR_INSTALL\Virtual Remote"
- SetOutPath "$DIR_INSTALL\Virtual Remote"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\bin\${BuildType}\*.*"
- File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
- File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
-
- ; Installing skins
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\Skins\*.*"
-
- ; Installing Virtual Remote for Smart Devices
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote for Smart Devices.lnk" "$DIR_INSTALL\Virtual Remote\Smart Devices"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Web Remote.lnk" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" "" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "IR Blast" SectionIRBlast
-
- DetailPrint "Installing IR Blast ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR Blast"
- SetOutPath "$DIR_INSTALL\IR Blast"
- SetOverwrite ifnewer
- File "Applications\IR Blast (No Window)\bin\${BuildType}\*.*"
- File "Applications\IR Blast\bin\${BuildType}\IRBlast.exe"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "IR File Tool" SectionIRFileTool
-!else
-Section /o "IR File Tool" SectionIRFileTool
-!endif
-
- DetailPrint "Installing IR File Tool ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR File Tool"
- SetOutPath "$DIR_INSTALL\IR File Tool"
- SetOverwrite ifnewer
- File "Applications\IR File Tool\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR File Tool"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR File Tool.lnk" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" "" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Keyboard Relay" SectionKeyboardInputRelay
-!else
-Section /o "Keyboard Relay" SectionKeyboardInputRelay
-!endif
-
- DetailPrint "Installing Keyboard Input Relay ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Keyboard Input Relay"
- SetOutPath "$DIR_INSTALL\Keyboard Input Relay"
- SetOverwrite ifnewer
- File "Applications\Keyboard Input Relay\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Keyboard Input Relay"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" "" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Dbox Tuner" SectionDboxTuner
-!else
-Section /o "Dbox Tuner" SectionDboxTuner
-!endif
-
- DetailPrint "Installing Dbox Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Dbox Tuner"
- SetOutPath "$DIR_INSTALL\Dbox Tuner"
- SetOverwrite ifnewer
- File "Applications\Dbox Tuner\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Dbox Tuner"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "HCW PVR Tuner" SectionHcwPvrTuner
-!else
-Section /o "HCW PVR Tuner" SectionHcwPvrTuner
-!endif
-
- DetailPrint "Installing HCW PVR Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\HCW PVR Tuner"
- SetOutPath "$DIR_INSTALL\HCW PVR Tuner"
- SetOverwrite ifnewer
- File "Applications\HCW PVR Tuner\bin\${BuildType}\*.*"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Debug Client" SectionDebugClient
-!else
-Section /o "Debug Client" SectionDebugClient
-!endif
-
- DetailPrint "Installing Debug Client ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Debug Client
- CreateDirectory "$DIR_INSTALL\Debug Client"
- SetOutPath "$DIR_INSTALL\Debug Client"
- SetOverwrite ifnewer
- File "Applications\Debug Client\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Debug Client"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Client.lnk" "$DIR_INSTALL\Debug Client\DebugClient.exe" "" "$DIR_INSTALL\Debug Client\DebugClient.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "-Complete"
-
- DetailPrint "Completing install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create website link file
- WriteIniStr "$DIR_INSTALL\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-
- ; Write the uninstaller
- WriteUninstaller "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Create start menu shortcuts
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
-
- ; Store the install log
- StrCpy $0 "$APPDATA\${PRODUCT_NAME}\Logs\Install.log"
- Push $0
- Call DumpLog
-
- ; Finish
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
-
-; Section descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionInputService} "A windows service that provides access to your IR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPControlPlugin} "Connects to the Input Service to control MediaPortal."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPBlastZonePlugin} "Lets you control your IR devices from within the MediaPortal GUI."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the default MediaPortal TV engine."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV3BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the MediaPortal TV server."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTranslator} "Control your whole PC."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTrayLauncher} "Simple tray application to launch an application of your choosing when a particular button is pressed."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionVirtualRemote} "Simulated remote control, works as an application or as a web hosted remote control (with included Web Remote). Also includes a Skin Editor and Smart Device versions of Virtual Remote."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRBlast} "Command line tools for blasting IR codes."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRFileTool} "Tool for learning, modifying, testing, correcting and converting IR command files."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionKeyboardInputRelay} "Relays keyboard input to the Input Service to act on keypresses like remote buttons."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDboxTuner} "Command line tuner for Dreambox devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionHcwPvrTuner} "Command line tuner for Hauppauge PVR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDebugClient} "Very simple testing tool for troubleshooting input and communications problems."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;======================================
-;======================================
-
-!ifndef DEBUG
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-!endif
-
-
-;======================================
-
-Function un.onInit
-
- !insertmacro initRegKeys
-
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
- Abort
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "Uninstall"
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
- Sleep 100
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Remove files and uninstaller
- DetailPrint "Attempting to remove MediaPortal Blast Zone Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPBlastZonePlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal Process Plugin Common Files ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssUtils.dll"
-
- DetailPrint "Attempting to remove MediaPortal Control Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPControlPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV2 Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\TV2BlasterPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV3 Plugin ..."
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\MPUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssComms.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\TV3BlasterPlugin.dll"
-
- DetailPrint "Removing Set Top Box presets ..."
- RMDir /R "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
-
- DetailPrint "Removing program files ..."
- RMDir /R /REBOOTOK "$DIR_INSTALL"
-
- DetailPrint "Removing start menu shortcuts ..."
- RMDir /R "$SMPROGRAMS\${PRODUCT_NAME}"
-
- ; Remove registry keys
- DetailPrint "Removing registry keys ..."
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
- DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
-
- ; Remove auto-runs
- DetailPrint "Removing application auto-runs ..."
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tray Launcher"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Translator"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
-
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/IR Server Suite.nsi.old (from rev 1554, trunk/plugins/IR Server Suite/IR Server Suite.nsi)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi.old (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-03-29 12:41:00 UTC (rev 1555)
@@ -0,0 +1,995 @@
+;======================================
+; IR Server Suite.nsi
+;
+; (C) Copyright Aaron Dinnage, 2008
+;======================================
+!define DEBUG
+
+!ifdef DEBUG
+ !define BuildType "Debug"
+!else
+ !define BuildType "Release"
+!endif
+
+!include "x64.nsh"
+!include "MUI.nsh"
+
+!define PRODUCT_NAME "IR Server Suite"
+!define PRODUCT_VERSION "1.0.4.2"
+!define PRODUCT_PUBLISHER "and-81"
+!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
+
+Name "${PRODUCT_NAME}"
+OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
+InstallDir ""
+!ifdef DEBUG
+ ShowInstDetails show
+ ShowUninstDetails show
+!else
+ ShowInstDetails hide
+ ShowUninstDetails hide
+!endif
+BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
+SetCompressor /SOLID /FINAL lzma
+CRCCheck On
+
+; Variables
+var DIR_INSTALL
+var DIR_MEDIAPORTAL
+var DIR_TVSERVER
+
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
+!insertmacro MUI_PAGE_COMPONENTS
+
+; Main app install path
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
+!insertmacro MUI_PAGE_DIRECTORY
+
+; MediaPortal install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
+!insertmacro MUI_PAGE_DIRECTORY
+
+; TV Server install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
+!insertmacro MUI_PAGE_DIRECTORY
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+;======================================
+;======================================
+
+!macro initRegKeys
+ ${If} ${RunningX64}
+
+ SetRegView 64
+
+ ${DisableX64FSRedirection}
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${EnableX64FSRedirection}
+
+ ${Else}
+
+ SetRegView 32
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${Endif}
+!macroend
+
+;======================================
+;======================================
+
+Function .onInit
+
+!insertmacro initRegKeys
+
+FunctionEnd
+
+;======================================
+
+Function .onInstSuccess
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
+
+StartInputService:
+ Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
+
+SkipStartInputService:
+
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreMP
+ SectionGetFlags 3 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 4 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 5 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ Abort
+
+EndDirectoryPreMP:
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreTV
+ SectionGetFlags 6 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
+
+ Abort
+
+EndDirectoryPreTV:
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowApp
+ !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowMP
+ !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowTV
+ !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveApp
+ StrCpy $DIR_INSTALL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveMP
+ StrCpy $DIR_MEDIAPORTAL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveTV
+ StrCpy $DIR_TVSERVER $INSTDIR
+FunctionEnd
+
+;======================================
+
+!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x102D
+
+Function DumpLog
+ Exch $5
+ Push $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $6
+
+ FindWindow $0 "#32770" "" $HWNDPARENT
+ GetDlgItem $0 $0 1016
+ StrCmp $0 0 exit
+ FileOpen $5 $5 "w"
+ StrCmp $5 "" exit
+ SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+ System::Alloc ${NSIS_MAX_STRLEN}
+ Pop $3
+ StrCpy $2 0
+ System::Call "*(i, i, i, i, i, i, i, i, i) i \
+ (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+ loop: StrCmp $2 $6 done
+ System::Call "User32::SendMessageA(i, i, i, i) i \
+ ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+ System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+ FileWrite $5 "$4$\r$\n"
+ IntOp $2 $2 + 1
+ Goto loop
+ done:
+ FileClose $5
+ System::Free $1
+ System::Free $3
+ exit:
+ Pop $6
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+ Exch $5
+FunctionEnd
+
+;======================================
+;======================================
+
+Section "-Prepare"
+
+ DetailPrint "Preparing to install ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Kill running Programs
+ DetailPrint "Terminating processes ..."
+ ExecWait '"taskkill" /F /IM Translator.exe'
+ ExecWait '"taskkill" /F /IM TrayLauncher.exe'
+ ExecWait '"taskkill" /F /IM WebRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
+ ExecWait '"taskkill" /F /IM IRFileTool.exe'
+ ExecWait '"taskkill" /F /IM DebugClient.exe'
+ ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
+
+StopInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
+
+SkipStopInputService:
+ Sleep 100
+
+SectionEnd
+
+;======================================
+
+Section "-Core"
+
+ DetailPrint "Setting up paths and installing core files ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Create install directory
+ CreateDirectory "$DIR_INSTALL"
+
+ ; Write the installation paths into the registry
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
+
+ ; Write documentation
+!ifdef DEBUG
+ DetailPrint "Warning: Documentation is not included in debug builds"
+!else
+ SetOutPath "$DIR_INSTALL"
+ SetOverwrite ifnewer
+ File "Documentation\${PRODUCT_NAME}.chm"
+!endif
+
+ ; Create app data directories
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
+
+ ; Copy known set top boxes
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOverwrite ifnewer
+ File /r /x .svn "Set Top Boxes\*.*"
+
+ ; Create a start menu shortcut folder
+ CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+
+SectionEnd
+
+;======================================
+
+Section "Input Service" SectionInputService
+
+ DetailPrint "Installing Input Service ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Uninstall current Input Service ...
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
+
+UninstallInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
+
+SkipUninstallInputService:
+ Sleep 100
+
+ ; Installing Input Service
+ CreateDirectory "$DIR_INSTALL\Input Service"
+ SetOutPath "$DIR_INSTALL\Input Service"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service\bin\${BuildType}\*.*"
+
+ ; Installing Input Service Configuration
+ CreateDirectory "$DIR_INSTALL\Input Service Configuration"
+ SetOutPath "$DIR_INSTALL\Input Service Configuration"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
+
+ ; Install IR Server Plugins ...
+ DetailPrint "Installing IR Server Plugins ..."
+ CreateDirectory "$DIR_INSTALL\IR Server Plugins"
+ SetOutPath "$DIR_INSTALL\IR Server Plugins"
+ SetOverwrite ifnewer
+
+ File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
+ File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
+ File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
+ File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
+ File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
+ File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
+ File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
+ ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
+ File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
+ ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
+ File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
+ File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
+ ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
+ File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
+ File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
+ File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
+ ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
+ File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
+ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
+ ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
+ ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
+ File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
+ File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
+ File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
+ File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
+ File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
+ File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
+
+ ; Create App Data Folder for IR Server configuration files
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
+
+ ; Copy Abstract Remote maps
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOverwrite ifnewer
+ File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
+ File "Input Service\Input Service\RemoteTable.xsd"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
+
+ ; Launch Input Service
+ DetailPrint "Starting Input Service ..."
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
+
+SectionEnd
+
+;======================================
+
+Section "MP Control Plugin" SectionMPControlPlugin
+
+ DetailPrint "Installing MP Control Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
+
+ ; Write input mapping
+ SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOverwrite ifnewer
+ File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!else
+Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!endif
+
+ DetailPrint "Installing MP Blast Zone Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOverwrite off
+ File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
+
+ ; Write skin files
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!else
+Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!endif
+
+ DetailPrint "Installing TV2 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
+
+ DetailPrint "Installing TV3 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_TVSERVER\Plugins"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section "Translator" SectionTranslator
+
+ DetailPrint "Installing Translator ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Translator"
+ SetOutPath "$DIR_INSTALL\Translator"
+ SetOverwrite ifnewer
+ File "Applications\Translator\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+
+ ; Copy in default settings files
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+ SetOverwrite ifnewer
+ File "Applications\Translator\Default Settings\*.xml"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Tray Launcher" SectionTrayLauncher
+!else
+Section /o "Tray Launcher" SectionTrayLauncher
+!endif
+
+ DetailPrint "Installing Tray Launcher ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Tray Launcher"
+ SetOutPath "$DIR_INSTALL\Tray Launcher"
+ SetOverwrite ifnewer
+ File "Applications\Tray Launcher\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "Virtual Remote" SectionVirtualRemote
+
+ DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Virtual Remote and Web Remote
+ CreateDirectory "$DIR_INSTALL\Virtual Remote"
+ SetOutPath "$DIR_INSTALL\Virtual Remote"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\bin\${BuildType}\*.*"
+ File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
+ File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
+
+ ; Installing skins
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\Skins\*.*"
+
+ ; Installing Virtual Remote for Smart Devices
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote for Smart Devices.lnk" "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Web Remote.lnk" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" "" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "IR Blast" SectionIRBlast
+
+ DetailPrint "Installing IR Blast ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\IR Blast"
+ SetOutPath "$DIR_INSTALL\IR Blast"
+ SetOverwrite if...
[truncated message content] |
|
From: <an...@us...> - 2008-03-30 10:58:16
|
Revision: 1564
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1564&view=rev
Author: and-81
Date: 2008-03-30 03:49:24 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.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/Forms/MouseCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IRServerInfo.cs
trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.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/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MappedEvent.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/setup.nsi
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Program.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -221,7 +221,7 @@
_address = doc.DocumentElement.Attributes["Address"].Value;
_userName = doc.DocumentElement.Attributes["UserName"].Value;
_password = doc.DocumentElement.Attributes["Password"].Value;
- _boxType = (StbBoxType)Enum.Parse(typeof(StbBoxType), doc.DocumentElement.Attributes["BoxType"].Value);
+ _boxType = (StbBoxType)Enum.Parse(typeof(StbBoxType), doc.DocumentElement.Attributes["BoxType"].Value, true);
_timeout = int.Parse(doc.DocumentElement.Attributes["Timeout"].Value);
}
catch (FileNotFoundException)
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -168,7 +168,7 @@
{
try
{
- ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), _processPriority);
+ ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), _processPriority, true);
Process.GetCurrentProcess().PriorityClass = priority;
IrssLog.Info("Process priority set to: {0}", _processPriority);
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -1274,7 +1274,7 @@
{
try
{
- ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), newPriority);
+ ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), newPriority, true);
Process.GetCurrentProcess().PriorityClass = priority;
IrssLog.Info("Process priority set to: {0}", newPriority);
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -466,7 +466,7 @@
if (String.IsNullOrEmpty(command))
throw new ArgumentNullException("command");
- string[] commands = command.Split(new char[] { '|' }, StringSplitOptions.None);
+ string[] commands = command.Split('|');
if (commands.Length != elements)
throw new Exceptions.CommandStructureException(String.Format("Command structure does not split as expected: {0}", command));
@@ -776,7 +776,7 @@
{
string subString = command.Substring(MouseMoveToPos.Length);
- string[] coords = subString.Split(new char[] { ',' });
+ string[] coords = subString.Split(',');
int x = int.Parse(coords[0]);
int y = int.Parse(coords[1]);
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -104,7 +104,7 @@
string subString = command.Substring(Common.MouseMoveToPos.Length);
- string[] coords = subString.Split(new char[] { ',' });
+ string[] coords = subString.Split(',');
numericUpDownX.Value = Decimal.Parse(coords[0]);
numericUpDownY.Value = Decimal.Parse(coords[1]);
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IRServerInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IRServerInfo.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IRServerInfo.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -118,7 +118,7 @@
{
string dataString = Encoding.ASCII.GetString(dataBytes);
- string[] data = dataString.Split(new char[] { ',' });
+ string[] data = dataString.Split(',');
IRServerInfo irServerInfo = new IRServerInfo();
irServerInfo.CanLearn = bool.Parse(data[0]);
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -173,7 +173,7 @@
/// <param name="command">The command.</param>
public static void ProcessSendMediaPortalAction(string[] command)
{
- Action.ActionType type = (Action.ActionType)Enum.Parse(typeof(Action.ActionType), command[0]);
+ Action.ActionType type = (Action.ActionType)Enum.Parse(typeof(Action.ActionType), command[0], true);
float f1 = float.Parse(command[1]);
float f2 = float.Parse(command[2]);
@@ -187,7 +187,7 @@
/// <param name="command">The command.</param>
public static void ProcessSendMediaPortalMessage(string[] command)
{
- GUIMessage.MessageType type = (GUIMessage.MessageType)Enum.Parse(typeof(GUIMessage.MessageType), command[0]);
+ GUIMessage.MessageType type = (GUIMessage.MessageType)Enum.Parse(typeof(GUIMessage.MessageType), command[0], true);
int windowId = int.Parse(command[1]);
int senderId = int.Parse(command[2]);
int controlId = int.Parse(command[3]);
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -21,8 +21,8 @@
public class CustomHIDReceiver : PluginBase, IConfigure, IRemoteReceiver, IKeyboardReceiver, IMouseReceiver
{
- #region Debug
-#if DEBUG
+ // #define TEST_APPLICATION in the project properties when creating the console test app ...
+#if TEST_APPLICATION
static void Remote(string deviceName, string code)
{
@@ -41,27 +41,38 @@
static void Main()
{
CustomHIDReceiver c = new CustomHIDReceiver();
+
+ try
+ {
+ c.Configure(null);
- c.Configure(null);
+ c.RemoteCallback += new RemoteHandler(Remote);
+ c.KeyboardCallback += new KeyboardHandler(Keyboard);
+ c.MouseCallback += new MouseHandler(Mouse);
- c.RemoteCallback += new RemoteHandler(Remote);
- c.KeyboardCallback += new KeyboardHandler(Keyboard);
- c.MouseCallback += new MouseHandler(Mouse);
+ Console.WriteLine("Usage: {0}", c._device.usUsage);
+ Console.WriteLine("UsagePage: {0}", c._device.usUsagePage);
+ Console.WriteLine();
- Console.WriteLine("Usage: {0}", c._device.usUsage);
- Console.WriteLine("UsagePage: {0}", c._device.usUsagePage);
- Console.WriteLine();
+ c.Start();
- c.Start();
+ Application.Run();
- Application.Run();
+ c.Stop();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.ToString());
+ }
+ finally
+ {
+ c = null;
+ }
- c.Stop();
- c = null;
+ Console.ReadKey();
}
#endif
- #endregion Debug
#region Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -250,7 +250,7 @@
doc.Load(ConfigurationFile);
_serialPortName = doc.DocumentElement.Attributes["SerialPortName"].Value;
- _blastMode = (BlastMode)Enum.Parse(typeof(BlastMode), doc.DocumentElement.Attributes["BlastMode"].Value);
+ _blastMode = (BlastMode)Enum.Parse(typeof(BlastMode), doc.DocumentElement.Attributes["BlastMode"].Value, true);
}
#if TRACE
catch (Exception ex)
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 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -18,10 +18,53 @@
public class XBCDRCReceiver : PluginBase, IRemoteReceiver, IDisposable
{
+ // #define TEST_APPLICATION in the project properties when creating the console test app ...
+#if TEST_APPLICATION
+
+ static void Remote(string deviceName, string code)
+ {
+ Console.WriteLine("Remote: {0}", code);
+ }
+
+ [STAThread]
+ static void Main()
+ {
+ XBCDRCReceiver c;
+
+ try
+ {
+ c = new XBCDRCReceiver();
+
+ //c.Configure(null);
+
+ c.RemoteCallback += new RemoteHandler(Remote);
+
+ c.Start();
+
+ System.Windows.Forms.Application.Run();
+
+ c.Stop();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.ToString());
+ }
+ finally
+ {
+ c = null;
+ }
+
+ Console.ReadKey();
+ }
+
+#endif
+
+
#region Constants
const int DeviceBufferSize = 7;
const string DevicePathVidPid = "vid_045e&pid_0284";
+ // const string DevicePathVidPid = "vid_1130&pid_cc00"; Asus DH Remote
#endregion Constants
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj 2008-03-30 10:49:24 UTC (rev 1564)
@@ -11,6 +11,8 @@
<AssemblyName>XBCDRC Receiver</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <StartupObject>
+ </StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -58,6 +60,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -72,7 +75,7 @@
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
- <Private>False</Private>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -163,7 +163,7 @@
{
try
{
- ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), _processPriority);
+ ProcessPriorityClass priority = (ProcessPriorityClass)Enum.Parse(typeof(ProcessPriorityClass), _processPriority, true);
Process.GetCurrentProcess().PriorityClass = priority;
IrssLog.Info("Process priority set to: {0}", _processPriority);
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj 2008-03-30 10:49:24 UTC (rev 1564)
@@ -100,7 +100,6 @@
<Private>False</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj 2008-03-30 10:49:24 UTC (rev 1564)
@@ -120,7 +120,6 @@
<Private>False</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MappedEvent.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MappedEvent.cs 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MappedEvent.cs 2008-03-30 10:49:24 UTC (rev 1564)
@@ -172,7 +172,7 @@
if (String.IsNullOrEmpty(commandString))
return null;
- string[] eventStringElements = eventString.Split(new char[] { ',', '=' }, StringSplitOptions.None);
+ string[] eventStringElements = eventString.Split(',', '=');
if (eventStringElements.Length == 1)
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj 2008-03-30 10:49:24 UTC (rev 1564)
@@ -111,7 +111,6 @@
<Private>False</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj 2008-03-30 10:49:24 UTC (rev 1564)
@@ -123,9 +123,6 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
- <Reference Include="System.Data">
- <Name>System.Data</Name>
- </Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
Modified: trunk/plugins/IR Server Suite/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup.nsi 2008-03-29 22:58:42 UTC (rev 1563)
+++ trunk/plugins/IR Server Suite/setup.nsi 2008-03-30 10:49:24 UTC (rev 1564)
@@ -98,7 +98,7 @@
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN "$INSTDIR\SetupTV.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\Input Service Configuration\Input Service Configuration.exe"
!define MUI_FINISHPAGE_RUN_TEXT "Input Service Configuration"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-03-31 16:04:56
|
Revision: 1573
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1573&view=rev
Author: and-81
Date: 2008-03-31 09:03:59 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.dll
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Windows.Forms.dll
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/SourceGrid.dll
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest
trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
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/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/Resources.Designer.cs
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.dll
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.xml
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Windows.Forms.xml
trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/SourceGrid.xml
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/DevAge.Core.xml
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/DevAge.Windows.Forms.xml
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/SourceGrid/SourceGrid.xml
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/0.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/1.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/2.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/3.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/4.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/5.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/6.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/7.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/8.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/9.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital/SELECT.IR
trunk/plugins/IR Server Suite/Set Top Boxes/SCV Digital.xml
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-03-31 05:15:11 UTC (rev 1572)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-03-31 16:03:59 UTC (rev 1573)
@@ -36,16 +36,16 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="HcwPvrTuner.exe.manifest">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Content Include="HcwPvrTuner.exe.manifest">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </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.
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-03-31 05:15:11 UTC (rev 1572)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-03-31 16:03:59 UTC (rev 1573)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="X86" name="HcwPvrTuner" type="win32" />
+ <assemblyIdentity version="1.0.4.2" processorArchitecture="*" name="HcwPvrTuner" type="win32" />
<description>Tune channels with Hauppauge IR Blaster built in to compatible TV Cards</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-31 05:15:11 UTC (rev 1572)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2008-03-31 16:03:59 UTC (rev 1573)
@@ -72,7 +72,7 @@
for (int row = 1; row < gridPlugins.RowsCount; row++)
{
checkBox = gridPlugins[row, ColReceive] as SourceGrid.Cells.CheckBox;
- if (checkBox != null && checkBox.Checked)
+ if (checkBox != null && checkBox.Checked == true)
receivers.Add(gridPlugins[row, ColName].DisplayText);
}
@@ -107,7 +107,7 @@
for (int row = 1; row < gridPlugins.RowsCount; row++)
{
checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox;
- if (checkBox != null && checkBox.Checked)
+ if (checkBox != null && checkBox.Checked == true)
return gridPlugins[row, ColName].DisplayText;
}
@@ -213,7 +213,7 @@
SourceGrid.CellContext context = (SourceGrid.CellContext)sender;
SourceGrid.Cells.CheckBox cell = (SourceGrid.Cells.CheckBox)context.Cell;
- if (!cell.Checked)
+ if (cell.Checked != true)
return;
PluginBase plugin = cell.Row.Tag as PluginBase;
@@ -222,7 +222,7 @@
{
SourceGrid.Cells.CheckBox checkBox = gridPlugins[row, ColTransmit] as SourceGrid.Cells.CheckBox;
- if (checkBox != null && checkBox.Checked && !gridPlugins[row, ColName].DisplayText.Equals(plugin.Name, StringComparison.OrdinalIgnoreCase))
+ if (checkBox != null && checkBox.Checked == true && !gridPlugins[row, ColName].DisplayText.Equals(plugin.Name, StringComparison.OrdinalIgnoreCase))
checkBox.Checked = false;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-03-31 05:15:11 UTC (rev 1572)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-03-31 16:03:59 UTC (rev 1573)
@@ -76,15 +76,15 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="DevAge.Core, Version=4.6.2660.128, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
+ <Reference Include="DevAge.Core, Version=4.10.2845.21697, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
+ <HintPath>SourceGrid\DevAge.Core.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
- <HintPath>SourceGrid\DevAge.Core.dll</HintPath>
</Reference>
- <Reference Include="DevAge.Windows.Forms, Version=4.6.2660.128, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
+ <Reference Include="DevAge.Windows.Forms, Version=4.10.2845.21698, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>SourceGrid\DevAge.Windows.Forms.dll</HintPath>
</Reference>
- <Reference Include="SourceGrid, Version=4.7.2662.1973, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="SourceGrid, Version=4.11.2887.1415, Culture=neutral, PublicKeyToken=df6f5e538749e85d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>SourceGrid\SourceGrid.dll</HintPath>
</Reference>
@@ -126,12 +126,12 @@
<ItemGroup>
<None Include="Graphics\Advanced.png" />
<None Include="Graphics\Detect.png" />
+ <Content Include="IRServer.exe.manifest">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="Graphics\Help.png" />
<Content Include="Icon.ico" />
<Content Include="Icon16.ico" />
- <Content Include="IRServer.exe.manifest">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Advanced.resx">
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-03-31 05:15:11 UTC (rev 1572)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-03-31 16:03:59 UTC (rev 1573)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="X86" name="IRServer" type="win32" />
+ <assemblyIdentity version="1.0.4.2" processorArchitecture="*" 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>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/SourceGrid/DevAge.Core.xml 2008-03-31 16:03:59 UTC (rev 1573)
@@ -0,0 +1,1911 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>DevAge.Core</name>
+ </assembly>
+ <members>
+ <member name="T:DevAge.Text.FixedLength.LineParser">
+ <summary>
+ A class for parsing fixed length string and loading the fields into a class.
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.#ctor">
+ <summary>
+ Constructor. Fill the Fields list fot specify the columns.
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.#ctor(System.Type)">
+ <summary>
+ Load the parser fields with the properties specified in the type. You must use the FieldAttribute and ParseFormatAttribute to specify additional informations like the field length.
+ </summary>
+ <param name="lineClassType"></param>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.Reset">
+ <summary>
+ Reset the parser
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.LoadLine(System.String)">
+ <summary>
+ Load the specified line in the parser.
+ </summary>
+ <param name="line"></param>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.GetValue(System.String)">
+ <summary>
+ Get a specified field value.
+ </summary>
+ <param name="fieldName"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.LineParser.FillLineClass(System.Object)">
+ <summary>
+ Fill the properties of the specified class with the values of the line has defined by the Fields collection.
+ </summary>
+ <param name="schemaClass"></param>
+ <returns>Returns the same class specified in the schemaClass parameter, this is useful if you have struct or value types.</returns>
+ </member>
+ <member name="P:DevAge.Text.FixedLength.LineParser.Fields">
+ <summary>
+ Gets a collection of fields.
+ </summary>
+ </member>
+ <member name="T:DevAge.Data.SqlClient.SqlCommandBuilder">
+ <summary>
+ This class is similar to the System.Data.SqlClient.SqlCommandBuilder, but use only the DataTable to create the required commands.
+ Don't support identity (autoincrement) column and only the base data type. This class don't use the data source to explore the data but only the DataTable informations.
+ So you must populate the PrimaryKeys of the DataSet. I suggest to use GUID column (uniqueidentifier) to replace the identity column.
+ Remember to set the Connection of the generated command.
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.SqlClient.SqlCommandBuilder.#ctor(System.Data.DataTable)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="dataTable">table used to create commands</param>
+ </member>
+ <member name="P:DevAge.Data.SqlClient.SqlCommandBuilder.DataTable">
+ <summary>
+ Table used to create commands
+ </summary>
+ </member>
+ <member name="T:DevAge.DateTimeHelper">
+ <summary>
+ Summary description for DateTimeHelper.
+ </summary>
+ </member>
+ <member name="M:DevAge.DateTimeHelper.YearsDifference(System.DateTime,System.DateTime)">
+ <summary>
+ Calculate the difference in years of 2 dates. Usually used for age calculations. dateA - dateB
+ </summary>
+ <param name="dateA"></param>
+ <param name="dateB"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.DateTimeHelper.MonthsDifference(System.DateTime,System.DateTime)">
+ <summary>
+ Calculate the difference in months of 2 dates. dateA - dateB
+ </summary>
+ <param name="dateA"></param>
+ <param name="dateB"></param>
+ <returns></returns>
+ </member>
+ <member name="T:DevAge.Data.FileDataSet">
+ <summary>
+ Summary description for Manager.
+ </summary>
+ </member>
+ <member name="P:DevAge.Data.FileDataSet.SaveDataFormat">
+ <summary>
+ Gets or Sets the format used to save the DataSet
+ </summary>
+ </member>
+ <member name="P:DevAge.Data.FileDataSet.FileDataFormat">
+ <summary>
+ Gets the current format of the File where the data are loaded.
+ </summary>
+ </member>
+ <member name="P:DevAge.Data.FileDataSet.MergeReadedSchema">
+ <summary>
+ Gets or Sets if merge the schema of the file with the schema of the DataSet specified. Use true if the DataSet doesn't have a schema definition. Default is false.
+ </summary>
+ </member>
+ <member name="T:DevAge.DevAgeApplicationException">
+ <summary>
+ Generic DevAge Exception
+ </summary>
+ </member>
+ <member name="M:DevAge.DevAgeApplicationException.#ctor(System.String)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="p_strErrDescription"></param>
+ </member>
+ <member name="M:DevAge.DevAgeApplicationException.#ctor(System.String,System.Exception)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="p_strErrDescription"></param>
+ <param name="p_InnerException"></param>
+ </member>
+ <member name="M:DevAge.DevAgeApplicationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="p_Info"></param>
+ <param name="p_StreamingContext"></param>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.FieldAttribute">
+ <summary>
+ Required attribute to specify the field position and length
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldAttribute.#ctor(System.Int32,System.Int32)">
+ <summary>
+ Constructor.
+ </summary>
+ <param name="fieldIndex">Index of the field, 0 based. Each field must have a unique progressive index</param>
+ <param name="length">Lenght of the field when readed and writed to the string.</param>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.ParseFormatAttribute">
+ <summary>
+ Attribute used to specify additional parse options
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.ParseFormatAttribute.#ctor">
+ <summary>
+ Constructor. Use one of these properties to customize the format: CultureInfo, DateTimeFormat, NumberFormat, TrimBeforeParse.
+ Default is Invariant culture format.
+ </summary>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.ValueMappingAttribute">
+ <summary>
+ Attribute used to convert a specific value to another value
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.ValueMappingAttribute.#ctor(System.String,System.Object)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="stringValue">String value</param>
+ <param name="fieldValue">Field typed value</param>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.StandardValueAttribute">
+ <summary>
+ Attribute used to specify the standard value (mandatory value) for a specific field.
+ You can use this attribute for example when you want a particular field to only accept one or more standard values.
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.StandardValueAttribute.#ctor(System.Object)">
+ <summary>
+ Construcotr
+ </summary>
+ <param name="standardValue">Required value</param>
+ </member>
+ <member name="T:DevAge.Patterns.IActivity">
+ <summary>
+ An interface to represents a basic activity.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.IActivity.Start(DevAge.Patterns.IActivityEvents)">
+ <summary>
+ Start the activity and all sub activities.
+ </summary>
+ <param name="events">Interface class that receive the events, can be null if no event class is needed.</param>
+ </member>
+ <member name="M:DevAge.Patterns.IActivity.Cancel">
+ <summary>
+ Cancel the current activity and all sub activities throwing a ActivityCanceledException.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.SubActivities">
+ <summary>
+ Subordinated activities. Are executed after the current activity. If one of these activity throws an exception is propagated to parent activity and the operation is stopped.
+ Note that the sub activities can be async and so can be executed in a parellel mode.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.Status">
+ <summary>
+ Activity status
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.Name">
+ <summary>
+ Name of the activity used to describe the class.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.WaitHandle">
+ <summary>
+ Gets the WaitHandle class used to wait for the completition of the activity.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.Exception">
+ <summary>
+ Gets the exception throwed when the activity fail. Null if no exception.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.Parent">
+ <summary>
+ Gets or sets the Activity parent. Null when it is a root activity.
+ Do not set manually the parent activity, but simply add the activity to the SubActivities collection.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.IActivity.FullName">
+ <summary>
+ Gets the activity full name of the activity, composed by the full name of the parent activity separated with a \ character
+ </summary>
+ </member>
+ <member name="F:DevAge.Patterns.SubActivityWaitMode.DoNotWait">
+ <summary>
+ Don't wait the sub activities to finish (parallel processing, asyncronous)
+ </summary>
+ </member>
+ <member name="F:DevAge.Patterns.SubActivityWaitMode.WaitOnEach">
+ <summary>
+ Wait for each sub activities (syncronous)
+ </summary>
+ </member>
+ <member name="F:DevAge.Patterns.SubActivityWaitMode.WaitAtTheEnd">
+ <summary>
+ Wait all the sub activities at the end (parallel processing but syncronized with the parent)
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.ActivityBase">
+ <summary>
+ Base activity class. Override the OnWork method to customize the activity.
+ </summary>
+ </member>
+ <member name="F:DevAge.Patterns.ActivityBase.mActivityCount">
+ <summary>
+ An activity count used only to generate a seguential name
+ </summary>
+ </member>
+ <member name="F:DevAge.Patterns.ActivityBase.mWaitHandle">
+ <summary>
+ Initially set to signaled=true=completed, nonsignaled=false=notcompleted,
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.ResetRunningStatus">
+ <summary>
+ Reset the status property to the original values. If the activity is still running an exception is throw.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.OnWork">
+ <summary>
+ Working method. Abstract. Override this method to provide a specific work for the activity.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.DoWork">
+ <summary>
+ Internal work method. Call the OnWork method and Start the SubActivities.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.WaitActivities(DevAge.Patterns.ActivityCollection,System.Int32)">
+ <summary>
+ Wait until or SubActivities are completed. Throw an exception on timeout.
+ </summary>
+ <param name="activities"></param>
+ <param name="timeout"></param>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.WaitActivity(DevAge.Patterns.IActivity,System.Int32)">
+ <summary>
+ Wait until or SubActivities are completed. Throw an exception on timeout.
+ </summary>
+ <param name="activity"></param>
+ <param name="timeout"></param>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.CheckActivitiesException(DevAge.Patterns.ActivityCollection)">
+ <summary>
+ Throw an exception if one of the activities has an exception.
+ </summary>
+ <param name="activities"></param>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.CheckActivityException(DevAge.Patterns.IActivity)">
+ <summary>
+ Throw an exception if one of the activities has an exception.
+ </summary>
+ <param name="activity"></param>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.StartActivity">
+ <summary>
+ Start the activity. NOTE: Usually don't override this method but override the OnWork method to implement the specific activity work.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.Start(DevAge.Patterns.IActivityEvents)">
+ <summary>
+ Start the activity. If the activity is already running an exception is throw.
+ To override the common working code use the OnWork abstract method.
+ </summary>
+ <param name="events">Interface class that receive the events, can be null if no event class is needed.</param>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityBase.Cancel">
+ <summary>
+ Cancel the current activity and all sub activities throwing a ActivityCanceledException.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.SubActivitiesTimeOut">
+ <summary>
+ Gets or sets the time to wait for the sub activities. If the operation is still executing then a TimeOutException is fired. Default is System.Threading.Timeout.Infinite. Default is true.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.PropagateException">
+ <summary>
+ Gets or sets if propagate an exception from sub activities to the current activities. Default is true.
+ Only valid SubActivitiesTimeOut is WaitOnEach or WaitAtTheEnd
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.SubActivityWaitMode">
+ <summary>
+ Gets or sets how the current activity wait the completition of the sub activities.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.SubActivities">
+ <summary>
+ Subordinated activities. Are executed after the current activity. If one of these activity throws an exception is propagated to parent activity and the operation is stopped.
+ Note that the sub activities can be async and so can be executed in a parellel mode.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.Status">
+ <summary>
+ Activity status
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.Name">
+ <summary>
+ Name of the activity used to describe the class.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.WaitHandle">
+ <summary>
+ Gets the WaitHandle class used to wait for the completition of the activity.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.Exception">
+ <summary>
+ Gets the exception throwed when the activity fail. Null if no exception.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.Parent">
+ <summary>
+ Gets or sets the Activity parent. Null when it is a root activity.
+ Do not set manually the parent activity, but simply add the activity to the SubActivities collection.
+ </summary>
+ </member>
+ <member name="P:DevAge.Patterns.ActivityBase.FullName">
+ <summary>
+ Gets the activity full name of the activity, composed by the full name of the parent activity separated with a \ character
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.Activity">
+ <summary>
+ An activity used as a container for other activities using a syncronized code.
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.AsynchronousActivity">
+ <summary>
+ An activity used as a container for other activities using an asynchronous code.
+ Override the OnAsyncWork method for custom asynchronous work.
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.AsyncActivityBase">
+ <summary>
+ Base activity class. Override the OnBeginWork and OnEndWork method to customize the activity.
+ This class support an asyncronous activity.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.AsyncActivityBase.OnBeginWork(System.AsyncCallback)">
+ <summary>
+ Begind working method. Called to start the asyncronous activity. Abstract.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.AsyncActivityBase.OnEndWork(System.IAsyncResult)">
+ <summary>
+ End working method. Called when the asyncronous operation is finished
+ </summary>
+ <param name="asyncResult">AsyncResult</param>
+ </member>
+ <member name="M:DevAge.Patterns.AsyncActivityBase.OnWork">
+ <summary>
+ Working method.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.AsyncActivityBase.StartActivity">
+ <summary>
+ Start the activity. NOTE: Usually don't override this method but override the OnBeginWork method to implement the specific activity work.
+ </summary>
+ </member>
+ <member name="T:DevAge.Data.StreamDataSet">
+ <summary>
+ A static class used to serialize a DataSet to and from a stream using a binary or xml format.
+ The xml format use the standard DataSet xml serialization, the binary format use a custom format.
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.StreamDataSet.Write(System.IO.Stream,System.Data.DataSet,DevAge.Data.StreamDataSetFormat)">
+ <summary>
+ Write the dataset to the stream using the specified format.
+ </summary>
+ <param name="destination"></param>
+ <param name="source"></param>
+ <param name="format"></param>
+ </member>
+ <member name="M:DevAge.Data.StreamDataSet.Read(System.IO.Stream,System.Data.DataSet,DevAge.Data.StreamDataSetFormat,System.Boolean)">
+ <summary>
+ Read from the stream and populate the dataset using the specified format.
+ </summary>
+ <param name="source"></param>
+ <param name="destination"></param>
+ <param name="format"></param>
+ <param name="mergeSchema">True to merge the schema, otherwise it is used the schema of the dataset</param>
+ </member>
+ <member name="T:DevAge.Data.StreamDataSetFormat">
+ <summary>
+ Enum to control the serialization format
+ </summary>
+ </member>
+ <member name="F:DevAge.Data.StreamDataSetFormat.XML">
+ <summary>
+ Standard xml format used by the ReadXml and WriteXml of the DataSet
+ </summary>
+ </member>
+ <member name="F:DevAge.Data.StreamDataSetFormat.Binary">
+ <summary>
+ Custom binary format. More compact of the xml but not human readable
+ </summary>
+ </member>
+ <member name="T:DevAge.Data.BinaryDataSetInvalidException">
+ <summary>
+ Binary data not valid exception
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.BinaryDataSetInvalidException.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.BinaryDataSetInvalidException.#ctor(System.Exception)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="p_InnerException"></param>
+ </member>
+ <member name="T:DevAge.Data.BinaryDataSetVersionException">
+ <summary>
+ Version not valid exception
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.BinaryDataSetVersionException.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="M:DevAge.Data.BinaryDataSetVersionException.#ctor(System.Exception)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="p_InnerException"></param>
+ </member>
+ <member name="T:DevAge.Configuration.CommandLineArgs">
+ <summary>
+ Description résumée de Arguments.
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.Converter.PercentTypeConverter">
+ <summary>
+ A TypeConverter that support string conversion from and to string with the percent symbol.
+ Support Conversion for Float, Double and Decimal
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Converter.PercentTypeConverter.ConsiderAllStringAsPercent">
+ <summary>
+ If true and the user insert a string with no percent symbel the value is divided by 100, otherwise not.
+ </summary>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.LineWriter">
+ <summary>
+ A class used to create fixed lenght string.
+ </summary>
+ </member>
+ <member name="T:DevAge.IO.StreamPersistence">
+ <summary>
+ A static class to help save and read stream data
+ </summary>
+ </member>
+ <member name="T:DevAge.Configuration.PersistableItemDictionary">
+ <summary>
+ A dictionary with keys of type String and values of type PersistableItem
+ </summary>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.#ctor">
+ <summary>
+ Initializes a new empty instance of the PersistableItemDictionary class
+ </summary>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.Add(System.String,DevAge.Configuration.PersistableItem)">
+ <summary>
+ Adds an element with the specified key and value to this PersistableItemDictionary.
+ </summary>
+ <param name="key">
+ The String key of the element to add.
+ </param>
+ <param name="value">
+ The PersistableItem value of the element to add.
+ </param>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.Contains(System.String)">
+ <summary>
+ Determines whether this PersistableItemDictionary contains a specific key.
+ </summary>
+ <param name="key">
+ The String key to locate in this PersistableItemDictionary.
+ </param>
+ <returns>
+ true if this PersistableItemDictionary contains an element with the specified key;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.ContainsKey(System.String)">
+ <summary>
+ Determines whether this PersistableItemDictionary contains a specific key.
+ </summary>
+ <param name="key">
+ The String key to locate in this PersistableItemDictionary.
+ </param>
+ <returns>
+ true if this PersistableItemDictionary contains an element with the specified key;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.ContainsValue(DevAge.Configuration.PersistableItem)">
+ <summary>
+ Determines whether this PersistableItemDictionary contains a specific value.
+ </summary>
+ <param name="value">
+ The PersistableItem value to locate in this PersistableItemDictionary.
+ </param>
+ <returns>
+ true if this PersistableItemDictionary contains an element with the specified value;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Configuration.PersistableItemDictionary.Remove(System.String)">
+ <summary>
+ Removes the element with the specified key from this PersistableItemDictionary.
+ </summary>
+ <param name="key">
+ The String key of the element to remove.
+ </param>
+ </member>
+ <member name="P:DevAge.Configuration.PersistableItemDictionary.Item(System.String)">
+ <summary>
+ Gets or sets the PersistableItem associated with the given String
+ </summary>
+ <param name="key">
+ The String whose value to get or set.
+ </param>
+ </member>
+ <member name="P:DevAge.Configuration.PersistableItemDictionary.Keys">
+ <summary>
+ Gets a collection containing the keys in this PersistableItemDictionary.
+ </summary>
+ </member>
+ <member name="P:DevAge.Configuration.PersistableItemDictionary.Values">
+ <summary>
+ Gets a collection containing the values in this PersistableItemDictionary.
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.Converter.CurrencyTypeConverter">
+ <summary>
+ A TypeConverter that support string conversion from and to string with the currency symbol.
+ Support Conversion for Float, Double and Decimal, Int
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.Converter.NumberTypeConverter">
+ <summary>
+ A TypeConverter that support string conversion from and to string with a custom format number.
+ Support Conversion for Float, Double and Decimal, Int
+ </summary>
+ </member>
+ <member name="T:DevAge.Text.FixedLength.FieldList">
+ <summary>
+ A dictionary with keys of type string and values of type IField
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.#ctor">
+ <summary>
+ Initializes a new empty instance of the FieldList class
+ </summary>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.Add(DevAge.Text.FixedLength.IField)">
+ <summary>
+ Adds an element with the specified key and value to this FieldList.
+ </summary>
+ <param name="key">
+ The string key of the element to add.
+ </param>
+ <param name="value">
+ The IField value of the element to add.
+ </param>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.Contains(System.String)">
+ <summary>
+ Determines whether this FieldList contains a specific key.
+ </summary>
+ <param name="fieldName">
+ The string key to locate in this FieldList.
+ </param>
+ <returns>
+ true if this FieldList contains an element with the specified key;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.ContainsKey(System.String)">
+ <summary>
+ Determines whether this FieldList contains a specific key.
+ </summary>
+ <param name="key">
+ The string key to locate in this FieldList.
+ </param>
+ <returns>
+ true if this FieldList contains an element with the specified key;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.ContainsValue(DevAge.Text.FixedLength.IField)">
+ <summary>
+ Determines whether this FieldList contains a specific value.
+ </summary>
+ <param name="value">
+ The IField value to locate in this FieldList.
+ </param>
+ <returns>
+ true if this FieldList contains an element with the specified value;
+ otherwise, false.
+ </returns>
+ </member>
+ <member name="M:DevAge.Text.FixedLength.FieldList.Remove(System.String)">
+ <summary>
+ Removes the element with the specified key from this FieldList.
+ </summary>
+ <param name="fieldName">
+ The string key of the element to remove.
+ </param>
+ </member>
+ <member name="P:DevAge.Text.FixedLength.FieldList.Item(System.String)">
+ <summary>
+ Gets or sets the IField associated with the given string
+ </summary>
+ <param name="key">
+ The string whose value to get or set.
+ </param>
+ </member>
+ <member name="P:DevAge.Text.FixedLength.FieldList.Keys">
+ <summary>
+ Gets a collection containing the keys in this FieldList.
+ </summary>
+ </member>
+ <member name="P:DevAge.Text.FixedLength.FieldList.Values">
+ <summary>
+ Gets a collection containing the values in this FieldList.
+ </summary>
+ </member>
+ <member name="T:DevAge.Shell.Utilities">
+ <summary>
+ Shell utilities
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.ActivityCanceledException">
+ <summary>
+ Exception fired when canceling an activity with the Cancel method.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityCanceledException.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.ActivityStatusNotValidException">
+ <summary>
+ Exception fired when canceling an activity with the Cancel method.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.ActivityStatusNotValidException.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.TimeOutActivityException">
+ <summary>
+ Exception fired when a time out is encountered.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.TimeOutActivityException.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="T:DevAge.Patterns.SubActivityException">
+ <summary>
+ Exception fired when a time out is encountered.
+ </summary>
+ </member>
+ <member name="M:DevAge.Patterns.SubActivityException.#ctor(System.String,System.Exception)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="activityName"></param>
+ <param name="innerException"></param>
+ </member>
+ <member name="T:DevAge.IO.IsolatedStorage.IsolatedStorageSettingBase">
+ <summary>
+ Abstract class that help to save settings in the isolated storage
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.Validator.ValidatorTypeConverter">
+ <summary>
+ A string editor that use a TypeConverter for conversion.
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.Validator.ValidatorBase">
+ <summary>
+ A base class to support value conversion and validation. This class is used if no conversion is required or as a base class for specialized validator.
+ Naming Legend:
+ Object = an object not yet converted for the current validator,
+ Value = an object already converted and valid for the current validator,
+ String = a string that can be used for conversion to and from Value,
+ DisplayString = a string representation of the Value
+ </summary>
+ </member>
+ <member name="T:DevAge.ComponentModel.ComponentLight">
+ <summary>
+ A IComponent implementation, used as a base class for component derived class. It is similar to the System Component class but doesn't derive from MarshalByRef class, for this reason it is faster and consume less resources.
+ Can be serialized.
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.ComponentLight.#ctor">
+ <summary>
+ Default constructor
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.ComponentLight.#ctor(DevAge.ComponentModel.ComponentLight)">
+ <summary>
+ Copy constructor
+ </summary>
+ <param name="other"></param>
+ </member>
+ <member name="T:DevAge.ComponentModel.Validator.IValidator">
+ <summary>
+ An interface to support value conversion and validation.
+ Naming Legend:
+ Object = an object not yet converted for the current validator,
+ Value = an object already converted and valid for the current validator,
+ String = a string that can be used for conversion to and from Value,
+ DisplayString = a string representation of the Value
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsNullString(System.String)">
+ <summary>
+ Returns true if the string is null or if is equals to the NullString
+ </summary>
+ <param name="p_str"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.ObjectToValue(System.Object)">
+ <summary>
+ Convert an object according to the current ValueType of the validator
+ </summary>
+ <param name="p_Object"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.ValueToObject(System.Object,System.Type)">
+ <summary>
+ Convert a value valid for the current validator ValueType to an object with the Type specified. Throw an exception on error.
+ </summary>
+ <param name="p_Value"></param>
+ <param name="p_ReturnObjectType"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.ValueToString(System.Object)">
+ <summary>
+ Convert a value valid for the current validator ValueType to a string that can be used for other conversions, for example StringToValue method.
+ </summary>
+ <param name="p_Value"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.StringToValue(System.String)">
+ <summary>
+ Converts a string to an object according to the type of the string editor
+ </summary>
+ <param name="p_str"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsStringConversionSupported">
+ <summary>
+ Returns true if string conversion is suported. AllowStringConversion must be true and the current Validator must support string conversion.
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.ValueToDisplayString(System.Object)">
+ <summary>
+ Converts a value valid for this validator valuetype to a string representation. The string cannot be used for conversion.
+ If the validator support string conversion this method simply call ValueToString otherwise call Value.ToString()
+ </summary>
+ <param name="p_Value"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsValidValue(System.Object)">
+ <summary>
+ Returns true if the value is valid for this type of editor without any conversion.
+ </summary>
+ <param name="p_Value"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsValidObject(System.Object)">
+ <summary>
+ Returns true if the object is valid for this type of validator, using conversion functions.
+ </summary>
+ <param name="p_Object"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsValidObject(System.Object,System.Object@)">
+ <summary>
+ Returns true if the object is valid for this type of validator, using conversion functions. Returns as parameter the value converted.
+ </summary>
+ <param name="p_Object"></param>
+ <param name="p_ValueConverted"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsValidString(System.String)">
+ <summary>
+ Returns true if the string is valid for this type of editor, using string conversion function.
+ </summary>
+ <param name="p_strValue"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsValidString(System.String,System.Object@)">
+ <summary>
+ Returns true if the string is valid for this type of editor, using string conversion function. An returns the object converted.
+ </summary>
+ <param name="p_strValue"></param>
+ <param name="p_ValueConverted"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.IsInStandardValues(System.Object)">
+ <summary>
+ Returns true if the value specified is presents in the list StandardValues.
+ </summary>
+ <param name="p_Value"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.StandardValueAtIndex(System.Int32)">
+ <summary>
+ Returns the standard values at the specified index. If StandardValues support IList use simple the indexer method otherwise loop troght the collection.
+ </summary>
+ <param name="p_Index"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.IValidator.StandardValuesIndexOf(System.Object)">
+ <summary>
+ Returns the index of the specified standard value. -1 if not found. If StandardValues support IList use simple the indexer method otherwise loop troght the collection.
+ </summary>
+ <param name="p_StandardValue"></param>
+ <returns></returns>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.AllowNull">
+ <summary>
+ True to allow null object value or NullString string Value
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.NullString">
+ <summary>
+ Null string representation. A string is null when is null or when is equals to this string. Default is empty string.
+ Used by ValueToString and StringToValue
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.NullDisplayString">
+ <summary>
+ Null string representation. A string is null when is null or when is equals to this string. Default is empty string.
+ Used by ValueToDisplayString
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.AllowStringConversion">
+ <summary>
+ Gets or Sets if the string conversion is allowed.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.MinimumValue">
+ <summary>
+ Minimum value allowed. If null no check is performed. The value must derive from IComparable interface to use Minimum or Maximum feature.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.MaximumValue">
+ <summary>
+ Maximum value allowed. If null no check is performed. The value must derive from IComparable interface to use Minimum or Maximum feature.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.ValueType">
+ <summary>
+ Type allowed for the current editor. Cannot be null.
+ </summary>
+ </member>
+ <member name="E:DevAge.ComponentModel.Validator.IValidator.ConvertingObjectToValue">
+ <summary>
+ Fired when converting a object to the value specified. Called from method ObjectToValue and IsValidObject
+ </summary>
+ </member>
+ <member name="E:DevAge.ComponentModel.Validator.IValidator.ConvertingValueToObject">
+ <summary>
+ Fired when converting a object to the value specified. Called from method ObjectToValue and IsValidObject
+ </summary>
+ </member>
+ <member name="E:DevAge.ComponentModel.Validator.IValidator.ConvertingValueToDisplayString">
+ <summary>
+ Fired when converting a value to a display string. Called from method ValueToDisplayString
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.DefaultValue">
+ <summary>
+ Default value for this editor, usually is the default value for the specified type.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.StandardValues">
+ <summary>
+ A list of values that this editor can support. If StandardValuesExclusive is true then the editor can only support one of these values.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.StandardValuesExclusive">
+ <summary>
+ If StandardValuesExclusive is true then the editor can only support the list specified in StandardValues.
+ </summary>
+ </member>
+ <member name="P:DevAge.ComponentModel.Validator.IValidator.CultureInfo">
+ <summary>
+ Culture for conversion. If null the default user culture is used. Default is null.
+ </summary>
+ </member>
+ <member name="E:DevAge.ComponentModel.Validator.IValidator.Changed">
+ <summary>
+ Fired when one of the properties of the Validator change.
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.#ctor">
+ <summary>
+ Constructor. Initialize the class using a null type.
+ </summary>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.#ctor(System.Type)">
+ <summary>
+ Constructor.
+ </summary>
+ <param name="type">The type used to validate the values. If null no validation is made.</param>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.IsNullString(System.String)">
+ <summary>
+ Returns true if the string is null or if is equals to the NullString
+ </summary>
+ <param name="p_str"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.ObjectToStringForError(System.Object)">
+ <summary>
+ Returns a string used for error description for a specified object. Usually used when printing the object for the error message when there is a conversion error.
+ </summary>
+ <param name="val"></param>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.ObjectToValue(System.Object)">
+ <summary>
+ Convert an object according to the current ValueType of the validator
+ </summary>
+ <param name="p_Object"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.ValueToObject(System.Object,System.Type)">
+ <summary>
+ Convert a value according to the current ValueType to an object with the Type specified. Throw an exception on error.
+ </summary>
+ <param name="p_Value"></param>
+ <param name="p_ReturnObjectType"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.ValueToString(System.Object)">
+ <summary>
+ Converts a value object to a string representation
+ </summary>
+ <param name="p_Value"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.StringToValue(System.String)">
+ <summary>
+ Converts a string to an object according to the type of the string editor
+ </summary>
+ <param name="p_str"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DevAge.ComponentModel.Validator.ValidatorBase.IsStringConversionSupported">
+ <summary>
+ Returns true if string conversion is suported. AllowStringConversio...
[truncated message content] |
|
From: <an...@us...> - 2008-04-01 15:13:40
|
Revision: 1577
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1577&view=rev
Author: and-81
Date: 2008-04-01 08:13:04 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
Added Strong Names to most applications and libraries
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/MacroScope/MacroScope.csproj
trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Web Remote.csproj
trunk/plugins/IR Server Suite/Commands/Command/Command.csproj
trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/MediaPortalCommands.csproj
trunk/plugins/IR Server Suite/Commands/VariableList/VariableList.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj
trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/ShellLink/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/ShellLink/ShellLink.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
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/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WiimoteLib/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
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.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Media Center Connection.csproj
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite.snk
Removed Paths:
-------------
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/MediaState.reg
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,8 @@
<AssemblyName>Abstractor</AssemblyName>
<StartupObject>Abstractor.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +35,25 @@
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <Optimize>true</Optimize>
+ <DebugType>
+ </DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -34,3 +35,4 @@
[assembly: AssemblyFileVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,8 @@
<AssemblyName>DboxTuner</AssemblyName>
<StartupObject>DboxTuner.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -34,3 +35,4 @@
[assembly: AssemblyFileVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -12,6 +12,8 @@
<StartupObject>DebugClient.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -36,24 +38,6 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <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>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -38,3 +39,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>HcwPvrTuner</RootNamespace>
<AssemblyName>HcwPvrTuner</AssemblyName>
<StartupObject>HcwPvrTuner.Program</StartupObject>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -13,6 +13,8 @@
</ApplicationIcon>
<StartupObject>IRBlast.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -38,24 +40,6 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <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>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -38,3 +39,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -13,6 +13,8 @@
</ApplicationIcon>
<StartupObject>IRBlast.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -38,24 +40,6 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <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>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -38,3 +39,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -12,6 +12,8 @@
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<StartupObject>IrFileTool.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,25 +39,6 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>
- </DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,10 @@
<AssemblyName>IRServer</AssemblyName>
<StartupObject>IRServer.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
+ <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -21,13 +25,8 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
- <ApplicationVersion>1.0.2.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <SignAssembly>false</SignAssembly>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -3,6 +3,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security.Permissions;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -40,3 +41,4 @@
[assembly: CLSCompliant(true)]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, Unrestricted = true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,8 @@
<AssemblyName>KeyboardInputRelay</AssemblyName>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>KeyboardInputRelay.Program</StartupObject>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -34,3 +35,4 @@
[assembly: AssemblyFileVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -9,6 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LogTimeCodeExtractor</RootNamespace>
<AssemblyName>LogTimeCodeExtractor</AssemblyName>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/LogTimeCodeExtractor/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/MacroScope/MacroScope.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,8 @@
<AssemblyName>MacroScope</AssemblyName>
<StartupObject>MacroScope.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -36,3 +37,4 @@
[assembly: AssemblyFileVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,24 +11,9 @@
<AssemblyName>SageSetup</AssemblyName>
<StartupObject>SageSetup.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</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>
- <DebugType>none</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -39,3 +40,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("00506894-d61e-47b9-9039-879c543a73e1")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,14 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <Optimize>true</Optimize>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,6 +12,8 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>Translator.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -48,16 +40,6 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>true</UseVSHostingProcess>
- <DocumentationFile>bin\x86\Debug\Translator.XML</DocumentationFile>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -38,3 +39,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("2011f0d4-cec8-43d2-8678-79f24cd6c517")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -12,6 +12,8 @@
<StartupObject>TrayLauncher.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -38,25 +40,6 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>true</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <Optimize>true</Optimize>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -38,3 +39,4 @@
[assembly: CLSCompliant(true)]
[assembly: Guid("b9084277-405c-48e6-80d1-c0d0e1dae27d")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,14 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <Optimize>true</Optimize>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,6 +12,8 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>VirtualRemote.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -47,15 +39,6 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>true</UseVSHostingProcess>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -33,3 +34,4 @@
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//
// General Information about an assembly is controlled through the following
@@ -32,3 +33,4 @@
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -33,3 +34,4 @@
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -33,4 +34,5 @@
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -12,6 +12,8 @@
<StartupObject>SkinEditor.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -36,25 +38,6 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <Optimize>true</Optimize>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,4 @@
//
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Web Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -11,6 +11,8 @@
<AssemblyName>WebRemote</AssemblyName>
<StartupObject>WebRemote.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Commands/Command/Command.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Commands/Command/Command.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Commands/Command/Command.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>CommandBase</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Commands/CommandProcessor/CommandProcessor.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>CommandProcessor</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>Commands.General</RootNamespace>
<AssemblyName>GeneralCommands</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/MediaPortalCommands.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/MediaPortalCommands.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/MediaPortalCommands.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>Commands.MediaPortal</RootNamespace>
<AssemblyName>MediaPortalCommands</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Commands/VariableList/VariableList.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Commands/VariableList/VariableList.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Commands/VariableList/VariableList.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -10,6 +10,8 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>VariableList</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -15,6 +15,8 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,27 +41,6 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <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>
- <DefineConstants>
- </DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>none</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -2,6 +2,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
//using System.Security.Permissions;
// General Information about an assembly is controlled through the following
@@ -39,3 +40,4 @@
[assembly: CLSCompliant(true)]
//[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -9,6 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IrssScheduler</RootNamespace>
<AssemblyName>IrssScheduler</AssemblyName>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs 2008-04-01 15:13:04 UTC (rev 1577)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -17,7 +18,7 @@
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(true)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a0d1d4e4-6c74-4199-90fd-68f0e789ff29")]
@@ -33,3 +34,4 @@
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-01 11:10:54 UTC (rev 1576)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-01 15:13:04 UTC (rev 1577)
@@ -13,6 +13,8 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -40,28 +42,6 @@
</DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <TreatWar...
[truncated message content] |
|
From: <che...@us...> - 2008-04-03 01:08:28
|
Revision: 1584
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1584&view=rev
Author: chef_koch
Date: 2008-04-02 18:08:27 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IR Server Suite/Build Deploy Release.bat
trunk/plugins/IR Server Suite/setup/
trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/setup/setup-AddRemovePage.nsh
trunk/plugins/IR Server Suite/setup/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup/setup-languages.nsh
trunk/plugins/IR Server Suite/setup/setup.nsi
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh
trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup-languages.nsh
trunk/plugins/IR Server Suite/setup.nsi
Added: trunk/plugins/IR Server Suite/Build Deploy Release.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build Deploy Release.bat (rev 0)
+++ trunk/plugins/IR Server Suite/Build Deploy Release.bat 2008-04-03 01:08:27 UTC (rev 1584)
@@ -0,0 +1,15 @@
+rem @ECHO OFF
+
+setup\DeployVersionSVN.exe /svn="%CD%"
+
+"%ProgramFiles%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild Release "IR Server Suite.sln"
+
+setup\DeployVersionSVN.exe /svn="%CD%" /revert
+
+rem these commands are necessary to get the svn revision, to enable them just remove the EXIT one line above
+setup\DeployVersionSVN.exe /svn="%CD%" /GetVersion
+IF NOT EXIST version.txt EXIT
+SET /p version=<version.txt
+DEL version.txt
+"%ProgramFiles%\NSIS\makensis.exe" /DVER_BUILD=%version% setup\setup.nsi
+pause
\ No newline at end of file
Deleted: trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-04-02 23:15:47 UTC (rev 1583)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-04-03 01:08:27 UTC (rev 1584)
@@ -1,996 +0,0 @@
-;======================================
-; IR Server Suite.nsi
-;
-; (C) Copyright Aaron Dinnage, 2008
-;======================================
-!define DEBUG
-
-!ifdef DEBUG
- !define BuildType "Debug"
-!else
- !define BuildType "Release"
-!endif
-
-!include "x64.nsh"
-!include "MUI.nsh"
-
-!define PRODUCT_NAME "IR Server Suite"
-!define PRODUCT_VERSION "1.0.4.2"
-!define PRODUCT_PUBLISHER "and-81"
-!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
-
-Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
-InstallDir ""
-!ifdef DEBUG
- ShowInstDetails show
- ShowUninstDetails show
-!else
- ShowInstDetails hide
- ShowUninstDetails hide
-!endif
-BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
-SetCompressor /SOLID /FINAL lzma
-CRCCheck On
-
-; Variables
-var DIR_INSTALL
-var DIR_MEDIAPORTAL
-var DIR_TVSERVER
-
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
-!insertmacro MUI_PAGE_COMPONENTS
-
-; Main app install path
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
-!insertmacro MUI_PAGE_DIRECTORY
-
-; MediaPortal install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
-!insertmacro MUI_PAGE_DIRECTORY
-
-; TV Server install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
-!insertmacro MUI_PAGE_DIRECTORY
-
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-;======================================
-;======================================
-
-!macro initRegKeys
- ${If} ${RunningX64}
-
- SetRegView 64
-
- ${DisableX64FSRedirection}
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${EnableX64FSRedirection}
-
- ${Else}
-
- SetRegView 32
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${Endif}
-!macroend
-
-;======================================
-;======================================
-
-Function .onInit
-
-!insertmacro initRegKeys
-
-FunctionEnd
-
-;======================================
-
-Function .onInstSuccess
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
-
-StartInputService:
- Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
-
-SkipStartInputService:
-
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreMP
- SectionGetFlags 3 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 4 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 5 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- Abort
-
-EndDirectoryPreMP:
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreTV
- SectionGetFlags 6 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
-
- Abort
-
-EndDirectoryPreTV:
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowApp
- !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowMP
- !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowTV
- !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveApp
- StrCpy $DIR_INSTALL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveMP
- StrCpy $DIR_MEDIAPORTAL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveTV
- StrCpy $DIR_TVSERVER $INSTDIR
-FunctionEnd
-
-;======================================
-
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
-
-Function DumpLog
- Exch $5
- Push $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $6
-
- FindWindow $0 "#32770" "" $HWNDPARENT
- GetDlgItem $0 $0 1016
- StrCmp $0 0 exit
- FileOpen $5 $5 "w"
- StrCmp $5 "" exit
- SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
- System::Alloc ${NSIS_MAX_STRLEN}
- Pop $3
- StrCpy $2 0
- System::Call "*(i, i, i, i, i, i, i, i, i) i \
- (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
- loop: StrCmp $2 $6 done
- System::Call "User32::SendMessageA(i, i, i, i) i \
- ($0, ${LVM_GETITEMTEXT}, $2, r1)"
- System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
- FileWrite $5 "$4$\r$\n"
- IntOp $2 $2 + 1
- Goto loop
- done:
- FileClose $5
- System::Free $1
- System::Free $3
- exit:
- Pop $6
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Pop $0
- Exch $5
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "-Prepare"
-
- DetailPrint "Preparing to install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
-
-StopInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
-
-SkipStopInputService:
- Sleep 100
-
-SectionEnd
-
-;======================================
-
-Section "-Core"
-
- DetailPrint "Setting up paths and installing core files ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create install directory
- CreateDirectory "$DIR_INSTALL"
-
- ; Write the installation paths into the registry
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
-
- ; Write documentation
-!ifdef DEBUG
- DetailPrint "Warning: Documentation is not included in debug builds"
-!else
- SetOutPath "$DIR_INSTALL"
- SetOverwrite ifnewer
- File "Documentation\${PRODUCT_NAME}.chm"
-!endif
-
- ; Create app data directories
- CreateDirectory "$APPDATA\${PRODUCT_NAME}"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
-
- ; Copy known set top boxes
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOverwrite ifnewer
- File /r /x .svn "Set Top Boxes\*.*"
-
- ; Create a start menu shortcut folder
- CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-
-SectionEnd
-
-;======================================
-
-Section "Input Service" SectionInputService
-
- DetailPrint "Installing Input Service ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Installing Input Service
- CreateDirectory "$DIR_INSTALL\Input Service"
- SetOutPath "$DIR_INSTALL\Input Service"
- SetOverwrite ifnewer
- File "Input Service\Input Service\bin\${BuildType}\*.*"
-
- ; Installing Input Service Configuration
- CreateDirectory "$DIR_INSTALL\Input Service Configuration"
- SetOutPath "$DIR_INSTALL\Input Service Configuration"
- SetOverwrite ifnewer
- File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
-
- ; Install IR Server Plugins ...
- DetailPrint "Installing IR Server Plugins ..."
- CreateDirectory "$DIR_INSTALL\IR Server Plugins"
- SetOutPath "$DIR_INSTALL\IR Server Plugins"
- SetOverwrite ifnewer
-
- File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
- File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
- File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
- File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
- File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
- File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
- File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
- ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
- File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
- ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
- File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
- File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
- ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
- File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
- File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
- File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
- ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
- File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
- File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
- ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
- File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
- File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll"
- ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
- File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
- File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
- File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
- File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
- File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
- File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
-
- ; Create App Data Folder for IR Server configuration files
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
-
- ; Copy Abstract Remote maps
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOverwrite ifnewer
- File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
- File "Input Service\Input Service\RemoteTable.xsd"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
-
- ; Launch Input Service
- DetailPrint "Starting Input Service ..."
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
-
-SectionEnd
-
-;======================================
-
-Section "MP Control Plugin" SectionMPControlPlugin
-
- DetailPrint "Installing MP Control Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
-
- ; Write input mapping
- SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOverwrite ifnewer
- File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!else
-Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!endif
-
- DetailPrint "Installing MP Blast Zone Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOverwrite off
- File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
-
- ; Write skin files
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!else
-Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!endif
-
- DetailPrint "Installing TV2 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
-
- DetailPrint "Installing TV3 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_TVSERVER\Plugins"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section "Translator" SectionTranslator
-
- DetailPrint "Installing Translator ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Translator"
- SetOutPath "$DIR_INSTALL\Translator"
- SetOverwrite ifnewer
- File "Applications\Translator\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
-
- ; Copy in default settings files
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
- SetOverwrite ifnewer
- File "Applications\Translator\Default Settings\*.xml"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Tray Launcher" SectionTrayLauncher
-!else
-Section /o "Tray Launcher" SectionTrayLauncher
-!endif
-
- DetailPrint "Installing Tray Launcher ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Tray Launcher"
- SetOutPath "$DIR_INSTALL\Tray Launcher"
- SetOverwrite ifnewer
- File "Applications\Tray Launcher\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "Virtual Remote" SectionVirtualRemote
-
- DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Virtual Remote and Web Remote
- CreateDirectory "$DIR_INSTALL\Virtual Remote"
- SetOutPath "$DIR_INSTALL\Virtual Remote"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\bin\${BuildType}\*.*"
- File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
- File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
-
- ; Installing skins
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\Skins\*.*"
-
- ; Installing Virtual Remote for Smart Devices
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote for Smart Devices.lnk" "$DIR_INSTALL\Virtual Remote\Smart Devices"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Web Remote.lnk" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" "" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "IR Blast" SectionIRBlast
-
- DetailPrint "Installing IR Blast ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR Blast"
- SetOutPath "$DIR_INSTALL\IR Blast"
- SetOverwrite ifnewer
- File "Applications\IR Blast (No Window)\bin\${BuildType}\*.*"
- File "Applications\IR Blast\bin\${BuildType}\IRBlast.exe"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "IR File Tool" SectionIRFileTool
-!else
-Section /o "IR File Tool" SectionIRFileTool
-!endif
-
- DetailPrint "Installing IR File Tool ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR File Tool"
- SetOutPath "$DIR_INSTALL\IR File Tool"
- SetOverwrite ifnewer
- File "Applications\IR File Tool\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR File Tool"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR File Tool.lnk" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" "" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Keyboard Relay" SectionKeyboardInputRelay
-!else
-Section /o "Keyboard Relay" SectionKeyboardInputRelay
-!endif
-
- DetailPrint "Installing Keyboard Input Relay ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Keyboard Input Relay"
- SetOutPath "$DIR_INSTALL\Keyboard Input Relay"
- SetOverwrite ifnewer
- File "Applications\Keyboard Input Relay\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Keyboard Input Relay"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" "" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Dbox Tuner" SectionDboxTuner
-!else
-Section /o "Dbox Tuner" SectionDboxTuner
-!endif
-
- DetailPrint "Installing Dbox Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Dbox Tuner"
- SetOutPath "$DIR_INSTALL\Dbox Tuner"
- SetOverwrite ifnewer
- File "Applications\Dbox Tuner\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Dbox Tuner"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "HCW PVR Tuner" SectionHcwPvrTuner
-!else
-Section /o "HCW PVR Tuner" SectionHcwPvrTuner
-!endif
-
- DetailPrint "Installing HCW PVR Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\HCW PVR Tuner"
- SetOutPath "$DIR_INSTALL\HCW PVR Tuner"
- SetOverwrite ifnewer
- File "Applications\HCW PVR Tuner\bin\${BuildType}\*.*"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Debug Client" SectionDebugClient
-!else
-Section /o "Debug Client" SectionDebugClient
-!endif
-
- DetailPrint "Installing Debug Client ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Debug Client
- CreateDirectory "$DIR_INSTALL\Debug Client"
- SetOutPath "$DIR_INSTALL\Debug Client"
- SetOverwrite ifnewer
- File "Applications\Debug Client\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Debug Client"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Client.lnk" "$DIR_INSTALL\Debug Client\DebugClient.exe" "" "$DIR_INSTALL\Debug Client\DebugClient.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "-Complete"
-
- DetailPrint "Completing install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create website link file
- WriteIniStr "$DIR_INSTALL\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-
- ; Write the uninstaller
- WriteUninstaller "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Create start menu shortcuts
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
-
- ; Store the install log
- StrCpy $0 "$APPDATA\${PRODUCT_NAME}\Logs\Install.log"
- Push $0
- Call DumpLog
-
- ; Finish
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
-
-; Section descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionInputService} "A windows service that provides access to your IR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPControlPlugin} "Connects to the Input Service to control MediaPortal."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPBlastZonePlugin} "Lets you control your IR devices from within the MediaPortal GUI."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the default MediaPortal TV engine."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV3BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the MediaPortal TV server."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTranslator} "Control your whole PC."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTrayLauncher} "Simple tray application to launch an application of your choosing when a particular button is pressed."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionVirtualRemote} "Simulated remote control, works as an application or as a web hosted remote control (with included Web Remote). Also includes a Skin Editor and Smart Device versions of Virtual Remote."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRBlast} "Command line tools for blasting IR codes."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRFileTool} "Tool for learning, modifying, testing, correcting and converting IR command files."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionKeyboardInputRelay} "Relays keyboard input to the Input Service to act on keypresses like remote buttons."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDboxTuner} "Command line tuner for Dreambox devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionHcwPvrTuner} "Command line tuner for Hauppauge PVR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDebugClient} "Very simple testing tool for troubleshooting input and communications problems."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;======================================
-;======================================
-
-!ifndef DEBUG
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-!endif
-
-
-;======================================
-
-Function un.onInit
-
- !insertmacro initRegKeys
-
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
- Abort
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "Uninstall"
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
- Sleep 100
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Remove files and uninstaller
- DetailPrint "Attempting to remove MediaPortal Blast Zone Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPBlastZonePlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal Process Plugin Common Files ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssUtils.dll"
-
- DetailPrint "Attempting to remove MediaPortal Control Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPControlPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV2 Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\TV2BlasterPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV3 Plugin ..."
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\MPUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssComms.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\TV3BlasterPlugin.dll"
-
- DetailPrint "Removing Set Top Box presets ..."
- RMDir /R "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
-
- DetailPrint "Removing program files ..."
- RMDir /R /REBOOTOK "$DIR_INSTALL"
-
- DetailPrint "Removing start menu shortcuts ..."
- RMDir /R "$SMPROGRAMS\${PRODUCT_NAME}"
-
- ; Remove registry keys
- DetailPrint "Removing registry keys ..."
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
- DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
-
- ; Remove auto-runs
- DetailPrint "Removing application auto-runs ..."
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tray Launcher"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Translator"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
-
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old (from rev 1583, trunk/plugins/IR Server Suite/IR Server Suite.nsi.old)
===================================================================
--- trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old (rev 0)
+++ trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old 2008-04-03 01:08:27 UTC (rev 1584)
@@ -0,0 +1,996 @@
+;======================================
+; IR Server Suite.nsi
+;
+; (C) Copyright Aaron Dinnage, 2008
+;======================================
+!define DEBUG
+
+!ifdef DEBUG
+ !define BuildType "Debug"
+!else
+ !define BuildType "Release"
+!endif
+
+!include "x64.nsh"
+!include "MUI.nsh"
+
+!define PRODUCT_NAME "IR Server Suite"
+!define PRODUCT_VERSION "1.0.4.2"
+!define PRODUCT_PUBLISHER "and-81"
+!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
+
+Name "${PRODUCT_NAME}"
+OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
+InstallDir ""
+!ifdef DEBUG
+ ShowInstDetails show
+ ShowUninstDetails show
+!else
+ ShowInstDetails hide
+ ShowUninstDetails hide
+!endif
+BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
+SetCompressor /SOLID /FINAL lzma
+CRCCheck On
+
+; Variables
+var DIR_INSTALL
+var DIR_MEDIAPORTAL
+var DIR_TVSERVER
+
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
+!insertmacro MUI_PAGE_COMPONENTS
+
+; Main app install path
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
+!insertmacro MUI_PAGE_DIRECTORY
+
+; MediaPortal install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
+!insertmacro MUI_PAGE_DIRECTORY
+
+; TV Server install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
+!insertmacro MUI_PAGE_DIRECTORY
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+;======================================
+;======================================
+
+!macro initRegKeys
+ ${If} ${RunningX64}
+
+ SetRegView 64
+
+ ${DisableX64FSRedirection}
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${EnableX64FSRedirection}
+
+ ${Else}
+
+ SetRegView 32
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${Endif}
+!macroend
+
+;======================================
+;======================================
+
+Function .onInit
+
+!insertmacro initRegKeys
+
+FunctionEnd
+
+;======================================
+
+Function .onInstSuccess
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
+
+StartInputService:
+ Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
+
+SkipStartInputService:
+
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreMP
+ SectionGetFlags 3 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 4 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 5 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ Abort
+
+EndDirectoryPreMP:
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreTV
+ SectionGetFlags 6 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
+
+ Abort
+
+EndDirectoryPreTV:
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowApp
+ !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowMP
+ !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowTV
+ !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveApp
+ StrCpy $DIR_INSTALL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveMP
+ StrCpy $DIR_MEDIAPORTAL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveTV
+ StrCpy $DIR_TVSERVER $INSTDIR
+FunctionEnd
+
+;======================================
+
+!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x102D
+
+Function DumpLog
+ Exch $5
+ Push $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $6
+
+ FindWindow $0 "#32770" "" $HWNDPARENT
+ GetDlgItem $0 $0 1016
+ StrCmp $0 0 exit
+ FileOpen $5 $5 "w"
+ StrCmp $5 "" exit
+ SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+ System::Alloc ${NSIS_MAX_STRLEN}
+ Pop $3
+ StrCpy $2 0
+ System::Call "*(i, i, i, i, i, i, i, i, i) i \
+ (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+ loop: StrCmp $2 $6 done
+ System::Call "User32::SendMessageA(i, i, i, i) i \
+ ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+ System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+ FileWrite $5 "$4$\r$\n"
+ IntOp $2 $2 + 1
+ Goto loop
+ done:
+ FileClose $5
+ System::Free $1
+ System::Free $3
+ exit:
+ Pop $6
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+ Exch $5
+FunctionEnd
+
+;======================================
+;======================================
+
+Section "-Prepare"
+
+ DetailPrint "Preparing to install ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Kill running Programs
+ DetailPrint "Terminating processes ..."
+ ExecWait '"taskkill" /F /IM Translator.exe'
+ ExecWait '"taskkill" /F /IM TrayLauncher.exe'
+ ExecWait '"taskkill" /F /IM WebRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
+ ExecWait '"taskkill" /F /IM IRFileTool.exe'
+ ExecWait '"taskkill" /F /IM DebugClient.exe'
+ ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
+
+StopInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
+
+SkipStopInputService:
+ Sleep 100
+
+SectionEnd
+
+;======================================
+
+Section "-Core"
+
+ DetailPrint "Setting up paths and installing core files ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Create install directory
+ CreateDirectory "$DIR_INSTALL"
+
+ ; Write the installation paths into the registry
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
+
+ ; Write documentation
+!ifdef DEBUG
+ DetailPrint "Warning: Documentation is not included in debug builds"
+!else
+ SetOutPath "$DIR_INSTALL"
+ SetOverwrite ifnewer
+ File "Documentation\${PRODUCT_NAME}.chm"
+!endif
+
+ ; Create app data directories
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
+
+ ; Copy known set top boxes
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOverwrite ifnewer
+ File /r /x .svn "Set Top Boxes\*.*"
+
+ ; Create a start menu shortcut folder
+ CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+
+SectionEnd
+
+;======================================
+
+Section "Input Service" SectionInputService
+
+ DetailPrint "Installing Input Service ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Uninstall current Input Service ...
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
+
+UninstallInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
+
+SkipUninstallInputService:
+ Sleep 100
+
+ ; Installing Input Service
+ CreateDirectory "$DIR_INSTALL\Input Service"
+ SetOutPath "$DIR_INSTALL\Input Service"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service\bin\${BuildType}\*.*"
+
+ ; Installing Input Service Configuration
+ CreateDirectory "$DIR_INSTALL\Input Service Configuration"
+ SetOutPath "$DIR_INSTALL\Input Service Configuration"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
+
+ ; Install IR Server Plugins ...
+ DetailPrint "Installing IR Server Plugins ..."
+ CreateDirectory "$DIR_INSTALL\IR Server Plugins"
+ SetOutPath "$DIR_INSTALL\IR Server Plugins"
+ SetOverwrite ifnewer
+
+ File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
+ File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
+ File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
+ File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
+ File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
+ File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
+ File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
+ ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
+ File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
+ ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
+ File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
+ File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
+ ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
+ File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
+ File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
+ File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
+ ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
+ File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
+ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
+ ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll"
+ ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
+ File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
+ File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
+ File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
+ File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
+ File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
+ File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
+
+ ; Create App Data Folder for IR Server configuration files
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
+
+ ; Copy Abstract Remote maps
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOverwrite ifnewer
+ File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
+ File "Input Service\Input Service\RemoteTable.xsd"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
+
+ ; Launch Input Service
+ DetailPrint "Starting Input Service ..."
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
+
+SectionEnd
+
+;======================================
+
+Section "MP Control Plugin" SectionMPControlPlugin
+
+ DetailPrint "Installing MP Control Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
+
+ ; Write input mapping
+ SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOverwrite ifnewer
+ File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!else
+Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!endif
+
+ DetailPrint "Installing MP Blast Zone Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOverwrite off
+ File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
+
+ ; Write skin files
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!else
+Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!endif
+
+ DetailPrint "Installing TV2 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
+
+ DetailPrint "Installing TV3 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_TVSERVER\Plugins"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section "Translator" SectionTranslator
+
+ DetailPrint "Installing Translator ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Translator"
+ SetOutPath "$DIR_INSTALL\Translator"
+ SetOverwrite ifnewer
+ File "Applications\Translator\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+
+ ; Copy in default settings files
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+ SetOverwrite ifnewer
+ File "Applications\Translator\Default Settings\*.xml"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Tray Launcher" SectionTrayLauncher
+!else
+Section /o "Tray Launcher" SectionTrayLauncher
+!endif
+
+ DetailPrint "Installing Tray Launcher ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Tray Launcher"
+ SetOutPath "$DIR_INSTALL\Tray Launcher"
+ SetOverwrite ifnewer
+ File "Applications\Tray Launcher\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "Virtual Remote" SectionVirtualRemote
+
+ DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Virtual Remote and Web Remote
+ CreateDirectory "$DIR_INSTALL\Virtual Remote"
+ SetOutPath "$DIR_INSTALL\Virtual Remote"
...
[truncated message content] |
|
From: <che...@us...> - 2008-04-03 01:19:03
|
Revision: 1586
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1586&view=rev
Author: chef_koch
Date: 2008-04-02 18:18:53 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
reverted last change, was stupid and did not really thought about it, soory :(
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Build Deploy Release.bat
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh
trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup-languages.nsh
trunk/plugins/IR Server Suite/setup.nsi
Removed Paths:
-------------
trunk/plugins/IR Server Suite/setup/
Modified: trunk/plugins/IR Server Suite/Build Deploy Release.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build Deploy Release.bat 2008-04-03 01:12:48 UTC (rev 1585)
+++ trunk/plugins/IR Server Suite/Build Deploy Release.bat 2008-04-03 01:18:53 UTC (rev 1586)
@@ -2,7 +2,7 @@
"%ProgramFiles%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild Release "IR Server Suite.sln"
-"%ProgramFiles%\NSIS\makensis.exe" setup\setup.nsi
+"%ProgramFiles%\NSIS\makensis.exe" setup.nsi
EXIT
Copied: trunk/plugins/IR Server Suite/IR Server Suite.nsi.old (from rev 1585, trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi.old (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-04-03 01:18:53 UTC (rev 1586)
@@ -0,0 +1,996 @@
+;======================================
+; IR Server Suite.nsi
+;
+; (C) Copyright Aaron Dinnage, 2008
+;======================================
+!define DEBUG
+
+!ifdef DEBUG
+ !define BuildType "Debug"
+!else
+ !define BuildType "Release"
+!endif
+
+!include "x64.nsh"
+!include "MUI.nsh"
+
+!define PRODUCT_NAME "IR Server Suite"
+!define PRODUCT_VERSION "1.0.4.2"
+!define PRODUCT_PUBLISHER "and-81"
+!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
+
+Name "${PRODUCT_NAME}"
+OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
+InstallDir ""
+!ifdef DEBUG
+ ShowInstDetails show
+ ShowUninstDetails show
+!else
+ ShowInstDetails hide
+ ShowUninstDetails hide
+!endif
+BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
+SetCompressor /SOLID /FINAL lzma
+CRCCheck On
+
+; Variables
+var DIR_INSTALL
+var DIR_MEDIAPORTAL
+var DIR_TVSERVER
+
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
+!insertmacro MUI_PAGE_COMPONENTS
+
+; Main app install path
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
+!insertmacro MUI_PAGE_DIRECTORY
+
+; MediaPortal install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
+!insertmacro MUI_PAGE_DIRECTORY
+
+; TV Server install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
+!insertmacro MUI_PAGE_DIRECTORY
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+;======================================
+;======================================
+
+!macro initRegKeys
+ ${If} ${RunningX64}
+
+ SetRegView 64
+
+ ${DisableX64FSRedirection}
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${EnableX64FSRedirection}
+
+ ${Else}
+
+ SetRegView 32
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${Endif}
+!macroend
+
+;======================================
+;======================================
+
+Function .onInit
+
+!insertmacro initRegKeys
+
+FunctionEnd
+
+;======================================
+
+Function .onInstSuccess
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
+
+StartInputService:
+ Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
+
+SkipStartInputService:
+
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreMP
+ SectionGetFlags 3 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 4 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 5 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ Abort
+
+EndDirectoryPreMP:
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreTV
+ SectionGetFlags 6 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
+
+ Abort
+
+EndDirectoryPreTV:
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowApp
+ !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowMP
+ !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowTV
+ !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveApp
+ StrCpy $DIR_INSTALL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveMP
+ StrCpy $DIR_MEDIAPORTAL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveTV
+ StrCpy $DIR_TVSERVER $INSTDIR
+FunctionEnd
+
+;======================================
+
+!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x102D
+
+Function DumpLog
+ Exch $5
+ Push $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $6
+
+ FindWindow $0 "#32770" "" $HWNDPARENT
+ GetDlgItem $0 $0 1016
+ StrCmp $0 0 exit
+ FileOpen $5 $5 "w"
+ StrCmp $5 "" exit
+ SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+ System::Alloc ${NSIS_MAX_STRLEN}
+ Pop $3
+ StrCpy $2 0
+ System::Call "*(i, i, i, i, i, i, i, i, i) i \
+ (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+ loop: StrCmp $2 $6 done
+ System::Call "User32::SendMessageA(i, i, i, i) i \
+ ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+ System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+ FileWrite $5 "$4$\r$\n"
+ IntOp $2 $2 + 1
+ Goto loop
+ done:
+ FileClose $5
+ System::Free $1
+ System::Free $3
+ exit:
+ Pop $6
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+ Exch $5
+FunctionEnd
+
+;======================================
+;======================================
+
+Section "-Prepare"
+
+ DetailPrint "Preparing to install ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Kill running Programs
+ DetailPrint "Terminating processes ..."
+ ExecWait '"taskkill" /F /IM Translator.exe'
+ ExecWait '"taskkill" /F /IM TrayLauncher.exe'
+ ExecWait '"taskkill" /F /IM WebRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
+ ExecWait '"taskkill" /F /IM IRFileTool.exe'
+ ExecWait '"taskkill" /F /IM DebugClient.exe'
+ ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
+
+StopInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
+
+SkipStopInputService:
+ Sleep 100
+
+SectionEnd
+
+;======================================
+
+Section "-Core"
+
+ DetailPrint "Setting up paths and installing core files ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Create install directory
+ CreateDirectory "$DIR_INSTALL"
+
+ ; Write the installation paths into the registry
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
+
+ ; Write documentation
+!ifdef DEBUG
+ DetailPrint "Warning: Documentation is not included in debug builds"
+!else
+ SetOutPath "$DIR_INSTALL"
+ SetOverwrite ifnewer
+ File "Documentation\${PRODUCT_NAME}.chm"
+!endif
+
+ ; Create app data directories
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
+
+ ; Copy known set top boxes
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOverwrite ifnewer
+ File /r /x .svn "Set Top Boxes\*.*"
+
+ ; Create a start menu shortcut folder
+ CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+
+SectionEnd
+
+;======================================
+
+Section "Input Service" SectionInputService
+
+ DetailPrint "Installing Input Service ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Uninstall current Input Service ...
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
+
+UninstallInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
+
+SkipUninstallInputService:
+ Sleep 100
+
+ ; Installing Input Service
+ CreateDirectory "$DIR_INSTALL\Input Service"
+ SetOutPath "$DIR_INSTALL\Input Service"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service\bin\${BuildType}\*.*"
+
+ ; Installing Input Service Configuration
+ CreateDirectory "$DIR_INSTALL\Input Service Configuration"
+ SetOutPath "$DIR_INSTALL\Input Service Configuration"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
+
+ ; Install IR Server Plugins ...
+ DetailPrint "Installing IR Server Plugins ..."
+ CreateDirectory "$DIR_INSTALL\IR Server Plugins"
+ SetOutPath "$DIR_INSTALL\IR Server Plugins"
+ SetOverwrite ifnewer
+
+ File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
+ File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
+ File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
+ File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
+ File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
+ File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
+ File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
+ ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
+ File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
+ ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
+ File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
+ File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
+ ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
+ File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
+ File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
+ File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
+ ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
+ File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
+ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
+ ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll"
+ ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
+ File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
+ File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
+ File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
+ File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
+ File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
+ File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
+
+ ; Create App Data Folder for IR Server configuration files
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
+
+ ; Copy Abstract Remote maps
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOverwrite ifnewer
+ File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
+ File "Input Service\Input Service\RemoteTable.xsd"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
+
+ ; Launch Input Service
+ DetailPrint "Starting Input Service ..."
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
+
+SectionEnd
+
+;======================================
+
+Section "MP Control Plugin" SectionMPControlPlugin
+
+ DetailPrint "Installing MP Control Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
+
+ ; Write input mapping
+ SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOverwrite ifnewer
+ File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!else
+Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!endif
+
+ DetailPrint "Installing MP Blast Zone Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOverwrite off
+ File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
+
+ ; Write skin files
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!else
+Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!endif
+
+ DetailPrint "Installing TV2 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
+
+ DetailPrint "Installing TV3 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_TVSERVER\Plugins"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section "Translator" SectionTranslator
+
+ DetailPrint "Installing Translator ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Translator"
+ SetOutPath "$DIR_INSTALL\Translator"
+ SetOverwrite ifnewer
+ File "Applications\Translator\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+
+ ; Copy in default settings files
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+ SetOverwrite ifnewer
+ File "Applications\Translator\Default Settings\*.xml"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Tray Launcher" SectionTrayLauncher
+!else
+Section /o "Tray Launcher" SectionTrayLauncher
+!endif
+
+ DetailPrint "Installing Tray Launcher ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Tray Launcher"
+ SetOutPath "$DIR_INSTALL\Tray Launcher"
+ SetOverwrite ifnewer
+ File "Applications\Tray Launcher\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "Virtual Remote" SectionVirtualRemote
+
+ DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Virtual Remote and Web Remote
+ CreateDirectory "$DIR_INSTALL\Virtual Remote"
+ SetOutPath "$DIR_INSTALL\Virtual Remote"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\bin\${BuildType}\*.*"
+ File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
+ File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
+
+ ; Installing skins
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\Skins\*.*"
+
+ ; Installing Virtual Remote for Smart Devices
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote for Smart Devices.lnk" "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Web Remote.lnk" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" "" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "IR Blast" SectionIRBlast
+
+ DetailPrint "Installing IR Blast ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\IR Blast"
+ SetOutPath "$DIR_INSTALL\IR Blast"
+ SetOverwrite ifnewer
+ File "Applications\IR Blast (No Window)\bin\${BuildType}\*.*"
+ File "Applications\IR Blast\bin\${BuildType}\IRBlast.exe"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "IR File Tool" SectionIRFileTool
+!else
+Section /o "IR File Tool" SectionIRFileTool
+!endif
+
+ DetailPrint "Installing IR File Tool ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\IR File Tool"
+ SetOutPath "$DIR_INSTALL\IR File Tool"
+ SetOverwrite ifnewer
+ File "Applications\IR File Tool\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR File Tool"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR File Tool.lnk" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" "" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Keyboard Relay" SectionKeyboardInputRelay
+!else
+Section /o "Keyboard Relay" SectionKeyboardInputRelay
+!endif
+
+ DetailPrint "Installing Keyboard Input Relay ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\Keyboard Input Relay"
+ SetOutPath "$DIR_INSTALL\Keyboard Input Relay"
+ SetOverwrite ifnewer
+ File "Applications\Keyboard Input Relay\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Keyboard Input Relay"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" "" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Dbox Tuner" SectionDboxTuner
+!else
+Section /o "Dbox Tuner" SectionDboxTuner
+!endif
+
+ DetailPrint "Installing Dbox Tuner ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\Dbox Tuner"
+ SetOutPath "$DIR_INSTALL\Dbox Tuner"
+ SetOverwrite ifnewer
+ File "Applications\Dbox Tuner\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Dbox Tuner"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "HCW PVR Tuner" SectionHcwPvrTuner
+!else
+Section /o "HCW PVR Tuner" SectionHcwPvrTuner
+!endif
+
+ DetailPrint "Installing HCW PVR Tuner ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing IR Server
+ CreateDirectory "$DIR_INSTALL\HCW PVR Tuner"
+ SetOutPath "$DIR_INSTALL\HCW PVR Tuner"
+ SetOverwrite ifnewer
+ File "Applications\HCW PVR Tuner\bin\${BuildType}\*.*"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Debug Client" SectionDebugClient
+!else
+Section /o "Debug Client" SectionDebugClient
+!endif
+
+ DetailPrint "Installing Debug Client ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Debug Client
+ CreateDirectory "$DIR_INSTALL\Debug Client"
+ SetOutPath "$DIR_INSTALL\Debug Client"
+ SetOverwrite ifnewer
+ File "Applications\Debug Client\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Debug Client"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Client.lnk" "$DIR_INSTALL\Debug Client\DebugClient.exe" "" "$DIR_INSTALL\Debug Client\DebugClient.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "-Complete"
+
+ DetailPrint "Completing install ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Create website link file
+ WriteIniStr "$DIR_INSTALL\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+
+ ; Write the uninstaller
+ WriteUninstaller "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
+
+ ; Create start menu shortcuts
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
+
+ ; Store the install log
+ StrCpy $0 "$APPDATA\${PRODUCT_NAME}\Logs\Install.log"
+ Push $0
+ Call DumpLog
+
+ ; Finish
+!ifdef DEBUG
+ SetAutoClose false
+!else
+ SetAutoClose true
+!endif
+
+SectionEnd
+
+;======================================
+;======================================
+
+; Section descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionInputService} "A windows service that provides access to your IR devices."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPControlPlugin} "Connects to the Input Service to control MediaPortal."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPBlastZonePlugin} "Lets you control your IR devices from within the MediaPortal GUI."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the default MediaPortal TV engine."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV3BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the MediaPortal TV server."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionTranslator} "Control your whole PC."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionTrayLauncher} "Simple tray application to launch an application of your choosing when a particular button is pressed."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionVirtualRemote} "Simulated remote control, works as an application or as a web hosted remote control (with included Web Remote). Also includes a Skin Editor and Smart Device versions of Virtual Remote."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRBlast} "Command line tools for blasting IR codes."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRFileTool} "Tool for learning, modifying, testing, correcting and converting IR command files."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionKeyboardInputRelay} "Relays keyboard input to the Input Service to act on keypresses like remote buttons."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionDboxTuner} "Command line tuner for Dreambox devices."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionHcwPvrTuner} "Command line tuner for Hauppauge PVR devices."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SectionDebugClient} "Very simple testing tool for troubleshooting input and communications problems."
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;======================================
+;======================================
+
+!ifndef DEBUG
+Function un.onUninstSuccess
+ HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+!endif
+
+
+;======================================
+
+Function un.onInit
+
+ !insertmacro initRegKeys
+
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+ Abort
+FunctionEnd
+
+;======================================
+;======================================
+
+Section "Uninstall"
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Kill running Programs
+ DetailPrint "Terminating processes ..."
+ ExecWait '"taskkill" /F /IM Translator.exe'
+ ExecWait '"taskkill" /F /IM TrayLauncher.exe'
+ ExecWait '"taskkill" /F /IM WebRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
+ ExecWait '"taskkill" /F /IM IRFileTool.exe'
+ ExecWait '"taskkill" /F /IM DebugClient.exe'
+ ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
+ Sleep 100
+
+ ; Uninstall current Input Service ...
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
+
+UninstallInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
+
+SkipUninstallInputService:
+ Sleep 100
+
+ ; Remove files and uninstaller
+ DetailPrint "Attempting to remove MediaPortal Blast Zone Plugin ..."
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPUtils.dll"
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssComms.dll"
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssUtils.dll"
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPBlastZonePlugin.dll"
+
+ DetailPrint "Attempting to remove MediaPortal Process Plugin Common Files ..."
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPUtils.dll"
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssComms.dll"
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssUtils.dll"
+
+ DetailPrint "Attempting to remove MediaPortal Control Plugin ..."
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPControlPlugin.dll"
+
+ DetailPrint "Attempting to remove MediaPortal TV2 Plugin ..."
+ Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\TV2BlasterPlugin.dll"
+
+ DetailPrint "Attempting to remove MediaPortal TV3 Plugin ..."
+ Delete /REBOOTOK "$DIR_TVSERVER\Plugins\MPUtils.dll"
+ Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssComms.dll"
+ Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssUtils.dll"
+ Delete /REBOOTOK "$DIR_TVSERVER\Plugins\TV3BlasterPlugin.dll"
+
+ DetailPrint "Removing Set Top Box presets ..."
+ RMDir /R "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+
+ DetailPrint "Removing program files ..."
+ RMDir /R /REBOOTOK "$DIR_INSTALL"
+
+ DetailPrint "Removing start menu shortcuts ..."
+ RMDir /R "$SMPROGRAMS\${PRODUCT_NAME}"
+
+ ; Remove registry keys
+ DetailPrint "Removing registry keys ..."
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+ DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
+
+ ; Remove auto-runs
+ DetailPrint "Removing application auto-runs ..."
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tray Launcher"
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Translator"
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
+
+!ifdef DEBUG
+ SetAutoClose false
+!else
+ SetAutoClose true
+!endif
+
+SectionEnd
+
+;======================================
+;======================================
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh (from rev 1585, trunk/plugins/IR Server Suite/setup/setup-AddRemovePage.nsh)
===================================================================
--- trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh (rev 0)
+++ trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh 2008-04-03 01:18:53 UTC (rev 1586)
@@ -0,0 +1,162 @@
+#region Copyright (C) 2005-2008 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2008 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+#**********************************************************************************************************#
+#
+# This original header file is taken from: http://nsis.sourceforge.net/Add/Remove_Functionality
+# and modified for our needs.
+#
+#**********************************************************************************************************#
+
+!include WordFunc.nsh
+!include FileFunc.nsh
+
+!insertmacro VersionCompare
+!insertmacro GetParent
+
+##### Add/Remove/Reinstall page
+Var ReinstallPageCheck
+
+Function PageReinstall
+ ReadRegStr $R0 HKLM "${REG_UNINSTALL}" "InstallPath"
+
+ ${If} $R0 == ""
+ Abort
+ ${EndIf}
+
+ ReadRegDWORD $R0 HKLM "${REG_UNINSTALL}" "VersionMajor"
+ ReadRegDWORD $R1 HKLM "${REG_UNINSTALL}" "VersionMinor"
+ ReadRegDWORD $R2 HKLM "${REG_UNINSTALL}" "VersionRevision"
+ ReadRegDWORD $R3 HKLM "${REG_UNINSTALL}" "VersionBuild"
+ StrCpy $R0 $R0.$R1.$R2.$R3
+
+ ${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD} $R0 $R0
+ ${If} $R0 == 0
+ StrCpy $R1 "$(TEXT_ADDREMOVE_INFO_REPAIR)"
+ StrCpy $R2 "$(TEXT_ADDREMOVE_REPAIR_OPT1)"
+ StrCpy $R3 "$(TEXT_ADDREMOVE_REPAIR_OPT2)"
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_ADDREMOVE_HEADER)" "$(TEXT_ADDREMOVE_HEADER2_REPAIR)"
+ StrCpy $R0 "2"
+ ${ElseIf} $R0 == 1
+ StrCpy $R1 "$(TEXT_ADDREMOVE_INFO_UPGRADE)"
+ StrCpy $R2 "$(TEXT_ADDREMOVE_UPDOWN_OPT1)"
+ StrCpy $R3 "$(TEXT_ADDREMOVE_UPDOWN_OPT2)"
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_ADDREMOVE_HEADER)" "$(TEXT_ADDREMOVE_HEADER2_UPDOWN)"
+ StrCpy $R0 "1"
+ ${ElseIf} $R0 == 2
+ StrCpy $R1 "$(TEXT_ADDREMOVE_INFO_DOWNGRADE)"
+ StrCpy $R2 "$(TEXT_ADDREMOVE_UPDOWN_OPT1)"
+ StrCpy $R3 "$(TEXT_ADDREMOVE_UPDOWN_OPT2)"
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_ADDREMOVE_HEADER)" "$(TEXT_ADDREMOVE_HEADER2_UPDOWN)"
+ StrCpy $R0 "1"
+ ${Else}
+ Abort
+ ${EndIf}
+
+ nsDialogs::Create /NOUNLOAD 1018
+
+ ${NSD_CreateLabel} 0 0 100% 24u $R1
+ Pop $R1
+
+ ${NSD_CreateRadioButton} 30u 50u -30u 8u $R2
+ Pop $R2
+ ${NSD_OnClick} $R2 PageReinstallUpdateSelection
+
+ ${NSD_CreateRadioButton} 30u 70u -30u 8u $R3
+ Pop $R3
+ ${NSD_OnClick} $R3 PageReinstallUpdateSelection
+
+ ${If} $ReinstallPageCheck != 2
+ SendMessage $R2 ${BM_SETCHECK} ${BST_CHECKED} 0
+ ${Else}
+ SendMessage $R3 ${BM_SETCHECK} ${BST_CHECKED} 0
+ ${EndIf}
+
+ nsDialogs::Show
+FunctionEnd
+
+Function PageReinstallUpdateSelection
+ Pop $R1
+
+ ${NSD_GetState} $R2 $R1
+
+ ${If} $R1 == ${BST_CHECKED}
+ StrCpy $ReinstallPageCheck 1
+ ${Else}
+ StrCpy $ReinstallPageCheck 2
+ ${EndIf}
+
+FunctionEnd
+
+Function PageLeaveReinstall
+ ${NSD_GetState} $R2 $R1
+
+ StrCmp $R0 "1" 0 +2
+ StrCmp $R1 "1" doUninstall finish
+ StrCmp $R0 "2" 0 +3
+ StrCmp $R1 "1" finish doUninstall
+
+ doUninstall:
+ ; check if MP is already installed
+ ReadRegStr $R0 HKLM "${REG_UNINSTALL}" UninstallString
+ ${If} ${FileExists} "$R0"
+ ; get parent folder of uninstallation EXE (RO) and save it to R1
+ ${GetParent} $R0 $R1
+ ; start uninstallation of installed MP, from tmp folder, so it will delete itself
+ HideWindow
+ ClearErrors
+ CopyFiles $R0 "$TEMP\uninstall-temp.exe"
+ ExecWait '"$TEMP\uninstall-temp.exe" _?=$R1'
+ BringToFront
+
+ ; if an error occured, ask to cancel installation
+ ${If} ${Errors}
+ MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(TEXT_MSGBOX_ERROR_ON_UNINSTALL)" IDYES +2
+ Quit
+ ${EndIf}
+ ${EndIf}
+
+ ; if reboot flag is set, abort the installation, and continue the installer on next startup
+ ${If} ${FileExists} "$INSTDIR\rebootflag"
+ MessageBox MB_OK|MB_ICONEXCLAMATION "$(TEXT_MSGBOX_ERROR_REBOOT_REQUIRED)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" "$(^Name)" $EXEPATH
+ Quit
+ ${EndIf}
+
+ finish:
+FunctionEnd
+
+
+
+LangString TEXT_ADDREMOVE_HEADER ${LANG_ENGLISH} "Already Installed"
+LangString TEXT_ADDREMOVE_HEADER2_REPAIR ${LANG_ENGLISH} "Choose the maintenance option to perform."
+LangString TEXT_ADDREMOVE_HEADER2_UPDOWN ${LANG_ENGLISH} "Choose how you want to install $(^Name)."
+LangString TEXT_ADDREMOVE_INFO_REPAIR ${LANG_ENGLISH} "$(^Name) ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
+LangString TEXT_ADDREMOVE_INFO_UPGRADE ${LANG_ENGLISH} "An older version of $(^Name) is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+LangString TEXT_ADDREMOVE_INFO_DOWNGRADE ${LANG_ENGLISH} "A newer version of $(^Name) is already installed! It is not recommended that you install an older version. If you really want to install this older version, it's better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+LangString TEXT_ADDREMOVE_REPAIR_OPT1 ${LANG_ENGLISH} "Add/Remove/Reinstall components"
+LangString TEXT_ADDREMOVE_REPAIR_OPT2 ${LANG_ENGLISH} "Uninstall $(^Name)"
+LangString TEXT_ADDREMOVE_UPDOWN_OPT1 ${LANG_ENGLISH} "Uninstall before installing"
+LangString TEXT_ADDREMOVE_UPDOWN_OPT2 ${LANG_ENGLISH} "Do not uninstall"
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh (from rev 1585, trunk/plugins/IR Server Suite/setup/setup-CommonMPMacros.nsh)
===================================================================
--- trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh (rev 0)
+++ trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh 2008-04-03 01:18:53 UTC (rev 1586)
@@ -0,0 +1,575 @@
+#region Copyright (C) 2005-2008 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2008 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+
+!include FileFunc.nsh
+!include "XML.nsh"
+
+!include FileFunc.nsh
+!insertmacro GetRoot
+!insertmacro un.GetRoot
+
+!include WordFunc.nsh
+!insertmacro WordReplace
+!insertmacro un.WordReplace
+
+#**********************************************************************************************************#
+#
+# different useful macros
+#
+#**********************************************************************************************************#
+
+#Var AR_SecFlags
+#Var AR_RegFlags
+
+# registry
+# ${MEMENTO_REGISTRY_ROOT}
+# ${MEMENTO_REGISTRY_KEY}
+# ${MEMENTO_REGISTRY_KEY}
+#ReadRegDWORD $AR_RegFlags ${MEMENTO_REGISTRY_ROOT} `${MEMENTO_REGISTRY_KEY}` `MementoSection_${__MementoSectionLastSectionId}`
+
+ /* not needed anymore ----- done by MementoSectionRestore
+!macro InitSection SecName
+ ;This macro reads component installed flag from the registry and
+ ;changes checked state of the section on the components page.
+ ;Input: section index constant name specified in Section command.
+
+ ClearErrors
+ ;Reading component status from registry
+ ReadRegDWORD $AR_RegFlags "${MEMENTO_REGISTRY_ROOT}" "${MEMENTO_REGISTRY_KEY}" "${SecName}"
+ IfErrors "default_${SecName}"
+
+ ;Status will stay default if registry value not found
+ ;(component was never installed)
+ IntOp $AR_RegFlags $AR_RegFlags & 0x0001 ;Turn off all other bits
+ SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading default section flags
+ IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE ;Turn lowest (enabled) bit off
+ IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags ;Change lowest bit
+
+ ;Writing modified flags
+ SectionSetFlags ${${SecName}} $AR_SecFlags
+
+ "default_${SecName}:"
+!macroend
+*/
+
+!macro FinishSection SecName
+ ;This macro reads section flag set by user and removes the section
+ ;if it is not selected.
+ ;Then it writes component installed flag to registry
+ ;Input: section index constant name specified in Section command.
+
+ ${IfNot} ${SectionIsSelected} "${${SecName}}"
+ ClearErrors
+ ReadRegDWORD $R0 ${MEMENTO_REGISTRY_ROOT} '${MEMENTO_REGISTRY_KEY}' 'MementoSection_${SecName}'
+
+ ${If} $R0 = 1
+ !insertmacro "Remove_${${SecName}}"
+ ${EndIf}
+ ${EndIf}
+!macroend
+
+!macro RemoveSection SecName
+ ;This macro is used to call section's Remove_... macro
+ ;from the uninstaller.
+ ;Input: section index constant name specified in Section command.
+
+ !insertmacro "Remove_${${SecName}}"
+!macroend
+
+!macro DisableComponent SectionName AddText
+ !insertmacro UnselectSection "${SectionName}"
+ ; Make the unselected section read only
+ !insertmacro SetSectionFlag "${SectionName}" 16
+ SectionGetText ${SectionName} $R0
+ SectionSetText ${SectionName} "$R0${AddText}"
+!macroend
+
+
+
+#**********************************************************************************************************#
+#
+# Useful macros for MediaPortal and addtional Software which can be used like other LogicLib expressions.
+#
+#**********************************************************************************************************#
+
+!ifndef MP_REG_UNINSTALL
+ !define MP_REG_UNINSTALL "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MediaPortal"
+!endif
+!ifndef TV3_REG_UNINSTALL
+ !define TV3_REG_UNINSTALL "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MediaPortal TV Server"
+!endif
+
+#**********************************************************************************************************#
+# LOGICLIB EXPRESSIONS
+
+;====================================== OLD MP INSTALLATION TESTs
+
+!macro _MP022IsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ClearErrors
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{87819CFA-1786-484D-B0DE-10B5FBF2625D}" "UninstallString"
+ IfErrors `${_f}` `${_t}`
+!macroend
+!define MP022IsInstalled `"" MP022IsInstalled ""`
+
+!macro _MP023IsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MediaPortal 0.2.3.0" "UninstallString"
+
+ IfFileExists $_LOGICLIB_TEMP `${_t}` `${_f}`
+!macroend
+!define MP023IsInstalled `"" MP023IsInstalled ""`
+
+;====================================== OLD TVServer/TVClient INSTALLATION TESTs
+
+!macro _MSI_TVServerIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ClearErrors
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{4B738773-EE07-413D-AFB7-BB0AB04A5488}" "UninstallString"
+ IfErrors `${_f}` `${_t}`
+!macroend
+!define MSI_TVServerIsInstalled `"" MSI_TVServerIsInstalled ""`
+
+!macro _MSI_TVClientIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ClearErrors
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F7444E89-5BC0-497E-9650-E50539860DE0}" "UninstallString"
+ IfErrors 0 `${_t}`
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FD9FD453-1C0C-4EDA-AEE6-D7CF0E9951CA}" "UninstallString"
+ IfErrors `${_f}` `${_t}`
+!macroend
+!define MSI_TVClientIsInstalled `"" MSI_TVClientIsInstalled ""`
+
+;======================================
+
+!macro _MPIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ReadRegStr $_LOGICLIB_TEMP HKLM "${MP_REG_UNINSTALL}" "UninstallString"
+
+ IfFileExists $_LOGICLIB_TEMP `${_t}` `${_f}`
+!macroend
+!define MPIsInstalled `"" MPIsInstalled ""`
+
+!macro _TVServerIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ReadRegStr $_LOGICLIB_TEMP HKLM "${TV3_REG_UNINSTALL}" "UninstallString"
+
+ IfFileExists $_LOGICLIB_TEMP 0 `${_f}`
+
+ ReadRegStr $_LOGICLIB_TEMP HKLM "${TV3_REG_UNINSTALL}" "MementoSection_SecServer"
+ StrCmp $_LOGICLIB_TEMP 1 `${_t}` `${_f}`
+!macroend
+!define TVServerIsInstalled `"" TVServerIsInstalled ""`
+
+!macro _TVClientIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ReadRegStr $_LOGICLIB_TEMP HKLM "${TV3_REG_UNINSTALL}" "UninstallString"
+
+ IfFileExists $_LOGICLIB_TEMP 0 `${_f}`
+
+ ReadRegStr $_LOGICLIB_TEMP HKLM "${TV3_REG_UNINSTALL}" "MementoSection_SecClient"
+ StrCmp $_LOGICLIB_TEMP 1 `${_t}` `${_f}`
+!macroend
+!define TVClientIsInstalled `"" TVClientIsInstalled ""`
+
+;====================================== 3rd PARTY APPLICATION TESTs
+
+!macro _VCRedistIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ ClearErrors
+ ReadRegStr $_LOGICLIB_TEMP HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7299052b-02a4-4627-81f2-1818da5d550d}" "DisplayVersion"
+ IfErrors `${_f}` 0
+ StrCmp $_LOGICLIB_TEMP "8.0.56336" `${_t}` `${_f}`
+!macroend
+!define VCRedistIsInstalled `"" VCRedistIsInstalled ""`
+
+!macro _dotNetIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+
+ ReadRegStr $4 HKLM "Software\Microsoft\.NETFramework" "InstallRoot"
+ # remove trailing back slash
+ Push $4
+ Exch $EXEDIR
+ Exch $EXEDIR
+ Pop $4
+ # if the root directory doesn't exist .NET is not installed
+ IfFileExists $4 0 `${_f}`
+
+ StrCpy $0 0
+
+ EnumStart:
+
+ EnumRegKey $2 HKLM "Software\Microsoft\.NETFramework\Policy" $0
+ IntOp $0 $0 + 1
+ StrCmp $2 "" `${_f}`
+
+ StrCpy $1 0
+
+ EnumPolicy:
+
+ EnumRegValue $3 HKLM "Software\Microsoft\.NETFramework\Policy\$2" $1
+ IntOp $1 $1 + 1
+ StrCmp $3 "" EnumStart
+ IfFileExists "$4\$2.$3" `${_t}` EnumPolicy
+!macroend
+!define dotNetIsInstalled `"" dotNetIsInstalled ""`
+
+#**********************************************************************************************************#
+# Get MP infos
+!macro MP_GET_INSTALL_DIR _var
+
+ ${If} ${MP023IsInstalled}
+ ReadRegStr ${_var} HKLM "SOFTWARE\Team MediaPortal\MediaPortal" "ApplicationDir"
+ ${ElseIf} ${MPIsInstalled}
+ ReadRegStr ${_var} HKLM "${MP_REG_UNINSTALL}" "InstallPath"
+ ${Else}
+ StrCpy ${_var} ""
+ ${EndIf}
+
+!macroend
+
+!macro TVSERVER_GET_INSTALL_DIR _var
+
+ ${If} ${TVServerIsInstalled}
+ ReadRegStr ${_var} HKLM "${TV3_REG_UNINSTALL}" "InstallPath"
+ ${Else}
+ StrCpy ${_var} ""
+ ${EndIf}
+
+!macroend
+
+!insertmacro GetTime
+!macro GET_BACKUP_POSTFIX _var
+
+ ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
+ ; $0="01" day
+ ; $1="04" month
+ ; $2="2005" year
+ ; $3="Friday" day of week name
+ ; $4="16" hour
+ ; $5="05" minute
+ ; $6="50" seconds
+
+ StrCpy ${_var} "BACKUP_$1-$0_$4-$5"
+
+!macroend
+
+
+
+#**********************************************************************************************************#
+#
+# common language strings
+#
+#**********************************************************************************************************#
+LangString TEXT_MP_NOT_INSTALLED ${LANG_ENGLISH} "MediaPortal not installed"
+LangString TEXT_TVSERVER_NOT_INSTALLED ${LANG_ENGLISH} "TVServer not installed"
+
+
+LangString TEXT_MSGBOX_INSTALLATION_CANCELD ${LANG_ENGLISH} "Installation will be canceled."
+LangString TEXT_MSGBOX_MORE_INFO ${LANG_ENGLISH} "Do you want to get more information about it?"
+
+LangString TEXT_MSGBOX_ERROR_WIN ${LANG_ENGLISH} "Your operating system is not supported by $(^Name).$\r$\n$\r$\n$(TEXT_MSGBOX_INSTALLATION_CANCELD)$\r$\n$\r$\n$(TEXT_MSGBOX_MORE_INFO)"
+LangString TEXT_MSGBOX_ERROR_VCREDIST ${LANG_ENGLISH} "Microsoft Visual C++ 2005 SP1 Redistributable Package (x86) is not installed.$\r$\nIt is a requirement for $(^Name).$\r$\n$\r$\n$(TEXT_MSGBOX_INSTALLATION_CANCELD)$\r$\n$\r$\n$(TEXT_MSGBOX_MORE_INFO)"
+LangString TEXT_MSGBOX_ERROR_DOTNET ${LANG_ENGLISH} "Microsoft .Net Framework 2 is not installed.$\r$\nIt is a requirement for $(^Name).$\r$\n$\r$\n$(TEXT_MSGBOX_INSTALLATION_CANCELD)$\r$\n$\r$\n$(TEXT_MSGBOX_MORE_INFO)"
+
+LangString TEXT_MSGBOX_ERROR_IS_INSTALLED ${LANG_ENGLISH} "$(^Name) is already installed. You need to uninstall it, before you continue with the installation.$\r$\nUninstall will be lunched when pressing OK."
+LangString TEXT_MSGBOX_ERROR_ON_UNINSTALL ${LANG_ENGLISH} "An error occured while trying to uninstall old version!$\r$\nDo you still want to continue the installation?"
+LangString TEXT_MSGBOX_ERROR_REBOOT_REQUIRED ${LANG_ENGLISH} "A reboot is required after a previous action. Reboot you system and try it again."
+
+ /*
+; Section flag test
+!macro _MPIsInstalled _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+
+ ReadRegStr $MPBaseDir HKLM "${MP_REG_UNINSTALL}" "UninstallString"
+ ${If} $MPBaseDir == ""
+ # this fallback should only be enabled until MediaPortal 1.0 is out
+ ReadRegStr $MPBaseDir HKLM "SOFTWARE\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+#!define MP_REG_UNINSTALL "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MediaPortal"
+#!define TV3_REG_UNINSTALL "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MediaPortal TV Server"
+
+ ${If} $MPBaseDir == ""
+ !insertmacro UnselectSection "${SecClient}"
+ ; Make the unselected section read only
+ !insertmacro SetSectionFlag "${SecClient}" 16
+ SectionGetText ${SecClient} $R0
+ SectionSetText ${SecClient} "$R0 ($(TEXT_MP_NOT_INSTALLED))"
+ ${EndIf}
+ ${EndIf}
+ SectionGetFlags `${_b}` $_LOGICLIB_TEMP
+ IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & `${_a}`
+
+ !insertmacro _= $_LOGICLIB_TEMP `${_a}` `${_t}` `${_f}`
+ !macroend
+
+ #!define MPIsInstalled `${SF_SELECTED} SectionFlagIsSet`
+!define MPIsInstalled "!insertmacro _MPIsInstalled"
+ */
+
+
+
+#***************************
+#***************************
+
+Var MyDocs
+Var UserAppData
+Var CommonAppData
+
+Var MPdir.Base
+
+Var MPdir.Config
+Var MPdir.Plugins
+Var MPdir.Log
+Var MPdir.CustomInputDevice
+Var MPdir.CustomInputDefault
+Var MPdir.Skin
+Var MPdir.Language
+Var MPdir.Database
+Var MPdir.Thumbs
+Var MPdir.Weather
+Var MPdir.Cache
+Var MPdir.BurnerSupport
+
+#***************************
+#***************************
+
+!macro GET_PATH_TEXT
+
+ Pop $R0
+
+ ${xml::GotoPath} "/Config" $0
+ ${If} $0 != 0
+ # MessageBox MB_OK "error: xml::GotoPath /Config"
+ Goto error
+ ${EndIf}
+
+ loop:
+
+ ${xml::FindNextElement} "Dir" $0 $1
+ ${If} $1 != 0
+ # MessageBox MB_OK "error: xml::FindNextElement >/Dir< >$0<"
+ Goto error
+ ${EndIf}
+ ;MessageBox MB_OK "xml::FindNextElement$\n$$0=$0$\n$$1=$1"
+
+ ${xml::ElementPath} $0
+ ${xml::GetAttribute} "id" $0 $1
+ ${If} $1 != 0
+ # MessageBox MB_OK "error: xml::GetAttribute >id< >$0<"
+ Goto error
+ ${EndIf}
+ ${IfThen} $0 == $R0 ${|} Goto foundDir ${|}
+
+ Goto loop
+
+
+ foundDir:
+ ${xml::ElementPath} $0
+ ${xml::GotoPath} "$0/Path" $1
+ ${If} $1 != 0
+ # MessageBox MB_OK "error: xml::GotoPath >$0/Path<"
+ Goto error
+ ${EndIf}
+
+ ${xml::GetText} $0 $1
+ ${If} $1 != 0
+ ; maybe the path is only empty, which means MPdir.Base
+ #MessageBox MB_OK "error: xml::GetText"
+ #Goto error
+ StrCpy $0 ""
+ ${EndIf}
+
+ Push $0
+ Goto end
+
+ error:
+ Push "-1"
+
+ end:
+
+!macroend
+Function GET_PATH_TEXT
+ !insertmacro GET_PATH_TEXT
+FunctionEnd
+Function un.GET_PATH_TEXT
+ !insertmacro GET_PATH_TEXT
+FunctionEnd
+
+#***************************
+#***************************
+
+!macro ReadMPdir UNINSTALL_PREFIX DIR
+
+ Push "${DIR}"
+ Call ${UNINSTALL_PREFIX}GET_PATH_TEXT
+ Pop $0
+ ${IfThen} $0 == -1 ${|} Goto error ${|}
+
+ ${${UNINSTALL_PREFIX}WordReplace} "$0" "%APPDATA%" "$UserAppData" "+" $0
+ ${${UNINSTALL_PREFIX}WordReplace} "$0" "%PROGRAMDATA%" "$CommonAppData" "+" $0
+
+ ${${UNINSTALL_PREFIX}GetRoot} "$0" $1
+
+ ${IfThen} $1 == "" ${|} StrCpy $0 "$MPdir.Base\$0" ${|}
+
+ ; TRIM \ AT THE END
+ StrLen $1 "$0"
+ #MessageBox MB_OK "1 $1$\r$\n2 $2$\r$\n3 $3"
+ IntOp $2 $1 - 1
+ #MessageBox MB_OK "1 $1$\r$\n2 $2$\r$\n3 $3"
+ StrCpy $3 $0 1 $2
+ #MessageBox MB_OK "1 $1$\r$\n2 $2$\r$\n3 $3"
+
+ ${If} $3 == "\"
+ StrCpy $MPdir.${DIR} $0 $2
+ ${Else}
+ StrCpy $MPdir.${DIR} $0
+ ${EndIf}
+
+!macroend
+
+#***************************
+#***************************
+
+!macro ReadConfig UNINSTALL_PREFIX
+
+ #MessageBox MB_OK "${UNINSTALL_PREFIX}"
+
+ Pop $0
+ IfFileExists "$0\MediaPortalDirs.xml" 0 error
+
+
+ #${xml::LoadFile} "$EXEDIR\MediaPortalDirsXP.xml" $0
+ ${xml::LoadFile} "$0\MediaPortalDirs.xml" $0
+ ${IfThen} $0 != 0 ${|} Goto error ${|}
+
+ #</Dir> Log CustomInputDevice CustomInputDefault Skin Language Database Thumbs Weather Cache BurnerSupport
+
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Config
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Plugins
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Log
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" CustomInputDevice
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" CustomInputDefault
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Skin
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Language
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Database
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" Thumbs
+ !insertmacro ReadMPdir "${UNINSTALL_PREFIX}" We...
[truncated message content] |
|
From: <che...@us...> - 2008-04-04 06:49:54
|
Revision: 1591
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1591&view=rev
Author: chef_koch
Date: 2008-04-03 23:49:52 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
moved setup files into own directory
added deploy version svn
Added Paths:
-----------
trunk/plugins/IR Server Suite/setup/
trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/setup/setup-AddRemovePage.nsh
trunk/plugins/IR Server Suite/setup/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup/setup-languages.nsh
trunk/plugins/IR Server Suite/setup/setup.nsi
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
trunk/plugins/IR Server Suite/setup-AddRemovePage.nsh
trunk/plugins/IR Server Suite/setup-CommonMPMacros.nsh
trunk/plugins/IR Server Suite/setup-languages.nsh
trunk/plugins/IR Server Suite/setup.nsi
Deleted: trunk/plugins/IR Server Suite/IR Server Suite.nsi.old
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-04-04 06:47:49 UTC (rev 1590)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi.old 2008-04-04 06:49:52 UTC (rev 1591)
@@ -1,996 +0,0 @@
-;======================================
-; IR Server Suite.nsi
-;
-; (C) Copyright Aaron Dinnage, 2008
-;======================================
-!define DEBUG
-
-!ifdef DEBUG
- !define BuildType "Debug"
-!else
- !define BuildType "Release"
-!endif
-
-!include "x64.nsh"
-!include "MUI.nsh"
-
-!define PRODUCT_NAME "IR Server Suite"
-!define PRODUCT_VERSION "1.0.4.2"
-!define PRODUCT_PUBLISHER "and-81"
-!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
-
-Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
-InstallDir ""
-!ifdef DEBUG
- ShowInstDetails show
- ShowUninstDetails show
-!else
- ShowInstDetails hide
- ShowUninstDetails hide
-!endif
-BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
-SetCompressor /SOLID /FINAL lzma
-CRCCheck On
-
-; Variables
-var DIR_INSTALL
-var DIR_MEDIAPORTAL
-var DIR_TVSERVER
-
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
-!insertmacro MUI_PAGE_COMPONENTS
-
-; Main app install path
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
-!insertmacro MUI_PAGE_DIRECTORY
-
-; MediaPortal install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
-!insertmacro MUI_PAGE_DIRECTORY
-
-; TV Server install path
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
-!insertmacro MUI_PAGE_DIRECTORY
-
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-;======================================
-;======================================
-
-!macro initRegKeys
- ${If} ${RunningX64}
-
- SetRegView 64
-
- ${DisableX64FSRedirection}
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${EnableX64FSRedirection}
-
- ${Else}
-
- SetRegView 32
-
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
- ${Endif}
-
- ${Endif}
-
- ${Endif}
-!macroend
-
-;======================================
-;======================================
-
-Function .onInit
-
-!insertmacro initRegKeys
-
-FunctionEnd
-
-;======================================
-
-Function .onInstSuccess
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
-
-StartInputService:
- Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
-
-SkipStartInputService:
-
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreMP
- SectionGetFlags 3 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 4 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 5 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- Abort
-
-EndDirectoryPreMP:
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreTV
- SectionGetFlags 6 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
-
- Abort
-
-EndDirectoryPreTV:
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowApp
- !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowMP
- !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowTV
- !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
- !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
- !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
- !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveApp
- StrCpy $DIR_INSTALL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveMP
- StrCpy $DIR_MEDIAPORTAL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveTV
- StrCpy $DIR_TVSERVER $INSTDIR
-FunctionEnd
-
-;======================================
-
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
-
-Function DumpLog
- Exch $5
- Push $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $6
-
- FindWindow $0 "#32770" "" $HWNDPARENT
- GetDlgItem $0 $0 1016
- StrCmp $0 0 exit
- FileOpen $5 $5 "w"
- StrCmp $5 "" exit
- SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
- System::Alloc ${NSIS_MAX_STRLEN}
- Pop $3
- StrCpy $2 0
- System::Call "*(i, i, i, i, i, i, i, i, i) i \
- (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
- loop: StrCmp $2 $6 done
- System::Call "User32::SendMessageA(i, i, i, i) i \
- ($0, ${LVM_GETITEMTEXT}, $2, r1)"
- System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
- FileWrite $5 "$4$\r$\n"
- IntOp $2 $2 + 1
- Goto loop
- done:
- FileClose $5
- System::Free $1
- System::Free $3
- exit:
- Pop $6
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Pop $0
- Exch $5
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "-Prepare"
-
- DetailPrint "Preparing to install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
-
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
-
-StopInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
-
-SkipStopInputService:
- Sleep 100
-
-SectionEnd
-
-;======================================
-
-Section "-Core"
-
- DetailPrint "Setting up paths and installing core files ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create install directory
- CreateDirectory "$DIR_INSTALL"
-
- ; Write the installation paths into the registry
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
- WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
-
- ; Write documentation
-!ifdef DEBUG
- DetailPrint "Warning: Documentation is not included in debug builds"
-!else
- SetOutPath "$DIR_INSTALL"
- SetOverwrite ifnewer
- File "Documentation\${PRODUCT_NAME}.chm"
-!endif
-
- ; Create app data directories
- CreateDirectory "$APPDATA\${PRODUCT_NAME}"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
-
- ; Copy known set top boxes
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
- SetOverwrite ifnewer
- File /r /x .svn "Set Top Boxes\*.*"
-
- ; Create a start menu shortcut folder
- CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-
-SectionEnd
-
-;======================================
-
-Section "Input Service" SectionInputService
-
- DetailPrint "Installing Input Service ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Installing Input Service
- CreateDirectory "$DIR_INSTALL\Input Service"
- SetOutPath "$DIR_INSTALL\Input Service"
- SetOverwrite ifnewer
- File "Input Service\Input Service\bin\${BuildType}\*.*"
-
- ; Installing Input Service Configuration
- CreateDirectory "$DIR_INSTALL\Input Service Configuration"
- SetOutPath "$DIR_INSTALL\Input Service Configuration"
- SetOverwrite ifnewer
- File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
-
- ; Install IR Server Plugins ...
- DetailPrint "Installing IR Server Plugins ..."
- CreateDirectory "$DIR_INSTALL\IR Server Plugins"
- SetOutPath "$DIR_INSTALL\IR Server Plugins"
- SetOverwrite ifnewer
-
- File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
- File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
- File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
- File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
- File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
- File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
- File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
- File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
- ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
- File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
- ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
- File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
- File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
- ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
- File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
- File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
- File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
- ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
- File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
- File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
- ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
- File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
- File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll"
- ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
- File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
- File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
- File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
- File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
- File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
- File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
- File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
-
- ; Create App Data Folder for IR Server configuration files
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
-
- ; Copy Abstract Remote maps
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
- SetOverwrite ifnewer
- File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
- File "Input Service\Input Service\RemoteTable.xsd"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
-
- ; Launch Input Service
- DetailPrint "Starting Input Service ..."
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
-
-SectionEnd
-
-;======================================
-
-Section "MP Control Plugin" SectionMPControlPlugin
-
- DetailPrint "Installing MP Control Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
-
- ; Write input mapping
- SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
- SetOverwrite ifnewer
- File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!else
-Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
-!endif
-
- DetailPrint "Installing MP Blast Zone Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
-
- ; Write app data
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
- SetOverwrite off
- File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
-
- ; Write skin files
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
- SetOverwrite on
- File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
-
- ; Create Macro folder
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!else
-Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
-!endif
-
- DetailPrint "Installing TV2 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
-
- DetailPrint "Installing TV3 Blaster Plugin ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Write plugin dll
- SetOutPath "$DIR_TVSERVER\Plugins"
- SetOverwrite ifnewer
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
- File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
-
-SectionEnd
-
-;======================================
-
-Section "Translator" SectionTranslator
-
- DetailPrint "Installing Translator ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Translator"
- SetOutPath "$DIR_INSTALL\Translator"
- SetOverwrite ifnewer
- File "Applications\Translator\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
-
- ; Copy in default settings files
- SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
- SetOverwrite ifnewer
- File "Applications\Translator\Default Settings\*.xml"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Tray Launcher" SectionTrayLauncher
-!else
-Section /o "Tray Launcher" SectionTrayLauncher
-!endif
-
- DetailPrint "Installing Tray Launcher ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Translator
- CreateDirectory "$DIR_INSTALL\Tray Launcher"
- SetOutPath "$DIR_INSTALL\Tray Launcher"
- SetOverwrite ifnewer
- File "Applications\Tray Launcher\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "Virtual Remote" SectionVirtualRemote
-
- DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Virtual Remote and Web Remote
- CreateDirectory "$DIR_INSTALL\Virtual Remote"
- SetOutPath "$DIR_INSTALL\Virtual Remote"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\bin\${BuildType}\*.*"
- File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
- File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
-
- ; Installing skins
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote\Skins\*.*"
-
- ; Installing Virtual Remote for Smart Devices
- CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
- SetOverwrite ifnewer
- File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
- File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Virtual Remote"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemote.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote Skin Editor.lnk" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" "" "$DIR_INSTALL\Virtual Remote\VirtualRemoteSkinEditor.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Virtual Remote for Smart Devices.lnk" "$DIR_INSTALL\Virtual Remote\Smart Devices"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Web Remote.lnk" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" "" "$DIR_INSTALL\Virtual Remote\WebRemote.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "IR Blast" SectionIRBlast
-
- DetailPrint "Installing IR Blast ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR Blast"
- SetOutPath "$DIR_INSTALL\IR Blast"
- SetOverwrite ifnewer
- File "Applications\IR Blast (No Window)\bin\${BuildType}\*.*"
- File "Applications\IR Blast\bin\${BuildType}\IRBlast.exe"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "IR File Tool" SectionIRFileTool
-!else
-Section /o "IR File Tool" SectionIRFileTool
-!endif
-
- DetailPrint "Installing IR File Tool ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\IR File Tool"
- SetOutPath "$DIR_INSTALL\IR File Tool"
- SetOverwrite ifnewer
- File "Applications\IR File Tool\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR File Tool"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\IR File Tool.lnk" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" "" "$DIR_INSTALL\IR File Tool\IRFileTool.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Keyboard Relay" SectionKeyboardInputRelay
-!else
-Section /o "Keyboard Relay" SectionKeyboardInputRelay
-!endif
-
- DetailPrint "Installing Keyboard Input Relay ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Keyboard Input Relay"
- SetOutPath "$DIR_INSTALL\Keyboard Input Relay"
- SetOverwrite ifnewer
- File "Applications\Keyboard Input Relay\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Keyboard Input Relay"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" "" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" 0
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Dbox Tuner" SectionDboxTuner
-!else
-Section /o "Dbox Tuner" SectionDboxTuner
-!endif
-
- DetailPrint "Installing Dbox Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\Dbox Tuner"
- SetOutPath "$DIR_INSTALL\Dbox Tuner"
- SetOverwrite ifnewer
- File "Applications\Dbox Tuner\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Dbox Tuner"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "HCW PVR Tuner" SectionHcwPvrTuner
-!else
-Section /o "HCW PVR Tuner" SectionHcwPvrTuner
-!endif
-
- DetailPrint "Installing HCW PVR Tuner ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing IR Server
- CreateDirectory "$DIR_INSTALL\HCW PVR Tuner"
- SetOutPath "$DIR_INSTALL\HCW PVR Tuner"
- SetOverwrite ifnewer
- File "Applications\HCW PVR Tuner\bin\${BuildType}\*.*"
-
-SectionEnd
-
-;======================================
-
-!ifdef DEBUG
-Section "Debug Client" SectionDebugClient
-!else
-Section /o "Debug Client" SectionDebugClient
-!endif
-
- DetailPrint "Installing Debug Client ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Installing Debug Client
- CreateDirectory "$DIR_INSTALL\Debug Client"
- SetOutPath "$DIR_INSTALL\Debug Client"
- SetOverwrite ifnewer
- File "Applications\Debug Client\bin\${BuildType}\*.*"
-
- ; Create folders
- CreateDirectory "$APPDATA\${PRODUCT_NAME}\Debug Client"
-
- ; Create start menu shortcut
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Client.lnk" "$DIR_INSTALL\Debug Client\DebugClient.exe" "" "$DIR_INSTALL\Debug Client\DebugClient.exe" 0
-
-SectionEnd
-
-;======================================
-
-Section "-Complete"
-
- DetailPrint "Completing install ..."
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Create website link file
- WriteIniStr "$DIR_INSTALL\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-
- ; Write the uninstaller
- WriteUninstaller "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Create start menu shortcuts
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
-
- ; Store the install log
- StrCpy $0 "$APPDATA\${PRODUCT_NAME}\Logs\Install.log"
- Push $0
- Call DumpLog
-
- ; Finish
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
-
-; Section descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionInputService} "A windows service that provides access to your IR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPControlPlugin} "Connects to the Input Service to control MediaPortal."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionMPBlastZonePlugin} "Lets you control your IR devices from within the MediaPortal GUI."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV2BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the default MediaPortal TV engine."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTV3BlasterPlugin} "For tuning external channels (on Set Top Boxes) with the MediaPortal TV server."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTranslator} "Control your whole PC."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionTrayLauncher} "Simple tray application to launch an application of your choosing when a particular button is pressed."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionVirtualRemote} "Simulated remote control, works as an application or as a web hosted remote control (with included Web Remote). Also includes a Skin Editor and Smart Device versions of Virtual Remote."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRBlast} "Command line tools for blasting IR codes."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionIRFileTool} "Tool for learning, modifying, testing, correcting and converting IR command files."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionKeyboardInputRelay} "Relays keyboard input to the Input Service to act on keypresses like remote buttons."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDboxTuner} "Command line tuner for Dreambox devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionHcwPvrTuner} "Command line tuner for Hauppauge PVR devices."
- !insertmacro MUI_DESCRIPTION_TEXT ${SectionDebugClient} "Very simple testing tool for troubleshooting input and communications problems."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;======================================
-;======================================
-
-!ifndef DEBUG
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-!endif
-
-
-;======================================
-
-Function un.onInit
-
- !insertmacro initRegKeys
-
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
- Abort
-FunctionEnd
-
-;======================================
-;======================================
-
-Section "Uninstall"
-
- ; Use the all users context
- SetShellVarContext all
-
- ; Kill running Programs
- DetailPrint "Terminating processes ..."
- ExecWait '"taskkill" /F /IM Translator.exe'
- ExecWait '"taskkill" /F /IM TrayLauncher.exe'
- ExecWait '"taskkill" /F /IM WebRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemote.exe'
- ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
- ExecWait '"taskkill" /F /IM IRFileTool.exe'
- ExecWait '"taskkill" /F /IM DebugClient.exe'
- ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
- Sleep 100
-
- ; Uninstall current Input Service ...
- IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
-
-UninstallInputService:
- ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
-
-SkipUninstallInputService:
- Sleep 100
-
- ; Remove files and uninstaller
- DetailPrint "Attempting to remove MediaPortal Blast Zone Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Windows\MPBlastZonePlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal Process Plugin Common Files ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPUtils.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssComms.dll"
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\IrssUtils.dll"
-
- DetailPrint "Attempting to remove MediaPortal Control Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\MPControlPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV2 Plugin ..."
- Delete /REBOOTOK "$DIR_MEDIAPORTAL\Plugins\Process\TV2BlasterPlugin.dll"
-
- DetailPrint "Attempting to remove MediaPortal TV3 Plugin ..."
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\MPUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssComms.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\IrssUtils.dll"
- Delete /REBOOTOK "$DIR_TVSERVER\Plugins\TV3BlasterPlugin.dll"
-
- DetailPrint "Removing Set Top Box presets ..."
- RMDir /R "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
-
- DetailPrint "Removing program files ..."
- RMDir /R /REBOOTOK "$DIR_INSTALL"
-
- DetailPrint "Removing start menu shortcuts ..."
- RMDir /R "$SMPROGRAMS\${PRODUCT_NAME}"
-
- ; Remove registry keys
- DetailPrint "Removing registry keys ..."
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
- DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
-
- ; Remove auto-runs
- DetailPrint "Removing application auto-runs ..."
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tray Launcher"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Translator"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
-
-!ifdef DEBUG
- SetAutoClose false
-!else
- SetAutoClose true
-!endif
-
-SectionEnd
-
-;======================================
-;======================================
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/setup/DeployVersionSVN.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old (from rev 1589, trunk/plugins/IR Server Suite/IR Server Suite.nsi.old)
===================================================================
--- trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old (rev 0)
+++ trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old 2008-04-04 06:49:52 UTC (rev 1591)
@@ -0,0 +1,996 @@
+;======================================
+; IR Server Suite.nsi
+;
+; (C) Copyright Aaron Dinnage, 2008
+;======================================
+!define DEBUG
+
+!ifdef DEBUG
+ !define BuildType "Debug"
+!else
+ !define BuildType "Release"
+!endif
+
+!include "x64.nsh"
+!include "MUI.nsh"
+
+!define PRODUCT_NAME "IR Server Suite"
+!define PRODUCT_VERSION "1.0.4.2"
+!define PRODUCT_PUBLISHER "and-81"
+!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
+
+Name "${PRODUCT_NAME}"
+OutFile "${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
+InstallDir ""
+!ifdef DEBUG
+ ShowInstDetails show
+ ShowUninstDetails show
+!else
+ ShowInstDetails hide
+ ShowUninstDetails hide
+!endif
+BrandingText "${PRODUCT_NAME} by Aaron Dinnage"
+SetCompressor /SOLID /FINAL lzma
+CRCCheck On
+
+; Variables
+var DIR_INSTALL
+var DIR_MEDIAPORTAL
+var DIR_TVSERVER
+
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "Documentation\LICENSE.GPL"
+!insertmacro MUI_PAGE_COMPONENTS
+
+; Main app install path
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
+!insertmacro MUI_PAGE_DIRECTORY
+
+; MediaPortal install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
+!insertmacro MUI_PAGE_DIRECTORY
+
+; TV Server install path
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
+!insertmacro MUI_PAGE_DIRECTORY
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+;======================================
+;======================================
+
+!macro initRegKeys
+ ${If} ${RunningX64}
+
+ SetRegView 64
+
+ ${DisableX64FSRedirection}
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${EnableX64FSRedirection}
+
+ ${Else}
+
+ SetRegView 32
+
+ ; Get IR Server Suite installation directory ...
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
+ ${Endif}
+
+ ; Get MediaPortal installation directory ...
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ${If} $DIR_MEDIAPORTAL == ""
+
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+
+ ${If} $DIR_MEDIAPORTAL == ""
+ StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
+ ${Endif}
+
+ ${Endif}
+
+ ; Get MediaPortal TV Server installation directory ...
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
+ ${If} $DIR_TVSERVER == ""
+
+ ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
+
+ ${If} $DIR_TVSERVER == ""
+ StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
+ ${Endif}
+
+ ${Endif}
+
+ ${Endif}
+!macroend
+
+;======================================
+;======================================
+
+Function .onInit
+
+!insertmacro initRegKeys
+
+FunctionEnd
+
+;======================================
+
+Function .onInstSuccess
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StartInputService SkipStartInputService
+
+StartInputService:
+ Exec '"$DIR_INSTALL\Input Service\Input Service.exe" /start'
+
+SkipStartInputService:
+
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreMP
+ SectionGetFlags 3 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 4 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ SectionGetFlags 5 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
+
+ Abort
+
+EndDirectoryPreMP:
+FunctionEnd
+
+;======================================
+
+Function DirectoryPreTV
+ SectionGetFlags 6 $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
+
+ Abort
+
+EndDirectoryPreTV:
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowApp
+ !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowMP
+ !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryShowTV
+ !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
+ !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
+ !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveApp
+ StrCpy $DIR_INSTALL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveMP
+ StrCpy $DIR_MEDIAPORTAL $INSTDIR
+FunctionEnd
+
+;======================================
+
+Function DirectoryLeaveTV
+ StrCpy $DIR_TVSERVER $INSTDIR
+FunctionEnd
+
+;======================================
+
+!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x102D
+
+Function DumpLog
+ Exch $5
+ Push $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $6
+
+ FindWindow $0 "#32770" "" $HWNDPARENT
+ GetDlgItem $0 $0 1016
+ StrCmp $0 0 exit
+ FileOpen $5 $5 "w"
+ StrCmp $5 "" exit
+ SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+ System::Alloc ${NSIS_MAX_STRLEN}
+ Pop $3
+ StrCpy $2 0
+ System::Call "*(i, i, i, i, i, i, i, i, i) i \
+ (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+ loop: StrCmp $2 $6 done
+ System::Call "User32::SendMessageA(i, i, i, i) i \
+ ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+ System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+ FileWrite $5 "$4$\r$\n"
+ IntOp $2 $2 + 1
+ Goto loop
+ done:
+ FileClose $5
+ System::Free $1
+ System::Free $3
+ exit:
+ Pop $6
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+ Exch $5
+FunctionEnd
+
+;======================================
+;======================================
+
+Section "-Prepare"
+
+ DetailPrint "Preparing to install ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Kill running Programs
+ DetailPrint "Terminating processes ..."
+ ExecWait '"taskkill" /F /IM Translator.exe'
+ ExecWait '"taskkill" /F /IM TrayLauncher.exe'
+ ExecWait '"taskkill" /F /IM WebRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemote.exe'
+ ExecWait '"taskkill" /F /IM VirtualRemoteSkinEditor.exe'
+ ExecWait '"taskkill" /F /IM IRFileTool.exe'
+ ExecWait '"taskkill" /F /IM DebugClient.exe'
+ ExecWait '"taskkill" /F /IM KeyboardInputRelay.exe'
+
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" StopInputService SkipStopInputService
+
+StopInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /stop'
+
+SkipStopInputService:
+ Sleep 100
+
+SectionEnd
+
+;======================================
+
+Section "-Core"
+
+ DetailPrint "Setting up paths and installing core files ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Create install directory
+ CreateDirectory "$DIR_INSTALL"
+
+ ; Write the installation paths into the registry
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "Install_Dir" "$DIR_INSTALL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir" "$DIR_MEDIAPORTAL"
+ WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
+
+ ; Write documentation
+!ifdef DEBUG
+ DetailPrint "Warning: Documentation is not included in debug builds"
+!else
+ SetOutPath "$DIR_INSTALL"
+ SetOverwrite ifnewer
+ File "Documentation\${PRODUCT_NAME}.chm"
+!endif
+
+ ; Create app data directories
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Logs"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\IR Commands"
+
+ ; Copy known set top boxes
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Set Top Boxes"
+ SetOverwrite ifnewer
+ File /r /x .svn "Set Top Boxes\*.*"
+
+ ; Create a start menu shortcut folder
+ CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+
+SectionEnd
+
+;======================================
+
+Section "Input Service" SectionInputService
+
+ DetailPrint "Installing Input Service ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Uninstall current Input Service ...
+ IfFileExists "$DIR_INSTALL\Input Service\Input Service.exe" UninstallInputService SkipUninstallInputService
+
+UninstallInputService:
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /uninstall'
+
+SkipUninstallInputService:
+ Sleep 100
+
+ ; Installing Input Service
+ CreateDirectory "$DIR_INSTALL\Input Service"
+ SetOutPath "$DIR_INSTALL\Input Service"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service\bin\${BuildType}\*.*"
+
+ ; Installing Input Service Configuration
+ CreateDirectory "$DIR_INSTALL\Input Service Configuration"
+ SetOutPath "$DIR_INSTALL\Input Service Configuration"
+ SetOverwrite ifnewer
+ File "Input Service\Input Service Configuration\bin\${BuildType}\*.*"
+
+ ; Install IR Server Plugins ...
+ DetailPrint "Installing IR Server Plugins ..."
+ CreateDirectory "$DIR_INSTALL\IR Server Plugins"
+ SetOutPath "$DIR_INSTALL\IR Server Plugins"
+ SetOverwrite ifnewer
+
+ File "IR Server Plugins\Ads Tech PTV-335 Receiver\bin\${BuildType}\Ads Tech PTV-335 Receiver.*"
+ File "IR Server Plugins\CoolCommand Receiver\bin\${BuildType}\CoolCommand Receiver.*"
+ File "IR Server Plugins\Custom HID Receiver\bin\${BuildType}\Custom HID Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Direct Input Receiver.*"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.DirectInput.dll"
+ File "IR Server Plugins\Direct Input Receiver\bin\${BuildType}\Microsoft.DirectX.dll"
+ File "IR Server Plugins\FusionRemote Receiver\bin\${BuildType}\FusionRemote Receiver.*"
+ File "IR Server Plugins\Girder Plugin\bin\${BuildType}\Girder Plugin.*"
+ File "IR Server Plugins\HCW Receiver\bin\${BuildType}\HCW Receiver.*"
+ File "IR Server Plugins\IgorPlug Receiver\bin\${BuildType}\IgorPlug Receiver.*"
+ ;File "IR Server Plugins\IR501 Receiver\bin\${BuildType}\IR501 Receiver.*"
+ File "IR Server Plugins\IR507 Receiver\bin\${BuildType}\IR507 Receiver.*"
+ ;File "IR Server Plugins\Ira Transceiver\bin\${BuildType}\Ira Transceiver.*"
+ File "IR Server Plugins\IRMan Receiver\bin\${BuildType}\IRMan Receiver.*"
+ File "IR Server Plugins\IRTrans Transceiver\bin\${BuildType}\IRTrans Transceiver.*"
+ ;File "IR Server Plugins\Keyboard Input\bin\${BuildType}\Keyboard Input.*"
+ File "IR Server Plugins\LiveDrive Receiver\bin\${BuildType}\LiveDrive Receiver.*"
+ File "IR Server Plugins\MacMini Receiver\bin\${BuildType}\MacMini Receiver.*"
+ File "IR Server Plugins\Microsoft MCE Transceiver\bin\${BuildType}\Microsoft MCE Transceiver.*"
+ ;File "IR Server Plugins\RC102 Receiver\bin\${BuildType}\RC102 Receiver.*"
+ File "IR Server Plugins\RedEye Blaster\bin\${BuildType}\RedEye Blaster.*"
+ File "IR Server Plugins\Serial IR Blaster\bin\${BuildType}\Serial IR Blaster.*"
+ ;File "IR Server Plugins\Speech Receiver\bin\${BuildType}\Speech Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\Technotrend Receiver.*"
+ File "IR Server Plugins\Technotrend Receiver\bin\${BuildType}\ttBdaDrvApi_Dll.dll"
+ ;File "IR Server Plugins\Tira Transceiver\bin\${BuildType}\Tira Transceiver.*"
+ File "IR Server Plugins\USB-UIRT Transceiver\bin\${BuildType}\USB-UIRT Transceiver.*"
+ File "IR Server Plugins\Wii Remote Receiver\bin\${BuildType}\Wii Remote Receiver.*"
+ File "IR Server Plugins\WiimoteLib\bin\${BuildType}\WiimoteLib.*"
+ File "IR Server Plugins\Windows Message Receiver\bin\${BuildType}\Windows Message Receiver.*"
+ File "IR Server Plugins\WinLirc Transceiver\bin\${BuildType}\WinLirc Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\X10 Transceiver.*"
+ File "IR Server Plugins\X10 Transceiver\bin\${BuildType}\Interop.X10.dll"
+ File "IR Server Plugins\XBCDRC Receiver\bin\${BuildType}\XBCDRC Receiver.*"
+
+ ; Create App Data Folder for IR Server configuration files
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service"
+
+ ; Copy Abstract Remote maps
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Input Service\Abstract Remote Maps"
+ SetOverwrite ifnewer
+ File /r /x .svn "Input Service\Input Service\Abstract Remote Maps\*.*"
+ File "Input Service\Input Service\RemoteTable.xsd"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Input Service Configuration.lnk" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" "" "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe" 0
+
+ ; Launch Input Service
+ DetailPrint "Starting Input Service ..."
+ ExecWait '"$DIR_INSTALL\Input Service\Input Service.exe" /install'
+
+SectionEnd
+
+;======================================
+
+Section "MP Control Plugin" SectionMPControlPlugin
+
+ DetailPrint "Installing MP Control Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Control Plugin\bin\${BuildType}\MPControlPlugin.dll"
+
+ ; Write input mapping
+ SetOutPath "$DIR_MEDIAPORTAL\InputDeviceMappings\defaults"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Control Plugin\InputMapping\MPControlPlugin.xml"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Control Plugin"
+ SetOverwrite ifnewer
+ File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Control Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!else
+Section /o "MP Blast Zone Plugin" SectionMPBlastZonePlugin
+!endif
+
+ DetailPrint "Installing MP Blast Zone Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Windows"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\MP Blast Zone Plugin\bin\${BuildType}\MPBlastZonePlugin.dll"
+
+ ; Write app data
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin"
+ SetOverwrite off
+ File "MediaPortal Plugins\MP Blast Zone Plugin\AppData\Menu.xml"
+
+ ; Write skin files
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ SetOutPath "$DIR_MEDIAPORTAL\Skin\BlueTwo wide"
+ SetOverwrite on
+ File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*"
+
+ ; Create Macro folder
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\MP Blast Zone Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!else
+Section /o "TV2 Blaster Plugin" SectionTV2BlasterPlugin
+!endif
+
+ DetailPrint "Installing TV2 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_MEDIAPORTAL\Plugins\Process"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV2 Blaster Plugin\bin\${BuildType}\TV2BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV2 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section /o "TV3 Blaster Plugin" SectionTV3BlasterPlugin
+
+ DetailPrint "Installing TV3 Blaster Plugin ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Write plugin dll
+ SetOutPath "$DIR_TVSERVER\Plugins"
+ SetOverwrite ifnewer
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\MPUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssComms.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\IrssUtils.dll"
+ File "MediaPortal Plugins\TV3 Blaster Plugin\bin\${BuildType}\TV3BlasterPlugin.dll"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\TV3 Blaster Plugin\Macro"
+
+SectionEnd
+
+;======================================
+
+Section "Translator" SectionTranslator
+
+ DetailPrint "Installing Translator ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Translator"
+ SetOutPath "$DIR_INSTALL\Translator"
+ SetOverwrite ifnewer
+ File "Applications\Translator\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Macro"
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+
+ ; Copy in default settings files
+ SetOutPath "$APPDATA\${PRODUCT_NAME}\Translator\Default Settings"
+ SetOverwrite ifnewer
+ File "Applications\Translator\Default Settings\*.xml"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk" "$DIR_INSTALL\Translator\Translator.exe" "" "$DIR_INSTALL\Translator\Translator.exe" 0
+
+SectionEnd
+
+;======================================
+
+!ifdef DEBUG
+Section "Tray Launcher" SectionTrayLauncher
+!else
+Section /o "Tray Launcher" SectionTrayLauncher
+!endif
+
+ DetailPrint "Installing Tray Launcher ..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Translator
+ CreateDirectory "$DIR_INSTALL\Tray Launcher"
+ SetOutPath "$DIR_INSTALL\Tray Launcher"
+ SetOverwrite ifnewer
+ File "Applications\Tray Launcher\bin\${BuildType}\*.*"
+
+ ; Create folders
+ CreateDirectory "$APPDATA\${PRODUCT_NAME}\Tray Launcher"
+
+ ; Create start menu shortcut
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" "" "$DIR_INSTALL\Tray Launcher\TrayLauncher.exe" 0
+
+SectionEnd
+
+;======================================
+
+Section "Virtual Remote" SectionVirtualRemote
+
+ DetailPrint "Installing Virtual Remote, Skin Editor, Smart Device versions, and Web Remote..."
+
+ ; Use the all users context
+ SetShellVarContext all
+
+ ; Installing Virtual Remote and Web Remote
+ CreateDirectory "$DIR_INSTALL\Virtual Remote"
+ SetOutPath "$DIR_INSTALL\Virtual Remote"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\bin\${BuildType}\*.*"
+ File "Applications\Web Remote\bin\${BuildType}\WebRemote.*"
+ File "Applications\Virtual Remote Skin Editor\bin\${BuildType}\VirtualRemoteSkinEditor.*"
+
+ ; Installing skins
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Skins"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote\Skins\*.*"
+
+ ; Installing Virtual Remote for Smart Devices
+ CreateDirectory "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOutPath "$DIR_INSTALL\Virtual Remote\Smart Devices"
+ SetOverwrite ifnewer
+ File "Applications\Virtual Remote (PocketPC2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (Smartphone2003) Installer\${BuildType}\*.cab"
+ File "Applications\Virtual Remote (WinCE5) Installer\${BuildType}\*.cab"
+
+ ; Create fold...
[truncated message content] |
|
From: <an...@us...> - 2008-04-04 08:49:44
|
Revision: 1595
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1595&view=rev
Author: and-81
Date: 2008-04-04 01:49:40 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Ira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.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/MceDetectionData.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/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Speech Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
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/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/RemoteTable.Designer.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.resx
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/DeviceIoOverlapped.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Icon.ico
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Keyboard.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Mouse.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/Resources.resx
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Microsoft MCE.xml
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="*" name="HcwPvrTuner" type="win32" />
+ <assemblyIdentity name="HcwPvrTuner" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Tune channels with Hauppauge IR Blaster built in to compatible TV Cards</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2008-04-04 08:49:40 UTC (rev 1595)
@@ -55,25 +55,6 @@
<DocumentationFile>
</DocumentationFile>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <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>
- <DebugType>
- </DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
<ItemGroup>
<Reference Include="DevAge.Core, Version=4.10.2845.21697, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
<HintPath>SourceGrid\DevAge.Core.dll</HintPath>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="*" name="IRServer" type="win32" />
+ <assemblyIdentity name="IRServer" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Provides multiple connections for local and network access to a remote control transceiver</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -35,8 +35,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="*" name="KeyboardInputRelay" type="win32" />
+ <assemblyIdentity name="KeyboardInputRelay" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Relays keyboard input to the input service to use like remote button presses</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/MacroScope/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -33,8 +33,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -39,6 +39,7 @@
}
else
{
+ comboBoxComputer.Items.Add("localhost");
comboBoxComputer.Items.AddRange(networkPCs.ToArray());
}
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -6,7 +6,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("IR Server - Sage Setup")]
+[assembly: AssemblyTitle("IR Server Suite - Sage Setup")]
[assembly: AssemblyDescription("Setup the Sage EXE Tuner plugins for use with IR Server Suite")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("and-81")]
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2008-04-04 08:49:40 UTC (rev 1595)
@@ -13,6 +13,7 @@
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
+ <DelaySign>false</DelaySign>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.4.2" processorArchitecture="*" name="SageSetup" type="win32" />
+ <assemblyIdentity name="SageSetup" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Setup the Sage EXE Tuner plugins for use with IR Server Suite</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -23,6 +23,7 @@
#region Variables
string _keyCode = String.Empty;
+ string _deviceName = String.Empty;
DelegateKeyCodeSet _keyCodeSet;
@@ -39,6 +40,15 @@
get { return _keyCode; }
}
+ /// <summary>
+ /// Gets the name of the device that generated the key code.
+ /// </summary>
+ /// <value>The name of the device that generated the key code.</value>
+ public string DeviceName
+ {
+ get { return _deviceName; }
+ }
+
#endregion Properties
#region Constructor
@@ -72,6 +82,8 @@
int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+ _deviceName = deviceName;
+
// TODO: When Abstract Remote Model becomes on by default
//if (deviceName.Equals("Abstract", StringComparison.OrdinalIgnoreCase)
_keyCode = keyCode;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -523,6 +523,7 @@
getKeyCode.ShowDialog(this);
string keyCode = getKeyCode.KeyCode;
+ string deviceName = getKeyCode.DeviceName;
if (String.IsNullOrEmpty(keyCode))
return;
@@ -544,9 +545,16 @@
{
string description = String.Empty;
- // TODO: Get description from Abstract Remote Model ...
- description = keyCode + " button";
+ // TODO: Implement abstract remote button descriptions.
+ if (deviceName.Equals("Abstract", StringComparison.OrdinalIgnoreCase))
+ {
+ switch (keyCode.ToLowerInvariant())
+ {
+ case "Red": description = "Red teletext button"; break;
+ }
+ }
+
map = new ButtonMappingForm(keyCode, description, String.Empty);
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("2011f0d4-cec8-43d2-8678-79f24cd6c517")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("b9084277-405c-48e6-80d1-c0d0e1dae27d")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,7 +30,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/Command/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/CommandProcessor/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/GeneralCommands/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/MediaPortalCommands/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/TestApp/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,7 +30,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Commands/VariableList/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Common/IrssScheduler/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,6 +32,6 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("f3d8dcef-bb5c-4ae6-aa41-d6d11c9a2114")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("db244336-eeac-4789-af94-6fbe53df225f")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -35,7 +35,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("560F8887-A826-40c8-BAB2-022FB7011EEF")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("efdc4eaa-6ccc-4928-a1e7-f4b634780081")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("733bd6d4-9188-4f52-9bc4-9cc03deaef17")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("7b404b6c-e5a5-4d76-b5b6-d71dfd7696fb")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("a50e930e-1653-40d5-ba5a-3c0315868c1b")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("fef45a20-12af-4750-b7fa-8c8b6ea42a15")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:05:53 UTC (rev 1594)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.2")]
-[assembly: AssemblyFileVersion("1.0.4.2")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("2286B6BF-A7F8-4f1a-B72A-764B5002C949")]
Property changes on: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver
___________________________________________________________________
Name: svn:ignore
+ bin
obj
Added: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs 2008-04-04 08:49:40 UTC (rev 1595)
@@ -0,0 +1,502 @@
+namespace InputService.Plugin
+{
+ partial class Configure
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.labelButtonRepeatDelay = new System.Windows.Forms.Label();
+ this.labelButtonHeldDelay = new System.Windows.Forms.Label();
+ this.numericUpDownButtonRepeatDelay = new System.Windows.Forms.NumericUpDown();
+ this.numericUpDownButtonHeldDelay = new System.Windows.Forms.NumericUpDown();
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.groupBoxRemoteTiming = new System.Windows.Forms.GroupBox();
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.numericUpDownKeyHeldDelay = new System.Windows.Forms.NumericUpDown();
+ this.numericUpDownKeyRepeatDelay = new System.Windows.Forms.NumericUpDown();
+ this.checkBoxHandleKeyboardLocal = new System.Windows.Forms.CheckBox();
+ this.checkBoxHandleMouseLocal = new System.Windows.Forms.CheckBox();
+ this.numericUpDownMouseSensitivity = new System.Windows.Forms.NumericUpDown();
+ this.checkBoxEnableRemote = new System.Windows.Forms.CheckBox();
+ this.checkBoxEnableKeyboard = new System.Windows.Forms.CheckBox();
+ this.checkBoxEnableMouse = new System.Windows.Forms.CheckBox();
+ this.checkBoxUseSystemRatesRemote = new System.Windows.Forms.CheckBox();
+ this.checkBoxUseSystemRatesKeyboard = new System.Windows.Forms.CheckBox();
+ this.tabControl = new System.Windows.Forms.TabControl();
+ this.tabPageRemote = new System.Windows.Forms.TabPage();
+ this.tabPageKeyboard = new System.Windows.Forms.TabPage();
+ this.groupBoxKeypressTiming = new System.Windows.Forms.GroupBox();
+ this.labelKeyRepeatDelay = new System.Windows.Forms.Label();
+ this.labelKeyHeldDelay = new System.Windows.Forms.Label();
+ this.tabPageMouse = new System.Windows.Forms.TabPage();
+ this.labelMouseSensitivity = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonRepeatDelay)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonHeldDelay)).BeginInit();
+ this.groupBoxRemoteTiming.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyHeldDelay)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyRepeatDelay)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMouseSensitivity)).BeginInit();
+ this.tabControl.SuspendLayout();
+ this.tabPageRemote.SuspendLayout();
+ this.tabPageKeyboard.SuspendLayout();
+ this.groupBoxKeypressTiming.SuspendLayout();
+ this.tabPageMouse.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // labelButtonRepeatDelay
+ //
+ this.labelButtonRepeatDelay.Location = new System.Drawing.Point(8, 24);
+ this.labelButtonRepeatDelay.Name = "labelButtonRepeatDelay";
+ this.labelButtonRepeatDelay.Size = new System.Drawing.Size(128, 20);
+ this.labelButtonRepeatDelay.TabIndex = 1;
+ this.labelButtonRepeatDelay.Text = "Button repeat delay:";
+ this.labelButtonRepeatDelay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // labelButtonHeldDelay
+ //
+ this.labelButtonHeldDelay.Location = new System.Drawing.Point(8, 56);
+ this.labelButtonHeldDelay.Name = "labelButtonHeldDelay";
+ this.labelButtonHeldDelay.Size = new System.Drawing.Size(128, 20);
+ this.labelButtonHeldDelay.TabIndex = 3;
+ this.labelButtonHeldDelay.Text = "Button held delay:";
+ this.labelButtonHeldDelay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // numericUpDownButtonRepeatDelay
+ //
+ this.numericUpDownButtonRepeatDelay.Increment = new decimal(new int[] {
+ 50,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownButtonRepeatDelay.Location = new System.Drawing.Point(144, 24);
+ this.numericUpDownButtonRepeatDelay.Maximum = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownButtonRepeatDelay.Name = "numericUpDownButtonRepeatDelay";
+ this.numericUpDownButtonRepeatDelay.Size = new System.Drawing.Size(80, 20);
+ this.numericUpDownButtonRepeatDelay.TabIndex = 2;
+ this.numericUpDownButtonRepeatDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.numericUpDownButtonRepeatDelay.ThousandsSeparator = true;
+ this.toolTips.SetToolTip(this.numericUpDownButtonRepeatDelay, "When the button is held this is the time between the first press and the first re" +
+ "peat");
+ this.numericUpDownButtonRepeatDelay.Value = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ //
+ // numericUpDownButtonHeldDelay
+ //
+ this.numericUpDownButtonHeldDelay.Increment = new decimal(new int[] {
+ 50,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownButtonHeldDelay.Location = new System.Drawing.Point(144, 56);
+ this.numericUpDownButtonHeldDelay.Maximum = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownButtonHeldDelay.Name = "numericUpDownButtonHeldDelay";
+ this.numericUpDownButtonHeldDelay.Size = new System.Drawing.Size(80, 20);
+ this.numericUpDownButtonHeldDelay.TabIndex = 4;
+ this.numericUpDownButtonHeldDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.numericUpDownButtonHeldDelay.ThousandsSeparator = true;
+ this.toolTips.SetToolTip(this.numericUpDownButtonHeldDelay, "When the button is held this is the time between repeats");
+ this.numericUpDownButtonHeldDelay.Value = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ //
+ // 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(128, 240);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(64, 24);
+ this.buttonOK.TabIndex = 1;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK...
[truncated message content] |
|
From: <an...@us...> - 2008-04-04 09:02:55
|
Revision: 1596
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1596&view=rev
Author: and-81
Date: 2008-04-04 02:02:48 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Updated Version Numbering Scheme. 1.4.2.0
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.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/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/HcwPvrTuner.exe.manifest 2008-04-04 09:02:48 UTC (rev 1596)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity name="HcwPvrTuner" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
+ <assemblyIdentity name="HcwPvrTuner" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Tune channels with Hauppauge IR Blaster built in to compatible TV Cards</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/HCW PVR Tuner/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2008-04-04 09:02:48 UTC (rev 1596)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity name="IRServer" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
+ <assemblyIdentity name="IRServer" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Provides multiple connections for local and network access to a remote control transceiver</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -35,8 +35,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/KeyboardInputRelay.exe.manifest 2008-04-04 09:02:48 UTC (rev 1596)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity name="KeyboardInputRelay" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
+ <assemblyIdentity name="KeyboardInputRelay" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Relays keyboard input to the input service to use like remote button presses</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest 2008-04-04 09:02:48 UTC (rev 1596)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity name="SageSetup" version="1.0.4.2" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
+ <assemblyIdentity name="SageSetup" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
<description>Setup the Sage EXE Tuner plugins for use with IR Server Suite</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -1212,7 +1212,7 @@
}
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
- MessageBox.Show(this, "Translator\nVersion 1.0.4.2 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ MessageBox.Show(this, "Translator\nVersion 1.4.2.0 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void addProgramToolStripMenuItem_Click(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("2011f0d4-cec8-43d2-8678-79f24cd6c517")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("b9084277-405c-48e6-80d1-c0d0e1dae27d")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,7 +30,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,8 +31,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,6 +30,6 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -34,8 +34,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-04 09:02:48 UTC (rev 1596)
@@ -5,7 +5,7 @@
<H2>What's new?<BR><HR COLOR="RED"></H2>
<!--
-<P>Version 1.0.5.0
+<P>Version 1.5.0.0
<UL>
<LI>Macros: Major overhaul of macro and command structures (WARNING: This breaks compatibility with existing macro files).</LI>
<LI>Macros: Variable assignment, a data stack and conditional execution statements in macros are now available. See documentation for more info.</LI>
@@ -16,7 +16,7 @@
<BR>
-->
-<P>Version 1.0.4.2
+<P>Version 1.4.2.0
<UL>
<LI>MP Control plugin: Fixed Macro command for Multi-Mapping.</LI>
<LI>MCE Remote Receiver: Fixed XP and Replacement driver blasting bug that has existed since October.</LI>
@@ -67,6 +67,7 @@
<LI>Abstract Remote Model: Corrected a bug in the Abstract Remote Map for MP Control Plugin.</LI>
<LI>Run Command: Fixed a Force Focus bug.</LI>
<LI>Misc: Updated SourceGrid component to version 4.11</LI>
+<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2.0</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2008-04-04 09:02:48 UTC (rev 1596)
@@ -24,12 +24,14 @@
<DocumentationFile>bin\Debug\Ads Tech PTV-335 Receiver.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
+ <DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>
+ </DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -54,7 +54,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -53,7 +53,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/CoolCommand Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -10,7 +10,7 @@
[assembly: AssemblyTitle("CoolCommand Receiver")]
[assembly: AssemblyDescription("IR Server Plugin for the Leadtek Winfast CoolCommand Receiver device")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("and-81")]
[assembly: AssemblyProduct("CoolCommandReceiver")]
[assembly: AssemblyCopyright("Aaron Dinnage")]
[assembly: AssemblyTrademark("")]
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("f3d8dcef-bb5c-4ae6-aa41-d6d11c9a2114")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -117,7 +117,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -132,7 +132,7 @@
/// <summary>
/// IR Server plugin version.
/// </summary>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Direct Input Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
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 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -211,7 +211,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("db244336-eeac-4789-af94-6fbe53df225f")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -54,7 +54,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -35,7 +35,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/HcwReceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -51,7 +51,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("560F8887-A826-40c8-BAB2-022FB7011EEF")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("efdc4eaa-6ccc-4928-a1e7-f4b634780081")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -171,7 +171,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR501 Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("733bd6d4-9188-4f52-9bc4-9cc03deaef17")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -161,7 +161,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("7b404b6c-e5a5-4d76-b5b6-d71dfd7696fb")]
Modified: 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.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -56,7 +56,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("a50e930e-1653-40d5-ba5a-3c0315868c1b")]
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 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -218,7 +218,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("fef45a20-12af-4750-b7fa-8c8b6ea42a15")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -158,7 +158,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("2286B6BF-A7F8-4f1a-B72A-764B5002C949")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -322,7 +322,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("78F56C8B-482D-4278-A21B-AB8D07D5E2A2")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -216,7 +216,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Keyboard Input/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -32,7 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -151,7 +151,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/LiveDrive Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -227,7 +227,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
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 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -279,7 +279,7 @@
/// <summary>
/// IR Server plugin version.
/// </summary>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(false)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/Properties/AssemblyInfo.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
[assembly: CLSCompliant(true)]
[assembly: Guid("be1ce0a8-71de-440e-8ba9-9b9d386691a7")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2008-04-04 08:49:40 UTC (rev 1595)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2008-04-04 09:02:48 UTC (rev 1596)
@@ -174,7 +174,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR ...
[truncated message content] |
|
From: <an...@us...> - 2008-04-04 11:30:09
|
Revision: 1600
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1600&view=rev
Author: and-81
Date: 2008-04-04 04:28:11 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Installer improvements
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Build Deploy Release.bat
trunk/plugins/IR Server Suite/setup/setup.nsi
Modified: trunk/plugins/IR Server Suite/Build Deploy Release.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build Deploy Release.bat 2008-04-04 10:07:20 UTC (rev 1599)
+++ trunk/plugins/IR Server Suite/Build Deploy Release.bat 2008-04-04 11:28:11 UTC (rev 1600)
@@ -1,23 +1,2 @@
-rem @ECHO OFF
-
-rem Goto advancedBuild
-
"%ProgramFiles%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild Release "IR Server Suite.sln"
"%ProgramFiles%\NSIS\makensis.exe" setup\setup.nsi
-
-EXIT
-
-:advancedBuild
-
-setup\DeployVersionSVN.exe /svn="%CD%"
-
-"%ProgramFiles%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild Release "IR Server Suite.sln"
-
-setup\DeployVersionSVN.exe /svn="%CD%" /revert
-
-rem these commands are necessary to get the svn revision, to enable them just remove the EXIT one line above
-setup\DeployVersionSVN.exe /svn="%CD%" /GetVersion
-IF NOT EXIST version.txt EXIT
-SET /p version=<version.txt
-DEL version.txt
-"%ProgramFiles%\NSIS\makensis.exe" /DVER_BUILD=%version% setup\setup.nsi
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-04 10:07:20 UTC (rev 1599)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-04 11:28:11 UTC (rev 1600)
@@ -10,39 +10,32 @@
# 2. The xml-plugin from http://nsis.sourceforge.net/XML_plug-in
#
#**********************************************************************************************************#
-!define _DEBUG
-!ifdef _DEBUG
- !define BuildType "Debug"
-!else
- !define BuildType "Release"
-!endif
+!define PRODUCT_NAME "IR Server Suite"
+!define PRODUCT_PUBLISHER "Aaron Dinnage (and-81)"
+!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
-;======================================
-
-!define PRODUCT_NAME "IR Server Suite"
-!define PRODUCT_VERSION "1.0.4.2"
-!define PRODUCT_PUBLISHER "Aaron Dinnage (and-81)"
-!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
-
!define REG_UNINSTALL "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define MEMENTO_REGISTRY_ROOT HKLM
!define MEMENTO_REGISTRY_KEY "${REG_UNINSTALL}"
-; i would suggest to using the last digit for the svn revision number
-; so you can also remove the debug flag becuase you could indicate it by using the VER_BUILD
-; which is set to zero for Release BUILDS
+; VER_BUILD is set to zero for Release builds
!define VER_MAJOR 1
!define VER_MINOR 4
!define VER_REVISION 2
+
!ifndef VER_BUILD
- !define VER_BUILD 0
+ !define VER_BUILD 0
!endif
+
!if ${VER_BUILD} == 0 # it's a stable release
- !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}"
+ !define BuildType "Release"
+ !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}"
!else # it's an svn release
- !define VERSION "debug build ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}"
+ !define BuildType "Debug"
+ !define VERSION "Debug build ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}"
!endif
+
BrandingText "${PRODUCT_NAME} ${VERSION} by ${PRODUCT_PUBLISHER}"
SetCompressor /SOLID /FINAL lzma
@@ -65,17 +58,18 @@
!insertmacro GetParent
;======================================
+
Name "${PRODUCT_NAME}"
-OutFile "..\${PRODUCT_NAME} - ${PRODUCT_VERSION}.exe"
+OutFile "..\${PRODUCT_NAME} - ${VERSION}.exe"
InstallDir ""
#InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
#InstallDirRegKey HKLM "${REG_UNINSTALL}" InstallPath
-!ifdef _DEBUG
- ShowInstDetails show
- ShowUninstDetails show
+!if ${VER_BUILD} != 0
+ ShowInstDetails show
+ ShowUninstDetails show
!else
- ShowInstDetails hide
- ShowUninstDetails hide
+ ShowInstDetails hide
+ ShowUninstDetails hide
!endif
CRCCheck On
@@ -93,13 +87,13 @@
#!define MUI_HEADERIMAGE
#!if ${VER_BUILD} == 0 # it's a stable release
-# !define MUI_HEADERIMAGE_BITMAP "images\header.bmp"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
-# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
+# !define MUI_HEADERIMAGE_BITMAP "images\header.bmp"
+# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
+# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
#!else # it's an svn release
-# !define MUI_HEADERIMAGE_BITMAP "images\header-svn.bmp"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
-# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
+# !define MUI_HEADERIMAGE_BITMAP "images\header-svn.bmp"
+# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
+# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
#!endif
#!define MUI_HEADERIMAGE_RIGHT
@@ -143,8 +137,12 @@
#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
!insertmacro MUI_PAGE_DIRECTORY
-; !!!!! changed the order of the directory pages, to prevent if no mp and no tve3 plugins were selected the page on irserversuite shows the NEXT button but the mpand tve3 pages abort and installation starts
-; no both pages would abort and won't be shown, and irserver suite dir page shows the install button :-)
+; !!!!! changed the order of the directory pages, to prevent if
+; no mp and no tve3 plugins were selected the page on irserversuite
+; shows the NEXT button but the mpand tve3 pages abort and installation starts
+; no both pages would abort and won't be shown, and
+; irserver suite dir page shows the install button :-)
+
; Main app install path
!define MUI_PAGE_HEADER_TEXT "Choose ${PRODUCT_NAME} Location"
!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install ${PRODUCT_NAME}."
@@ -215,7 +213,6 @@
${If} $DIR_MEDIAPORTAL == ""
!insertmacro MP_GET_INSTALL_DIR "$DIR_MEDIAPORTAL"
- #StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
${Endif}
${Endif}
@@ -228,7 +225,6 @@
${If} $DIR_TVSERVER == ""
!insertmacro TVSERVER_GET_INSTALL_DIR "$DIR_TVSERVER"
- #StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
${Endif}
${Endif}
@@ -253,7 +249,6 @@
${If} $DIR_MEDIAPORTAL == ""
!insertmacro MP_GET_INSTALL_DIR "$DIR_MEDIAPORTAL"
- #StrCpy '$DIR_MEDIAPORTAL' '$PROGRAMFILES\Team MediaPortal\MediaPortal'
${Endif}
${Endif}
@@ -266,7 +261,6 @@
${If} $DIR_TVSERVER == ""
!insertmacro TVSERVER_GET_INSTALL_DIR "$DIR_TVSERVER"
- #StrCpy '$DIR_TVSERVER' '$PROGRAMFILES\Team MediaPortal\MediaPortal TV Server'
${Endif}
${Endif}
@@ -325,7 +319,7 @@
WriteRegStr HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir" "$DIR_TVSERVER"
; Write documentation
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
DetailPrint "Warning: Documentation is not included in debug builds"
!else
SetOutPath "$DIR_INSTALL"
@@ -528,7 +522,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "MP Blast Zone Plugin" SectionMPBlastZonePlugin
!else
${MementoUnselectedSection} "MP Blast Zone Plugin" SectionMPBlastZonePlugin
@@ -571,7 +565,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "TV2 Blaster Plugin" SectionTV2BlasterPlugin
!else
${MementoUnselectedSection} "TV2 Blaster Plugin" SectionTV2BlasterPlugin
@@ -702,7 +696,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "Tray Launcher" SectionTrayLauncher
!else
${MementoUnselectedSection} "Tray Launcher" SectionTrayLauncher
@@ -819,7 +813,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "IR File Tool" SectionIRFileTool
!else
${MementoUnselectedSection} "IR File Tool" SectionIRFileTool
@@ -855,7 +849,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "Keyboard Relay" SectionKeyboardInputRelay
!else
${MementoUnselectedSection} "Keyboard Relay" SectionKeyboardInputRelay
@@ -894,7 +888,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "Dbox Tuner" SectionDboxTuner
!else
${MementoUnselectedSection} "Dbox Tuner" SectionDboxTuner
@@ -924,7 +918,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "HCW PVR Tuner" SectionHcwPvrTuner
!else
${MementoUnselectedSection} "HCW PVR Tuner" SectionHcwPvrTuner
@@ -951,7 +945,7 @@
;======================================
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
${MementoSection} "Debug Client" SectionDebugClient
!else
${MementoUnselectedSection} "Debug Client" SectionDebugClient
@@ -1019,7 +1013,7 @@
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
@@ -1031,7 +1025,7 @@
Call DumpLog
; Finish
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
SetAutoClose false
!else
SetAutoClose true
@@ -1077,7 +1071,7 @@
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
DeleteRegKey HKLM "Software\${PRODUCT_NAME}"
-!ifdef _DEBUG
+!if ${VER_BUILD} != 0
SetAutoClose false
!else
SetAutoClose true
@@ -1170,83 +1164,7 @@
FunctionEnd
;======================================
-/*
-Function DirectoryPreMP
- SectionGetFlags 3 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
- SectionGetFlags 4 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- SectionGetFlags 5 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreMP
-
- Abort
-
-EndDirectoryPreMP:
-FunctionEnd
-
-;======================================
-
-Function DirectoryPreTV
- SectionGetFlags 6 $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} EndDirectoryPreTV
-
- Abort
-
-EndDirectoryPreTV:
-FunctionEnd
-;======================================
-
-Function DirectoryShowApp
- !insertmacro MUI_HEADER_TEXT "Choose ${PRODUCT_NAME} Location" "Choose the folder in which to install ${PRODUCT_NAME}."
- #!insertmacro MUI_INNERDIALOG_TEXT 1041 "${PRODUCT_NAME} Folder"
- #!insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_INSTALL"
- #!insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowMP
- !insertmacro MUI_HEADER_TEXT "Choose MediaPortal Location" "Choose the folder in which to install MediaPortal plugins."
- #!insertmacro MUI_INNERDIALOG_TEXT 1041 "MediaPortal Folder"
- #!insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_MEDIAPORTAL"
- #!insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryShowTV
- !insertmacro MUI_HEADER_TEXT "Choose TV Server Location" "Choose the folder in which to install TV Server plugins."
- #!insertmacro MUI_INNERDIALOG_TEXT 1041 "TV Server Folder"
- #!insertmacro MUI_INNERDIALOG_TEXT 1019 "$DIR_TVSERVER"
- #!insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveApp
- StrCpy $DIR_INSTALL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveMP
- StrCpy $DIR_MEDIAPORTAL $INSTDIR
-FunctionEnd
-
-;======================================
-
-Function DirectoryLeaveTV
- StrCpy $DIR_TVSERVER $INSTDIR
-FunctionEnd
-*/
-;======================================
-
!define LVM_GETITEMCOUNT 0x1004
!define LVM_GETITEMTEXT 0x102D
@@ -1306,14 +1224,11 @@
;======================================
;======================================
-!ifndef _DEBUG
Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
FunctionEnd
-!endif
-
;======================================
Function un.onInit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-04 11:59:36
|
Revision: 1601
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1601&view=rev
Author: and-81
Date: 2008-04-04 04:59:15 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Documentation/Input Service/index.html
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Ira Transceiver/IraTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Speech Receiver/SpeechReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs
trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old
Added Paths:
-----------
trunk/plugins/IR Server Suite/Build Deploy Debug.bat
Added: trunk/plugins/IR Server Suite/Build Deploy Debug.bat
===================================================================
--- trunk/plugins/IR Server Suite/Build Deploy Debug.bat (rev 0)
+++ trunk/plugins/IR Server Suite/Build Deploy Debug.bat 2008-04-04 11:59:15 UTC (rev 1601)
@@ -0,0 +1,15 @@
+rem @ECHO OFF
+
+setup\DeployVersionSVN.exe /svn="%CD%"
+
+"%ProgramFiles%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" /rebuild Debug "IR Server Suite.sln"
+
+setup\DeployVersionSVN.exe /svn="%CD%" /revert
+
+rem these commands are necessary to get the svn revision, to enable them just remove the EXIT one line above
+setup\DeployVersionSVN.exe /svn="%CD%" /GetVersion
+
+IF NOT EXIST version.txt EXIT
+SET /p version=<version.txt
+DEL version.txt
+"%ProgramFiles%\NSIS\makensis.exe" /DVER_BUILD=%version% setup\setup.nsi
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Documentation/Input Service/index.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/Input Service/index.html 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/Documentation/Input Service/index.html 2008-04-04 11:59:15 UTC (rev 1601)
@@ -31,7 +31,7 @@
<P><B>Use the Abstract Remote Model</B><BR>
This option enables Abstract Remote Model parsing. This feature converts button presses from a variety of recognised remotes into one common set of buttons. So for example, instead of two different remotes sending "57823" and "abab8238" as the remote button id for the Play button they would both be converted to simply "Play". This simplifies the configuration process but also keeps the initial flexibility of IR Server Suite because any button press that does not map to the Abstract Remote Model will continue to be handled in the old way.<BR>
<BR>
-This feature is disabled by default in Version 1.0.4.2 but will become enabled by default in later versions.</P>
+This feature is disabled by default in Version 1.4.2 but will become enabled by default in later versions.</P>
<P><B>Set Priority:</B><BR>
This option lets you fine tune the process priority of the Input Service. If you find that your PC is running too slowly and remote input is delayed or performance is poor you might find that you will get a response rate increase by increasing the Process Priority of the Input Service.</P>
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-04 11:59:15 UTC (rev 1601)
@@ -67,7 +67,7 @@
<LI>Abstract Remote Model: Corrected a bug in the Abstract Remote Map for MP Control Plugin.</LI>
<LI>Run Command: Fixed a Force Focus bug.</LI>
<LI>Misc: Updated SourceGrid component to version 4.11</LI>
-<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2.0</LI>
+<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Ira Transceiver/IraTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Ira Transceiver/IraTransceiver.cs 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Ira Transceiver/IraTransceiver.cs 2008-04-04 11:59:15 UTC (rev 1601)
@@ -75,7 +75,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Speech Receiver/SpeechReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Speech Receiver/SpeechReceiver.cs 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Speech Receiver/SpeechReceiver.cs 2008-04-04 11:59:15 UTC (rev 1601)
@@ -42,7 +42,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Tira Transceiver/TiraTransceiver.cs 2008-04-04 11:59:15 UTC (rev 1601)
@@ -95,7 +95,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.4.2"; } }
+ public override string Version { get { return "1.4.2.0"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old
===================================================================
--- trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old 2008-04-04 11:28:11 UTC (rev 1600)
+++ trunk/plugins/IR Server Suite/setup/IR Server Suite.nsi.old 2008-04-04 11:59:15 UTC (rev 1601)
@@ -15,7 +15,7 @@
!include "MUI.nsh"
!define PRODUCT_NAME "IR Server Suite"
-!define PRODUCT_VERSION "1.0.4.2"
+!define PRODUCT_VERSION "1.4.2"
!define PRODUCT_PUBLISHER "and-81"
!define PRODUCT_WEB_SITE "http://forum.team-mediaportal.com/mce_replacement_plugin-f165.html"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-05 02:56:43
|
Revision: 1605
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1605&view=rev
Author: and-81
Date: 2008-04-04 19:56:41 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-04 16:08:12 UTC (rev 1604)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-05 02:56:41 UTC (rev 1605)
@@ -67,6 +67,7 @@
<LI>Abstract Remote Model: Corrected a bug in the Abstract Remote Map for MP Control Plugin.</LI>
<LI>Run Command: Fixed a Force Focus bug.</LI>
<LI>Misc: Updated SourceGrid component to version 4.11</LI>
+<LI>New Input Plugin: Added experimental Imon support (thanks to Cybrmage for helping).</LI>
<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-04 16:08:12 UTC (rev 1604)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-05 02:56:41 UTC (rev 1605)
@@ -628,22 +628,23 @@
bool right = false;
bool left = false;
/*
- if (dataBytes[2] & 0x20 != 0) x |= 1 << 7; // sign bit
- if (dataBytes[2] & 0x80 != 0) x |= 1 << 4;
- if (dataBytes[2] & 0x40 != 0) x |= 1 << 3;
- if (dataBytes[3] & 0x08 != 0) x |= 1 << 2;
- if (dataBytes[3] & 0x04 != 0) x |= 1 << 1;
- if (dataBytes[3] & 0x02 != 0) x |= 1;
+ if ((dataBytes[2] & 0x20) != 0) x |= 1 << 7; // sign bit
+ if ((dataBytes[2] & 0x80) != 0) x |= 1 << 4;
+ if ((dataBytes[2] & 0x40) != 0) x |= 1 << 3;
+ if ((dataBytes[3] & 0x08) != 0) x |= 1 << 2;
+ if ((dataBytes[3] & 0x04) != 0) x |= 1 << 1;
+ if ((dataBytes[3] & 0x02) != 0) x |= 1;
- if (dataBytes[1] & 0x10 != 0) y |= 1 << 7; // sign bit
- if (dataBytes[1] & 0x20 != 0) y |= 1 << 4;
- if (dataBytes[2] & 0x08 != 0) y |= 1 << 3;
- if (dataBytes[2] & 0x04 != 0) y |= 1 << 2;
- if (dataBytes[2] & 0x02 != 0) y |= 1 << 1;
- if (dataBytes[2] & 0x01 != 0) y |= 1;
+ if ((dataBytes[1] & 0x10) != 0) y |= 1 << 7; // sign bit
+ if ((dataBytes[1] & 0x20) != 0) y |= 1 << 4;
+ if ((dataBytes[2] & 0x08) != 0) y |= 1 << 3;
+ if ((dataBytes[2] & 0x04) != 0) y |= 1 << 2;
+ if ((dataBytes[2] & 0x02) != 0) y |= 1 << 1;
+ if ((dataBytes[2] & 0x01) != 0) y |= 1;
*/
- //if (dataBytes[1] & 0x80 != 0) right = true;
- //if (dataBytes[1] & 0x40 != 0) left = true;
+
+ if ((dataBytes[3] & 0x40) != 0) right = true;
+ if ((dataBytes[3] & 0x20) != 0) left = true;
MouseEvent(x, y, right, left);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-05 14:15:36
|
Revision: 1606
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1606&view=rev
Author: and-81
Date: 2008-04-05 07:15:34 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Microsoft MCE.xml
trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj
Added Paths:
-----------
trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Imon PAD.xml
trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.exe.manifest
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-05 02:56:41 UTC (rev 1605)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-05 14:15:34 UTC (rev 1606)
@@ -93,6 +93,9 @@
const uint IOCTL_IMON_FW_VER = 0x00222014; // function 0x805 - read FW version (4 bytes)
const uint IOCTL_IMON_READ2 = 0x00222034; // function 0x80D - ??? read (8 bytes)
+ const uint IMON_PAD_BUTTON = 1000;
+ const uint IMON_MCE_BUTTON = 2000;
+
#endregion Constants
#region Enumerations
@@ -241,7 +244,9 @@
uint _lastRemoteButtonKeyCode = 0;
DateTime _lastRemoteButtonTime = DateTime.Now;
bool _remoteButtonRepeated = false;
-
+
+ byte _remoteToggle = 0x00;
+
bool _keyboardKeyRepeated = false;
DateTime _lastKeyboardKeyTime = DateTime.Now;
@@ -584,6 +589,69 @@
#endif
}
+ void ProcessInput(byte[] dataBytes)
+ {
+#if DEBUG
+ DebugWrite("Data Received: ");
+ DebugDump(dataBytes);
+#endif
+
+ if ((dataBytes[0] & 0xFC) == 0x28) // iMon PAD remote button
+ {
+ uint keyCode = IMON_PAD_BUTTON;
+ keyCode |= (uint)((dataBytes[0] & 0x03) << 6);
+ keyCode |= (uint)(dataBytes[1] & 0x30);
+ keyCode |= (uint)((dataBytes[1] & 0x06) << 1);
+ keyCode |= (uint)((dataBytes[2] & 0x80) >> 6);
+
+ if ((dataBytes[2] & 0x40) == 0)
+ {
+ RemoteEvent(keyCode, _remoteToggle != 1);
+ _remoteToggle = 1;
+ }
+ else
+ {
+ _remoteToggle = 0;
+ }
+ }
+ else if ((dataBytes[0] & 0xFC) == 0x68) // iMon PAD mouse move/button
+ {
+ int xSign = (((dataBytes[0] & 0x02) != 0) ? 1 : -1);
+ int ySign = (((dataBytes[0] & 0x01) != 0) ? 1 : -1);
+ int xSize = ((dataBytes[1] & 0x78) >> 3);
+ int ySize = ((dataBytes[2] & 0x78) >> 3);
+
+ bool right = ((dataBytes[1] & 0x04) != 0);
+ bool left = ((dataBytes[1] & 0x01) != 0);
+
+ MouseEvent(xSign * xSize, ySign * ySize, right, left);
+ }
+ else if (dataBytes[7] == 0xAE) // MCE remote button
+ {
+ uint keyCode = IMON_MCE_BUTTON + dataBytes[3];
+
+ RemoteEvent(keyCode, _remoteToggle != dataBytes[2]);
+ _remoteToggle = dataBytes[2];
+ }
+ else if (dataBytes[7] == 0xBE) // MCE Keyboard key press
+ {
+ KeyboardEvent(dataBytes[2], dataBytes[3]);
+ }
+ else if (dataBytes[7] == 0xCE) // MCE Keyboard mouse move/button
+ {
+ int xSign = (dataBytes[2] & 0x20) == 0 ? 1 : -1;
+ int ySign = (dataBytes[1] & 0x10) == 0 ? 1 : -1;
+
+ int xSize = (dataBytes[3] & 0x0F);
+ int ySize = (dataBytes[2] & 0x0F);
+
+ bool right = (dataBytes[3] & 0x40) != 0;
+ bool left = (dataBytes[3] & 0x20) != 0;
+
+ MouseEvent(xSign * xSize, ySign * ySize, right, left);
+ }
+ }
+
void ReceiveThread()
{
#if DEBUG
@@ -607,48 +675,10 @@
byte[] dataBytes = new byte[bytesRead];
Marshal.Copy(deviceBufferPtr, dataBytes, 0, bytesRead);
-#if DEBUG
- DebugWrite("Data Received: ");
- DebugDump(dataBytes);
-#endif
+ if (dataBytes[0] != 0xFF && dataBytes[0] != 0x00)
+ ProcessInput(dataBytes);
- switch (dataBytes[7])
- {
- case 0xAE: // Remote button
- RemoteEvent(dataBytes[3], false);
- break;
-
- case 0xBE: // MCE Keyboard Key
- KeyboardEvent(dataBytes[2], dataBytes[3]);
- break;
-
- case 0xCE: // MCE Keyboard mouse report
- int x = 0;
- int y = 0;
- bool right = false;
- bool left = false;
- /*
- if ((dataBytes[2] & 0x20) != 0) x |= 1 << 7; // sign bit
- if ((dataBytes[2] & 0x80) != 0) x |= 1 << 4;
- if ((dataBytes[2] & 0x40) != 0) x |= 1 << 3;
- if ((dataBytes[3] & 0x08) != 0) x |= 1 << 2;
- if ((dataBytes[3] & 0x04) != 0) x |= 1 << 1;
- if ((dataBytes[3] & 0x02) != 0) x |= 1;
-
- if ((dataBytes[1] & 0x10) != 0) y |= 1 << 7; // sign bit
- if ((dataBytes[1] & 0x20) != 0) y |= 1 << 4;
- if ((dataBytes[2] & 0x08) != 0) y |= 1 << 3;
- if ((dataBytes[2] & 0x04) != 0) y |= 1 << 2;
- if ((dataBytes[2] & 0x02) != 0) y |= 1 << 1;
- if ((dataBytes[2] & 0x01) != 0) y |= 1;
- */
-
- if ((dataBytes[3] & 0x40) != 0) right = true;
- if ((dataBytes[3] & 0x20) != 0) left = true;
-
- MouseEvent(x, y, right, left);
- break;
- }
+ Thread.Sleep(50);
}
}
}
@@ -777,7 +807,7 @@
void KeyboardEvent(uint keyCode, uint modifiers)
{
#if DEBUG
- DebugWriteLine("RemoteEvent: {0}, {1}", keyCode, modifiers);
+ DebugWriteLine("KeyboardEvent: {0}, {1}", keyCode, modifiers);
#endif
if (!_enableKeyboardInput)
Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Imon PAD.xml
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Imon PAD.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Imon PAD.xml 2008-04-05 14:15:34 UTC (rev 1606)
@@ -0,0 +1,58 @@
+<?xml version="1.0" standalone="yes"?>
+<DocumentElement>
+ <RemoteTable RawCode="?1" AbstractButton="Up" />
+ <RemoteTable RawCode="?2" AbstractButton="Down" />
+ <RemoteTable RawCode="?3" AbstractButton="Left" />
+ <RemoteTable RawCode="?4" AbstractButton="Right" />
+ <RemoteTable RawCode="1148" AbstractButton="OK" />
+ <RemoteTable RawCode="1038" AbstractButton="VolumeUp" />
+ <RemoteTable RawCode="1042" AbstractButton="VolumeDown" />
+ <RemoteTable RawCode="1022" AbstractButton="ChannelUp" />
+ <RemoteTable RawCode="1014" AbstractButton="ChannelDown" />
+ <RemoteTable RawCode="1178" AbstractButton="Start" />
+ <RemoteTable RawCode="1032" AbstractButton="Back" />
+ <RemoteTable RawCode="?5" AbstractButton="Info" />
+ <RemoteTable RawCode="1218" AbstractButton="Mute" />
+ <RemoteTable RawCode="1234" AbstractButton="Number0" />
+ <RemoteTable RawCode="1058" AbstractButton="Number1" />
+ <RemoteTable RawCode="1242" AbstractButton="Number2" />
+ <RemoteTable RawCode="1050" AbstractButton="Number3" />
+ <RemoteTable RawCode="1138" AbstractButton="Number4" />
+ <RemoteTable RawCode="1090" AbstractButton="Number5" />
+ <RemoteTable RawCode="1170" AbstractButton="Number6" />
+ <RemoteTable RawCode="1214" AbstractButton="Number7" />
+ <RemoteTable RawCode="1136" AbstractButton="Number8" />
+ <RemoteTable RawCode="1160" AbstractButton="Number9" />
+ <RemoteTable RawCode="1128" AbstractButton="Play" />
+ <RemoteTable RawCode="1144" AbstractButton="Pause" />
+ <RemoteTable RawCode="1220" AbstractButton="Stop" />
+ <RemoteTable RawCode="1192" AbstractButton="FastForward" />
+ <RemoteTable RawCode="1130" AbstractButton="Rewind" />
+ <RemoteTable RawCode="1064" AbstractButton="Record" />
+ <RemoteTable RawCode="1066" AbstractButton="NextChapter" />
+ <RemoteTable RawCode="1208" AbstractButton="PreviousChapter" />
+ <RemoteTable RawCode="1002" AbstractButton="Power" />
+ <RemoteTable RawCode="1016" AbstractButton="Power2" />
+ <RemoteTable RawCode="?6" AbstractButton="Teletext" />
+ <RemoteTable RawCode="?7" AbstractButton="Red" />
+ <RemoteTable RawCode="?8" AbstractButton="Green" />
+ <RemoteTable RawCode="?9" AbstractButton="Yellow" />
+ <RemoteTable RawCode="?10" AbstractButton="Blue" />
+ <RemoteTable RawCode="1252" AbstractButton="Clear" />
+ <RemoteTable RawCode="1034" AbstractButton="Enter" />
+ <RemoteTable RawCode="1096" AbstractButton="Hash" />
+ <RemoteTable RawCode="1056" AbstractButton="Star" />
+ <RemoteTable RawCode="1082" AbstractButton="Music" />
+ <RemoteTable RawCode="1224" AbstractButton="Pictures" />
+ <RemoteTable RawCode="1200" AbstractButton="Videos" />
+ <RemoteTable RawCode="1102" AbstractButton="DVD" />
+ <RemoteTable RawCode="1040" AbstractButton="TV" />
+ <RemoteTable RawCode="?11" AbstractButton="Guide" />
+ <RemoteTable RawCode="?12" AbstractButton="LiveTV" />
+ <RemoteTable RawCode="?13" AbstractButton="Radio" />
+ <RemoteTable RawCode="?14" AbstractButton="Print" />
+ <RemoteTable RawCode="?15" AbstractButton="RecordedTV" />
+ <RemoteTable RawCode="1106" AbstractButton="AspectRatio" />
+ <RemoteTable RawCode="?16" AbstractButton="Print" />
+ <RemoteTable RawCode="?17" AbstractButton="Messenger" />
+</DocumentElement>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Microsoft MCE.xml
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Microsoft MCE.xml 2008-04-05 02:56:41 UTC (rev 1605)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/Imon/Microsoft MCE.xml 2008-04-05 14:15:34 UTC (rev 1606)
@@ -1,58 +1,58 @@
<?xml version="1.0" standalone="yes"?>
<DocumentElement>
- <RemoteTable RawCode="30" AbstractButton="Up" />
- <RemoteTable RawCode="31" AbstractButton="Down" />
- <RemoteTable RawCode="32" AbstractButton="Left" />
- <RemoteTable RawCode="33" AbstractButton="Right" />
- <RemoteTable RawCode="34" AbstractButton="OK" />
- <RemoteTable RawCode="16" AbstractButton="VolumeUp" />
- <RemoteTable RawCode="17" AbstractButton="VolumeDown" />
- <RemoteTable RawCode="18" AbstractButton="ChannelUp" />
- <RemoteTable RawCode="19" AbstractButton="ChannelDown" />
- <RemoteTable RawCode="13" AbstractButton="Start" />
- <RemoteTable RawCode="35" AbstractButton="Back" />
- <RemoteTable RawCode="15" AbstractButton="Info" />
- <RemoteTable RawCode="14" AbstractButton="Mute" />
- <RemoteTable RawCode="0" AbstractButton="Number0" />
- <RemoteTable RawCode="1" AbstractButton="Number1" />
- <RemoteTable RawCode="2" AbstractButton="Number2" />
- <RemoteTable RawCode="3" AbstractButton="Number3" />
- <RemoteTable RawCode="4" AbstractButton="Number4" />
- <RemoteTable RawCode="5" AbstractButton="Number5" />
- <RemoteTable RawCode="6" AbstractButton="Number6" />
- <RemoteTable RawCode="7" AbstractButton="Number7" />
- <RemoteTable RawCode="8" AbstractButton="Number8" />
- <RemoteTable RawCode="9" AbstractButton="Number9" />
- <RemoteTable RawCode="22" AbstractButton="Play" />
- <RemoteTable RawCode="24" AbstractButton="Pause" />
- <RemoteTable RawCode="25" AbstractButton="Stop" />
- <RemoteTable RawCode="20" AbstractButton="FastForward" />
- <RemoteTable RawCode="21" AbstractButton="Rewind" />
- <RemoteTable RawCode="23" AbstractButton="Record" />
- <RemoteTable RawCode="26" AbstractButton="NextChapter" />
- <RemoteTable RawCode="27" AbstractButton="PreviousChapter" />
- <RemoteTable RawCode="101" AbstractButton="Power" />
- <RemoteTable RawCode="12" AbstractButton="Power2" />
- <RemoteTable RawCode="90" AbstractButton="Teletext" />
- <RemoteTable RawCode="91" AbstractButton="Red" />
- <RemoteTable RawCode="92" AbstractButton="Green" />
- <RemoteTable RawCode="93" AbstractButton="Yellow" />
- <RemoteTable RawCode="94" AbstractButton="Blue" />
- <RemoteTable RawCode="10" AbstractButton="Clear" />
- <RemoteTable RawCode="11" AbstractButton="Enter" />
- <RemoteTable RawCode="28" AbstractButton="Hash" />
- <RemoteTable RawCode="29" AbstractButton="Star" />
- <RemoteTable RawCode="71" AbstractButton="Music" />
- <RemoteTable RawCode="73" AbstractButton="Pictures" />
- <RemoteTable RawCode="74" AbstractButton="Videos" />
- <RemoteTable RawCode="36" AbstractButton="DVD" />
- <RemoteTable RawCode="70" AbstractButton="TV" />
- <RemoteTable RawCode="38" AbstractButton="Guide" />
- <RemoteTable RawCode="37" AbstractButton="LiveTV" />
- <RemoteTable RawCode="80" AbstractButton="Radio" />
- <RemoteTable RawCode="78" AbstractButton="Print" />
- <RemoteTable RawCode="72" AbstractButton="RecordedTV" />
- <RemoteTable RawCode="39" AbstractButton="AspectRatio" />
- <RemoteTable RawCode="78" AbstractButton="Print" />
- <RemoteTable RawCode="105" AbstractButton="Messenger" />
+ <RemoteTable RawCode="2030" AbstractButton="Up" />
+ <RemoteTable RawCode="2031" AbstractButton="Down" />
+ <RemoteTable RawCode="2032" AbstractButton="Left" />
+ <RemoteTable RawCode="2033" AbstractButton="Right" />
+ <RemoteTable RawCode="2034" AbstractButton="OK" />
+ <RemoteTable RawCode="2016" AbstractButton="VolumeUp" />
+ <RemoteTable RawCode="2017" AbstractButton="VolumeDown" />
+ <RemoteTable RawCode="2018" AbstractButton="ChannelUp" />
+ <RemoteTable RawCode="2019" AbstractButton="ChannelDown" />
+ <RemoteTable RawCode="2013" AbstractButton="Start" />
+ <RemoteTable RawCode="2035" AbstractButton="Back" />
+ <RemoteTable RawCode="2015" AbstractButton="Info" />
+ <RemoteTable RawCode="2014" AbstractButton="Mute" />
+ <RemoteTable RawCode="2000" AbstractButton="Number0" />
+ <RemoteTable RawCode="2001" AbstractButton="Number1" />
+ <RemoteTable RawCode="2002" AbstractButton="Number2" />
+ <RemoteTable RawCode="2003" AbstractButton="Number3" />
+ <RemoteTable RawCode="2004" AbstractButton="Number4" />
+ <RemoteTable RawCode="2005" AbstractButton="Number5" />
+ <RemoteTable RawCode="2006" AbstractButton="Number6" />
+ <RemoteTable RawCode="2007" AbstractButton="Number7" />
+ <RemoteTable RawCode="2008" AbstractButton="Number8" />
+ <RemoteTable RawCode="2009" AbstractButton="Number9" />
+ <RemoteTable RawCode="2022" AbstractButton="Play" />
+ <RemoteTable RawCode="2024" AbstractButton="Pause" />
+ <RemoteTable RawCode="2025" AbstractButton="Stop" />
+ <RemoteTable RawCode="2020" AbstractButton="FastForward" />
+ <RemoteTable RawCode="2021" AbstractButton="Rewind" />
+ <RemoteTable RawCode="2023" AbstractButton="Record" />
+ <RemoteTable RawCode="2026" AbstractButton="NextChapter" />
+ <RemoteTable RawCode="2027" AbstractButton="PreviousChapter" />
+ <RemoteTable RawCode="2101" AbstractButton="Power" />
+ <RemoteTable RawCode="2012" AbstractButton="Power2" />
+ <RemoteTable RawCode="2090" AbstractButton="Teletext" />
+ <RemoteTable RawCode="2091" AbstractButton="Red" />
+ <RemoteTable RawCode="2092" AbstractButton="Green" />
+ <RemoteTable RawCode="2093" AbstractButton="Yellow" />
+ <RemoteTable RawCode="2094" AbstractButton="Blue" />
+ <RemoteTable RawCode="2010" AbstractButton="Clear" />
+ <RemoteTable RawCode="2011" AbstractButton="Enter" />
+ <RemoteTable RawCode="2028" AbstractButton="Hash" />
+ <RemoteTable RawCode="2029" AbstractButton="Star" />
+ <RemoteTable RawCode="2071" AbstractButton="Music" />
+ <RemoteTable RawCode="2073" AbstractButton="Pictures" />
+ <RemoteTable RawCode="2074" AbstractButton="Videos" />
+ <RemoteTable RawCode="2036" AbstractButton="DVD" />
+ <RemoteTable RawCode="2070" AbstractButton="TV" />
+ <RemoteTable RawCode="2038" AbstractButton="Guide" />
+ <RemoteTable RawCode="2037" AbstractButton="LiveTV" />
+ <RemoteTable RawCode="2080" AbstractButton="Radio" />
+ <RemoteTable RawCode="2078" AbstractButton="Print" />
+ <RemoteTable RawCode="2072" AbstractButton="RecordedTV" />
+ <RemoteTable RawCode="2039" AbstractButton="AspectRatio" />
+ <RemoteTable RawCode="2078" AbstractButton="Print" />
+ <RemoteTable RawCode="2105" AbstractButton="Messenger" />
</DocumentElement>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj 2008-04-05 02:56:41 UTC (rev 1605)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj 2008-04-05 14:15:34 UTC (rev 1606)
@@ -106,6 +106,7 @@
</Content>
</ItemGroup>
<ItemGroup>
+ <Content Include="Abstract Remote Maps\Imon\Imon PAD.xml" />
<Content Include="Abstract Remote Maps\Imon\Microsoft MCE.xml" />
<Content Include="Input Service.exe.manifest">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Added: trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.exe.manifest (rev 0)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.exe.manifest 2008-04-05 14:15:34 UTC (rev 1606)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
+ <assemblyIdentity name="Input Service" version="1.4.2.0" publicKeyToken="dc0b77bf2c754d95" processorArchitecture="msil" />
+ <description>Provides multiple connections for local and network access to attached input devices</description>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-06 09:44:42
|
Revision: 1608
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1608&view=rev
Author: and-81
Date: 2008-04-06 02:44:35 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/0.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/1.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/2.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/3.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/4.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/5.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/6.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/7.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/8.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/9.IR
Added Paths:
-----------
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/#.IR
trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/Prechange.IR
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1717,6 +1717,8 @@
}
void SaveSettings()
{
+ IrssLog.Info("Saving settings ...");
+
try
{
using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
@@ -1759,6 +1761,7 @@
IrssLog.Error(ex);
}
}
+
void CreateDefaultSettings()
{
try
@@ -1768,13 +1771,29 @@
_pluginNameTransmit = String.Empty;
else
_pluginNameTransmit = blasters[0];
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ _pluginNameTransmit = String.Empty;
+ }
+ try
+ {
string[] receivers = Program.DetectReceivers();
if (receivers == null || receivers.Length == 0)
_pluginNameReceive = null;
else
_pluginNameReceive = receivers;
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ _pluginNameReceive = null;
+ }
+ try
+ {
SaveSettings();
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -17,6 +17,9 @@
static class Program
{
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
[STAThread]
static void Main()
{
@@ -83,6 +86,9 @@
string path = Path.Combine(installFolder, "IR Server Plugins");
string[] files = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly);
+
+ // TODO: Return a Type[], don't instantiate unless required
+
foreach (string file in files)
{
try
@@ -94,32 +100,15 @@
{
if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(PluginBase)))
{
- try
- {
- PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
+ PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
- if (plugin != null)
- plugins.Add(plugin);
- }
- catch
- {
- // Ignore this plugin ...
- }
+ 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
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.ToString(), "IR Server Plugin Error");
- }
+ catch (BadImageFormatException) { } // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
+ catch (TypeLoadException) { } // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
}
return plugins.ToArray();
@@ -152,6 +141,8 @@
/// <returns>String array of plugin names.</returns>
internal static string[] DetectReceivers()
{
+ IrssLog.Info("Detect Receivers ...");
+
PluginBase[] plugins = AvailablePlugins();
if (plugins == null || plugins.Length == 0)
return null;
@@ -159,8 +150,17 @@
List<string> receivers = new List<string>();
foreach (PluginBase 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);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
if (receivers.Count > 0)
return receivers.ToArray();
@@ -174,6 +174,8 @@
/// <returns>String array of plugin names.</returns>
internal static string[] DetectBlasters()
{
+ IrssLog.Info("Detect Blasters ...");
+
PluginBase[] plugins = Program.AvailablePlugins();
if (plugins == null || plugins.Length == 0)
return null;
@@ -181,8 +183,17 @@
List<string> blasters = new List<string>();
foreach (PluginBase plugin in plugins)
- if (plugin is ITransmitIR && plugin.Detect())
- blasters.Add(plugin.Name);
+ {
+ try
+ {
+ if (plugin is ITransmitIR && plugin.Detect())
+ blasters.Add(plugin.Name);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
if (blasters.Count > 0)
return blasters.ToArray();
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -454,26 +454,18 @@
}
}
- // Launch program
- using (Process launch = new Process())
- {
- launch.StartInfo.FileName = _programFile;
- launch.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
- launch.StartInfo.UseShellExecute = true;
- launch.Start();
+ string[] launchCommand = new string[] {
+ _programFile,
+ Path.GetDirectoryName(_programFile),
+ String.Empty,
+ Enum.GetName(typeof(ProcessWindowStyle), ProcessWindowStyle.Normal),
+ false.ToString(),
+ true.ToString(),
+ false.ToString(),
+ true.ToString()
+ };
- int attempt = 0;
- while (!launch.HasExited && attempt++ < 50)
- {
- if (launch.MainWindowHandle != IntPtr.Zero)
- {
- Win32.SetForegroundWindow(launch.MainWindowHandle, true);
- break;
- }
-
- Thread.Sleep(500);
- }
- }
+ Common.ProcessRunCommand(launchCommand);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -569,6 +569,8 @@
}
Thread.Sleep(1500);
+
+ title = process.MainWindowTitle;
}
}
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-06 09:44:35 UTC (rev 1608)
@@ -69,6 +69,9 @@
<LI>Misc: Updated SourceGrid component to version 4.11</LI>
<LI>New Input Plugin: Added experimental Imon support (thanks to Cybrmage for helping).</LI>
<LI>Version Numbering: Changed version numbering scheme to use last digit as SVN version number. With zero for release builds. Now Version 1.0.4.2 becomes 1.4.2</LI>
+<LI>Input Service: Fixed some small plugin loading issues.</LI>
+<LI>Imon input plugin: Improved Imon plugin, now supports MCE and Imon PAD remote hardware.</LI>
+<LI>Tray Launcher: Now uses the Common program launching code (includes new focus forcing code).</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.Designer.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -47,8 +47,10 @@
this.checkBoxEnableMouse = new System.Windows.Forms.CheckBox();
this.checkBoxUseSystemRatesRemote = new System.Windows.Forms.CheckBox();
this.checkBoxUseSystemRatesKeyboard = new System.Windows.Forms.CheckBox();
+ this.comboBoxHardwareMode = new System.Windows.Forms.ComboBox();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPageRemote = new System.Windows.Forms.TabPage();
+ this.labelHardwareMode = new System.Windows.Forms.Label();
this.tabPageKeyboard = new System.Windows.Forms.TabPage();
this.groupBoxKeypressTiming = new System.Windows.Forms.GroupBox();
this.labelKeyRepeatDelay = new System.Windows.Forms.Label();
@@ -73,7 +75,7 @@
this.labelButtonRepeatDelay.Location = new System.Drawing.Point(8, 24);
this.labelButtonRepeatDelay.Name = "labelButtonRepeatDelay";
this.labelButtonRepeatDelay.Size = new System.Drawing.Size(128, 20);
- this.labelButtonRepeatDelay.TabIndex = 1;
+ this.labelButtonRepeatDelay.TabIndex = 0;
this.labelButtonRepeatDelay.Text = "Button repeat delay:";
this.labelButtonRepeatDelay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -82,7 +84,7 @@
this.labelButtonHeldDelay.Location = new System.Drawing.Point(8, 56);
this.labelButtonHeldDelay.Name = "labelButtonHeldDelay";
this.labelButtonHeldDelay.Size = new System.Drawing.Size(128, 20);
- this.labelButtonHeldDelay.TabIndex = 3;
+ this.labelButtonHeldDelay.TabIndex = 2;
this.labelButtonHeldDelay.Text = "Button held delay:";
this.labelButtonHeldDelay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -101,7 +103,7 @@
0});
this.numericUpDownButtonRepeatDelay.Name = "numericUpDownButtonRepeatDelay";
this.numericUpDownButtonRepeatDelay.Size = new System.Drawing.Size(80, 20);
- this.numericUpDownButtonRepeatDelay.TabIndex = 2;
+ this.numericUpDownButtonRepeatDelay.TabIndex = 1;
this.numericUpDownButtonRepeatDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.numericUpDownButtonRepeatDelay.ThousandsSeparator = true;
this.toolTips.SetToolTip(this.numericUpDownButtonRepeatDelay, "When the button is held this is the time between the first press and the first re" +
@@ -127,7 +129,7 @@
0});
this.numericUpDownButtonHeldDelay.Name = "numericUpDownButtonHeldDelay";
this.numericUpDownButtonHeldDelay.Size = new System.Drawing.Size(80, 20);
- this.numericUpDownButtonHeldDelay.TabIndex = 4;
+ this.numericUpDownButtonHeldDelay.TabIndex = 3;
this.numericUpDownButtonHeldDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.numericUpDownButtonHeldDelay.ThousandsSeparator = true;
this.toolTips.SetToolTip(this.numericUpDownButtonHeldDelay, "When the button is held this is the time between repeats");
@@ -169,7 +171,7 @@
this.groupBoxRemoteTiming.Location = new System.Drawing.Point(8, 72);
this.groupBoxRemoteTiming.Name = "groupBoxRemoteTiming";
this.groupBoxRemoteTiming.Size = new System.Drawing.Size(232, 88);
- this.groupBoxRemoteTiming.TabIndex = 1;
+ this.groupBoxRemoteTiming.TabIndex = 2;
this.groupBoxRemoteTiming.TabStop = false;
this.groupBoxRemoteTiming.Text = "Remote button timing (in milliseconds)";
//
@@ -324,7 +326,7 @@
this.checkBoxUseSystemRatesRemote.Location = new System.Drawing.Point(8, 40);
this.checkBoxUseSystemRatesRemote.Name = "checkBoxUseSystemRatesRemote";
this.checkBoxUseSystemRatesRemote.Size = new System.Drawing.Size(187, 17);
- this.checkBoxUseSystemRatesRemote.TabIndex = 0;
+ this.checkBoxUseSystemRatesRemote.TabIndex = 1;
this.checkBoxUseSystemRatesRemote.Text = "Use system keyboard rate settings";
this.toolTips.SetToolTip(this.checkBoxUseSystemRatesRemote, "Use the system keyboard repeat rate settings for remote button timing");
this.checkBoxUseSystemRatesRemote.UseVisualStyleBackColor = true;
@@ -342,6 +344,16 @@
this.checkBoxUseSystemRatesKeyboard.UseVisualStyleBackColor = true;
this.checkBoxUseSystemRatesKeyboard.CheckedChanged += new System.EventHandler(this.checkBoxUseSystemRatesKeyboard_CheckedChanged);
//
+ // comboBoxHardwareMode
+ //
+ this.comboBoxHardwareMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxHardwareMode.FormattingEnabled = true;
+ this.comboBoxHardwareMode.Location = new System.Drawing.Point(152, 168);
+ this.comboBoxHardwareMode.Name = "comboBoxHardwareMode";
+ this.comboBoxHardwareMode.Size = new System.Drawing.Size(89, 21);
+ this.comboBoxHardwareMode.TabIndex = 4;
+ this.toolTips.SetToolTip(this.comboBoxHardwareMode, "Choose between MCE and Imon remote types");
+ //
// tabControl
//
this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -358,6 +370,8 @@
//
// tabPageRemote
//
+ this.tabPageRemote.Controls.Add(this.comboBoxHardwareMode);
+ this.tabPageRemote.Controls.Add(this.labelHardwareMode);
this.tabPageRemote.Controls.Add(this.checkBoxUseSystemRatesRemote);
this.tabPageRemote.Controls.Add(this.checkBoxEnableRemote);
this.tabPageRemote.Controls.Add(this.groupBoxRemoteTiming);
@@ -369,6 +383,15 @@
this.tabPageRemote.Text = "Remote";
this.tabPageRemote.UseVisualStyleBackColor = true;
//
+ // labelHardwareMode
+ //
+ this.labelHardwareMode.Location = new System.Drawing.Point(8, 168);
+ this.labelHardwareMode.Name = "labelHardwareMode";
+ this.labelHardwareMode.Size = new System.Drawing.Size(136, 21);
+ this.labelHardwareMode.TabIndex = 3;
+ this.labelHardwareMode.Text = "Hardware mode:";
+ this.labelHardwareMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
// tabPageKeyboard
//
this.tabPageKeyboard.Controls.Add(this.checkBoxUseSystemRatesKeyboard);
@@ -439,15 +462,17 @@
//
// Configure
//
+ this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(272, 273);
+ this.CancelButton = this.buttonCancel;
+ this.ClientSize = new System.Drawing.Size(272, 272);
this.Controls.Add(this.tabControl);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(288, 309);
+ this.MinimumSize = new System.Drawing.Size(280, 306);
this.Name = "Configure";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -498,5 +523,7 @@
private System.Windows.Forms.CheckBox checkBoxEnableMouse;
private System.Windows.Forms.CheckBox checkBoxUseSystemRatesRemote;
private System.Windows.Forms.CheckBox checkBoxUseSystemRatesKeyboard;
+ private System.Windows.Forms.ComboBox comboBoxHardwareMode;
+ private System.Windows.Forms.Label labelHardwareMode;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Configure.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -13,6 +13,12 @@
#region Properties
+ public ImonReceiver.RcMode HardwareMode
+ {
+ get { return (ImonReceiver.RcMode)Enum.Parse(typeof(ImonReceiver.RcMode), comboBoxHardwareMode.SelectedItem as string); }
+ set { comboBoxHardwareMode.SelectedItem = Enum.GetName(typeof(ImonReceiver.RcMode), value); }
+ }
+
public bool EnableRemote
{
get { return checkBoxEnableRemote.Checked; }
@@ -86,6 +92,8 @@
public Configure()
{
InitializeComponent();
+
+ comboBoxHardwareMode.Items.AddRange(Enum.GetNames(typeof(ImonReceiver.RcMode)));
}
#endregion Constructor
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -96,10 +96,43 @@
const uint IMON_PAD_BUTTON = 1000;
const uint IMON_MCE_BUTTON = 2000;
+ static readonly byte[][] SetModeMCE = new byte[][] {
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x02 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x04 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x06 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x08 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0A }
+ };
+
+ static readonly byte[][] SetModeImon = new byte[][] {
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x02 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x04 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x06 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x08 },
+ new byte[] { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0A }
+ };
+
#endregion Constants
#region Enumerations
+ /// <summary>
+ /// Hardware mode (either MCE or Imon).
+ /// </summary>
+ internal enum RcMode
+ {
+ /// <summary>
+ /// Microsoft MCE Mode.
+ /// </summary>
+ Mce,
+ /// <summary>
+ /// Soundgraph Imon Mode.
+ /// </summary>
+ Imon,
+ }
+
[Flags]
enum KeyModifiers
{
@@ -220,6 +253,8 @@
#region Configuration
+ RcMode _hardwareMode = RcMode.Mce;
+
bool _enableRemoteInput = true;
bool _useSystemRatesRemote = false;
int _remoteFirstRepeat = 400;
@@ -353,6 +388,8 @@
Configure config = new Configure();
+ config.HardwareMode = _hardwareMode;
+
config.EnableRemote = _enableRemoteInput;
config.UseSystemRatesForRemote = _useSystemRatesRemote;
config.RemoteRepeatDelay = _remoteFirstRepeat;
@@ -370,6 +407,8 @@
if (config.ShowDialog(owner) == DialogResult.OK)
{
+ _hardwareMode = config.HardwareMode;
+
_enableRemoteInput = config.EnableRemote;
_useSystemRatesRemote = config.UseSystemRatesForRemote;
_remoteFirstRepeat = config.RemoteRepeatDelay;
@@ -433,6 +472,8 @@
if (_deviceHandle.IsInvalid)
throw new Win32Exception(lastError, "Failed to open device");
+ SetHardwareMode(_hardwareMode);
+
_processReceiveThread = true;
_receiveThread = new Thread(new ThreadStart(ReceiveThread));
_receiveThread.Name = "Imon Receive Thread";
@@ -527,6 +568,8 @@
try { doc.Load(ConfigurationFile); }
catch { return; }
+ try { _hardwareMode = (RcMode)Enum.Parse(typeof(RcMode), doc.DocumentElement.Attributes["HardwareMode"].Value); } catch { }
+
try { _enableRemoteInput = bool.Parse(doc.DocumentElement.Attributes["EnableRemoteInput"].Value); } catch {}
try { _useSystemRatesRemote = bool.Parse(doc.DocumentElement.Attributes["UseSystemRatesRemote"].Value); } catch { }
try { _remoteFirstRepeat = int.Parse(doc.DocumentElement.Attributes["RemoteFirstRepeat"].Value); } catch {}
@@ -558,6 +601,8 @@
writer.WriteStartDocument(true);
writer.WriteStartElement("settings"); // <settings>
+ writer.WriteAttributeString("HardwareMode", Enum.GetName(typeof(RcMode), _hardwareMode));
+
writer.WriteAttributeString("EnableRemoteInput", _enableRemoteInput.ToString());
writer.WriteAttributeString("UseSystemRatesRemote", _useSystemRatesRemote.ToString());
writer.WriteAttributeString("RemoteFirstRepeat", _remoteFirstRepeat.ToString());
@@ -577,10 +622,10 @@
writer.WriteEndDocument();
}
}
-#if TRACE
+#if DEBUG
catch (Exception ex)
{
- Trace.WriteLine(ex.ToString());
+ DebugWriteLine(ex.ToString());
}
#else
catch
@@ -592,7 +637,7 @@
void ProcessInput(byte[] dataBytes)
{
#if DEBUG
- DebugWrite("Data Received: ");
+ DebugWriteLine("Data Received:");
DebugDump(dataBytes);
#endif
@@ -751,6 +796,63 @@
}
}
+ void SetHardwareMode(RcMode mode)
+ {
+#if DEBUG
+ DebugWriteLine("SetHardwareMode({0})", Enum.GetName(typeof(RcMode), mode));
+#endif
+
+ int bytesRead;
+
+ IntPtr deviceBufferPtr = IntPtr.Zero;
+
+ try
+ {
+ switch (mode)
+ {
+ case RcMode.Imon:
+ foreach (byte[] send in SetModeImon)
+ {
+ deviceBufferPtr = Marshal.AllocHGlobal(send.Length);
+
+ Marshal.Copy(send, 0, deviceBufferPtr, send.Length);
+ IoControl(IOCTL_IMON_WRITE, deviceBufferPtr, send.Length, IntPtr.Zero, 0, out bytesRead);
+
+ Marshal.FreeHGlobal(deviceBufferPtr);
+ }
+ break;
+
+ case RcMode.Mce:
+ foreach (byte[] send in SetModeMCE)
+ {
+ deviceBufferPtr = Marshal.AllocHGlobal(send.Length);
+
+ Marshal.Copy(send, 0, deviceBufferPtr, send.Length);
+ IoControl(IOCTL_IMON_WRITE, deviceBufferPtr, send.Length, IntPtr.Zero, 0, out bytesRead);
+
+ Marshal.FreeHGlobal(deviceBufferPtr);
+ }
+ break;
+ }
+ }
+#if DEBUG
+ catch (Exception ex)
+ {
+ DebugWriteLine(ex.ToString());
+#else
+ catch
+ {
+#endif
+ if (_deviceHandle != null)
+ CancelIo(_deviceHandle);
+ }
+ finally
+ {
+ if (deviceBufferPtr != IntPtr.Zero)
+ Marshal.FreeHGlobal(deviceBufferPtr);
+ }
+ }
+
void RemoteEvent(uint keyCode, bool firstPress)
{
#if DEBUG
@@ -774,16 +876,16 @@
if (!_remoteButtonRepeated && timeBetween.TotalMilliseconds < firstRepeat)
{
-#if TRACE
- Trace.WriteLine("Skip First Repeat");
+#if DEBUG
+ DebugWriteLine("Skip, First Repeat");
#endif
return;
}
if (_remoteButtonRepeated && timeBetween.TotalMilliseconds < heldRepeats)
{
-#if TRACE
- Trace.WriteLine("Skip Held Repeat");
+#if DEBUG
+ DebugWriteLine("Skip, Held Repeat");
#endif
return;
}
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 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -688,7 +688,7 @@
if (!_remoteButtonRepeated && timeBetween.TotalMilliseconds < firstRepeat)
{
#if TRACE
- Trace.WriteLine("Skip First Repeat");
+ Trace.WriteLine("Skip, First Repeat");
#endif
return;
}
@@ -696,7 +696,7 @@
if (_remoteButtonRepeated && timeBetween.TotalMilliseconds < heldRepeats)
{
#if TRACE
- Trace.WriteLine("Skip Held Repeat");
+ Trace.WriteLine("Skip, Held Repeat");
#endif
return;
}
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -102,6 +102,9 @@
string path = Path.Combine(installFolder, "IR Server Plugins");
string[] files = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly);
+
+ // TODO: Return a Type[], don't instantiate unless required
+
foreach (string file in files)
{
try
@@ -113,28 +116,15 @@
{
if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(PluginBase)))
{
- try
- {
- PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
+ PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
- if (plugin != null)
- plugins.Add(plugin);
- }
- catch
- {
- // Ignore this plugin ...
- }
+ if (plugin != null)
+ plugins.Add(plugin);
}
}
}
- catch (BadImageFormatException)
- {
- // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
- }
- catch (TypeLoadException)
- {
- // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
- }
+ catch (BadImageFormatException) { } // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
+ catch (TypeLoadException) { } // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
}
return plugins.ToArray();
@@ -167,6 +157,8 @@
/// <returns>String array of plugin names.</returns>
internal static string[] DetectReceivers()
{
+ IrssLog.Info("Detect Receivers ...");
+
PluginBase[] plugins = AvailablePlugins();
if (plugins == null || plugins.Length == 0)
return null;
@@ -174,8 +166,17 @@
List<string> receivers = new List<string>();
foreach (PluginBase 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);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
if (receivers.Count > 0)
return receivers.ToArray();
@@ -189,6 +190,8 @@
/// <returns>String array of plugin names.</returns>
internal static string[] DetectBlasters()
{
+ IrssLog.Info("Detect Blasters ...");
+
PluginBase[] plugins = Program.AvailablePlugins();
if (plugins == null || plugins.Length == 0)
return null;
@@ -196,8 +199,17 @@
List<string> blasters = new List<string>();
foreach (PluginBase plugin in plugins)
- if (plugin is ITransmitIR && plugin.Detect())
- blasters.Add(plugin.Name);
+ {
+ try
+ {
+ if (plugin is ITransmitIR && plugin.Detect())
+ blasters.Add(plugin.Name);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
if (blasters.Count > 0)
return blasters.ToArray();
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 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -148,8 +148,17 @@
{
InitializeComponent();
- // Add transceivers to list ...
- _transceivers = Program.AvailablePlugins();
+ try
+ {
+ _transceivers = Program.AvailablePlugins();
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+
+ _transceivers = null;
+ }
+
if (_transceivers == null || _transceivers.Length == 0)
MessageBox.Show(this, "No Input Service Plugins found!", "Input Service Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error);
else
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 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs 2008-04-06 09:44:35 UTC (rev 1608)
@@ -76,9 +76,6 @@
}
catch (Exception ex)
{
-#if TRACE
- Trace.WriteLine(ex.ToString());
-#endif
MessageBox.Show(ex.ToString(), "Error detecting duplicate processes", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
@@ -155,23 +152,20 @@
{
doc.Load(ConfigurationFile);
}
+ catch (DirectoryNotFoundException)
+ {
+ IrssLog.Error("No configuration file found ({0}), folder not found! Creating default configuration file", ConfigurationFile);
+
+ Directory.CreateDirectory(Path.GetDirectoryName(ConfigurationFile));
+
+ CreateDefaultSettings();
+ return;
+ }
catch (FileNotFoundException)
{
IrssLog.Warn("No configuration file found ({0}), creating default configuration file", ConfigurationFile);
- string[] blasters = DetectBlasters();
- if (blasters == null)
- _pluginNameTransmit = String.Empty;
- else
- _pluginNameTransmit = blasters[0];
-
- string[] receivers = DetectReceivers();
- if (receivers == null)
- _pluginNameReceive = null;
- else
- _pluginNameReceive = receivers;
-
- SaveSettings();
+ CreateDefaultSettings();
return;
}
catch (Exception ex)
@@ -253,6 +247,46 @@
}
}
+ static void CreateDefaultSettings()
+ {
+ try
+ {
+ string[] blasters = Program.DetectBlasters();
+ if (blasters == null)
+ _pluginNameTransmit = String.Empty;
+ else
+ _pluginNameTransmit = blasters[0];
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ _pluginNameTransmit = String.Empty;
+ }
+
+ try
+ {
+ string[] receivers = Program.DetectReceivers();
+ if (receivers == null)
+ _pluginNameReceive = null;
+ else
+ _pluginNameReceive = receivers;
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ _pluginNameReceive = null;
+ }
+
+ try
+ {
+ SaveSettings();
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
+
static void RestartService(string serviceName)
{
IrssLog.Info("Restarting service ({0})", serviceName);
@@ -292,57 +326,40 @@
/// <returns>Array of plugin instances.</returns>
internal static PluginBase[] AvailablePlugins()
{
- try
- {
- List<PluginBase> plugins = new List<PluginBase>();
+ List<PluginBase> plugins = new List<PluginBase>();
- string installFolder = SystemRegistry.GetInstallFolder();
- if (String.IsNullOrEmpty(installFolder))
- return null;
+ string installFolder = SystemRegistry.GetInstallFolder();
+ if (String.IsNullOrEmpty(installFolder))
+ return null;
- string path = Path.Combine(installFolder, "IR Server Plugins");
- string[] files = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly);
+ string path = Path.Combine(installFolder, "IR Server Plugins");
+ string[] files = Directory.GetFiles(path, "*.dll", SearchOption.TopDirectoryOnly);
- foreach (string file in files)
+ // TODO: Return a Type[], don't instantiate unless required
+
+ foreach (string file in files)
+ {
+ try
{
- try
+ Assembly assembly = Assembly.LoadFrom(file);
+ Type[] types = assembly.GetExportedTypes();
+
+ foreach (Type type in types)
{
- Assembly assembly = Assembly.LoadFrom(file);
- Type[] types = assembly.GetExportedTypes();
-
- foreach (Type type in types)
+ if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(PluginBase)))
{
- if (type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(PluginBase)))
- {
- PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
+ PluginBase plugin = (PluginBase)assembly.CreateInstance(type.FullName);
- if (plugin != null)
- plugins.Add(plugin);
- }
+ if (plugin != null)
+ plugins.Add(plugin);
}
}
- catch (BadImageFormatException)
- {
- // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
- }
- catch (TypeLoadException)
- {
- // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
- }
}
+ catch (BadImageFormatException) { } // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
+ catch (TypeLoadException) { } // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
+ }
- return plugins.ToArray();
- }
-#if TRACE
- catch (Exception ex)
- {
- Trace.WriteLine("Input Service Configuration: " + ex.ToString());
-#else
- catch
- {
-#endif
- return null;
- }
+ return plugins.ToArray();
}
/// <summary>
@@ -353,30 +370,28 @@
{
IrssLog.Info("Detect Receivers ...");
- try
- {
- PluginBase[] plugins = AvailablePlugins();
+ PluginBase[] plugins = AvailablePlugins();
+ if (plugins == null || plugins.Length == 0)
+ return null;
- List<string> receivers = new List<string>();
+ List<string> receivers = new List<string>();
- foreach (PluginBase plugin in plugins)
+ foreach (PluginBase plugin in plugins)
+ {
+ try
+ {
if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect())
receivers.Add(plugin.Name);
-
- if (receivers.Count > 0)
- return receivers.ToArray();
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
}
-#if TRACE
- catch (Exception ex)
- {
- Trace.WriteLine("Input Service Configuration: " + ex.ToString());
- }
-#else
- catch
- {
- }
-#endif
+ if (receivers.Count > 0)
+ return receivers.ToArray();
+
return null;
}
@@ -388,30 +403,28 @@
{
IrssLog.Info("Detect Blasters ...");
- try
- {
- PluginBase[] plugins = Program.AvailablePlugins();
+ PluginBase[] plugins = Program.AvailablePlugins();
+ if (plugins == null || plugins.Length == 0)
+ return null;
- List<string> blasters = new List<string>();
+ List<string> blasters = new List<string>();
- foreach (PluginBase plugin in plugins)
+ foreach (PluginBase plugin in plugins)
+ {
+ try
+ {
if (plugin is ITransmitIR && plugin.Detect())
blasters.Add(plugin.Name);
-
- if (blasters.Count > 0)
- return blasters.ToArray();
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
}
-#if TRACE
- catch (Exception ex)
- {
- Trace.WriteLine("Input Service Configuration: " + ex.ToString());
- }
-#else
- catch
- {
- }
-#endif
+ if (blasters.Count > 0)
+ return blasters.ToArray();
+
return null;
}
Added: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/#.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/#.IR (rev 0)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/#.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -0,0 +1 @@
+0000 006F 000A 0000 0022 0020 0022 0020 0041 0041 0043 003F 0043 0020 0022 0041 0022 0020 0022 0020 0043 0020 0022 0D1D
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/0.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/0.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/0.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0000
\ No newline at end of file
+0000 006F 000B 0000 0020 0022 0020 0022 0041 0041 0041 0041 0043 0020 0022 0020 0022 0020 0022 0022 0020 0022 0020 0022 0020 0D1D
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/1.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/1.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/1.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0001
\ No newline at end of file
+0000 006F 000B 0000 0020 0020 0022 0020 0043 0041 0041 0041 0043 0020 0022 0020 0022 0020 0022 0020 0022 0020 0022 0041 0022 0CFD
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/2.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/2.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/2.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0002
\ No newline at end of file
+0000 006F 000A 0000 0020 0022 0041 0020 0022 0043 003F 0043 003F 0022 0022 0022 0020 0020 0022 0022 0020 0043 003F 0D21
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/3.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/3.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/3.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0003
\ No newline at end of file
+0000 0070 000B 0000 001F 0021 0041 0021 001F 0041 0041 0043 0041 001F 0021 001F 0021 0021 001F 0021 001F 0041 0021 0021 001F 0CE0
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/4.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/4.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/4.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0004
\ No newline at end of file
+0000 006F 000A 0000 0020 0022 0041 0022 0020 0043 0041 0041 0041 0022 0020 0022 0020 0022 0020 0043 0041 0020 0022 0D1D
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/5.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/5.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/5.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0005
\ No newline at end of file
+0000 006F 000A 0000 0020 0022 0041 0020 0022 0041 0041 0041 0043 0020 0022 0020 0022 0020 0022 0041 0041 0041 0022 0CFF
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/6.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/6.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/6.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0006
\ No newline at end of file
+0000 006F 000A 0000 0020 0022 0041 0022 0020 0041 0041 0043 0041 0020 0022 0020 0022 0020 0022 0041 0022 0020 0041 0D1F
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/7.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/7.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/7.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0007
\ No newline at end of file
+0000 006F 000B 0000 0020 0022 0041 0020 0022 0041 0041 0041 0041 0022 0022 0020 0022 0020 0022 0041 0022 0020 0022 0020 0022 0CFC
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/8.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/8.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/8.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0008
\ No newline at end of file
+0000 006E 000A 0000 0020 0020 0022 0022 0042 0042 0042 0044 0042 0020 0022 0020 0022 0042 0042 0022 0020 0022 0020 0EB8
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/9.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/9.IR 2008-04-05 18:04:30 UTC (rev 1607)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/9.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -1 +1 @@
-5000 0073 0000 0001 000A 0009
\ No newline at end of file
+0000 006F 000A 0000 0020 0022 0041 0020 0022 0041 0041 0041 0041 0022 0022 0020 0022 0041 0041 0022 0020 0041 0022 0CFF
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/Prechange.IR
===================================================================
--- trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/Prechange.IR (rev 0)
+++ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/Prechange.IR 2008-04-06 09:44:35 UTC (rev 1608)
@@ -0,0 +1 @@
+0000 006F 0009 0000 0041 0020 0022 0020 0022 0041 0041 0043 0041 0041 0041 0041 0022 0020 0022 0020 0041 0D23
\ 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...> - 2008-04-07 07:25:19
|
Revision: 1612
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1612&view=rev
Author: and-81
Date: 2008-04-07 00:25:08 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Documentation/new.html
trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.IO;
@@ -62,6 +63,7 @@
#region Variables
+ Container _container;
NotifyIcon _notifyIcon;
bool _inConfiguration;
@@ -96,7 +98,9 @@
public IRServer()
{
// Setup taskbar icon
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
_notifyIcon.ContextMenuStrip.Items.Add(new ToolStripLabel("IR Server"));
@@ -140,8 +144,12 @@
StopServer();
StopClient();
+ _notifyIcon.Visible = false;
_notifyIcon.Dispose();
_notifyIcon = null;
+
+ _container.Dispose();
+ _container = null;
}
// Free native resources ...
Modified: trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -164,6 +164,7 @@
#region Variables
+ static Container _container;
static NotifyIcon _notifyIcon;
static bool _stealAppCommands = true;
@@ -411,7 +412,8 @@
static void SetupNotify()
{
// Setup notify icon ...
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.Icon = Properties.Resources.Icon;
_notifyIcon.Text = "Keyboard Input Relay - Connecting ...";
Modified: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -124,7 +124,7 @@
Marshal.Copy(lpData, dataBytes, 0, dataStructure.cbData);
string strData = Encoding.Default.GetString(dataBytes);
- Program.ProcessCommand(strData, true);
+ Program.ProcessCommand(strData, false);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -38,6 +38,7 @@
#region Components
+ static Container _container;
static NotifyIcon _notifyIcon;
static MainForm _mainForm;
static Client _client;
@@ -161,7 +162,8 @@
*/
// Setup notify icon ...
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
_notifyIcon.Icon = Properties.Resources.Icon16Connecting;
_notifyIcon.Text = "Translator - Connecting ...";
@@ -228,9 +230,16 @@
_inConfiguration = false;
}
-
+
+ // Dispose NotifyIcon ...
_notifyIcon.Visible = false;
+ _notifyIcon.Dispose();
+ _notifyIcon = null;
+ // Dispose Container ...
+ _container.Dispose();
+ _container = null;
+
Application.ThreadException -= new ThreadExceptionEventHandler(Application_ThreadException);
IrssLog.Close();
@@ -388,7 +397,6 @@
MapEvent(MappingEvent.PC_Shutdown);
break;
}
-
}
internal static void UpdateNotifyMenu()
@@ -1247,7 +1255,7 @@
if (!_notifyIcon.Visible)
{
_notifyIcon.Visible = true;
- _notifyIcon.ShowBalloonTip(1000, "Translator", "Icon is now visible", ToolTipIcon.Info);
+ _notifyIcon.ShowBalloonTip(2000, "Translator", "Icon is now visible", ToolTipIcon.Info);
}
}
else
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -42,6 +42,7 @@
bool _launchOnLoad;
string _launchKeyCode;
+ Container _container;
NotifyIcon _notifyIcon;
bool _inConfiguration;
@@ -74,7 +75,9 @@
contextMenu.Items.Add(new ToolStripMenuItem("&Setup", null, new EventHandler(ClickSetup)));
contextMenu.Items.Add(new ToolStripMenuItem("&Quit", null, new EventHandler(ClickQuit)));
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.ContextMenuStrip = contextMenu;
_notifyIcon.DoubleClick += new EventHandler(ClickSetup);
Modified: trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Applications/Web Remote/Program.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.IO;
@@ -37,7 +38,8 @@
#endregion Constants
#region Variables
-
+
+ static Container _container;
static NotifyIcon _notifyIcon;
static bool _inConfiguration;
@@ -145,7 +147,8 @@
contextMenu.Items.Add(new ToolStripMenuItem("&Setup", null, new EventHandler(ClickSetup)));
contextMenu.Items.Add(new ToolStripMenuItem("&Quit", null, new EventHandler(ClickQuit)));
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.ContextMenuStrip = contextMenu;
_notifyIcon.DoubleClick += new EventHandler(ClickSetup);
_notifyIcon.Icon = Properties.Resources.Icon;
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -505,24 +505,8 @@
// Give new process focus ...
if (forceFocus && !process.StartInfo.CreateNoWindow && process.StartInfo.WindowStyle != ProcessWindowStyle.Hidden)
{
- Thread focusForcer = new Thread(new ParameterizedThreadStart(FocusForcer));
- focusForcer.Name = String.Format("Focus Forcer: {0}", process.MainWindowTitle);
- focusForcer.IsBackground = true;
- focusForcer.Start(process.Id);
-
- /*
- int attempt = 0;
- while (!process.HasExited && attempt++ < 50)
- {
- if (process.MainWindowHandle != IntPtr.Zero)
- {
- Win32.SetForegroundWindow(process.MainWindowHandle, true);
- break;
- }
-
- Thread.Sleep(500);
- }
- */
+ FocusForcer forcer = new FocusForcer(process.Id);
+ forcer.Start();
}
if (waitForExit)
@@ -530,50 +514,6 @@
}
}
-
-
- static void FocusForcer(object processObj)
- {
- int processId = (int)processObj;
-
- Process process = Process.GetProcessById(processId);
-
- if (process == null)
- throw new ArgumentException("Argument is not a Process object", "processObj");
-
- process.WaitForInputIdle(15000);
-
- string title = String.Empty;
-
-
- for (int i = 0; i < 30 && String.IsNullOrEmpty(title = process.MainWindowTitle) && process != null && !process.HasExited; i++)
- Thread.Sleep(1000);
-
- if (String.IsNullOrEmpty(title) || process == null || process.HasExited)
- return;
-
- IntPtr windowHandle;
-
- while ((windowHandle = Win32.FindWindowByTitle(title)) != IntPtr.Zero)
- {
- IntPtr focused = Win32.ForegroundWindow();
-
- string focusedTitle = Win32.GetWindowTitle(focused);
-
- //Trace.WriteLine(String.Format("Focused: {0}", focused.ToInt32()));
-
- if (!title.Equals(focusedTitle, StringComparison.Ordinal) && !Win32.IsWindowChild(windowHandle, focused) && Win32.GetParentWindow(focused) != windowHandle)
- {
- Win32.SetForegroundWindow(windowHandle, true);
- //Trace.WriteLine(String.Format("Give focus to {0}", windowHandle.ToInt32()));
- }
-
- Thread.Sleep(1500);
-
- title = process.MainWindowTitle;
- }
- }
-
/// <summary>
/// Given a split Serial Command this method will send the command over the serial port according to the command structure supplied.
/// </summary>
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-07 07:25:08 UTC (rev 1612)
@@ -21,7 +21,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -44,6 +44,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -56,6 +57,7 @@
<Compile Include="Exceptions\CommandStructureException.cs" />
<Compile Include="Exceptions\CommandExecutionException.cs" />
<Compile Include="Exceptions\MacroStructureException.cs" />
+ <Compile Include="FocusForcer.cs" />
<Compile Include="Forms\BlastCommand.cs">
<SubType>Form</SubType>
</Compile>
Modified: trunk/plugins/IR Server Suite/Documentation/new.html
===================================================================
--- trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Documentation/new.html 2008-04-07 07:25:08 UTC (rev 1612)
@@ -72,6 +72,7 @@
<LI>Input Service: Fixed some small plugin loading issues.</LI>
<LI>Imon input plugin: Improved Imon plugin, now supports MCE and Imon PAD remote hardware.</LI>
<LI>Tray Launcher: Now uses the Common program launching code (includes new focus forcing code).</LI>
+<LI>Translator: Fixed a bug with the tray icon not re-appearing correctly after being hidden.</LI>
</UL></P>
<BR>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Imon Receiver/Imon Receiver.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -280,7 +280,7 @@
DateTime _lastRemoteButtonTime = DateTime.Now;
bool _remoteButtonRepeated = false;
- byte _remoteToggle = 0x00;
+ byte _remoteToggle = 0;
bool _keyboardKeyRepeated = false;
DateTime _lastKeyboardKeyTime = DateTime.Now;
@@ -644,12 +644,12 @@
if ((dataBytes[0] & 0xFC) == 0x28) // iMon PAD remote button
{
uint keyCode = IMON_PAD_BUTTON;
- keyCode |= (uint)((dataBytes[0] & 0x03) << 6);
- keyCode |= (uint)(dataBytes[1] & 0x30);
- keyCode |= (uint)((dataBytes[1] & 0x06) << 1);
- keyCode |= (uint)((dataBytes[2] & 0x80) >> 6);
+ keyCode += (uint)((dataBytes[0] & 0x03) << 6);
+ keyCode += (uint)(dataBytes[1] & 0x30);
+ keyCode += (uint)((dataBytes[1] & 0x06) << 1);
+ keyCode += (uint)((dataBytes[2] & 0xC0) >> 6);
- if ((dataBytes[2] & 0x40) == 0)
+ if ((keyCode & 0x01) == 0 && (dataBytes[2] & 0x40) == 0)
{
RemoteEvent(keyCode, _remoteToggle != 1);
_remoteToggle = 1;
@@ -722,8 +722,6 @@
if (dataBytes[0] != 0xFF && dataBytes[0] != 0x00)
ProcessInput(dataBytes);
-
- Thread.Sleep(50);
}
}
}
Modified: trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs 2008-04-06 15:12:22 UTC (rev 1611)
+++ trunk/plugins/IR Server Suite/Media Center Plugins/Media Center Connection/Tray.cs 2008-04-07 07:25:08 UTC (rev 1612)
@@ -54,7 +54,8 @@
static string _learnIRFilename;
static IRServerInfo _irServerInfo = new IRServerInfo();
-
+
+ static Container _container;
static NotifyIcon _notifyIcon;
static MediaState _mediaState;
@@ -134,7 +135,8 @@
contextMenu.Items.Add(new ToolStripMenuItem("&Setup", null, new EventHandler(ClickSetup)));
contextMenu.Items.Add(new ToolStripMenuItem("&Quit", null, new EventHandler(ClickQuit)));
- _notifyIcon = new NotifyIcon();
+ _container = new Container();
+ _notifyIcon = new NotifyIcon(_container);
_notifyIcon.ContextMenuStrip = contextMenu;
_notifyIcon.DoubleClick += new EventHandler(ClickSetup);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-07 16:16:57
|
Revision: 1615
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1615&view=rev
Author: and-81
Date: 2008-04-07 09:16:50 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.resx
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/Config.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Girder Plugin/GirderPluginWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Plugins/HCW Receiver/IrRemoteWrapper.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
trunk/plugins/IR Server Suite/setup/setup-languages.nsh
trunk/plugins/IR Server Suite/setup/setup.nsi
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/ExternalChannelConfig.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.resx
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.Designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.resx
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.resx
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/StbSetup.Designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/StbSetup.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/StbSetup.resx
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Icon.ico
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Icon16.ico
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Icon16Connecting.ico
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Icon32.ico
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Program.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Properties/
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Properties/Resources.resx
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/MSASState.dll
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/MSASState.dll.config
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/MSASState.reg
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/MediaState.dll
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/References/MemMapFile.dll
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Tray.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/Media Center Plugins/
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-04-07 13:24:03 UTC (rev 1614)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -107,8 +107,9 @@
}
}
}
- catch (BadImageFormatException) { } // Ignore Bad Image Format Exceptions, just keep checking for Input Service Plugins
- catch (TypeLoadException) { } // Ignore Type Load Exceptions, just keep checking for Input Service Plugins
+ 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
+ catch (FileNotFoundException) { } // Ignore File Not Found Exceptions, just keep checking for IR Server Plugins
}
return plugins.ToArray();
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/ExternalChannelConfig.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/ExternalChannelConfig.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/ExternalChannelConfig.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,302 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+namespace MediaCenterBlaster
+{
+
+ /// <summary>
+ /// External Channel Changing configuration file for tuning Set Top Boxes.
+ /// </summary>
+ public class ExternalChannelConfig
+ {
+
+ #region Constants
+
+ const int DefaultCardID = 0;
+
+ const int DefaultPauseTime = 500;
+ const bool DefaultSendSelect = false;
+ const bool DefaultDoubleChannelSelect = false;
+ const int DefaultRepeatChannelCommands = 0;
+ const int DefaultChannelDigits = 0;
+ const int DefaultRepeatPauseTime = 2000;
+ const bool DefaultUsePreChangeCommand = false;
+
+ #endregion Constants
+
+ #region Variables
+
+ string _fileName;
+
+ int _cardID;
+
+ int _pauseTime;
+ bool _sendSelect;
+ bool _doubleChannelSelect;
+ int _repeatChannelCommands;
+ int _channelDigits;
+ int _repeatPauseTime;
+ bool _usePreChangeCommand;
+
+ string _selectCommand;
+ string _preChangeCommand;
+ string[] _digits;
+
+ #endregion Variables
+
+ #region Properties
+
+ /// <summary>
+ /// Gets the name of the file used to store this configuration.
+ /// </summary>
+ /// <value>The name of the file.</value>
+ public string FileName
+ {
+ get { return _fileName; }
+ }
+
+ /// <summary>
+ /// Gets or sets the card id.
+ /// </summary>
+ /// <value>The card id.</value>
+ public int CardId
+ {
+ get { return _cardID; }
+ set { _cardID = value; }
+ }
+
+ /// <summary>
+ /// Gets or sets the pause time.
+ /// </summary>
+ /// <value>The pause time.</value>
+ public int PauseTime
+ {
+ get { return _pauseTime; }
+ set { _pauseTime = value; }
+ }
+ /// <summary>
+ /// Gets or sets a value indicating whether to send a select command.
+ /// </summary>
+ /// <value><c>true</c> if send select; otherwise, <c>false</c>.</value>
+ public bool SendSelect
+ {
+ get { return _sendSelect; }
+ set { _sendSelect = value; }
+ }
+ /// <summary>
+ /// Gets or sets a value indicating whether to send the select command twice.
+ /// </summary>
+ /// <value><c>true</c> if sending channel select twice; otherwise, <c>false</c>.</value>
+ public bool DoubleChannelSelect
+ {
+ get { return _doubleChannelSelect; }
+ set { _doubleChannelSelect = value; }
+ }
+ /// <summary>
+ /// Gets or sets the flag to repeat channel commands.
+ /// </summary>
+ /// <value>The flag to repeat channel commands.</value>
+ public int RepeatChannelCommands
+ {
+ get { return _repeatChannelCommands; }
+ set { _repeatChannelCommands = value; }
+ }
+ /// <summary>
+ /// Gets or sets the channel digit count.
+ /// </summary>
+ /// <value>The number of channel digits.</value>
+ public int ChannelDigits
+ {
+ get { return _channelDigits; }
+ set { _channelDigits = value; }
+ }
+ /// <summary>
+ /// Gets or sets the pause time between repeats.
+ /// </summary>
+ /// <value>The repeat pause time.</value>
+ public int RepeatPauseTime
+ {
+ get { return _repeatPauseTime; }
+ set { _repeatPauseTime = value; }
+ }
+ /// <summary>
+ /// Gets or sets a value indicating whether to use a pre-change command.
+ /// </summary>
+ /// <value>
+ /// <c>true</c> if using a pre-change command; otherwise, <c>false</c>.
+ /// </value>
+ public bool UsePreChangeCommand
+ {
+ get { return _usePreChangeCommand; }
+ set { _usePreChangeCommand = value; }
+ }
+
+ /// <summary>
+ /// Gets or sets the digit commands.
+ /// </summary>
+ /// <value>The digit commands.</value>
+ public string[] Digits
+ {
+ get { return _digits; }
+ set { _digits = value; }
+ }
+ /// <summary>
+ /// Gets or sets the select command.
+ /// </summary>
+ /// <value>The select command.</value>
+ public string SelectCommand
+ {
+ get { return _selectCommand; }
+ set { _selectCommand = value; }
+ }
+ /// <summary>
+ /// Gets or sets the pre-change command.
+ /// </summary>
+ /// <value>The pre-change command.</value>
+ public string PreChangeCommand
+ {
+ get { return _preChangeCommand; }
+ set { _preChangeCommand = value; }
+ }
+
+ #endregion Properties
+
+ #region Constructor
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ExternalChannelConfig"/> class.
+ /// </summary>
+ /// <param name="fileName">Name of the configuration file.</param>
+ public ExternalChannelConfig(string fileName)
+ {
+ _fileName = fileName;
+
+ _cardID = DefaultCardID;
+
+ _pauseTime = DefaultPauseTime;
+ _sendSelect = DefaultSendSelect;
+ _doubleChannelSelect = DefaultDoubleChannelSelect;
+ _repeatChannelCommands = DefaultRepeatChannelCommands;
+ _channelDigits = DefaultChannelDigits;
+ _repeatPauseTime = DefaultRepeatPauseTime;
+ _usePreChangeCommand = DefaultUsePreChangeCommand;
+
+ _selectCommand = String.Empty;
+ _preChangeCommand = String.Empty;
+ _digits = new string[10];
+
+ for (int i = 0; i < 10; i++)
+ _digits[i] = String.Empty;
+ }
+
+ #endregion Constructor
+
+ /// <summary>
+ /// Saves this instance to its configuration file.
+ /// </summary>
+ public void Save()
+ {
+ using (XmlTextWriter writer = new XmlTextWriter(_fileName, Encoding.UTF8))
+ {
+ writer.Formatting = Formatting.Indented;
+ writer.Indentation = 1;
+ writer.IndentChar = (char)9;
+ writer.WriteStartDocument(true);
+ writer.WriteStartElement("config"); // <config>
+
+ writer.WriteElementString("PauseTime", PauseTime.ToString());
+ writer.WriteElementString("UsePreChangeCommand", UsePreChangeCommand.ToString());
+ writer.WriteElementString("SendSelect", SendSelect.ToString());
+ writer.WriteElementString("DoubleChannelSelect", DoubleChannelSelect.ToString());
+ writer.WriteElementString("ChannelDigits", ChannelDigits.ToString());
+ writer.WriteElementString("RepeatChannelCommands", RepeatChannelCommands.ToString());
+ writer.WriteElementString("RepeatDelay", RepeatPauseTime.ToString());
+
+ writer.WriteElementString("SelectCommand", SelectCommand);
+ writer.WriteElementString("PreChangeCommand", PreChangeCommand);
+
+ for (int i = 0; i < 10; i++)
+ writer.WriteElementString("Digit" + i.ToString(), Digits[i]);
+
+ writer.WriteEndElement(); // </config>
+ writer.WriteEndDocument();
+ }
+ }
+
+ static string GetString(XmlDocument doc, string element, string defaultValue)
+ {
+ if (String.IsNullOrEmpty(element))
+ return defaultValue;
+
+ XmlNode node = doc.DocumentElement.SelectSingleNode(element);
+ if (node == null)
+ return defaultValue;
+
+ return node.InnerText;
+ }
+ static int GetInt(XmlDocument doc, string element, int defaultValue)
+ {
+ if (String.IsNullOrEmpty(element))
+ return defaultValue;
+
+ XmlNode node = doc.DocumentElement.SelectSingleNode(element);
+ if (node == null)
+ return defaultValue;
+
+ int returnValue;
+ if (int.TryParse(node.InnerText, out returnValue))
+ return returnValue;
+
+ return defaultValue;
+ }
+ static bool GetBool(XmlDocument doc, string element, bool defaultValue)
+ {
+ if (String.IsNullOrEmpty(element))
+ return defaultValue;
+
+ XmlNode node = doc.DocumentElement.SelectSingleNode(element);
+ if (node == null)
+ return defaultValue;
+
+ bool returnValue;
+ if (bool.TryParse(node.InnerText, out returnValue))
+ return returnValue;
+
+ return defaultValue;
+ }
+
+ /// <summary>
+ /// Loads the specified file into a new instance of <see cref="ExternalChannelConfig"/> class.
+ /// </summary>
+ /// <param name="fileName">Name of the file to load.</param>
+ /// <returns>A new <see cref="ExternalChannelConfig"/> class instance.</returns>
+ public static ExternalChannelConfig Load(string fileName)
+ {
+ ExternalChannelConfig newECC = new ExternalChannelConfig(fileName);
+
+ XmlDocument doc = new XmlDocument();
+ doc.Load(fileName);
+
+ newECC.PauseTime = GetInt(doc, "PauseTime", DefaultPauseTime);
+ newECC.UsePreChangeCommand = GetBool(doc, "UsePreChangeCommand", DefaultUsePreChangeCommand);
+ newECC.SendSelect = GetBool(doc, "SendSelect", DefaultSendSelect);
+ newECC.DoubleChannelSelect = GetBool(doc, "DoubleChannelSelect", DefaultDoubleChannelSelect);
+ newECC.RepeatChannelCommands = GetInt(doc, "RepeatChannelCommands", DefaultRepeatChannelCommands);
+ newECC.ChannelDigits = GetInt(doc, "ChannelDigits", DefaultChannelDigits);
+ newECC.RepeatPauseTime = GetInt(doc, "RepeatDelay", DefaultRepeatPauseTime);
+
+ newECC.SelectCommand = GetString(doc, "SelectCommand", String.Empty);
+ newECC.PreChangeCommand = GetString(doc, "PreChangeCommand", String.Empty);
+
+ for (int index = 0; index < 10; index++)
+ newECC.Digits[index] = GetString(doc, "Digit" + index.ToString(), String.Empty);
+
+ return newECC;
+ }
+
+ }
+
+}
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,200 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+#if TRACE
+using System.Diagnostics;
+#endif
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using System.Xml;
+
+using IrssUtils;
+
+namespace MediaCenterBlaster
+{
+
+ partial class ExternalChannels : Form
+ {
+
+ #region Variables
+
+ TabPage _tvCardTab;
+ StbSetup _tvCardStbSetup;
+
+ #endregion Variables
+
+ #region Constructor
+
+ public ExternalChannels()
+ {
+ InitializeComponent();
+ }
+
+ #endregion Constructor
+
+ private void ExternalChannels_Load(object sender, EventArgs e)
+ {
+ _tvCardStbSetup = new StbSetup(0);
+ _tvCardStbSetup.Name = "StbSetup";
+ _tvCardStbSetup.Dock = DockStyle.Fill;
+
+ _tvCardTab = new TabPage("STB");
+ _tvCardTab.Controls.Add(_tvCardStbSetup);
+
+ this.tabControlTVCards.TabPages.Add(_tvCardTab);
+
+ // Setup quick setup combo box
+ string[] quickSetupFiles = Directory.GetFiles(Common.FolderSTB, "*.xml", SearchOption.TopDirectoryOnly);
+ foreach (string file in quickSetupFiles)
+ comboBoxQuickSetup.Items.Add(Path.GetFileNameWithoutExtension(file));
+
+ comboBoxQuickSetup.Items.Add("Clear all");
+ }
+
+ static void ProcessExternalChannelProgram(string runCommand, int currentChannelDigit, string fullChannelString)
+ {
+ string[] commands = Common.SplitRunCommand(runCommand);
+
+ commands[2] = commands[2].Replace("%1", currentChannelDigit.ToString());
+ commands[2] = commands[2].Replace("%2", fullChannelString);
+
+ Common.ProcessRunCommand(commands);
+ }
+
+ static void ProcessSerialCommand(string serialCommand, int currentChannelDigit, string fullChannelString)
+ {
+ string[] commands = Common.SplitSerialCommand(serialCommand);
+
+ commands[0] = commands[0].Replace("%1", currentChannelDigit.ToString());
+ commands[0] = commands[0].Replace("%2", fullChannelString);
+
+ Common.ProcessSerialCommand(commands);
+ }
+
+ #region Buttons
+
+ private void buttonOK_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ _tvCardStbSetup.Save();
+ Tray.ExtChannelConfig.Save();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.ToString(), "Failed to save external channel setup", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+
+ private void buttonTest_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ StbSetup setup = _tvCardStbSetup;
+
+ int channelTest = Decimal.ToInt32(numericUpDownTest.Value);
+ string channel;
+ switch (setup.ChannelDigits)
+ {
+ case 2:
+ channel = channelTest.ToString("00");
+ break;
+
+ case 3:
+ channel = channelTest.ToString("000");
+ break;
+
+ case 4:
+ channel = channelTest.ToString("0000");
+ break;
+
+ default:
+ channel = channelTest.ToString();
+ break;
+ }
+
+ int charVal;
+ string command;
+
+ for (int repeatCount = 0; repeatCount <= setup.RepeatChannelCommands; repeatCount++)
+ {
+ if (repeatCount > 0 && setup.RepeatPauseTime > 0)
+ Thread.Sleep(setup.RepeatPauseTime);
+
+ if (setup.UsePreChangeCommand && !String.IsNullOrEmpty(setup.PreChangeCommand))
+ {
+ Tray.ProcessExternalCommand(setup.PreChangeCommand, -1, channel);
+
+ if (setup.PauseTime > 0)
+ Thread.Sleep(setup.PauseTime);
+ }
+
+ foreach (char digit in channel)
+ {
+ charVal = digit - 48;
+
+ command = setup.Digits[charVal];
+ if (!String.IsNullOrEmpty(command))
+ {
+ Tray.ProcessExternalCommand(command, charVal, channel);
+
+ if (setup.PauseTime > 0)
+ Thread.Sleep(setup.PauseTime);
+ }
+ }
+
+ if (setup.SendSelect && !String.IsNullOrEmpty(setup.SelectCommand))
+ {
+ Tray.ProcessExternalCommand(setup.SelectCommand, -1, channel);
+
+ if (setup.DoubleChannelSelect)
+ {
+ if (setup.PauseTime > 0)
+ Thread.Sleep(setup.PauseTime);
+
+ Tray.ProcessExternalCommand(setup.SelectCommand, -1, channel);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.ToString(), "Failed to test external channel", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void buttonQuickSet_Click(object sender, EventArgs e)
+ {
+ string quickSetup = comboBoxQuickSetup.Text;
+
+ if (String.IsNullOrEmpty(quickSetup))
+ return;
+
+ try
+ {
+ _tvCardStbSetup.SetToXml(quickSetup);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.ToString(), "Failed to quick-set external channel setup", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ this.Close();
+ }
+
+ #endregion Buttons
+
+ }
+
+}
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.designer.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,206 @@
+namespace MediaCenterBlaster
+{
+ partial class ExternalChannels
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.groupBoxQuickSetup = new System.Windows.Forms.GroupBox();
+ this.buttonQuickSet = new System.Windows.Forms.Button();
+ this.comboBoxQuickSetup = new System.Windows.Forms.ComboBox();
+ this.groupBoxTest = new System.Windows.Forms.GroupBox();
+ this.labelCh = new System.Windows.Forms.Label();
+ this.buttonTest = new System.Windows.Forms.Button();
+ this.numericUpDownTest = new System.Windows.Forms.NumericUpDown();
+ this.tabControlTVCards = new System.Windows.Forms.TabControl();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.groupBoxQuickSetup.SuspendLayout();
+ this.groupBoxTest.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTest)).BeginInit();
+ this.SuspendLayout();
+ //
+ // 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(400, 408);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(56, 24);
+ this.buttonOK.TabIndex = 3;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // groupBoxQuickSetup
+ //
+ this.groupBoxQuickSetup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxQuickSetup.Controls.Add(this.buttonQuickSet);
+ this.groupBoxQuickSetup.Controls.Add(this.comboBoxQuickSetup);
+ this.groupBoxQuickSetup.Location = new System.Drawing.Point(8, 352);
+ this.groupBoxQuickSetup.Name = "groupBoxQuickSetup";
+ this.groupBoxQuickSetup.Size = new System.Drawing.Size(288, 48);
+ this.groupBoxQuickSetup.TabIndex = 1;
+ this.groupBoxQuickSetup.TabStop = false;
+ this.groupBoxQuickSetup.Text = "Quick Setup";
+ //
+ // buttonQuickSet
+ //
+ this.buttonQuickSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonQuickSet.Location = new System.Drawing.Point(232, 16);
+ this.buttonQuickSet.Name = "buttonQuickSet";
+ this.buttonQuickSet.Size = new System.Drawing.Size(48, 21);
+ this.buttonQuickSet.TabIndex = 1;
+ this.buttonQuickSet.Text = "Set";
+ this.buttonQuickSet.UseVisualStyleBackColor = true;
+ this.buttonQuickSet.Click += new System.EventHandler(this.buttonQuickSet_Click);
+ //
+ // comboBoxQuickSetup
+ //
+ this.comboBoxQuickSetup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxQuickSetup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxQuickSetup.FormattingEnabled = true;
+ this.comboBoxQuickSetup.Location = new System.Drawing.Point(8, 16);
+ this.comboBoxQuickSetup.Name = "comboBoxQuickSetup";
+ this.comboBoxQuickSetup.Size = new System.Drawing.Size(216, 21);
+ this.comboBoxQuickSetup.TabIndex = 0;
+ //
+ // groupBoxTest
+ //
+ this.groupBoxTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxTest.Controls.Add(this.labelCh);
+ this.groupBoxTest.Controls.Add(this.buttonTest);
+ this.groupBoxTest.Controls.Add(this.numericUpDownTest);
+ this.groupBoxTest.Location = new System.Drawing.Point(304, 352);
+ this.groupBoxTest.Name = "groupBoxTest";
+ this.groupBoxTest.Size = new System.Drawing.Size(216, 48);
+ this.groupBoxTest.TabIndex = 2;
+ this.groupBoxTest.TabStop = false;
+ this.groupBoxTest.Text = "Test";
+ //
+ // labelCh
+ //
+ this.labelCh.Location = new System.Drawing.Point(8, 16);
+ this.labelCh.Name = "labelCh";
+ this.labelCh.Size = new System.Drawing.Size(64, 20);
+ this.labelCh.TabIndex = 0;
+ this.labelCh.Text = "Channel:";
+ this.labelCh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // buttonTest
+ //
+ this.buttonTest.Location = new System.Drawing.Point(152, 16);
+ this.buttonTest.Name = "buttonTest";
+ this.buttonTest.Size = new System.Drawing.Size(56, 20);
+ this.buttonTest.TabIndex = 2;
+ this.buttonTest.Text = "Test";
+ this.buttonTest.UseVisualStyleBackColor = true;
+ this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
+ //
+ // numericUpDownTest
+ //
+ this.numericUpDownTest.Location = new System.Drawing.Point(72, 16);
+ this.numericUpDownTest.Maximum = new decimal(new int[] {
+ 9999,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownTest.Name = "numericUpDownTest";
+ this.numericUpDownTest.Size = new System.Drawing.Size(72, 20);
+ this.numericUpDownTest.TabIndex = 1;
+ this.numericUpDownTest.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.numericUpDownTest.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
+ // tabControlTVCards
+ //
+ this.tabControlTVCards.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.tabControlTVCards.Location = new System.Drawing.Point(8, 8);
+ this.tabControlTVCards.Name = "tabControlTVCards";
+ this.tabControlTVCards.SelectedIndex = 0;
+ this.tabControlTVCards.Size = new System.Drawing.Size(512, 336);
+ this.tabControlTVCards.TabIndex = 0;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(464, 408);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(56, 24);
+ this.buttonCancel.TabIndex = 4;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // ExternalChannels
+ //
+ this.AcceptButton = this.buttonOK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.buttonCancel;
+ this.ClientSize = new System.Drawing.Size(528, 439);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.tabControlTVCards);
+ this.Controls.Add(this.groupBoxTest);
+ this.Controls.Add(this.groupBoxQuickSetup);
+ this.Controls.Add(this.buttonOK);
+ this.MinimizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(536, 466);
+ this.Name = "ExternalChannels";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "External Channel Changing";
+ this.Load += new System.EventHandler(this.ExternalChannels_Load);
+ this.groupBoxQuickSetup.ResumeLayout(false);
+ this.groupBoxTest.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTest)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button buttonOK;
+ private System.Windows.Forms.GroupBox groupBoxQuickSetup;
+ private System.Windows.Forms.ComboBox comboBoxQuickSetup;
+ private System.Windows.Forms.GroupBox groupBoxTest;
+ private System.Windows.Forms.NumericUpDown numericUpDownTest;
+ private System.Windows.Forms.Button buttonTest;
+ private System.Windows.Forms.Button buttonQuickSet;
+ private System.Windows.Forms.Label labelCh;
+ private System.Windows.Forms.TabControl tabControlTVCards;
+ private System.Windows.Forms.Button buttonCancel;
+
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.resx
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.resx (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/ExternalChannels.resx 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.Designer.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,242 @@
+namespace MediaCenterBlaster
+{
+ partial class MacroEditor
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.labelName = new System.Windows.Forms.Label();
+ this.textBoxName = new System.Windows.Forms.TextBox();
+ this.groupBoxCommandSequence = new System.Windows.Forms.GroupBox();
+ this.buttonRemove = new System.Windows.Forms.Button();
+ this.buttonMoveDown = new System.Windows.Forms.Button();
+ this.buttonMoveUp = new System.Windows.Forms.Button();
+ this.listBoxMacro = new System.Windows.Forms.ListBox();
+ this.comboBoxCommands = new System.Windows.Forms.ComboBox();
+ this.buttonAddCommand = new System.Windows.Forms.Button();
+ this.groupBoxCommands = new System.Windows.Forms.GroupBox();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonTest = new System.Windows.Forms.Button();
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.groupBoxCommandSequence.SuspendLayout();
+ this.groupBoxCommands.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // labelName
+ //
+ this.labelName.Location = new System.Drawing.Point(8, 8);
+ this.labelName.Name = "labelName";
+ this.labelName.Size = new System.Drawing.Size(48, 20);
+ this.labelName.TabIndex = 0;
+ this.labelName.Text = "Name:";
+ this.labelName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // textBoxName
+ //
+ this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxName.Location = new System.Drawing.Point(64, 8);
+ this.textBoxName.Name = "textBoxName";
+ this.textBoxName.Size = new System.Drawing.Size(240, 20);
+ this.textBoxName.TabIndex = 1;
+ //
+ // groupBoxCommandSequence
+ //
+ this.groupBoxCommandSequence.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.groupBoxCommandSequence.Controls.Add(this.buttonRemove);
+ this.groupBoxCommandSequence.Controls.Add(this.buttonMoveDown);
+ this.groupBoxCommandSequence.Controls.Add(this.buttonMoveUp);
+ this.groupBoxCommandSequence.Controls.Add(this.listBoxMacro);
+ this.groupBoxCommandSequence.Location = new System.Drawing.Point(8, 40);
+ this.groupBoxCommandSequence.Name = "groupBoxCommandSequence";
+ this.groupBoxCommandSequence.Size = new System.Drawing.Size(296, 192);
+ this.groupBoxCommandSequence.TabIndex = 2;
+ this.groupBoxCommandSequence.TabStop = false;
+ this.groupBoxCommandSequence.Text = "Macro";
+ //
+ // buttonRemove
+ //
+ this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonRemove.Location = new System.Drawing.Point(232, 160);
+ this.buttonRemove.Name = "buttonRemove";
+ this.buttonRemove.Size = new System.Drawing.Size(56, 24);
+ this.buttonRemove.TabIndex = 3;
+ this.buttonRemove.Text = "Remove";
+ this.buttonRemove.UseVisualStyleBackColor = true;
+ this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click);
+ //
+ // buttonMoveDown
+ //
+ this.buttonMoveDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonMoveDown.Location = new System.Drawing.Point(64, 160);
+ this.buttonMoveDown.Name = "buttonMoveDown";
+ this.buttonMoveDown.Size = new System.Drawing.Size(48, 24);
+ this.buttonMoveDown.TabIndex = 2;
+ this.buttonMoveDown.Text = "Down";
+ this.buttonMoveDown.UseVisualStyleBackColor = true;
+ this.buttonMoveDown.Click += new System.EventHandler(this.buttonMoveDown_Click);
+ //
+ // buttonMoveUp
+ //
+ this.buttonMoveUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonMoveUp.Location = new System.Drawing.Point(8, 160);
+ this.buttonMoveUp.Name = "buttonMoveUp";
+ this.buttonMoveUp.Size = new System.Drawing.Size(48, 24);
+ this.buttonMoveUp.TabIndex = 1;
+ this.buttonMoveUp.Text = "Up";
+ this.buttonMoveUp.UseVisualStyleBackColor = true;
+ this.buttonMoveUp.Click += new System.EventHandler(this.buttonMoveUp_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, 16);
+ this.listBoxMacro.Name = "listBoxMacro";
+ this.listBoxMacro.Size = new System.Drawing.Size(280, 136);
+ this.listBoxMacro.TabIndex = 0;
+ this.listBoxMacro.DoubleClick += new System.EventHandler(this.listBoxCommandSequence_DoubleClick);
+ //
+ // comboBoxCommands
+ //
+ this.comboBoxCommands.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxCommands.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxCommands.FormattingEnabled = true;
+ this.comboBoxCommands.Location = new System.Drawing.Point(8, 16);
+ this.comboBoxCommands.Name = "comboBoxCommands";
+ this.comboBoxCommands.Size = new System.Drawing.Size(232, 21);
+ this.comboBoxCommands.TabIndex = 0;
+ //
+ // buttonAddCommand
+ //
+ this.buttonAddCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonAddCommand.Location = new System.Drawing.Point(248, 16);
+ this.buttonAddCommand.Name = "buttonAddCommand";
+ this.buttonAddCommand.Size = new System.Drawing.Size(40, 21);
+ this.buttonAddCommand.TabIndex = 1;
+ this.buttonAddCommand.Text = "Add";
+ this.buttonAddCommand.UseVisualStyleBackColor = true;
+ this.buttonAddCommand.Click += new System.EventHandler(this.buttonAddCommand_Click);
+ //
+ // groupBoxCommands
+ //
+ this.groupBoxCommands.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxCommands.Controls.Add(this.buttonAddCommand);
+ this.groupBoxCommands.Controls.Add(this.comboBoxCommands);
+ this.groupBoxCommands.Location = new System.Drawing.Point(8, 240);
+ this.groupBoxCommands.Name = "groupBoxCommands";
+ this.groupBoxCommands.Size = new System.Drawing.Size(296, 48);
+ this.groupBoxCommands.TabIndex = 3;
+ this.groupBoxCommands.TabStop = false;
+ this.groupBoxCommands.Text = "Commands";
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(256, 296);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(48, 24);
+ this.buttonCancel.TabIndex = 6;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // buttonTest
+ //
+ this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonTest.Location = new System.Drawing.Point(8, 296);
+ this.buttonTest.Name = "buttonTest";
+ this.buttonTest.Size = new System.Drawing.Size(48, 24);
+ this.buttonTest.TabIndex = 4;
+ this.buttonTest.Text = "Test";
+ this.buttonTest.UseVisualStyleBackColor = true;
+ this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
+ //
+ // 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(200, 296);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(48, 24);
+ this.buttonOK.TabIndex = 5;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // MacroEditor
+ //
+ this.AcceptButton = this.buttonOK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.buttonCancel;
+ this.ClientSize = new System.Drawing.Size(312, 329);
+ this.Controls.Add(this.buttonOK);
+ this.Controls.Add(this.buttonTest);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.groupBoxCommands);
+ this.Controls.Add(this.groupBoxCommandSequence);
+ this.Controls.Add(this.labelName);
+ this.Controls.Add(this.textBoxName);
+ this.MinimizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(320, 356);
+ this.Name = "MacroEditor";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Macro Editor";
+ this.Load += new System.EventHandler(this.MacroEditor_Load);
+ this.groupBoxCommandSequence.ResumeLayout(false);
+ this.groupBoxCommands.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label labelName;
+ private System.Windows.Forms.TextBox textBoxName;
+ private System.Windows.Forms.GroupBox groupBoxCommandSequence;
+ private System.Windows.Forms.Button buttonRemove;
+ private System.Windows.Forms.Button buttonMoveDown;
+ private System.Windows.Forms.Button buttonMoveUp;
+ private System.Windows.Forms.ListBox listBoxMacro;
+ private System.Windows.Forms.ComboBox comboBoxCommands;
+ private System.Windows.Forms.Button buttonAddCommand;
+ private System.Windows.Forms.GroupBox groupBoxCommands;
+ private System.Windows.Forms.Button buttonCancel;
+ private System.Windows.Forms.Button buttonTest;
+ private System.Windows.Forms.Button buttonOK;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/MacroEditor.cs 2008-04-07 16:16:50 UTC (rev 1615)
@@ -0,0 +1,492 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+#if TRACE
+using System.Diagnostics;
+#endif
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+
+using IrssUtils;
+using IrssUtils.Forms;
+
+namespace MediaCenterBlaster
+{
+
+ partial class MacroEditor : Form
+ {
+
+ #region Constructor
+
+ /// <summary>
+ /// Creates a Macro Editor windows form.
+ /// </summary>
+ public MacroEditor()
+ {
+ InitializeComponent();
+
+ textBoxName.Text = "New";
+ textBoxName.Enabled = true;
+ }
+
+ /// <summary>
+ /// Creates a Macro Editor windows form.
+ /// </summary>
+ /// <param name="name">The name of an existing macro.</param>
+ public MacroEditor(string name)
+ : this()
+ {
+ if (String.IsNullOrEmpty(name))
+ throw new ArgumentNullException("name");
+
+ textBoxName.Text = name;
+ textBoxName.Enabled = false;
+
+ string fileName = Path.Combine(Tray.FolderMacros, name + Common.FileExtensionMacro);
+ ReadFromFile(fileName);
+ }
+
+ #endregion Constructor
+
+ #region Implementation
+
+ void RefreshCommandList()
+ {
+ comboBoxCommands.Items.Clear();
+
+ comboBoxCommands.Items.Add(Common.UITextRun);
+ comboBoxCommands.Items.Add(Common.UITextPause);
+ comboBoxCommands.Items.Add(Common.UITextSerial);
+ comboBoxCommands.Items.Add(Common.UITextWindowMsg);
+ comboBoxCommands.Items.Add(Common.UITextTcpMsg);
+ comboBoxCommands.Items.Add(Common.UITextHttpMsg);
+ comboBoxCommands.Items.Add(Common.UITextKeys);
+ comboBoxCommands.Items.Add(Common.UITextMouse);
+ comboBoxCommands.Items.Add(Common.UITextEject);
+ comboBoxCommands.Items.Add(Common.UITextPopup);
+ comboBoxCommands.Items.Add(Common.UITextGotoScreen);
+ comboBoxCommands.Items.Add(Common.UITextInputLayer);
+ //comboBoxCommands.Items.Add(Common.UITextWindowState);
+ comboBoxCommands.Items.Add(Common.UITextFocus);
+ comboBoxCommands.Items.Add(Common.UITextExit);
+ comboBoxCommands.Items.Add(Common.UITextSendMPAction);
+ comboBoxCommands.Items.Add(Common.UITextSendMPMsg);
+ comboBoxCommands.Items.Add(Common.UITextStandby);
+ comboBoxCommands.Items.Add(Common.UITextHibernate);
+ comboBoxCommands.Items.Add(Common.UITextReboot);
+ comboBoxCommands.Items.Add(Common.UITextShutdown);
+
+ string[] fileList = Tray.GetFileList(true);
+ if (fileList != null && fileList.Length > 0)
+ comboBoxCommands.Items.AddRange(fileList);
+ }
+
+ /// <summary>
+ /// Write the macro in the listBox to a macro name provided.
+ /// </summary>
+ /// <param name="fileName">Name of Macro to write (macro name, not file path).</param>
+ void WriteToFile(string fileName)
+ {
+ try
+ {
+ using (XmlTextWriter writer = new XmlTextWriter(fileName, Encoding.UTF8))
+ {
+ writer.Formatting = Formatting.Indented;
+ writer.WriteStartDocument(true);
+ writer.WriteStartElement("macro");
+
+ foreach (string item in listBoxMacro.Items)
+ {
+ writer.WriteStartElement("item");
+ writer.WriteAttributeString("command", item);
+ writer.WriteEndElement();
+ }
+
+ writer.WriteEndElement();
+ writer.WriteEndDocument();
+ }
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
+
+ /// <summary>
+ /// Read a macro into the listBox from the macro name provided.
+ /// </summary>
+ /// <param name="fileName">Name of Macro to read (macro name, not file path).</param>
+ void ReadFromFile(string fileName)
+ {
+ try
+ {
+ XmlDocument doc = new XmlDocument();
+ doc.Load(fileName);
+
+ XmlNodeList commandSequence = doc.DocumentElement.SelectNodes("item");
+
+ listBoxMacro.Items.Clear();
+
+ foreach (XmlNode item in commandSequence)
+ listBoxMacro.Items.Add(item.Attributes["command"].Value);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ }
+
+ private void MacroEditor_Load(object sender, EventArgs e)
+ {
+ RefreshCommandList();
+ }
+
+ private void buttonAddCommand_Click(object sender, EventArgs e)
+ {
+ if (comboBoxCommands.SelectedIndex == -1)
+ return;
+
+ try
+ {
+ string selected = comboBoxCommands.SelectedItem as string;
+ string newCommand = null;
+
+ if (selected.Equals(Common.UITextRun, StringComparison.OrdinalIgnoreCase))
+ {
+ ExternalProgram externalProgram = new ExternalProgram();
+ if (externalProgram.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixRun + externalProgram.CommandString;
+ }
+ else if (selected.Equals(Common.UITextPause, StringComparison.OrdinalIgnoreCase))
+ {
+ PauseTime pauseTime = new PauseTime();
+ if (pauseTime.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixPause + pauseTime.Time.ToString();
+ }
+ else if (selected.Equals(Common.UITextSerial, StringComparison.OrdinalIgnoreCase))
+ {
+ SerialCommand serialCommand = new SerialCommand();
+ if (serialCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixSerial + serialCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextWindowMsg, StringComparison.OrdinalIgnoreCase))
+ {
+ MessageCommand messageCommand = new MessageCommand();
+ if (messageCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixWindowMsg + messageCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextTcpMsg, StringComparison.OrdinalIgnoreCase))
+ {
+ TcpMessageCommand tcpMessageCommand = new TcpMessageCommand();
+ if (tcpMessageCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextHttpMsg, StringComparison.OrdinalIgnoreCase))
+ {
+ HttpMessageCommand httpMessageCommand = new HttpMessageCommand();
+ if (httpMessageCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixHttpMsg + httpMessageCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
+ {
+ KeysCommand keysCommand = new KeysCommand();
+ if (keysCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixKeys + keysCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextMouse, StringComparison.OrdinalIgnoreCase))
+ {
+ MouseCommand mouseCommand = new MouseCommand();
+ if (mouseCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixMouse + mouseCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextEject, StringComparison.OrdinalIgnoreCase))
+ {
+ EjectCommand ejectCommand = new EjectCommand();
+ if (ejectCommand.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixEject + ejectCommand.CommandString;
+ }
+ else if (selected.Equals(Common.UITextPopup, StringComparison.OrdinalIgnoreCase))
+ {
+ PopupMessage popupMessage = new PopupMessage();
+ if (popupMessage.ShowDialog(this) == DialogResult.OK)
+ newCommand = Common.CmdPrefixPopup + popupMessage.CommandString;
+ }
+ /*
+ else if (selected.Equals(Common.UITextWindowState, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixWindowState;
+ }
+ */
+ else if (selected.Equals(Common.UITextFocus, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixFocus;
+ }
+ else if (selected.Equals(Common.UITextExit, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixExit;
+ }
+ else if (selected.Equals(Common.UITextStandby, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixStandby;
+ }
+ else if (selected.Equals(Common.UITextHibernate, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixHibernate;
+ }
+ else if (selected.Equals(Common.UITextReboot, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixReboot;
+ }
+ else if (selected.Equals(Common.UITextShutdown, StringComparison.OrdinalIgnoreCase))
+ {
+ newCommand = Common.CmdPrefixShutdown;
+ }
+ else if (selected.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
+ {
+ BlastCommand blastCommand = new BlastCommand(
+ new BlastIrDelegate(Tray.BlastIR),
+ Common.FolderIRCommands,
+ Tray.TransceiverInformation.Ports,
+ selected.Substring(Common.CmdPrefixBlast.Length));
+
+ if (blastCommand.ShowDialog...
[truncated message content] |
|
From: <an...@us...> - 2008-04-07 16:31:32
|
Revision: 1616
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1616&view=rev
Author: and-81
Date: 2008-04-07 09:31:31 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
trunk/plugins/IR Server Suite/setup/setup.nsi
Property Changed:
----------------
trunk/plugins/IR Server Suite/Applications/Media Center Blaster/
trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)/
trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)/
trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)/
Property changes on: trunk/plugins/IR Server Suite/Applications/Media Center Blaster
___________________________________________________________________
Name: svn:ignore
+ bin
obj
Modified: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.Designer.cs 2008-04-07 16:16:50 UTC (rev 1615)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Forms/SetupForm.Designer.cs 2008-04-07 16:31:31 UTC (rev 1616)
@@ -167,11 +167,11 @@
// checkBoxLogVerbose
//
this.checkBoxLogVerbose.AutoSize = true;
- this.checkBoxLogVerbose.Location = new System.Drawing.Point(8, 8);
+ this.checkBoxLogVerbose.Location = new System.Drawing.Point(8, 16);
this.checkBoxLogVerbose.Name = "checkBoxLogVerbose";
- this.checkBoxLogVerbose.Size = new System.Drawing.Size(108, 17);
+ this.checkBoxLogVerbose.Size = new System.Drawing.Size(143, 17);
this.checkBoxLogVerbose.TabIndex = 0;
- this.checkBoxLogVerbose.Text = "Extended logging";
+ this.checkBoxLogVerbose.Text = "Enable extended logging";
this.toolTips.SetToolTip(this.checkBoxLogVerbose, "Enable more detailed logging of plugin operations");
this.checkBoxLogVerbose.UseVisualStyleBackColor = true;
//
@@ -193,7 +193,7 @@
this.buttonChangeServer.Location = new System.Drawing.Point(8, 184);
this.buttonChangeServer.Name = "buttonChangeServer";
this.buttonChangeServer.Size = new System.Drawing.Size(96, 24);
- this.buttonChangeServer.TabIndex = 1;
+ this.buttonChangeServer.TabIndex = 2;
this.buttonChangeServer.Text = "Change Server";
this.toolTips.SetToolTip(this.buttonChangeServer, "Change the IR Server host");
this.buttonChangeServer.UseVisualStyleBackColor = true;
@@ -201,12 +201,12 @@
//
// buttonHelp
//
- this.buttonHelp.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.buttonHelp.Location = new System.Drawing.Point(168, 184);
+ 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, 256);
this.buttonHelp.Name = "buttonHelp";
this.buttonHelp.Size = new System.Drawing.Size(56, 24);
- this.buttonHelp.TabIndex = 2;
- this.buttonHelp.Text = "Help";
+ this.buttonHelp.TabIndex = 1;
+ this.buttonHelp.Text = "&Help";
this.toolTips.SetToolTip(this.buttonHelp, "Click here for help");
this.buttonHelp.UseVisualStyleBackColor = true;
this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click);
@@ -228,7 +228,7 @@
//
// tabPageOptions
//
- this.tabPageOptions.Controls.Add(this.buttonHelp);
+ this.tabPageOptions.Controls.Add(this.checkBoxAutoRun);
this.tabPageOptions.Controls.Add(this.checkBoxLogVerbose);
this.tabPageOptions.Controls.Add(this.buttonChangeServer);
this.tabPageOptions.Controls.Add(this.buttonExtChannels);
@@ -309,25 +309,22 @@
//
// 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(8, 264);
+ this.checkBoxAutoRun.Location = new System.Drawing.Point(8, 48);
this.checkBoxAutoRun.Name = "checkBoxAutoRun";
- this.checkBoxAutoRun.Size = new System.Drawing.Size(178, 17);
+ this.checkBoxAutoRun.Size = new System.Drawing.Size(218, 17);
this.checkBoxAutoRun.TabIndex = 1;
- this.checkBoxAutoRun.Text = "&Start MCE Blaster with Windows";
+ this.checkBoxAutoRun.Text = "Start Media Center Blaster with Windows";
this.checkBoxAutoRun.UseVisualStyleBackColor = true;
this.checkBoxAutoRun.CheckedChanged += new System.EventHandler(this.checkBoxAutoRun_CheckedChanged);
//
// SetupForm
//
- this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.buttonCancel;
this.ClientSize = new System.Drawing.Size(392, 289);
- this.Controls.Add(this.checkBoxAutoRun);
this.Controls.Add(this.tabControl);
+ this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -344,7 +341,6 @@
this.tabPageMacros.ResumeLayout(false);
this.tabPageIR.ResumeLayout(false);
this.ResumeLayout(false);
- this.PerformLayout();
}
Modified: trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2008-04-07 16:16:50 UTC (rev 1615)
+++ trunk/plugins/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2008-04-07 16:31:31 UTC (rev 1616)
@@ -4,7 +4,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A1D30F1A-25AF-47EC-8E94-F92385012FC3}</ProjectGuid>
+ <ProjectGuid>{349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MediaCenterBlaster</RootNamespace>
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote (PocketPC2003)
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
Virtual Remote (PocketPC2003).csproj.user
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote (Smartphone2003)
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
Virtual Remote (Smartphone2003).csproj.user
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote (WinCE5)
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
Virtual Remote (WinCE5).csproj.user
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-07 16:16:50 UTC (rev 1615)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-07 16:31:31 UTC (rev 1616)
@@ -661,9 +661,9 @@
SectionGroup /e "Media Center Add-Ons" SectionGroupMCE
!if ${VER_BUILD} != 0
-${MementoSection} "Media Center Blaster" SectionMCEBlaster
+${MementoSection} "Media Center Blaster (experimental)" SectionMCEBlaster
!else
-${MementoUnselectedSection} "Media Center Blaster (experimental)" SectionMCEBlaster
+${MementoUnselectedSection} "Media Center Blaster" SectionMCEBlaster
!endif
DetailPrint "Installing Media Center Blaster ..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-07 16:41:45
|
Revision: 1617
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1617&view=rev
Author: and-81
Date: 2008-04-07 09:41:38 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/setup/setup.nsi
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-04-07 16:31:31 UTC (rev 1616)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2008-04-07 16:41:38 UTC (rev 1617)
@@ -367,7 +367,7 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media Center Blaster", "Applications\Media Center Blaster\Media Center Blaster.csproj", "{A1D30F1A-25AF-47EC-8E94-F92385012FC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media Center Blaster", "Applications\Media Center Blaster\Media Center Blaster.csproj", "{349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
@@ -609,10 +609,10 @@
{1F9F8771-1173-409E-A3D0-265756220D27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F9F8771-1173-409E-A3D0-265756220D27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F9F8771-1173-409E-A3D0-265756220D27}.Release|Any CPU.Build.0 = Release|Any CPU
- {A1D30F1A-25AF-47EC-8E94-F92385012FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A1D30F1A-25AF-47EC-8E94-F92385012FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A1D30F1A-25AF-47EC-8E94-F92385012FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A1D30F1A-25AF-47EC-8E94-F92385012FC3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -636,7 +636,7 @@
{FEB70334-6F8E-41D5-9B0A-D5714A296830} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{4C18B138-BF94-4224-9085-4D3EDA680EDA} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{DCE0C464-3843-45F1-A48B-C1A3FF532C1D} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
- {A1D30F1A-25AF-47EC-8E94-F92385012FC3} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{7C686499-7517-4338-8837-7E8617549D9A} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-07 16:31:31 UTC (rev 1616)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-07 16:41:38 UTC (rev 1617)
@@ -663,7 +663,7 @@
!if ${VER_BUILD} != 0
${MementoSection} "Media Center Blaster (experimental)" SectionMCEBlaster
!else
-${MementoUnselectedSection} "Media Center Blaster" SectionMCEBlaster
+${MementoUnselectedSection} "Media Center Blaster (experimental)" SectionMCEBlaster
!endif
DetailPrint "Installing Media Center Blaster ..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2008-04-08 04:09:28
|
Revision: 1619
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1619&view=rev
Author: and-81
Date: 2008-04-07 21:09:23 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx
trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.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/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -80,10 +80,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.groupBoxSetup = new System.Windows.Forms.GroupBox();
this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.labelServerAddress = new System.Windows.Forms.Label();
@@ -276,6 +277,7 @@
this.Controls.Add(this.groupBoxMapAbstract);
this.Controls.Add(this.groupBoxSetup);
this.Controls.Add(this.groupBoxStatus);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MainForm";
this.Text = "Abstract Remote Map Creator";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
Modified: trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Abstractor/MainForm.resx 2008-04-08 04:09:23 UTC (rev 1619)
@@ -117,4 +117,81 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <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>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AACwnC3/r5st/6+bLf+vmy3/r5st/7GdLf+xnS3/r5st/6+bLf+vmy3/sJwt/6+bLf+vmy3/r5st/66a
+ LP+vmy3/sJwt/66aLP+vmy3/r5st/6+bLf+wnC3/r5st/6+bLf+vmy3/sZ0t/7GdLf+vmy3/r5st/6+b
+ Lf+vmy3/sJwt/7CcLf+vmy3/q5gs/6yZLP+yni3/rZos/5iHKP+kkSr/rZos/7KeLf+vmy3/sJwt/6+b
+ Lf+vmy3/sJwt/6+bLf+vmy3/sJwt/6+bLf+vmy3/sJwt/6+bLf+yni3/rZos/6SRKv+Yhyj/rZos/7Ke
+ Lf+smSz/q5gs/6+bLf+wnC3/sJwt/6+bLf+vmy3/sZ0t/6aTK/+kkSr/2Mhs/8y4Rv+umiz/q5gs/7Gd
+ Lf+wnC3/rpos/7CcLf+vmy3/r5st/7CcLf+vmy3/sJwt/66aLP+wnC3/sZ0t/6uYLP+umiz/zLhG/9jI
+ bP+kkSr/ppMr/7GdLf+vmy3/r5st/7CcLf+wnC3/sJwt/7CcLf+qlyv/oY4p/8y4Rf///v3/9fHZ/8Wv
+ Mv+olSv/rpos/7CcLf+vmy3/r5st/7CcLf+wnC3/rpos/7CcLf+vmy3/r5st/7CcLf+umiz/qJUr/8Wv
+ Mv/18dn///79/8y4Rf+hjin/qpcr/7CcLf+wnC3/sJwt/7CcLf+xnS3/rZos/5uJKP+8pi//8+7Q////
+ ///3893/xK4y/6iVK/+wnC3/r5st/7CcLf+vmy3/sJwt/7CcLf+vmy3/sJwt/6+bLf+wnC3/r5st/7Cc
+ Lf+olSv/xK4y//fz3f//////8+7Q/7ymL/+biSj/rZos/7GdLf+wnC3/sJwt/7GdLf+qlyv/pJEq/9nK
+ cP//////+fbl/9G/Vv+mkyv/qJUr/7GdLf+vmy3/rJks/66aLP+vmy3/r5st/6+bLf+vmy3/rpos/6yZ
+ LP+vmy3/sZ0t/6iVK/+mkyv/0b9W//n25f//////2cpw/6SRKv+qlyv/sZ0t/7CcLf+wnC3/sJwt/6OQ
+ Kv+3oi7/7ue8///+/f/q4a3/tqEt/6yZLP+umiz/qZYr/6uYLP+smSz/p5Qr/62aLP+wnC3/sJwt/62a
+ LP+nlCv/rJks/6uYLP+pliv/rpos/6yZLP+2oS3/6uGt///+/f/u57z/t6Iu/6OQKv+wnC3/sJwt/6+b
+ Lf+tmiz/oI0p/866S////////v77/8m0Pf+hjin/q5gs/7CcLf+eiyn/sp4t//Lsyv/g04j/tKAt/62a
+ LP+pliv/tKAt/+DTiP/y7Mr/sp4t/56LKf+wnC3/q5gs/6GOKf/JtD3//v77///////Oukv/oI0p/62a
+ LP+vmy3/sJwt/6uYLP+Zhyj/39KE///////18dj/pJEq/6qXK/+vmy3/ppMr/6yZLP/f0ob///79//v5
+ 7//KtkH/sJwt/6iVK//KtkH/+/nv///+/f/f0ob/rJks/6aTK/+vmy3/qpcr/6SRKv/18dj//////9/S
+ hP+Zhyj/q5gs/7CcLf+wnC3/qJUr/62ZLP/x6sb//////+LWjv+WhSf/sp4t/62aLP+Zhyj/yLI5//r4
+ 6v/+/vv/7+i+/8CqMP+tmiz/ppMr/8CqMP/v6L7//v77//r46v/Isjn/mYco/62aLP+yni3/loUn/+LW
+ jv//////8erG/62ZLP+olSv/sJwt/6+bLf+diyj/0L1T///////7+vD/yLI5/56LKf+umiz/rJks/6SR
+ Kv/bzXj///////n25f/JtD3/pJEq/6yZLP+kkSr/pJEq/8m0Pf/59uX//////9vNeP+kkSr/rJks/66a
+ LP+eiyn/yLI5//v68P//////0L1T/52LKP+vmy3/rZos/5GBJv/i1o7//////+rir/+smSz/qZYr/7Cc
+ Lf+pliv/s58t/+zjs///////7OS0/6mWK/+mkyv/r5st/6WSKv+mkyv/qZYr/+zktP//////7OOz/7Of
+ Lf+pliv/sJwt/6mWK/+smSz/6uKv///////i1o7/kYEm/62aLP+yni3/l4Yo/+TZmf//////5dud/56L
+ Kf+qlyv/sJwt/5+MKf/BqzD/+PXj///////f0ob/oo8q/6aTK/+wnC3/r5su/6aTK/+ijyr/39KG////
+ ///49eP/wasw/5+MKf+wnC3/qpcr/56LKf/l253//////+TZmf+Xhij/sp4t/6yZLP+ijyr/6+Ox////
+ ///j2JT/oY4p/6iVK/+wnC3/mYco/9C8Uf//////+/rw/8SuM/+kkjD/n447/5eGR/+Sgkz/l4dD/6CO
+ Nf/DrjT/+/rw///////QvFH/mYco/7CcLf+olSv/oY4p/+PYlP//////6+Ox/6KPKv+smSz/qZYr/6uY
+ LP/w6sT//////9nKcv+hjin/r5st/7CcLf+biSj/28x2///////079L/ppM1/5CASv9xZGn/WU+H/09G
+ kf9gVXv/hndU/6OSN//079L//////9vMdv+biSj/sJwt/6+bLf+hjin/2cpy///////w6sT/q5gs/6mW
+ K/+smSz/rZos//Lsyv//////18Zo/6GOKf+vmy3/r5st/5eGKP/g1Ir//////+zlwf+SgUL/Z1x0/zYw
+ qf8cGcf/FhTM/yomtf9fVX3/kIBF/+zlwf//////4NSK/5eGKP+vmy3/r5st/6GOKf/Xxmj///////Ls
+ yv+tmiz/rJks/7CcLf+tmiz/8erG///////YyGz/n4wp/6qXK/+vmy3/lYQn/9/ShP//////7ObJ/4V1
+ S/9PRo7/GRbI/wYF3f8EBN//FBLN/0hAlv+Cc0//7ObJ///////f0oT/lYQn/6+bLf+qlyv/n4wp/9jI
+ bP//////8erG/62aLP+wnC3/rZos/62ZLP/x6sb//////9jIbP+fjCn/qpcr/6+bLf+diyj/2814////
+ ///z7tr/jHxG/1lPhP8gHcD/CQja/wYG3f8WFMr/SkKT/4V1Tv/x7Nv//////9vNeP+diyj/r5st/6qX
+ K/+fjCn/2Mhs///////x6sb/rZks/62aLP+qlyv/qJUr//Dpwv//////2st0/6GOKf+wnC3/r5st/5yK
+ KP/ay3T///////Lszv+slzv/emxe/0tDk/8pJbn/Ix+//zkzp/9mW3T/oo9F//Dqz///////2st0/5yK
+ KP+vmy3/sJwt/6GOKf/ay3T///////Dpwv+olSv/qpcr/7CcLf+diyj/6N+o///////i1pD/mIco/6uY
+ LP+wnC3/mIco/9LAWv//////+vjq/8eyQv+aiDz/gnNZ/2pedv9lWXv/dWhm/45+Sf/BrUf/+vjq////
+ ///SwFr/mIco/7CcLf+rmCz/mIco/+LWkP//////6N+o/52LKP+wnC3/sp4t/5SDJ//k2Jb//////+ng
+ q/+diyj/q5gs/7CcLf+lkir/wqww//j14///////3c9+/6KPLP+hjzT/n40//52LQf+fjTf/n40v/9zO
+ f///////+PXj/8KsMP+lkir/sJwt/6uYLP+diyj/6eCr///////k2Jb/lIMn/7KeLf+yni3/k4Mn/9nK
+ cP//////8+3O/7eiLv+kkSr/r5st/6qXK/+rmCz/5tyh///////v6L7/r5st/6WSKv+rmCz/pZIq/6WS
+ Kv+vmy3/7+i+///////m3KH/q5gs/6qXK/+vmy3/pJEq/7eiLv/z7c7//////9nKcP+Tgyf/sp4t/7Cc
+ Lf+eiyn/x7E3//n25v//////1cRi/5eGKP+xnS3/qpcr/6CNKf/Uw2D///////z79P/YyW7/rZos/62a
+ LP+pliv/rZos/9jJbv/8+/T//////9TDYP+gjSn/qpcr/7GdLf+Xhij/1cRi///////59ub/x7E3/56L
+ Kf+wnC3/sJwt/6iVK/+umiz/6eCr///////q4a3/mYco/6+bLf+vmy3/oI0p/7ulL//z7tD//////+7m
+ uv+9py//r5st/6mWK/+9py//7ua6///////z7tD/u6Uv/6CNKf+vmy3/r5st/5mHKP/q4a3//////+ng
+ q/+umiz/qJUr/7CcLf+wnC3/qJUr/5+MKf/cznr///////Ltzv+0oC3/qZYr/6+bLf+pliv/q5gs/9zO
+ ev/7+vD/5tyh/8CqMP+wnC3/qZYr/8CqMP/m3KH/+/rw/9zOev+rmCz/qZYr/6+bLf+pliv/tKAt//Lt
+ zv//////3M56/5+MKf+olSv/sJwt/7CcLf+xnS3/m4ko/8y4R//+/vv/+/rw/9TCXv+diyj/qZYr/66a
+ LP+hjin/taAt/9jIbP+7pS//rpos/6+bLf+vmy3/rpos/7ulL//YyGz/taAt/6GOKf+umiz/qZYr/52L
+ KP/Uwl7/+/rw//7++//MuEf/m4ko/7GdLf+wnC3/sJwt/7KeLf+kkSr/sJwt/+7muv//////7OS0/7mj
+ Lv+olSv/rZos/62aLP+pliv/rZks/6yZLP+tmiz/r5st/6+bLf+tmiz/rJks/62ZLP+pliv/rZos/62a
+ LP+olSv/uaMu/+zktP//////7ua6/7CcLf+kkSr/sp4t/7CcLf+wnC3/sJwt/6+bLf+eiyn/zblJ///+
+ /f///v3/4NOI/7ahLf+smSz/sp4t/6+bLf+nlCv/r5st/7CcLf+wnC3/sJwt/7CcLf+vmy3/p5Qr/6+b
+ Lf+yni3/rJks/7ahLf/g04j///79///+/f/NuUn/nosp/6+bLf+wnC3/sJwt/7CcLf+vmy3/tKAt/6CN
+ Kf+pliv/5tuf//7++//j2JX/uqQu/6uYLP+umiz/sJwt/6+bLf+vmy3/r5st/6+bLf+wnC3/r5st/6+b
+ Lf+vmy3/sJwt/66aLP+rmCz/uqQu/+PYlf/+/vv/5tuf/6mWK/+gjSn/tKAt/6+bLf+wnC3/sJwt/7Cc
+ Lf+xnS3/q5gs/6eUK/+4oi7/2st0/8WvMv+umiz/rZos/7CcLf+umiz/sJwt/6+bLf+vmy3/r5st/6+b
+ LP+vmy3/r5st/7CcLf+umiz/sJwt/62aLP+umiz/xa8y/9rLdP+4oi7/p5Qr/6uYLP+xnS3/sJwt/7Cc
+ Lf+umiz/sJwt/6+bLf+xnS3/rJks/6eUK/+qlyv/rJks/66aLP+vmy3/r5st/7CcLf+umiz/sJwt/7Cc
+ Lf+wnC3/sJwt/7CcLf+wnC3/rpos/7CcLf+vmy3/r5st/66aLP+smSz/qpcr/6eUK/+smSz/sZ0t/6+b
+ Lf+wnC3/rpos/7CcLf+vmy3/r5st/6+bLf+vmy3/sZ0t/66aLP+wnC3/r5st/6+bLf+wnC3/sJwt/7Cc
+ Lf+vmy3/sJwt/7CcLf+vmy3/sJwt/6+bLf+wnC3/sJwt/7CcLf+vmy3/r5st/7CcLf+umiz/sZ0t/6+b
+ Lf+vmy3/r5st/6+bLf+wnC3/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -114,6 +114,23 @@
#endregion Constructors
+ #region Implementation
+
+ /// <summary>
+ /// Imports the specified configuration into this configuration.
+ /// </summary>
+ /// <param name="config">The configuration to merge in.</param>
+ public void Import(Configuration config)
+ {
+ // TODO: Improve import logic ...
+
+ _mappedEvents.AddRange(config.Events);
+ _programSettings.AddRange(config.Programs);
+ _systemWideMappings.AddRange(config.SystemWideMappings);
+ }
+
+ #endregion Implementation
+
#region Static Methods
/// <summary>
@@ -122,7 +139,7 @@
/// <param name="config">Configuration to save.</param>
/// <param name="fileName">File to save to.</param>
/// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns>
- internal static bool Save(Configuration config, string fileName)
+ public static bool Save(Configuration config, string fileName)
{
try
{
@@ -144,7 +161,7 @@
/// </summary>
/// <param name="fileName">File to load from.</param>
/// <returns>Loaded Configuration.</returns>
- internal static Configuration Load(string fileName)
+ public static Configuration Load(string fileName)
{
try
{
Modified: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -4,6 +4,7 @@
using System.Windows.Forms;
using IrssUtils;
+using IrssUtils.Exceptions;
namespace Translator
{
@@ -156,7 +157,7 @@
if (windowHandle != IntPtr.Zero)
Win32.SendWindowsMessage(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData));
else
- MessageBox.Show("Couldn't find target");
+ throw new CommandExecutionException("Could not find running Translator instance to send message to");
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -1137,16 +1137,11 @@
if (openFileDialog.ShowDialog(this) == DialogResult.OK)
{
Configuration newConfig = Configuration.Load(openFileDialog.FileName);
-
if (newConfig == null)
return;
- // TODO: Improve import logic ...
+ Program.Config.Import(newConfig);
- Program.Config.Events.AddRange(newConfig.Events);
- Program.Config.Programs.AddRange(newConfig.Programs);
- Program.Config.SystemWideMappings.AddRange(newConfig.SystemWideMappings);
-
RefreshProgramList();
RefreshButtonList();
RefreshEventList();
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2008-04-08 04:09:23 UTC (rev 1619)
@@ -17,6 +17,7 @@
using IrssComms;
using IrssUtils;
+using IrssUtils.Exceptions;
namespace Translator
{
@@ -26,7 +27,7 @@
#region Constants
- internal static readonly string ConfigFile = Path.Combine(Common.FolderAppData, "Translator\\Translator.xml");
+ static readonly string DefaultConfigFile = Path.Combine(Common.FolderAppData, "Translator\\Translator.xml");
internal static readonly string FolderMacros = Path.Combine(Common.FolderAppData, "Translator\\Macro");
@@ -49,6 +50,8 @@
#region Variables
+ static string _configFile;
+
static string _learnIRFilename;
static bool _registered;
@@ -68,6 +71,12 @@
#region Properties
+ internal static string ConfigFile
+ {
+ get { return _configFile; }
+ set { _configFile = value; }
+ }
+
internal static Configuration Config
{
get { return _config; }
@@ -100,18 +109,27 @@
[STAThread]
static void Main(string[] args)
{
+ _configFile = DefaultConfigFile;
+
if (args.Length > 0)
{
try
{
- ProcessCommandLine(args);
+ if (ProcessCommandLine(args))
+ return;
}
+ catch (CommandExecutionException ex)
+ {
+ MessageBox.Show(ex.Message, "Translator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ catch (CommandStructureException ex)
+ {
+ MessageBox.Show(ex.Message, "Translator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "Translator - Error processing command line", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
-
- return;
}
// Check for multiple instances.
@@ -137,10 +155,10 @@
_variables = new VariableList();
// Load configuration ...
- _config = Configuration.Load(ConfigFile);
+ _config = Configuration.Load(_configFile);
if (_config == null)
{
- IrssLog.Warn(String.Format("Failed to load configuration file ({0}), creating new configuration", ConfigFile));
+ IrssLog.Warn("Failed to load configuration file ({0}), creating new configuration", _configFile);
_config = new Configuration();
}
@@ -259,8 +277,10 @@
IrssLog.Error(e.Exception);
}
- static void ProcessCommandLine(string[] args)
+ static bool ProcessCommandLine(string[] args)
{
+ bool dontRun = true;
+
for (int index = 0; index < args.Length; index++)
{
string command = args[index].ToUpperInvariant();
@@ -271,21 +291,21 @@
if (args.Length > index + 2)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixBlast + args[++index] + '|' + args[++index]);
else
- Console.WriteLine("Blast command requires two parameters.");
+ throw new CommandStructureException("Blast command requires two parameters (IR file, Port)");
continue;
case "-MACRO":
if (args.Length > index + 1)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixMacro + args[++index]);
else
- Console.WriteLine("Macro command requires a parameter.");
+ throw new CommandStructureException("Macro command requires a parameter (Macro file)");
continue;
case "-EJECT":
if (args.Length > index + 1)
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixEject + args[++index]);
else
- Console.WriteLine("Eject command requires a parameter.");
+ throw new CommandStructureException("Eject command requires a parameter (Drive)");
continue;
case "-SHUTDOWN":
@@ -328,15 +348,28 @@
}
else
{
- Console.WriteLine("Channel command requires three parameters.");
+ throw new CommandStructureException("Channel command requires three parameters (Channel, Padding, Port)");
}
continue;
}
+ case "-CONFIG":
+ if (args.Length > index + 1)
+ _configFile = args[++index];
+ else
+ throw new CommandStructureException("Config command requires a parameter (Config file path)");
+
+ dontRun = false;
+ continue;
+
+
//TODO: Add more command line options.
+
}
}
+
+ return dontRun;
}
static void ShowOSD()
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -63,4 +63,8 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
+gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-07 16:45:08 UTC (rev 1618)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-08 04:09:23 UTC (rev 1619)
@@ -373,4 +373,8 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
+gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ 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...> - 2008-04-10 14:12:27
|
Revision: 1622
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1622&view=rev
Author: and-81
Date: 2008-04-10 07:12:11 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/FocusForcer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssMacro.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
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/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/setup/setup-languages.nsh
trunk/plugins/IR Server Suite/setup/setup.nsi
Added Paths:
-----------
trunk/plugins/IR Server Suite/setup/Images/
trunk/plugins/IR Server Suite/setup/Images/header.bmp
trunk/plugins/IR Server Suite/setup/Images/wizard-svn.bmp
trunk/plugins/IR Server Suite/setup/Images/wizard.bmp
Modified: trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -66,6 +66,7 @@
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -68,10 +68,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\irssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -96,10 +96,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\irssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -64,7 +64,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
-gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -506,7 +506,8 @@
if (forceFocus && !process.StartInfo.CreateNoWindow && process.StartInfo.WindowStyle != ProcessWindowStyle.Hidden)
{
FocusForcer forcer = new FocusForcer(process.Id);
- forcer.Start();
+ //forcer.Start();
+ forcer.Force();
}
if (waitForExit)
@@ -892,11 +893,11 @@
#region Misc
+ /*
/// <summary>
/// Get a list of commands found in the Command Libraries.
/// </summary>
/// <returns>Available commands.</returns>
- /*
public static Type[] GetLibraryCommands()
{
try
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/FocusForcer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/FocusForcer.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/FocusForcer.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -14,9 +14,11 @@
#region Variables
int _processId;
- Thread _forcerThread;
+ //Thread _forcerThread;
IntPtr _windowHandle;
+ EventWaitHandle _waitHandle;
+
#endregion Variables
#region Constructor
@@ -32,19 +34,72 @@
#endregion Constructor
+ #region Public Methods
- public void Start()
+ /// <summary>
+ /// Forces the process into focus (once).
+ /// </summary>
+ /// <returns></returns>
+ public bool Force()
{
+ Process process = Process.GetProcessById(_processId);
+ if (process == null || process.HasExited)
+ throw new InvalidOperationException("Cannot force focus, process is not running");
+
+ //if (_forcerThread != null)
+ //throw new InvalidOperationException("Cannot force focus, Forcer thread already running");
+
+ _waitHandle = new AutoResetEvent(false);
+
+ try
+ {
+ Win32.EnumWindowsProc ewc = new Win32.EnumWindowsProc(CheckWindow);
+
+ while (!process.HasExited)
+ {
+ int focusedId = Win32.GetForegroundWindowPID();
+ if (focusedId != _processId)
+ {
+ _windowHandle = IntPtr.Zero;
+ Win32.EnumerateWindows(ewc, IntPtr.Zero);
+
+ bool waitResult = _waitHandle.WaitOne(5000, false);
+
+ if (_windowHandle != IntPtr.Zero)
+ return Win32.SetForegroundWindow(_windowHandle, true);
+ }
+
+ Thread.Sleep(5000);
+ }
+ }
+ finally
+ {
+ _waitHandle.Close();
+ _waitHandle = null;
+ }
+
+ return false;
+ }
+
+ /*
+ /// <summary>
+ /// Starts the forcer thread.
+ /// </summary>
+ public void StartThread()
+ {
if (_forcerThread != null)
throw new InvalidOperationException("Focus Forcer is already running");
_forcerThread = new Thread(new ThreadStart(ForcerThread));
- _forcerThread.Name = "Focus Forcer";
+ _forcerThread.Name = "Focus Forcer Thread";
_forcerThread.IsBackground = true;
_forcerThread.Start();
}
-
- public void Stop()
+
+ /// <summary>
+ /// Stops the forcer thread.
+ /// </summary>
+ public void StopThread()
{
if (_forcerThread == null)
return;
@@ -52,46 +107,86 @@
_forcerThread.Abort();
_forcerThread = null;
}
+ */
+ #endregion Public Methods
+
+ #region Implementation
+
+ /*
void ForcerThread()
{
Process process = Process.GetProcessById(_processId);
-
- if (process == null || process.HasExited)
+ if (process == null)
return;
- Win32.EnumWindowsProc ewc = new Win32.EnumWindowsProc(CheckWindow);
+ _waitHandle = new AutoResetEvent(false);
- while (!process.HasExited)
+ try
{
- int focused = Win32.GetForegroundWindowPID();
- if (focused != _processId)
- Win32.EnumerateWindows(ewc, IntPtr.Zero);
+ Win32.EnumWindowsProc ewc = new Win32.EnumWindowsProc(CheckWindow);
- Thread.Sleep(5000);
+ while (!process.HasExited)
+ {
+ int focusedId = Win32.GetForegroundWindowPID();
+ if (focusedId != _processId)
+ {
+ _windowHandle = IntPtr.Zero;
+ Win32.EnumerateWindows(ewc, IntPtr.Zero);
+
+ bool waitResult = _waitHandle.WaitOne(5000, false);
+
+#if TRACE
+ Trace.WriteLine(String.Format("ForcerThread: waitResult = {0}", waitResult));
+#endif
+
+ if (_windowHandle != IntPtr.Zero)
+ {
+ bool result = Win32.SetForegroundWindow(_windowHandle, true);
+#if TRACE
+ Trace.WriteLine(String.Format("ForcerThread: SetForegroundWindow returned {0}", result));
+#endif
+ }
+ }
+
+ Thread.Sleep(5000);
+ }
}
+ finally
+ {
+ _waitHandle.Close();
+ _waitHandle = null;
+ }
}
+ */
bool CheckWindow(IntPtr hWnd, IntPtr lParam)
{
if (hWnd == IntPtr.Zero)
{
_windowHandle = IntPtr.Zero;
+#if TRACE
+ Trace.WriteLine("CheckWindow: hWnd == IntPtr.Zero, _waitHandle.Set();");
+#endif
+ _waitHandle.Set();
return false;
}
if (Win32.GetWindowPID(hWnd) == _processId)
{
- bool result = Win32.SetForegroundWindow(hWnd, true);
+ _windowHandle = hWnd;
#if TRACE
- Trace.WriteLine(String.Format("SetForegroundWindow: {0}", result));
+ Trace.WriteLine("CheckWindow: Win32.GetWindowPID(hWnd) == _processId, _waitHandle.Set();");
#endif
+ _waitHandle.Set();
return false;
}
return true;
}
+ #endregion Implementation
+
}
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssMacro.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssMacro.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssMacro.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -24,19 +24,52 @@
#region Constants
- // String comparisons ...
+ #region String comparisons
+
+ /// <summary>
+ /// Equals.
+ /// </summary>
public const string IfEquals = "==";
+ /// <summary>
+ /// Does Not Equal.
+ /// </summary>
public const string IfNotEqual = "!=";
+ /// <summary>
+ /// Contains.
+ /// </summary>
public const string IfContains = "CONTAINS";
+ /// <summary>
+ /// Starts With.
+ /// </summary>
public const string IfStartsWith = "STARTS WITH";
+ /// <summary>
+ /// Ends With.
+ /// </summary>
public const string IfEndsWith = "ENDS WITH";
- // Integer comparisons ...
+ #endregion String comparisons
+
+ #region Integer comparisons
+
+ /// <summary>
+ /// Greater Than.
+ /// </summary>
public const string IfGreaterThan = ">";
+ /// <summary>
+ /// Less Than.
+ /// </summary>
public const string IfLessThan = "<";
+ /// <summary>
+ /// Greater Than or Equal To.
+ /// </summary>
public const string IfGreaterThanOrEqual = ">=";
+ /// <summary>
+ /// Less Than or Equal To.
+ /// </summary>
public const string IfLessThanOrEqual = "<=";
+ #endregion Integer comparisons
+
#endregion Constants
#region Public Methods
@@ -190,7 +223,7 @@
/// <summary>
/// Gets the position of label within the macro.
/// </summary>
- /// <param name="commands">The macro commands.</param>
+ /// <param name="commandList">The command list.</param>
/// <param name="label">The label to find.</param>
/// <returns>The label position.</returns>
static int GetLabelPosition(string[] commandList, string label)
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -25,9 +25,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile>bin\Debug\IrssUtils.XML</DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@@ -57,7 +57,8 @@
<Compile Include="Exceptions\CommandStructureException.cs" />
<Compile Include="Exceptions\CommandExecutionException.cs" />
<Compile Include="Exceptions\MacroStructureException.cs" />
- <Compile Include="FocusForcer.cs" />
+ <Compile Include="FocusForcer.cs">
+ </Compile>
<Compile Include="Forms\BlastCommand.cs">
<SubType>Form</SubType>
</Compile>
@@ -374,7 +375,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>CALL "%25VS80COMNTOOLS%25vsvars32.bat"
-gacutil.exe /i $(TargetFileName)</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -1,6 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
+#if TRACE
+using System.Diagnostics;
+#endif
using System.Drawing;
using System.Runtime.InteropServices;
using System.Text;
@@ -1846,7 +1849,7 @@
//[return: MarshalAs(UnmanagedType.Bool)]
//static extern bool ShowWindowAsync(IntPtr hWnd, int nCmdShow);
- [DllImport("user32.dll")]
+ [DllImport("user32.dll", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
static extern bool AttachThreadInput(
int threadId,
@@ -1917,10 +1920,15 @@
static extern IntPtr GetParent(
IntPtr hWnd);
- [DllImport("user32.dll")]
- static extern uint GetWindowThreadProcessId(
+ /*
+ [DllImport("User32.dll", CharSet = CharSet.Auto)]
+ static extern bool PeekMessage(
+ out System.Windows.Forms.Message msg,
IntPtr hWnd,
- out uint lpdwProcessId);
+ uint messageFilterMin,
+ uint messageFilterMax,
+ uint flags);
+ */
#endregion Interop
@@ -2175,29 +2183,58 @@
/// <returns><c>true</c> if successful, otherwise <c>false</c>.</returns>
public static bool SetForegroundWindow(IntPtr hWnd, bool force)
{
+#if TRACE
+ Trace.WriteLine(String.Format("SetForegroundWindow({0}, {1})", hWnd, force));
+#endif
+
IntPtr fgWindow = GetForegroundWindow();
if (hWnd == fgWindow)
+ {
+#if TRACE
+ Trace.WriteLine("SetForegroundWindow: hWnd == fgWindow");
+#endif
return true;
+ }
- bool setResult = SetForegroundWindow(hWnd);
- if (!force)
- return setResult;
+ bool setAttempt = SetForegroundWindow(hWnd);
+#if TRACE
+ Trace.WriteLine(String.Format("SetForegroundWindow: setAttempt == {0}", setAttempt));
+#endif
+ if (!force || setAttempt)
+ return setAttempt;
if (fgWindow == IntPtr.Zero)
+ {
+#if TRACE
+ Trace.WriteLine("SetForegroundWindow: fgWindow == IntPtr.Zero");
+#endif
return false;
+ }
int fgWindowPID = -1;
GetWindowThreadProcessId(fgWindow, out fgWindowPID);
if (fgWindowPID == -1)
+ {
+#if TRACE
+ Trace.WriteLine("SetForegroundWindow: fgWindowPID == -1");
+#endif
return false;
+ }
+ // If we don't attach successfully to the windows thread then we're out of options
int curThreadID = GetCurrentThreadId();
-
- // If we don't attach successfully to the windows thread then we're out of options
- if (!AttachThreadInput(curThreadID, fgWindowPID, true))
+ bool attached = AttachThreadInput(curThreadID, fgWindowPID, true);
+ int lastError = Marshal.GetLastWin32Error();
+
+ if (!attached)
+ {
+#if TRACE
+ Trace.WriteLine(String.Format("SetForegroundWindow: !AttachThreadInput, LastError = {0}", lastError));
+#endif
return false;
+ }
SetForegroundWindow(hWnd);
BringWindowToTop(hWnd);
@@ -2206,6 +2243,11 @@
// Detach
AttachThreadInput(curThreadID, fgWindowPID, false);
+#if TRACE
+ Trace.WriteLine("SetForegroundWindow: Done");
+#endif
+
+
// We've done all that we can so base our return value on whether we have succeeded or not
return (GetForegroundWindow() == hWnd);
}
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -67,10 +67,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -144,15 +144,6 @@
/// <param name="args">The arguments.</param>
protected override void OnStart(string[] args)
{
-#if DEBUG
- IrssLog.LogLevel = IrssLog.Level.Debug;
-#else
- IrssLog.LogLevel = IrssLog.Level.Info;
-#endif
- IrssLog.Open("Input Service.log");
-
- IrssLog.Info("Install folder: {0}", SystemRegistry.GetInstallFolder());
-
IrssLog.Info("Starting Input Service ...");
LoadSettings();
@@ -468,8 +459,6 @@
{
IrssLog.Error(ex);
}
-
- IrssLog.Close();
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs 2008-04-10 14:12:11 UTC (rev 1622)
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Configuration.Install;
#if TRACE
using System.Diagnostics;
@@ -35,57 +36,111 @@
/// <param name="args">Command line parameters.</param>
static void Main(string[] args)
{
- if (args.Length == 1)
+#if DEBUG
+ IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
+
+ try
{
- TransactedInstaller transactedInstaller = new TransactedInstaller();
- InputServiceInstaller inputServiceInstaller = new InputServiceInstaller();
- transactedInstaller.Installers.Add(inputServiceInstaller);
+ if (args.Length == 0)
+ {
+ IrssLog.Open("Input Service.log");
- string path = "/assemblypath=" + Assembly.GetExecutingAssembly().Location;
- string[] cmdline = { path };
-
- InstallContext installContext = new InstallContext(String.Empty, cmdline);
- transactedInstaller.Context = installContext;
-
- if (args[0].Equals("/install", StringComparison.OrdinalIgnoreCase))
- {
- transactedInstaller.Install(new Hashtable());
+ InputService inputService = new InputService();
+ ServiceBase.Run(inputService);
}
- else if (args[0].Equals("/uninstall", StringComparison.OrdinalIgnoreCase))
+ else
{
- transactedInstaller.Uninstall(null);
- }
- else if (args[0].Equals("/start", StringComparison.OrdinalIgnoreCase))
- {
- using (ServiceController serviceController = new ServiceController(ServiceName))
- if (serviceController.Status == ServiceControllerStatus.Stopped)
- serviceController.Start();
- }
- else if (args[0].Equals("/stop", StringComparison.OrdinalIgnoreCase))
- {
- using (ServiceController serviceController = new ServiceController(ServiceName))
- if (serviceController.Status == ServiceControllerStatus.Running)
- serviceController.Stop();
- }
- else if (args[0].Equals("/restart", StringComparison.OrdinalIgnoreCase))
- {
- using (ServiceController serviceController = new ServiceController(ServiceName))
+ IrssLog.Open("Input Service - Command Line.log");
+
+ foreach (string parameter in args)
{
- if (serviceController.Status == ServiceControllerStatus.Running)
- serviceController.Stop();
+ switch (parameter.ToUpperInvariant())
+ {
+ case "/INSTALL":
+ IrssLog.Info("Installing Input Service ...");
+ using (TransactedInstaller transactedInstaller = new TransactedInstaller())
+ {
+ using (InputServiceInstaller inputServiceInstaller = new InputServiceInstaller())
+ {
+ transactedInstaller.Installers.Add(inputServiceInstaller);
- serviceController.WaitForStatus(ServiceControllerStatus.Stopped, new TimeSpan(0, 0, 30));
+ string path = "/assemblypath=" + Assembly.GetExecutingAssembly().Location;
+ string[] cmdline = { path };
- if (serviceController.Status == ServiceControllerStatus.Stopped)
- serviceController.Start();
+ InstallContext installContext = new InstallContext(String.Empty, cmdline);
+ transactedInstaller.Context = installContext;
+
+ transactedInstaller.Install(new Hashtable());
+ }
+ }
+ break;
+
+ case "/UNINSTALL":
+ IrssLog.Info("Uninstalling Input Service ...");
+ using (TransactedInstaller transactedInstaller = new TransactedInstaller())
+ {
+ using (InputServiceInstaller inputServiceInstaller = new InputServiceInstaller())
+ {
+ transactedInstaller.Installers.Add(inputServiceInstaller);
+
+ string path = "/assemblypath=" + Assembly.GetExecutingAssembly().Location;
+ string[] cmdline = { path };
+
+ InstallContext installContext = new InstallContext(String.Empty, cmdline);
+ transactedInstaller.Context = installContext;
+
+ transactedInstaller.Uninstall(null);
+ }
+ }
+ break;
+
+ case "/START":
+ IrssLog.Info("Starting Input Service ...");
+ using (ServiceController serviceController = new ServiceController(ServiceName))
+ if (serviceController.Status == ServiceControllerStatus.Stopped)
+ serviceController.Start();
+ break;
+
+ case "/STOP":
+ IrssLog.Info("Stopping Input Service ...");
+ using (ServiceController serviceController = new ServiceController(ServiceName))
+ if (serviceController.Status == ServiceControllerStatus.Running)
+ serviceController.Stop();
+ break;
+
+ case "/RESTART":
+ IrssLog.Info("Restarting Input Service ...");
+ using (ServiceController serviceController = new ServiceController(ServiceName))
+ {
+ if (serviceController.Status == ServiceControllerStatus.Running)
+ serviceController.Stop();
+
+ serviceController.WaitForStatus(ServiceControllerStatus.Stopped, new TimeSpan(0, 0, 30));
+
+ if (serviceController.Status == ServiceControllerStatus.Stopped)
+ serviceController.Start();
+ }
+ break;
+
+ default:
+ throw new InvalidOperationException(String.Format("Unknown command line parameter \"{0}\"", parameter));
+ }
}
+
+ IrssLog.Info("Done.");
}
-
- return;
}
-
- InputService inputService = new InputService();
- ServiceBase.Run(inputService);
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex);
+ }
+ finally
+ {
+ IrssLog.Close();
+ }
}
/// <summary>
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 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj 2008-04-10 14:12:11 UTC (rev 1622)
@@ -115,10 +115,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
Added: trunk/plugins/IR Server Suite/setup/Images/header.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/setup/Images/header.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/setup/Images/wizard-svn.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/setup/Images/wizard-svn.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/setup/Images/wizard.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/setup/Images/wizard.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/IR Server Suite/setup/setup-languages.nsh
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup-languages.nsh 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/setup/setup-languages.nsh 2008-04-10 14:12:11 UTC (rev 1622)
@@ -37,7 +37,7 @@
LangString DESC_SectionTV2BlasterPlugin ${LANG_ENGLISH} "For tuning external channels (on Set Top Boxes) with the default MediaPortal TV engine."
LangString DESC_SectionGroupTV3 ${LANG_ENGLISH} "MediaPortal TV Server plugins."
LangString DESC_SectionTV3BlasterPlugin ${LANG_ENGLISH} "For tuning external channels (on Set Top Boxes) with the MediaPortal TV server."
-LangString DESC_SectionGroupMCE ${LANG_ENGLISH} "Windows Media Center Add-Ons."
+LangString DESC_SectionGroupMCE ${LANG_ENGLISH} "Windows Media Center add-ons."
LangString DESC_SectionMCEBlaster ${LANG_ENGLISH} "For tuning external channels (on Set Top Boxes) with Windows Media Center."
LangString DESC_SectionTranslator ${LANG_ENGLISH} "Control your whole PC."
LangString DESC_SectionTrayLauncher ${LANG_ENGLISH} "Simple program to launch an application of your choosing when a particular button is pressed."
Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-09 15:58:07 UTC (rev 1621)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi 2008-04-10 14:12:11 UTC (rev 1622)
@@ -33,10 +33,10 @@
!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}"
!else # it's an svn release
!define BuildType "Debug"
- !define VERSION "Debug build ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}"
+ !define VERSION "Test Build ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}"
!endif
-BrandingText "${PRODUCT_NAME} ${VERSION} by ${PRODUCT_PUBLISHER}"
+BrandingText "${PRODUCT_NAME} - ${VERSION} by ${PRODUCT_PUBLISHER}"
SetCompressor /SOLID /FINAL lzma
;======================================
@@ -62,15 +62,9 @@
Name "${PRODUCT_NAME}"
OutFile "..\${PRODUCT_NAME} - ${VERSION}.exe"
InstallDir ""
-#InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
-#InstallDirRegKey HKLM "${REG_UNINSTALL}" InstallPath
-!if ${VER_BUILD} != 0
- ShowInstDetails show
- ShowUninstDetails show
-!else
- ShowInstDetails hide
- ShowUninstDetails hide
-!endif
+
+ShowInstDetails show
+ShowUninstDetails show
CRCCheck On
; Variables
@@ -78,6 +72,9 @@
var DIR_MEDIAPORTAL
var DIR_TVSERVER
+var MP_INSTALLED
+var TVSERVER_INSTALLED
+
#---------------------------------------------------------------------------
# INSTALLER INTERFACE settings
#---------------------------------------------------------------------------
@@ -85,23 +82,22 @@
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-#!define MUI_HEADERIMAGE
-#!if ${VER_BUILD} == 0 # it's a stable release
-# !define MUI_HEADERIMAGE_BITMAP "images\header.bmp"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
-# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
-#!else # it's an svn release
-# !define MUI_HEADERIMAGE_BITMAP "images\header-svn.bmp"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
-# !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
-#!endif
-#!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "images\header.bmp"
+!if ${VER_BUILD} == 0
+ !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard.bmp"
+!else
+ !define MUI_WELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "images\wizard-svn.bmp"
+!endif
+!define MUI_HEADERIMAGE_RIGHT
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_NOAUTOCLOSE
;!define MUI_FINISHPAGE_RUN_NOTCHECKED
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Input Service Configuration\Input Service Configuration.exe"
-;!define MUI_FINISHPAGE_RUN_TEXT "Run Input Service Configuration (generally not necessary)"
+;!define MUI_FINISHPAGE_RUN "$DIR_INSTALL\Input Service Configuration\Input Service Configuration.exe"
+;!define MUI_FINISHPAGE_RUN_TEXT "Run Input Service Configuration"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -117,41 +113,27 @@
; MediaPortal install path
!define MUI_PAGE_HEADER_TEXT "Choose MediaPortal Location"
!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install MediaPortal plugins."
-!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install MediaPortal plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
!define MUI_DIRECTORYPAGE_TEXT_DESTINATION "MediaPortal Folder"
!define MUI_DIRECTORYPAGE_VARIABLE "$DIR_MEDIAPORTAL"
!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreMP
-#!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowMP
-#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveMP
!insertmacro MUI_PAGE_DIRECTORY
; TV Server install path
-
!define MUI_PAGE_HEADER_TEXT "Choose TV Server Location"
!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install TV Server plugins."
-!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
+!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install TV Server plugins in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
!define MUI_DIRECTORYPAGE_TEXT_DESTINATION "TV Server Folder"
!define MUI_DIRECTORYPAGE_VARIABLE "$DIR_TVSERVER"
!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPreTV
-#!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowTV
-#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveTV
!insertmacro MUI_PAGE_DIRECTORY
-; !!!!! changed the order of the directory pages, to prevent if
-; no mp and no tve3 plugins were selected the page on irserversuite
-; shows the NEXT button but the mpand tve3 pages abort and installation starts
-; no both pages would abort and won't be shown, and
-; irserver suite dir page shows the install button :-)
-
; Main app install path
!define MUI_PAGE_HEADER_TEXT "Choose ${PRODUCT_NAME} Location"
!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install ${PRODUCT_NAME}."
-!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+!define MUI_DIRECTORYPAGE_TEXT_TOP "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Install to start the installation."
!define MUI_DIRECTORYPAGE_TEXT_DESTINATION "${PRODUCT_NAME} Folder"
!define MUI_DIRECTORYPAGE_VARIABLE "$DIR_INSTALL"
-#!define MUI_PAGE_CUSTOMFUNCTION_SHOW DirectoryShowApp
-#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
-#!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeaveApp
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@@ -194,84 +176,45 @@
!insertmacro "${MacroName}" "SectionDebugClient"
!macroend
-!macro initRegKeys
- ${If} ${RunningX64}
+;======================================
+!macro Initialize
+
+ ${If} ${RunningX64}
SetRegView 64
+ ${Endif}
- ${DisableX64FSRedirection}
+ ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
+ ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
+ ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
-
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
-
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
-
- ${If} $DIR_MEDIAPORTAL == ""
- !insertmacro MP_GET_INSTALL_DIR "$DIR_MEDIAPORTAL"
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- !insertmacro TVSERVER_GET_INSTALL_DIR "$DIR_TVSERVER"
- ${Endif}
-
- ${Endif}
-
- ${EnableX64FSRedirection}
-
- ${Else}
-
+ ${If} ${RunningX64}
SetRegView 32
+ ${EnableX64FSRedirection}
+ ${Endif}
- ; Get IR Server Suite installation directory ...
- ReadRegStr $DIR_INSTALL HKLM "Software\${PRODUCT_NAME}" "Install_Dir"
- ${If} $DIR_INSTALL == ""
- StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
- ${Endif}
+ ; Get MediaPortal installation directory ...
+ ${If} $DIR_MEDIAPORTAL == ""
+ !insertmacro MP_GET_INSTALL_DIR "$DIR_MEDIAPORTAL"
+ ${Endif}
- ; Get MediaPortal installation directory ...
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\${PRODUCT_NAME}" "MediaPortal_Dir"
- ${If} $DIR_MEDIAPORTAL == ""
+ ; Get MediaPortal TV Server installation directory ...
+ ${If} $DIR_TVSERVER == ""
+ !insertmacro TVSERVER_GET_INSTALL_DIR "$DIR_TVSERVER"
+ ${Endif}
- ReadRegStr $DIR_MEDIAPORTAL HKLM "Software\Team MediaPortal\MediaPortal" "ApplicationDir"
+ ${If} ${RunningX64}
+ SetRegView 64
+ ${DisableX64FSRedirection}
+ ${Endif}
- ${If} $DIR_MEDIAPORTAL == ""
- !insertmacro MP_GET_INSTALL_DIR "$DIR_MEDIAPORTAL"
- ${Endif}
-
- ${Endif}
-
- ; Get MediaPortal TV Server installation directory ...
- ReadRegStr $DIR_TVSERVER HKLM "Software\${PRODUCT_NAME}" "TVServer_Dir"
- ${If} $DIR_TVSERVER == ""
-
- ReadRegStr $DIR_TVSERVER HKLM "Software\Team MediaPortal\MediaPortal TV Server" "InstallPath"
-
- ${If} $DIR_TVSERVER == ""
- !insertmacro TVSERVER_GET_INSTALL_DIR "$DIR_TVSERVER"
- ${Endif}
-
- ${Endif}
-
+ ; Get IR Server Suite installation directory ...
+ ${If} $DIR_INSTALL == ""
+ StrCpy '$DIR_INSTALL' '$PROGRAMFILES\${PRODUCT_NAME}'
${Endif}
- StrCpy $INSTDIR "$DIR_INSTALL"
!macroend
-
+
;======================================
;======================================
@@ -658,7 +601,7 @@
;======================================
-SectionGroup /e "Media Center Add-Ons" SectionGroupMCE
+SectionGroup /e "Media Center add-ons" SectionGroupMCE
!if ${VER_BUILD} != 0
${MementoSection} "Media Center Blaster (experimental)" SectionMCEBlaster
@@ -688,12 +631,12 @@
!macro Remove_${SectionMCEBlaster}
DetailPrint "Attempting to remove Media Center Blaster ..."
- ; remove Start Menu shortcuts
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Media Center Blaster.lnk"
-
; Remove auto-run
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Media Center Blaster"
+ ; remove Start Menu shortcuts
+ Delete "$SMPROGRAMS\${PRODUCT_NAME}\Media Center Blaster.lnk"
+
; remove files
RMDir /R /REBOOTOK "$DIR_INSTALL\Media Center Blaster"
!macroend
@@ -734,12 +677,12 @@
!macro Remove_${SectionTranslator}
DetailPrint "Attempting to remove Translator ..."
- ; remove Start Menu shortcuts
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk"
-
; Remove auto-run
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Translator"
+ ; remove Start Menu shortcuts
+ Delete "$SMPROGRAMS\${PRODUCT_NAME}\Translator.lnk"
+
; remove files
RMDir /R /REBOOTOK "$DIR_INSTALL\Translator"
!macroend
@@ -773,12 +716,12 @@
!macro Remove_${SectionTrayLauncher}
DetailPrint "Attempting to remove Tray Launcher ..."
- ; remove Start Menu shortcuts
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk"
-
; Remove auto-run
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Tray Launcher"
+ ; remove Start Menu shortcuts
+ Delete "$SMPROGRAMS\${PRODUCT_NAME}\Tray Launcher.lnk"
+
; remove files
RMDir /R /REBOOTOK "$DIR_INSTALL\Tray Launcher"
!macroend
@@ -919,9 +862,6 @@
; Create folders
CreateDirectory "$APPDATA\${PRODUCT_NAME}\Keyboard Input Relay"
- ; Remove auto-run
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
-
; Create start menu shortcut
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" "" "$DIR_INSTALL\Keyboard Input Relay\KeyboardInputRelay.exe" 0
@@ -929,6 +869,9 @@
!macro Remove_${SectionKeyboardInputRelay}
DetailPrint "Attempting to remove Keyboard Relay ..."
+ ; Remove auto-run
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Keyboard Input Relay"
+
; remove Start Menu shortcuts
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Keyboard Input Relay.lnk"
@@ -1054,7 +997,9 @@
WriteUninstaller "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
; Create start menu shortcuts
+!if ${VER_BUILD} == 0
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Documentation.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.chm"
+!endif
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$DIR_INSTALL\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Log Files.lnk" "$APPDATA\${PRODUCT_NAME}\Logs"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe" "" "$DIR_INSTALL\Uninstall ${PRODUCT_NAME}.exe"
@@ -1136,13 +1081,26 @@
Function .onInit
-!insertmacro initRegKeys
+ ${IfNot} ${MP023IsInstalled}
+ ${AndIfNot} ${MPIsInstalled}
+ StrCpy '$MP_INSTALLED' 'FALSE'
+ ${Else}
+ StrCpy '$MP_INSTALLED' 'TRUE'
+ ${EndIf}
-; reads components status for registry
-${MementoSectionRestore}
+ ${IfNot} ${TVServerIsInstalled}
+ StrCpy '$TVSERVER_INSTALLED' 'FALSE'
+ ${Else}
+ StrCpy '$TVSERVER_INSTALLED' 'TRUE'
+ ${EndIf}
-Call .onSelChange
+ !insertmacro Initialize
+ ; reads components status for registry
+ ${MementoSectionRestore}
+
+ Call .onSelChange
+
FunctionEnd
;======================================
@@ -1183,20 +1141,21 @@
;======================================
Function ComponentsPre
-; ${IfNot} ${MP023IsInstalled}
-; ${AndIfNot} ${MPIsInstalled}
-; !insertmacro DisableComponent "${SectionGroupMP}" " ($(TEXT_MP_NOT_INSTALLED))"
-; !insertmacro DisableComponent "${SectionMPCommon}" ""
-; !insertmacro DisableComponent "${SectionMPControlPlugin}" ""
-; !insertmacro DisableComponent "${SectionMPBlastZonePlugin}" ""
-; !insertmacro DisableComponent "${SectionTV2BlasterPlugin}" ""
-; ${EndIf}
-; ${IfNot} ${TVServerIsInstalled}
-; !insertmacro DisableComponent "${SectionGroupTV3}" " ($(TEXT_TVSERVER_NOT_INSTALLED))"
-; !insertmacro DisableComponent "${SectionTV3Common}" ""
-; !insertmacro DisableComponent "${SectionTV3BlasterPlugin}" ""
-; ${EndIf}
+ ${If} $MP_INSTALLED == "FALSE"
+ !insertmacro DisableComponent "${SectionGroupMP}" " ($(TEXT_MP_NOT_INSTALLED))"
+ !insertmacro DisableComponent "${SectionMPCommon}" ""
+ !insertmacro DisableComponent "${SectionMPControlPlugin}" ""
+ !insertmacro DisableComponent "${SectionMPBlastZonePlugin}" ""
+ !insertmacro DisableComponent "${SectionTV2BlasterPlugin}" ""
+ ${Endif}
+
+ ${If} $TVSERVER_INSTALLED == "FALSE"
+ !insertmacro DisableComponent "${SectionGroupTV3}" " ($(TEXT_TVSERVER_NOT_INSTALLED))"
+ !insertmacro DisableComponent "${SectionTV3Common}" ""
+ !insertmacro DisableComponent "${SectionTV3BlasterPlugin}" ""
+ ${Endif}
+
FunctionEnd
;======================================
@@ -1264,13 +1223,13 @@
;======================================
Function FinishShow
- ; This function is called, after the Finish Page creation is finished
+ ; This function is called, after the Finish Page creation is finished
- ; It checks, if the Server has been selected and only displays the run checkbox in this case
- ${IfNot} ${SectionIsSelected} SectionInputService
- SendMessage $mui.FinishPage.Run ${BM_CLICK} 0 0
- ShowWindow $mui.FinishPage.Run ${SW_HIDE}
- ${EndIf}
+ ; It checks, if the Server has been selected and only displays the run checkbox in this case
+ ${IfNot} ${SectionIsSelected} SectionInputService
+ SendMessage $mui.FinishPage.Run ${BM_CLICK} 0 0
+ ShowWindow $mui.FinishPage.Run ${SW_HIDE}
+ ${EndIf}
FunctionEnd
;======================================
@@ -1285,7 +1244,7 @@
Function un.onInit
- !insertmacro initRegKeys
+ !insertmacro Initialize
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
Abort
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X