Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4486] trunk/plugins/PowerScheduler++/Stable
|
From: <mic...@us...> - 2012-05-16 15:32:31
|
Revision: 4486
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4486&view=rev
Author: michael-t
Date: 2012-05-16 15:32:18 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Stable Version 1.2.3.0
Modified Paths:
--------------
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx
Added Paths:
-----------
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1
Removed Paths:
-------------
trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.6.0.mpe1
Added: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.6.0.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/MPEI/PowerScheduler++.xmp2 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 2012-05-16 15:32:18 UTC (rev 4486)
@@ -93,7 +93,7 @@
<Items>
<SectionParam Name="Header text">
<Value>[Name] [Version]
-([DevelopmentStatus] / experimental)</Value>
+([DevelopmentStatus])</Value>
<ValueType>String</ValueType>
<Description />
</SectionParam>
@@ -439,7 +439,7 @@
<Params>
<Items>
<SectionParam Name="Header text">
- <Value>The Extension Installer Wizard has successfully installed [Name] [Version] ([DevelopmentStatus] / experimental).</Value>
+ <Value>The Extension Installer Wizard has successfully installed [Name] [Version] ([DevelopmentStatus]).</Value>
<ValueType>String</ValueType>
<Description />
</SectionParam>
@@ -482,12 +482,12 @@
</MinVersion>
<MaxVersion>
<Major>1</Major>
- <Minor>3</Minor>
- <Build>0</Build>
+ <Minor>2</Minor>
+ <Build>99999</Build>
<Revision>99999</Revision>
</MaxVersion>
- <WarnOnly>true</WarnOnly>
- <Message>For MediaPortal release 1.2.x and 1.3.x (not compatible with 1.1.x releases)</Message>
+ <WarnOnly>false</WarnOnly>
+ <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message>
<Name>PowerScheduler++</Name>
</DependencyItem>
<DependencyItem>
@@ -519,19 +519,27 @@
<Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id>
<Author>michael_t (based on PowerScheduler by micheloe)</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl>
+ <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>2</Minor>
- <Build>6</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription>
- <VersionDescription>Version 1.2.6.0 - Beta version for MP 1.2.x and 1.3.x</VersionDescription>
- <DevelopmentStatus>Beta</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation>
- <ReleaseDate>2012-01-29T16:03:54</ReleaseDate>
+ <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features:
+- Plug&Play mode (just select profile and idle time)
+- Windows power settings are made automatically
+- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...)
+- Client settings are automatically matched to server configuration on single-seat scenarios
+- Configurable scheduler for automatic system reboot
+- Processes, Network monitor and Active shares also for standalone clients
+- Audio is unmuted after wakeup or return from away mode if necessary
+- ...</ExtensionDescription>
+ <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation>
+ <ReleaseDate>2012-05-15T16:03:54</ReleaseDate>
<Tags>tv server plugins, automation</Tags>
<Location>..\MPEI\[Name] [Version].mpe1</Location>
<Params>
@@ -554,7 +562,16 @@
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
- <Value />
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</Value>
<ValueType>String</ValueType>
<Description>Online stored screenshot urls separated by ; </Description>
</SectionParam>
@@ -614,14 +631,14 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>PowerScheduler_high.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{fa2ede5d-3194-44b3-aee9-d1c15d3afbce}-PowerScheduler_high.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{34eff1a4-e2c5-45b8-bec9-5dee831bdf50}-PowerScheduler_high.png</ZipFileName>
<DestinationFilename />
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{bbb5447e-7524-4a9f-b516-cba334470cbc}-PowerScheduler.gif</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{022dd12c-f3ff-4cf1-a006-f456ecdba65c}-PowerScheduler.gif</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/MPEI/update.xml 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml 2012-05-16 15:32:18 UTC (rev 4486)
@@ -56,157 +56,14 @@
<MaxVersion>
<Major>1</Major>
<Minor>2</Minor>
- <Build>5</Build>
- <Revision>0</Revision>
+ <Build>99999</Build>
+ <Revision>99999</Revision>
</MaxVersion>
- <WarnOnly>true</WarnOnly>
- <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message>
- <Name>PowerScheduler++</Name>
- </DependencyItem>
- <DependencyItem>
- <Type>MediaPortal</Type>
- <Id />
- <MinVersion>
- <Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
- </MinVersion>
- <MaxVersion>
- <Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
- </MaxVersion>
<WarnOnly>false</WarnOnly>
<Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message>
<Name>PowerScheduler++</Name>
</DependencyItem>
- </Items>
- </Dependencies>
- <PluginDependencies>
- <Items />
- </PluginDependencies>
- <GeneralInfo>
- <Name>PowerScheduler++</Name>
- <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id>
- <Author>michael_t (based on PowerScheduler by micheloe)</Author>
- <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl>
- <Version>
- <Major>1</Major>
- <Minor>2</Minor>
- <Build>5</Build>
- <Revision>12</Revision>
- </Version>
- <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription>
- <VersionDescription>Version 1.2.5.12 - Alpha / experimental version for MP 1.2.x
-
-- Bugfix: No sudden suspend after client is started</VersionDescription>
- <DevelopmentStatus>Alpha</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation>
- <ReleaseDate>2012-01-27T16:03:54</ReleaseDate>
- <Tags>tv server plugins, automation</Tags>
- <Location>..\MPEI\[Name] [Version].mpe1</Location>
- <Params>
- <Items>
- <SectionParam Name="Online Icon">
- <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value>
- <ValueType>String</ValueType>
- <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
- </SectionParam>
- <SectionParam Name="Configuration file">
- <Value>%TvServerBase%\SetupTv.exe</Value>
- <ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
- If have .exe extension the will be executed
- If have .dll extension used like MP plugin configuration</Description>
- </SectionParam>
- <SectionParam Name="Online Screenshots">
- <Value />
- <ValueType>String</ValueType>
- <Description>Online stored screenshot urls separated by ; </Description>
- </SectionParam>
- <SectionParam Name="Force to uninstall on update">
- <Value>YES</Value>
- <ValueType>Bool</ValueType>
- <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
- </SectionParam>
- </Items>
- </Params>
- </GeneralInfo>
- <UniqueFileList>
- <Items />
- </UniqueFileList>
- <ProjectSettings>
- <FolderGroups />
- </ProjectSettings>
- <IsSkin>false</IsSkin>
- </PackageClass>
- <PackageClass>
- <Version>2.0</Version>
- <Groups>
- <Items>
- <GroupItem Name="Server files">
- <DisplayName>Server files</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Server files</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Client files">
- <DisplayName>Client files</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Client files</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Original Files">
- <DisplayName>Original Files</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Original Files</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Never">
- <DisplayName>Never</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Never</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- </Items>
- </Groups>
- <Sections>
- <Items />
- </Sections>
- <Dependencies>
- <Items>
<DependencyItem>
- <Type>Installer</Type>
- <Id />
- <MinVersion>
- <Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
- </MinVersion>
- <MaxVersion>
- <Major>1</Major>
- <Minor>3</Minor>
- <Build>0</Build>
- <Revision>99999</Revision>
- </MaxVersion>
- <WarnOnly>true</WarnOnly>
- <Message>For MediaPortal release 1.2.x and 1.3.x (not compatible with 1.1.x releases)</Message>
- <Name>PowerScheduler++</Name>
- </DependencyItem>
- <DependencyItem>
<Type>MediaPortal</Type>
<Id />
<MinVersion>
@@ -235,19 +92,27 @@
<Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id>
<Author>michael_t (based on PowerScheduler by micheloe)</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-test-version-1-2-5-0-mediaportal-1-2-x-1-3-alpha-87446/</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=49</UpdateUrl>
+ <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>2</Minor>
- <Build>6</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features (easier configuration, reboot option, ...) and configurable support for "away mode" on Vista and Win7 systems.</ExtensionDescription>
- <VersionDescription>Version 1.2.6.0 - Beta version for MP 1.2.x and 1.3.x</VersionDescription>
- <DevelopmentStatus>Beta</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=40</OnlineLocation>
- <ReleaseDate>2012-01-29T16:03:54</ReleaseDate>
+ <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features:
+- Plug&Play mode (just select profile and idle time)
+- Windows power settings are made automatically
+- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...)
+- Client settings are automatically matched to server configuration on single-seat scenarios
+- Configurable scheduler for automatic system reboot
+- Processes, Network monitor and Active shares also for standalone clients
+- Audio is unmuted after wakeup or return from away mode if necessary
+- ...</ExtensionDescription>
+ <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation>
+ <ReleaseDate>2012-05-15T16:03:54</ReleaseDate>
<Tags>tv server plugins, automation</Tags>
<Location>..\MPEI\[Name] [Version].mpe1</Location>
<Params>
@@ -265,7 +130,16 @@
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
- <Value />
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</Value>
<ValueType>String</ValueType>
<Description>Online stored screenshot urls separated by ; </Description>
</SectionParam>
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -175,11 +175,11 @@
this.checkBoxRebootWakeup.AutoSize = true;
this.checkBoxRebootWakeup.Location = new System.Drawing.Point(12, 117);
this.checkBoxRebootWakeup.Name = "checkBoxRebootWakeup";
- this.checkBoxRebootWakeup.Size = new System.Drawing.Size(150, 17);
+ this.checkBoxRebootWakeup.Size = new System.Drawing.Size(180, 17);
this.checkBoxRebootWakeup.TabIndex = 4;
- this.checkBoxRebootWakeup.Text = "Wakeup system for reboot";
- this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, reboot will be caught up when the system is running again.\r\nThe sys" +
- "tem will reboot only when not busy with other tasks.");
+ this.checkBoxRebootWakeup.Text = "Wakeup the computer for reboot";
+ this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, the reboot will be caught up when the system is running again.\r\nThe" +
+ " computer will reboot only when not busy with other tasks.");
this.checkBoxRebootWakeup.UseVisualStyleBackColor = true;
this.checkBoxRebootWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable);
//
@@ -280,11 +280,11 @@
this.checkBoxMPClientRunning.AutoSize = true;
this.checkBoxMPClientRunning.Location = new System.Drawing.Point(12, 52);
this.checkBoxMPClientRunning.Name = "checkBoxMPClientRunning";
- this.checkBoxMPClientRunning.Size = new System.Drawing.Size(309, 17);
+ this.checkBoxMPClientRunning.Size = new System.Drawing.Size(379, 17);
this.checkBoxMPClientRunning.TabIndex = 2;
- this.checkBoxMPClientRunning.Text = "No standby after idle timeout while MediaPortal client is not running";
- this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents standby after idle timeout while doing administrative work\r\n(only recommended for a single-" +
- "seat HTPC).");
+ this.checkBoxMPClientRunning.Text = "Do not put the computer to sleep while the MediaPortal client is not running";
+ this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents automatic standby while doing administrative work\r\n(only recommended for" +
+ " a single-seat HTPC).");
this.checkBoxMPClientRunning.UseVisualStyleBackColor = true;
this.checkBoxMPClientRunning.CheckedChanged += new System.EventHandler(this.checkBoxMPClientRunning_CheckedChanged);
//
@@ -293,9 +293,9 @@
this.checkBoxProcessesAwayMode.AutoSize = true;
this.checkBoxProcessesAwayMode.Location = new System.Drawing.Point(34, 77);
this.checkBoxProcessesAwayMode.Name = "checkBoxProcessesAwayMode";
- this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(372, 17);
+ this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxProcessesAwayMode.TabIndex = 3;
- this.checkBoxProcessesAwayMode.Text = "No user standby while processes are running (enable away mode)";
+ this.checkBoxProcessesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxProcessesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the selected processes are running.\r\n");
this.checkBoxProcessesAwayMode.UseVisualStyleBackColor = true;
@@ -328,9 +328,9 @@
this.checkBoxEPGAwayMode.AutoSize = true;
this.checkBoxEPGAwayMode.Location = new System.Drawing.Point(34, 175);
this.checkBoxEPGAwayMode.Name = "checkBoxEPGAwayMode";
- this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(334, 17);
+ this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxEPGAwayMode.TabIndex = 6;
- this.checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG (enable away mode)";
+ this.checkBoxEPGAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxEPGAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" until EPG grabbing is completed.");
this.checkBoxEPGAwayMode.UseVisualStyleBackColor = true;
@@ -351,10 +351,11 @@
this.checkBoxEPGPreventStandby.AutoSize = true;
this.checkBoxEPGPreventStandby.Location = new System.Drawing.Point(12, 150);
this.checkBoxEPGPreventStandby.Name = "checkBoxEPGPreventStandby";
- this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(225, 17);
+ this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(277, 17);
this.checkBoxEPGPreventStandby.TabIndex = 5;
- this.checkBoxEPGPreventStandby.Text = "No standby after idle timeout while grabbing EPG";
- this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The system will not go to standby until EPG grabbing is completed.");
+ this.checkBoxEPGPreventStandby.Text = "Do not put the computer to sleep while grabbing EPG";
+ this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The computer will not go to standby automatically until EPG grabbing is completed" +
+ ".");
this.checkBoxEPGPreventStandby.UseVisualStyleBackColor = true;
this.checkBoxEPGPreventStandby.CheckedChanged += new System.EventHandler(this.checkBoxEPGPreventStandby_CheckedChanged);
//
@@ -363,9 +364,9 @@
this.checkBoxNetworkAwayMode.AutoSize = true;
this.checkBoxNetworkAwayMode.Location = new System.Drawing.Point(34, 72);
this.checkBoxNetworkAwayMode.Name = "checkBoxNetworkAwayMode";
- this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(348, 17);
+ this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxNetworkAwayMode.TabIndex = 3;
- this.checkBoxNetworkAwayMode.Text = "No user standby while network is active (enable away mode)";
+ this.checkBoxNetworkAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxNetworkAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the network is active.\r\n");
this.checkBoxNetworkAwayMode.UseVisualStyleBackColor = true;
@@ -376,9 +377,9 @@
this.checkBoxSharesAwayMode.AutoSize = true;
this.checkBoxSharesAwayMode.Location = new System.Drawing.Point(34, 200);
this.checkBoxSharesAwayMode.Name = "checkBoxSharesAwayMode";
- this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(349, 17);
+ this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxSharesAwayMode.TabIndex = 4;
- this.checkBoxSharesAwayMode.Text = "No user standby while shares are active (enable away mode)";
+ this.checkBoxSharesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxSharesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the selected shares are active.\r\n");
this.checkBoxSharesAwayMode.UseVisualStyleBackColor = true;
@@ -458,9 +459,9 @@
this.checkBoxReinitializeController.AutoSize = true;
this.checkBoxReinitializeController.Location = new System.Drawing.Point(12, 22);
this.checkBoxReinitializeController.Name = "checkBoxReinitializeController";
- this.checkBoxReinitializeController.Size = new System.Drawing.Size(295, 17);
+ this.checkBoxReinitializeController.Size = new System.Drawing.Size(303, 17);
this.checkBoxReinitializeController.TabIndex = 0;
- this.checkBoxReinitializeController.Text = "Reinitialize tvcontroller on wakeup (also reinitializes tuner)";
+ this.checkBoxReinitializeController.Text = "Reinitialize TV controller on wakeup (also reinitializes tuner)";
this.toolTip.SetToolTip(this.checkBoxReinitializeController, "Reinitializes the internal TV controller and tuner setup (does not restart the TV" +
"-Server).");
this.checkBoxReinitializeController.UseVisualStyleBackColor = true;
@@ -510,10 +511,10 @@
this.checkBoxNetworkEnabled.AutoSize = true;
this.checkBoxNetworkEnabled.Location = new System.Drawing.Point(12, 22);
this.checkBoxNetworkEnabled.Name = "checkBoxNetworkEnabled";
- this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(239, 17);
+ this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(309, 17);
this.checkBoxNetworkEnabled.TabIndex = 0;
- this.checkBoxNetworkEnabled.Text = "No standby after idle timeout while network is active";
- this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The system will not go to standby while the network is active.");
+ this.checkBoxNetworkEnabled.Text = "Do not put the computer to sleep while the network is active";
+ this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The computer will not go to standby automatically while the network is active.");
this.checkBoxNetworkEnabled.UseVisualStyleBackColor = true;
this.checkBoxNetworkEnabled.CheckedChanged += new System.EventHandler(this.checkBoxNetworkEnabled_CheckedChanged);
//
@@ -522,10 +523,11 @@
this.checkBoxSharesEnabled.AutoSize = true;
this.checkBoxSharesEnabled.Location = new System.Drawing.Point(12, 22);
this.checkBoxSharesEnabled.Name = "checkBoxSharesEnabled";
- this.checkBoxSharesEnabled.Size = new System.Drawing.Size(240, 17);
+ this.checkBoxSharesEnabled.Size = new System.Drawing.Size(292, 17);
this.checkBoxSharesEnabled.TabIndex = 0;
- this.checkBoxSharesEnabled.Text = "No standby after idle timeout while shares are active";
- this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The system will not go to standby while the selected shares are active.");
+ this.checkBoxSharesEnabled.Text = "Do not put the computer to sleep while shares are active";
+ this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The computer will not go to standby automatically while the selected shares are a" +
+ "ctive.");
this.checkBoxSharesEnabled.UseVisualStyleBackColor = true;
this.checkBoxSharesEnabled.CheckedChanged += new System.EventHandler(this.checkBoxSharesEnabled_CheckedChanged);
//
@@ -560,7 +562,7 @@
//
this.numericUpDownIdleTimeout.Anchor = System.Windows.Forms.AnchorStyles.None;
this.numericUpDownIdleTimeout.AutoSize = true;
- this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(79, 3);
+ this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(161, 3);
this.numericUpDownIdleTimeout.Maximum = new decimal(new int[] {
300,
0,
@@ -782,9 +784,9 @@
this.checkBoxEPGWakeup.AutoSize = true;
this.checkBoxEPGWakeup.Location = new System.Drawing.Point(12, 117);
this.checkBoxEPGWakeup.Name = "checkBoxEPGWakeup";
- this.checkBoxEPGWakeup.Size = new System.Drawing.Size(186, 17);
+ this.checkBoxEPGWakeup.Size = new System.Drawing.Size(216, 17);
this.checkBoxEPGWakeup.TabIndex = 4;
- this.checkBoxEPGWakeup.Text = "Wakeup system for EPG grabbing";
+ this.checkBoxEPGWakeup.Text = "Wakeup the computer for EPG grabbing";
this.checkBoxEPGWakeup.UseVisualStyleBackColor = true;
this.checkBoxEPGWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable);
//
@@ -1283,26 +1285,26 @@
this.labelIdleTimeout1.AutoSize = true;
this.labelIdleTimeout1.Location = new System.Drawing.Point(3, 6);
this.labelIdleTimeout1.Name = "labelIdleTimeout1";
- this.labelIdleTimeout1.Size = new System.Drawing.Size(70, 13);
+ this.labelIdleTimeout1.Size = new System.Drawing.Size(152, 13);
this.labelIdleTimeout1.TabIndex = 10;
- this.labelIdleTimeout1.Text = "Standby after";
+ this.labelIdleTimeout1.Text = "Put the computer to sleep after";
//
// labelIdleTimeout2
//
this.labelIdleTimeout2.Anchor = System.Windows.Forms.AnchorStyles.None;
this.labelIdleTimeout2.AutoSize = true;
- this.labelIdleTimeout2.Location = new System.Drawing.Point(126, 6);
+ this.labelIdleTimeout2.Location = new System.Drawing.Point(208, 6);
this.labelIdleTimeout2.Name = "labelIdleTimeout2";
- this.labelIdleTimeout2.Size = new System.Drawing.Size(105, 13);
+ this.labelIdleTimeout2.Size = new System.Drawing.Size(43, 13);
this.labelIdleTimeout2.TabIndex = 12;
- this.labelIdleTimeout2.Text = "minutes (idle timeout)";
+ this.labelIdleTimeout2.Text = "minutes";
//
// labelExpertMode
//
this.labelExpertMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelExpertMode.AutoSize = true;
this.labelExpertMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlLight;
+ this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlDark;
this.labelExpertMode.Location = new System.Drawing.Point(237, 212);
this.labelExpertMode.Name = "labelExpertMode";
this.labelExpertMode.RightToLeft = System.Windows.Forms.RightToLeft.No;
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -162,10 +162,10 @@
// For Windows XP change away mode label texts
if (Environment.OSVersion.Version.Major < 6)
{
- checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG";
- checkBoxProcessesAwayMode.Text = "No user standby while processes are running";
- checkBoxNetworkAwayMode.Text = "No user standby while network is active";
- checkBoxSharesAwayMode.Text = "No user standby while shares are active";
+ checkBoxEPGAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxProcessesAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxNetworkAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxSharesAwayMode.Text = "Prevent the user from putting the computer to sleep";
}
#if SERVER
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx 2012-05-16 15:32:18 UTC (rev 4486)
@@ -170,6 +170,6 @@
<value>Available Profiles:
HTPC: Dedicated multimedia appliance with MediaPortal GUI
Desktop: MediaPortal as application for viewing media and recording TV
-Notebook: Optimized for mobile use, no scheduled recordings</value>
+Notebook: Optimized for mobile use, no scheduled wakeup</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/VersionInfo.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/VersionInfo.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -47,9 +47,9 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.6.0")]
-[assembly: AssemblyFileVersion("1.2.6.0")]
-[assembly: AssemblyInformationalVersion("1.2.6.0 beta version for MP 1.2.x and 1.3.x")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyInformationalVersion("1.2.3.0 version for MP 1.2.x")]
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -1031,7 +1031,7 @@
using (Settings reader = new MPSettings())
{
// Check if we only should suspend in MP's home window
- boolSetting = reader.GetValueAsBool("psclientplugin", "homeonly", false);
+ boolSetting = reader.GetValueAsBool("psclientplugin", "HomeOnly", false);
setting = _settings.GetSetting("HomeOnly");
setting.Set<bool>(boolSetting);
Log.Debug("PS: Only allow standby when on home window: {0}", boolSetting);
@@ -1059,7 +1059,7 @@
else
boolSetting = true; // HTPC, Desktop
_settings.WakeupEnabled = boolSetting;
- Log.Debug("PS: Wakeup system for varios events: {0}", boolSetting);
+ Log.Debug("PS: Wakeup system for various events: {0}", boolSetting);
// Check configured shutdown mode
intSetting = reader.GetValueAsInt("psclientplugin", "ShutdownMode", 0);
@@ -1086,7 +1086,7 @@
if (_settings.ShutdownEnabled != boolSetting)
{
_settings.ShutdownEnabled = boolSetting;
- Log.Debug("PS: PowerScheduler++ forces system to go to standby when idle: {0}", boolSetting);
+ Log.Debug("PS: Server plugin setting - PowerScheduler++ forces system to go to standby when idle: {0}", boolSetting);
changed = true;
}
@@ -1095,7 +1095,7 @@
if (_settings.IdleTimeout != intSetting)
{
_settings.IdleTimeout = intSetting;
- Log.Debug("PS: {0}: {1} minutes", (_settings.ShutdownEnabled ? "Standby after" : "System idle timeout"), intSetting);
+ Log.Debug("PS: Server plugin setting - {0}: {1} minutes", (_settings.ShutdownEnabled ? "Standby after" : "System idle timeout"), intSetting);
changed = true;
}
@@ -1104,7 +1104,7 @@
if (_settings.WakeupEnabled != boolSetting)
{
_settings.WakeupEnabled = boolSetting;
- Log.Debug("PS: Wakeup system for varios events: {0}", boolSetting);
+ Log.Debug("PS: Server plugin setting - Wakeup system for various events: {0}", boolSetting);
changed = true;
}
@@ -1113,7 +1113,7 @@
if ((int)_settings.ShutdownMode != intSetting)
{
_settings.ShutdownMode = (ShutdownMode)intSetting;
- Log.Debug("PS: Shutdown mode: {0}", _settings.ShutdownMode.ToString());
+ Log.Debug("PS: Server plugin setting - Shutdown mode: {0}", _settings.ShutdownMode.ToString());
changed = true;
}
}
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -175,11 +175,11 @@
this.checkBoxRebootWakeup.AutoSize = true;
this.checkBoxRebootWakeup.Location = new System.Drawing.Point(12, 117);
this.checkBoxRebootWakeup.Name = "checkBoxRebootWakeup";
- this.checkBoxRebootWakeup.Size = new System.Drawing.Size(150, 17);
+ this.checkBoxRebootWakeup.Size = new System.Drawing.Size(180, 17);
this.checkBoxRebootWakeup.TabIndex = 4;
- this.checkBoxRebootWakeup.Text = "Wakeup system for reboot";
- this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, reboot will be caught up when the system is running again.\r\nThe sys" +
- "tem will reboot only when not busy with other tasks.");
+ this.checkBoxRebootWakeup.Text = "Wakeup the computer for reboot";
+ this.toolTip.SetToolTip(this.checkBoxRebootWakeup, "If unchecked, the reboot will be caught up when the system is running again.\r\nThe" +
+ " computer will reboot only when not busy with other tasks.");
this.checkBoxRebootWakeup.UseVisualStyleBackColor = true;
this.checkBoxRebootWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable);
//
@@ -280,11 +280,11 @@
this.checkBoxMPClientRunning.AutoSize = true;
this.checkBoxMPClientRunning.Location = new System.Drawing.Point(12, 52);
this.checkBoxMPClientRunning.Name = "checkBoxMPClientRunning";
- this.checkBoxMPClientRunning.Size = new System.Drawing.Size(309, 17);
+ this.checkBoxMPClientRunning.Size = new System.Drawing.Size(379, 17);
this.checkBoxMPClientRunning.TabIndex = 2;
- this.checkBoxMPClientRunning.Text = "No standby after idle timeout while MediaPortal client is not running";
- this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents standby after idle timeout while doing administrative work\r\n(only recommended for a single-" +
- "seat HTPC).");
+ this.checkBoxMPClientRunning.Text = "Do not put the computer to sleep while the MediaPortal client is not running";
+ this.toolTip.SetToolTip(this.checkBoxMPClientRunning, "Prevents automatic standby while doing administrative work\r\n(only recommended for" +
+ " a single-seat HTPC).");
this.checkBoxMPClientRunning.UseVisualStyleBackColor = true;
this.checkBoxMPClientRunning.CheckedChanged += new System.EventHandler(this.checkBoxMPClientRunning_CheckedChanged);
//
@@ -293,9 +293,9 @@
this.checkBoxProcessesAwayMode.AutoSize = true;
this.checkBoxProcessesAwayMode.Location = new System.Drawing.Point(34, 77);
this.checkBoxProcessesAwayMode.Name = "checkBoxProcessesAwayMode";
- this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(372, 17);
+ this.checkBoxProcessesAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxProcessesAwayMode.TabIndex = 3;
- this.checkBoxProcessesAwayMode.Text = "No user standby while processes are running (enable away mode)";
+ this.checkBoxProcessesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxProcessesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the selected processes are running.\r\n");
this.checkBoxProcessesAwayMode.UseVisualStyleBackColor = true;
@@ -328,9 +328,9 @@
this.checkBoxEPGAwayMode.AutoSize = true;
this.checkBoxEPGAwayMode.Location = new System.Drawing.Point(34, 175);
this.checkBoxEPGAwayMode.Name = "checkBoxEPGAwayMode";
- this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(334, 17);
+ this.checkBoxEPGAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxEPGAwayMode.TabIndex = 6;
- this.checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG (enable away mode)";
+ this.checkBoxEPGAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxEPGAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" until EPG grabbing is completed.");
this.checkBoxEPGAwayMode.UseVisualStyleBackColor = true;
@@ -351,10 +351,11 @@
this.checkBoxEPGPreventStandby.AutoSize = true;
this.checkBoxEPGPreventStandby.Location = new System.Drawing.Point(12, 150);
this.checkBoxEPGPreventStandby.Name = "checkBoxEPGPreventStandby";
- this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(225, 17);
+ this.checkBoxEPGPreventStandby.Size = new System.Drawing.Size(277, 17);
this.checkBoxEPGPreventStandby.TabIndex = 5;
- this.checkBoxEPGPreventStandby.Text = "No standby after idle timeout while grabbing EPG";
- this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The system will not go to standby until EPG grabbing is completed.");
+ this.checkBoxEPGPreventStandby.Text = "Do not put the computer to sleep while grabbing EPG";
+ this.toolTip.SetToolTip(this.checkBoxEPGPreventStandby, "The computer will not go to standby automatically until EPG grabbing is completed" +
+ ".");
this.checkBoxEPGPreventStandby.UseVisualStyleBackColor = true;
this.checkBoxEPGPreventStandby.CheckedChanged += new System.EventHandler(this.checkBoxEPGPreventStandby_CheckedChanged);
//
@@ -363,9 +364,9 @@
this.checkBoxNetworkAwayMode.AutoSize = true;
this.checkBoxNetworkAwayMode.Location = new System.Drawing.Point(34, 72);
this.checkBoxNetworkAwayMode.Name = "checkBoxNetworkAwayMode";
- this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(348, 17);
+ this.checkBoxNetworkAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxNetworkAwayMode.TabIndex = 3;
- this.checkBoxNetworkAwayMode.Text = "No user standby while network is active (enable away mode)";
+ this.checkBoxNetworkAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxNetworkAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the network is active.\r\n");
this.checkBoxNetworkAwayMode.UseVisualStyleBackColor = true;
@@ -376,9 +377,9 @@
this.checkBoxSharesAwayMode.AutoSize = true;
this.checkBoxSharesAwayMode.Location = new System.Drawing.Point(34, 200);
this.checkBoxSharesAwayMode.Name = "checkBoxSharesAwayMode";
- this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(349, 17);
+ this.checkBoxSharesAwayMode.Size = new System.Drawing.Size(344, 17);
this.checkBoxSharesAwayMode.TabIndex = 4;
- this.checkBoxSharesAwayMode.Text = "No user standby while shares are active (enable away mode)";
+ this.checkBoxSharesAwayMode.Text = "Enter away mode when the user wants to put the computer to sleep";
this.toolTip.SetToolTip(this.checkBoxSharesAwayMode, "Not even a \"Power Off\" or \"Remote Control Off\"causes the\r\nsystem to go to standby" +
" while the selected shares are active.\r\n");
this.checkBoxSharesAwayMode.UseVisualStyleBackColor = true;
@@ -458,9 +459,9 @@
this.checkBoxReinitializeController.AutoSize = true;
this.checkBoxReinitializeController.Location = new System.Drawing.Point(12, 22);
this.checkBoxReinitializeController.Name = "checkBoxReinitializeController";
- this.checkBoxReinitializeController.Size = new System.Drawing.Size(295, 17);
+ this.checkBoxReinitializeController.Size = new System.Drawing.Size(303, 17);
this.checkBoxReinitializeController.TabIndex = 0;
- this.checkBoxReinitializeController.Text = "Reinitialize tvcontroller on wakeup (also reinitializes tuner)";
+ this.checkBoxReinitializeController.Text = "Reinitialize TV controller on wakeup (also reinitializes tuner)";
this.toolTip.SetToolTip(this.checkBoxReinitializeController, "Reinitializes the internal TV controller and tuner setup (does not restart the TV" +
"-Server).");
this.checkBoxReinitializeController.UseVisualStyleBackColor = true;
@@ -510,10 +511,10 @@
this.checkBoxNetworkEnabled.AutoSize = true;
this.checkBoxNetworkEnabled.Location = new System.Drawing.Point(12, 22);
this.checkBoxNetworkEnabled.Name = "checkBoxNetworkEnabled";
- this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(239, 17);
+ this.checkBoxNetworkEnabled.Size = new System.Drawing.Size(309, 17);
this.checkBoxNetworkEnabled.TabIndex = 0;
- this.checkBoxNetworkEnabled.Text = "No standby after idle timeout while network is active";
- this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The system will not go to standby while the network is active.");
+ this.checkBoxNetworkEnabled.Text = "Do not put the computer to sleep while the network is active";
+ this.toolTip.SetToolTip(this.checkBoxNetworkEnabled, "The computer will not go to standby automatically while the network is active.");
this.checkBoxNetworkEnabled.UseVisualStyleBackColor = true;
this.checkBoxNetworkEnabled.CheckedChanged += new System.EventHandler(this.checkBoxNetworkEnabled_CheckedChanged);
//
@@ -522,10 +523,11 @@
this.checkBoxSharesEnabled.AutoSize = true;
this.checkBoxSharesEnabled.Location = new System.Drawing.Point(12, 22);
this.checkBoxSharesEnabled.Name = "checkBoxSharesEnabled";
- this.checkBoxSharesEnabled.Size = new System.Drawing.Size(240, 17);
+ this.checkBoxSharesEnabled.Size = new System.Drawing.Size(292, 17);
this.checkBoxSharesEnabled.TabIndex = 0;
- this.checkBoxSharesEnabled.Text = "No standby after idle timeout while shares are active";
- this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The system will not go to standby while the selected shares are active.");
+ this.checkBoxSharesEnabled.Text = "Do not put the computer to sleep while shares are active";
+ this.toolTip.SetToolTip(this.checkBoxSharesEnabled, "The computer will not go to standby automatically while the selected shares are a" +
+ "ctive.");
this.checkBoxSharesEnabled.UseVisualStyleBackColor = true;
this.checkBoxSharesEnabled.CheckedChanged += new System.EventHandler(this.checkBoxSharesEnabled_CheckedChanged);
//
@@ -560,7 +562,7 @@
//
this.numericUpDownIdleTimeout.Anchor = System.Windows.Forms.AnchorStyles.None;
this.numericUpDownIdleTimeout.AutoSize = true;
- this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(79, 3);
+ this.numericUpDownIdleTimeout.Location = new System.Drawing.Point(161, 3);
this.numericUpDownIdleTimeout.Maximum = new decimal(new int[] {
300,
0,
@@ -782,9 +784,9 @@
this.checkBoxEPGWakeup.AutoSize = true;
this.checkBoxEPGWakeup.Location = new System.Drawing.Point(12, 117);
this.checkBoxEPGWakeup.Name = "checkBoxEPGWakeup";
- this.checkBoxEPGWakeup.Size = new System.Drawing.Size(186, 17);
+ this.checkBoxEPGWakeup.Size = new System.Drawing.Size(216, 17);
this.checkBoxEPGWakeup.TabIndex = 4;
- this.checkBoxEPGWakeup.Text = "Wakeup system for EPG grabbing";
+ this.checkBoxEPGWakeup.Text = "Wakeup the computer for EPG grabbing";
this.checkBoxEPGWakeup.UseVisualStyleBackColor = true;
this.checkBoxEPGWakeup.CheckedChanged += new System.EventHandler(this.buttonApply_Enable);
//
@@ -1283,26 +1285,26 @@
this.labelIdleTimeout1.AutoSize = true;
this.labelIdleTimeout1.Location = new System.Drawing.Point(3, 6);
this.labelIdleTimeout1.Name = "labelIdleTimeout1";
- this.labelIdleTimeout1.Size = new System.Drawing.Size(70, 13);
+ this.labelIdleTimeout1.Size = new System.Drawing.Size(152, 13);
this.labelIdleTimeout1.TabIndex = 10;
- this.labelIdleTimeout1.Text = "Standby after";
+ this.labelIdleTimeout1.Text = "Put the computer to sleep after";
//
// labelIdleTimeout2
//
this.labelIdleTimeout2.Anchor = System.Windows.Forms.AnchorStyles.None;
this.labelIdleTimeout2.AutoSize = true;
- this.labelIdleTimeout2.Location = new System.Drawing.Point(126, 6);
+ this.labelIdleTimeout2.Location = new System.Drawing.Point(208, 6);
this.labelIdleTimeout2.Name = "labelIdleTimeout2";
- this.labelIdleTimeout2.Size = new System.Drawing.Size(105, 13);
+ this.labelIdleTimeout2.Size = new System.Drawing.Size(43, 13);
this.labelIdleTimeout2.TabIndex = 12;
- this.labelIdleTimeout2.Text = "minutes (idle timeout)";
+ this.labelIdleTimeout2.Text = "minutes";
//
// labelExpertMode
//
this.labelExpertMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelExpertMode.AutoSize = true;
this.labelExpertMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlLight;
+ this.labelExpertMode.ForeColor = System.Drawing.SystemColors.ControlDark;
this.labelExpertMode.Location = new System.Drawing.Point(237, 212);
this.labelExpertMode.Name = "labelExpertMode";
this.labelExpertMode.RightToLeft = System.Windows.Forms.RightToLeft.No;
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs 2012-05-16 15:32:18 UTC (rev 4486)
@@ -162,10 +162,10 @@
// For Windows XP change away mode label texts
if (Environment.OSVersion.Version.Major < 6)
{
- checkBoxEPGAwayMode.Text = "No user standby while grabbing EPG";
- checkBoxProcessesAwayMode.Text = "No user standby while processes are running";
- checkBoxNetworkAwayMode.Text = "No user standby while network is active";
- checkBoxSharesAwayMode.Text = "No user standby while shares are active";
+ checkBoxEPGAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxProcessesAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxNetworkAwayMode.Text = "Prevent the user from putting the computer to sleep";
+ checkBoxSharesAwayMode.Text = "Prevent the user from putting the computer to sleep";
}
#if SERVER
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx
===================================================================
--- trunk/plugins/PowerScheduler++/Test/1.2.6.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx 2012-05-14 16:15:13 UTC (rev 4485)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.3.0/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx 2012-05-16 15:32:18 UTC (rev 4486)
@@ -170,6 +170,6 @@
<value>Available Profiles:
HTPC: Dedicated multimedia appliance with MediaPortal GUI
Desktop: MediaPortal as application for viewing media and recording TV
-Notebook: Optimized for mobile use, no scheduled recordings</value>
+Notebook: Optimized for mobile use, no scheduled wakeup</value>
</data>
</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
