Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <mca...@us...> - 2012-05-21 19:56:30
|
Revision: 4489
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4489&view=rev
Author: mcarter2006
Date: 2012-05-21 19:56:24 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1
Modified: trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mca...@us...> - 2012-05-21 19:55:05
|
Revision: 4488
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4488&view=rev
Author: mcarter2006
Date: 2012-05-21 19:54:59 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/UKTVThumb/Normal/update.xml
Modified: trunk/plugins/UKTVThumb/Normal/update.xml
===================================================================
--- trunk/plugins/UKTVThumb/Normal/update.xml 2012-05-16 15:37:21 UTC (rev 4487)
+++ trunk/plugins/UKTVThumb/Normal/update.xml 2012-05-21 19:54:59 UTC (rev 4488)
@@ -79,10 +79,10 @@
<ForumPage>http://forum.team-mediaportal.com/skins-50/uk-tv-radio-logos-87737</ForumPage>
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/UKTVThumb/Normal/update.xml</UpdateUrl>
<Version>
- <Major>4</Major>
+ <Major>5</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>8</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread.
@@ -92,11 +92,11 @@
Duplicate logos are included due to different default names on Freeview and FreeToAir. All regional naming variations for BBC and ITV should be included, if I've missed yours let me know.
-Big thanks go to cheetah05 for the glossy template and the core of the Freeview TV logos. Thanks also go to Mew, TritonT and jsimo01 and many others.</ExtensionDescription>
+Big thanks go to cheetah05 for the glossy template and the core of the Freeview TV logos. Thanks also go to Mew, TritonT, jsimo01, Jasmeet_181 and many others.</ExtensionDescription>
<VersionDescription>TV and Radio logos for UK Freeview & Freesat.</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1</OnlineLocation>
- <ReleaseDate>2012-03-04T21:46:40</ReleaseDate>
+ <ReleaseDate>2012-05-21T21:46:40</ReleaseDate>
<Tags>logos, thumbs, tv, radio</Tags>
<Location>C:\Users\Matthew\Documents\TV Logos\Logos\mp-plugins\UKTVThumb\Normal\package\UK_Logos.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2012-05-16 15:37:32
|
Revision: 4487
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4487&view=rev
Author: michael-t
Date: 2012-05-16 15:37:21 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Added Paths:
-----------
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.3.0.mpe1
Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++ 1.2.3.0.mpe1
===================================================================
(Binary files differ)
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <che...@us...> - 2012-05-14 16:15:24
|
Revision: 4485
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4485&view=rev
Author: chef_koch
Date: 2012-05-14 16:15:13 +0000 (Mon, 14 May 2012)
Log Message:
-----------
removed IRSS from svn since it has it's own project within github ( https://github.com/MediaPortal/IR-Server-Suite/ )
Removed Paths:
-------------
trunk/plugins/IR Server Suite/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-20 18:54:50
|
Revision: 4484
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4484&view=rev
Author: doskabouter
Date: 2012-04-20 18:54:44 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
better cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-17 21:16:38 UTC (rev 4483)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-20 18:54:44 UTC (rev 4484)
@@ -74,8 +74,8 @@
public static string Parameter = string.Empty;
public static string loadFav = string.Empty;
+ private bool originalMouseSupport;
-
#endregion
#region ISetupForm Member
@@ -229,6 +229,7 @@
if (settings.UseMouse)
{
MyLog.debug("Mouse support is enabled");
+ originalMouseSupport = GUIGraphicsContext.MouseSupport;
GUIGraphicsContext.MouseSupport = true;
Cursor.Show();
}
@@ -332,11 +333,15 @@
webBrowser.DocumentCompleted -= new EventHandler(webBrowser_DocumentCompleted);
webBrowser.StatusTextChanged -= new EventHandler(webBrowser_StatusTextChanged);
webBrowser.DomKeyDown -= new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
+ webBrowser.DomClick -= new GeckoDomEventHandler(webBrowser_DomClick);
timer.Tick -= new EventHandler(timer_Tick);
timer.Stop();
if (settings.UseMouse)
+ {
Cursor.Hide();
+ GUIGraphicsContext.MouseSupport = originalMouseSupport;
+ }
base.OnPageDestroy(new_windowId);
}
@@ -417,7 +422,7 @@
else
GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
- }
+ }
#endregion
#region selectable buttons
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-17 21:16:48
|
Revision: 4483
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4483&view=rev
Author: doskabouter
Date: 2012-04-17 21:16:38 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
release 0.3.6
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-17 21:09:28 UTC (rev 4482)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-17 21:16:38 UTC (rev 4483)
@@ -1612,5 +1612,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>6</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Fixed initial defaultzoom again, improved display of numbers of the urls, fixed password dialog (show *), fixed mouse cursor not disappearing</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-04-17T23:12:57.385693+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</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>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-17 21:09:28 UTC (rev 4482)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-17 21:16:38 UTC (rev 4483)
@@ -116,8 +116,8 @@
<Description />
</SectionParam>
<SectionParam Name="Description">
- <Value>This will install [Name] version [Version] on your computer.
-It is recommended that you close all other applications before continuing.
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
Click Next to continue or Cancel to exit Setup.</Value>
<ValueType>String</ValueType>
<Description />
@@ -203,7 +203,7 @@
<SectionParam Name="Path to plugin">
<Value>%Plugins%\windows\browsetheweb.dll</Value>
<ValueType>Template</ValueType>
- <Description>Path to the plugin like
+ <Description>Path to the plugin like
%Plugins%\Windows\plugin.dll</Description>
</SectionParam>
</Items>
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>5</Build>
+ <Build>6</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed initial defaultzoom, Fixed crash in configuration</VersionDescription>
+ <VersionDescription>Fixed initial defaultzoom again, improved display of numbers of the urls, fixed password dialog (show *), fixed mouse cursor not disappearing</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T20:35:02.246943+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-17T23:12:57.385693+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
@@ -329,8 +329,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <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">
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-17 21:09:34
|
Revision: 4482
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4482&view=rev
Author: doskabouter
Date: 2012-04-17 21:09:28 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
placed link-ids on the left of the url, to improve readability
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-15 14:13:24 UTC (rev 4481)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-17 21:09:28 UTC (rev 4482)
@@ -55,7 +55,7 @@
#endregion
#region Constants
- private const string _spanstyle = "font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;";
+ private const string _spanstyle = "font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-right: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;";
#endregion
#region declare vars
@@ -417,7 +417,7 @@
else
GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
- }
+ }
#endregion
#region selectable buttons
@@ -508,7 +508,6 @@
if (mouse.Visible)
{
mouse.Visible = false;
-
}
else
{
@@ -888,13 +887,29 @@
newChild.InnerHtml = geckoId.ToString();
if (!String.IsNullOrEmpty(className))
newChild.SetAttribute("class", className);
- if (after.NextSibling != null)
- after.ParentNode.InsertBefore(newChild, after.NextSibling);
+ if (after.FirstChild == null)
+ after.AppendChild(newChild);
else
- after.ParentNode.AppendChild(newChild);
+ after.InsertBefore(newChild, after.FirstChild);
return newChild;
}
+ private void SetLinkAttributes(GeckoElement link, int linkNumber, out string id, out string name)
+ {
+ string gb = link.GetAttribute("gb");
+ id = link.GetAttribute("id");
+ name = link.GetAttribute("name");
+ if (string.IsNullOrEmpty(gb))
+ {
+ link.SetAttribute("gb", "gecko_link" + linkNumber);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ link.SetAttribute("id", "gb" + linkNumber);
+ id = "gb" + linkNumber;
+ }
+ }
+
private void webBrowser_DocumentCompleted(object sender, EventArgs e)
{
MyLog.debug("page completed : " + webBrowser.Url.ToString());
@@ -936,22 +951,15 @@
};
if (!element.InnerHtml.Contains("gecko_id"))
{
+ GeckoElement ls = element;
+ while (ls.LastChild != null && ls.LastChild is GeckoElement && !String.IsNullOrEmpty(ls.LastChild.TextContent))
+ ls = (GeckoElement)ls.LastChild;
insertSpan(i, String.Empty, "LINK", lastSpan.ClassName,
- element.LastChild == null ? element : element.LastChild);
+ ls);
}
- string gb = element.GetAttribute("gb");
- string id = element.GetAttribute("id");
- string name = element.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- element.SetAttribute("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- element.SetAttribute("id", "gb" + i);
- id = "gb" + i;
- }
+ string id, name;
+ SetLinkAttributes(element, i, out id, out name);
_htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
i++;
}
@@ -972,23 +980,12 @@
{
if (linkType != "hidden")
{
+ string id, name;
+ SetLinkAttributes(link, i, out id, out name);
- string gb = link.GetAttribute("gb");
- string id = link.GetAttribute("id");
- string name = link.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttribute("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttribute("id", "gb" + i);
- id = "gb" + i;
- }
-
if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
{
- insertSpan(i, action, "INPUT", null, link);
+ insertSpan(i, action, "INPUT", null, link.Parent);
}
if (linkType == "submit" ||
linkType == "reset" ||
@@ -1010,22 +1007,12 @@
}
else
{
- string gb = link.GetAttribute("gb");
- string id = link.GetAttribute("id");
- string name = link.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttribute("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttribute("id", "gb" + i);
- id = "gb" + i;
- }
+ string id, name;
+ SetLinkAttributes(link, i, out id, out name);
if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
{
- insertSpan(i, action, "INPUT", null, link);
+ insertSpan(i, action, "INPUT", null, link.Parent);
}
_htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-15 14:13:32
|
Revision: 4481
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4481&view=rev
Author: doskabouter
Date: 2012-04-15 14:13:24 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
- removed reference to htmlagilitypack
- cleanup code
- added ParentNode to GeckoNode
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-04-15 14:08:54 UTC (rev 4480)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-04-15 14:13:24 UTC (rev 4481)
@@ -66,9 +66,6 @@
<Reference Include="Dialogs">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="HtmlAgilityPack">
- <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\HtmlAgilityPack.dll</HintPath>
- </Reference>
<Reference Include="Ionic.Zip">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
</Reference>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-15 14:08:54 UTC (rev 4480)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-15 14:13:24 UTC (rev 4481)
@@ -48,13 +48,14 @@
private const int MOUSEEVENTF_LEFTUP = 0x04;
private const int MOUSEEVENTF_RIGHTDOWN = 0x08;
private const int MOUSEEVENTF_RIGHTUP = 0x10;
+ private const bool logHtml = false;
#region Links
private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
#endregion
#region Constants
- private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\" class=\"{3}\">{0}</span>";
+ private const string _spanstyle = "font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;";
#endregion
#region declare vars
@@ -859,9 +860,44 @@
GUIPropertyManager.SetProperty("#btWeb.status", str);
}
}
+
+ private void AddElements(List<GeckoElement> list, GeckoNode parent, string elName)
+ {
+ if (parent is GeckoElement && ((GeckoElement)parent).TagName.ToLowerInvariant() == elName)
+ list.Add((GeckoElement)parent);
+ foreach (GeckoNode child in parent.ChildNodes)
+ AddElements(list, child, elName);
+ }
+
+ private List<GeckoElement> getElements(GeckoNode parent, string elName)
+ {
+ List<GeckoElement> res = new List<GeckoElement>();
+ AddElements(res, parent, elName);
+ return res;
+ }
+
+ private GeckoElement insertSpan(int geckoId, string geckoAction, string geckoType, string className, GeckoNode after)
+ {
+ if (after == null)
+ throw new ArgumentNullException("after");
+ GeckoElement newChild = after.OwnerDocument.CreateElement("span");
+ newChild.SetAttribute("style", _spanstyle);
+ newChild.SetAttribute("gecko_id", geckoId.ToString());
+ newChild.SetAttribute("gecko_action", geckoAction);
+ newChild.SetAttribute("gecko_type", geckoType);
+ newChild.InnerHtml = geckoId.ToString();
+ if (!String.IsNullOrEmpty(className))
+ newChild.SetAttribute("class", className);
+ if (after.NextSibling != null)
+ after.ParentNode.InsertBefore(newChild, after.NextSibling);
+ else
+ after.ParentNode.AppendChild(newChild);
+ return newChild;
+ }
+
private void webBrowser_DocumentCompleted(object sender, EventArgs e)
{
- MyLog.debug("page completetd : " + webBrowser.Url.ToString());
+ MyLog.debug("page completed : " + webBrowser.Url.ToString());
try
{
@@ -900,7 +936,8 @@
};
if (!element.InnerHtml.Contains("gecko_id"))
{
- element.InnerHtml += string.Format(_span, i, "", "LINK", lastSpan.ClassName);
+ insertSpan(i, String.Empty, "LINK", lastSpan.ClassName,
+ element.LastChild == null ? element : element.LastChild);
}
string gb = element.GetAttribute("gb");
@@ -921,86 +958,79 @@
}
GeckoElementCollection forms = webBrowser.Document.GetElementsByTagName("form");
- HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
MyLog.debug("page forms cnt : " + forms.Count);
foreach (GeckoElement element in forms)
{
+ List<GeckoElement> inps = getElements(element, "input");
string action = element.GetAttribute("action");
- doc.LoadHtml(element.InnerHtml);
- foreach (HtmlAgilityPack.HtmlNode link in doc.DocumentNode.SelectNodes("//*"))
+ foreach (GeckoElement link in inps)
{
- if (link.OriginalName == "input")
+ string linkType = link.GetAttribute("type");
+ if (!String.IsNullOrEmpty(linkType))
{
- if (link.Attributes["type"] != null)
+ if (linkType != "hidden")
{
- if (link.Attributes["type"].Value != "hidden")
- {
- string gb = link.GetAttributeValue("gb", "");
- string id = link.GetAttributeValue("id", "");
- string name = link.GetAttributeValue("name", "");
- string outerHtml = link.OuterHtml;
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttributeValue("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttributeValue("id", "gb" + i);
- id = "gb" + i;
- }
-
- if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT", "");
- element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
- }
- if (link.Attributes["type"].Value == "submit" ||
- link.Attributes["type"].Value == "reset" ||
- link.Attributes["type"].Value == "radio" ||
- link.Attributes["type"].Value == "image" ||
- link.Attributes["type"].Value == "checkbox")
- {
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
- }
- else
- {
- if (link.Attributes["type"].Value == "password")
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.InputPassword));
- else
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- }
- i++;
- }
- }
- else
- {
- string gb = link.GetAttributeValue("gb", "");
- string id = link.GetAttributeValue("id", "");
- string name = link.GetAttributeValue("name", "");
- string outerHtml = link.OuterHtml;
+ string gb = link.GetAttribute("gb");
+ string id = link.GetAttribute("id");
+ string name = link.GetAttribute("name");
if (string.IsNullOrEmpty(gb))
{
- link.SetAttributeValue("gb", "gecko_link" + i);
+ link.SetAttribute("gb", "gecko_link" + i);
}
if (string.IsNullOrEmpty(id))
{
- link.SetAttributeValue("id", "gb" + i);
+ link.SetAttribute("id", "gb" + i);
id = "gb" + i;
}
if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
{
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT", "");
- element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
+ insertSpan(i, action, "INPUT", null, link);
}
-
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ if (linkType == "submit" ||
+ linkType == "reset" ||
+ linkType == "radio" ||
+ linkType == "image" ||
+ linkType == "checkbox")
+ {
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
+ }
+ else
+ {
+ if (linkType == "password")
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.InputPassword));
+ else
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ }
i++;
}
}
+ else
+ {
+ string gb = link.GetAttribute("gb");
+ string id = link.GetAttribute("id");
+ string name = link.GetAttribute("name");
+ if (string.IsNullOrEmpty(gb))
+ {
+ link.SetAttribute("gb", "gecko_link" + i);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ link.SetAttribute("id", "gb" + i);
+ id = "gb" + i;
+ }
+
+ if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
+ {
+ insertSpan(i, action, "INPUT", null, link);
+ }
+
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ i++;
+ }
}
}
#endregion
@@ -1026,6 +1056,13 @@
lastDomain = webBrowser.Document.Domain;
}
#endregion
+ if (logHtml)
+ {
+ using (System.IO.StreamWriter tw = new System.IO.StreamWriter(@"e:\last.html"))
+ {
+ tw.WriteLine(webBrowser.Document.DocumentElement.InnerHtml);
+ }
+ }
}
catch (Exception ex)
{
@@ -1105,27 +1142,27 @@
string result = string.Empty;
if (ShowKeyboard(ref result, id.Type == HtmlInputType.InputPassword) == DialogResult.OK)
{
- SetInputFieldText(id.Number, result);
+ SetInputElementValue(webBrowser.Document, id.Number, result);
}
webBrowser.Visible = true;
}
- public void SetInputFieldText(int id, string text)
+
+ private bool SetInputElementValue(GeckoNode parent, int geckoId, string text)
{
- HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
- doc.LoadHtml(webBrowser.Document.Body.InnerHtml);
-
- foreach (HtmlAgilityPack.HtmlNode element in doc.DocumentNode.SelectNodes("//input"))
+ GeckoElement el = parent as GeckoElement;
+ if (el != null && el.TagName.ToLowerInvariant() == "input" && el.GetAttribute("gb") == "gecko_link" + geckoId)
{
- string name = element.GetAttributeValue("gb", "");
- if (!string.IsNullOrEmpty(name))
+ el.SetAttribute("value", text);
+ return true;
+ }
+ else
+ {
+ foreach (GeckoNode child in parent.ChildNodes)
{
- if (name == "gecko_link" + id)
- {
- element.SetAttributeValue("value", text);
- webBrowser.Document.Body.InnerHtml = doc.DocumentNode.InnerHtml;
- break;
- }
+ if (SetInputElementValue(child, geckoId, text))
+ return true;
}
+ return false;
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs 2012-04-15 14:08:54 UTC (rev 4480)
+++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs 2012-04-15 14:13:24 UTC (rev 4481)
@@ -40,1033 +40,1038 @@
namespace Skybound.Gecko
{
- /// <summary>
- /// Provides a base class for DOM nodes.
- /// </summary>
- public class GeckoNode
- {
- internal GeckoNode(nsIDOMNode domObject)
- {
- _DomObject = domObject;
- }
-
- internal static GeckoNode Create(nsIDOMNode domObject)
- {
- if (domObject == null)
- return null;
-
- nsIDOMHTMLElement element = Xpcom.QueryInterface<nsIDOMHTMLElement>(domObject);
- if (element != null)
- return GeckoElement.Create(element);
-
- nsIDOMAttr attr = Xpcom.QueryInterface<nsIDOMAttr>(domObject);
- if (attr != null)
- return GeckoAttribute.Create(attr);
-
- return new GeckoNode(domObject);
- }
-
- /// <summary>
- /// Gets the underlying XPCOM object.
- /// </summary>
- public object DomObject
- {
- get { return _DomObject; }
- }
- nsIDOMNode _DomObject;
-
- public override bool Equals(object obj)
- {
- if (this == obj)
- return true;
- else if (obj is GeckoNode)
- return this.GetHashCode() == (obj as GeckoNode).GetHashCode();
-
- return base.Equals(obj);
- }
-
- public override int GetHashCode()
- {
- IntPtr pUnk = Marshal.GetIUnknownForObject(this._DomObject);
- try
- {
- return pUnk.GetHashCode();
- }
- finally
- {
- if (pUnk != IntPtr.Zero)
- Marshal.Release(pUnk);
- }
- }
-
- /// <summary>
- /// Gets the text contents of the node.
- /// </summary>
- public string TextContent
- {
- get { return nsString.Get(((nsIDOM3Node)_DomObject).GetTextContent); }
- set { nsString.Set(((nsIDOM3Node)_DomObject).SetTextContent, value); }
- }
-
- /// <summary>
- /// Gets or sets the value of the node.
- /// </summary>
- public string NodeValue
- {
- get { return nsString.Get(((nsIDOMNode)_DomObject).GetNodeValue); }
- set { nsString.Set(((nsIDOMNode)_DomObject).SetNodeValue, value); }
- }
-
- /// <summary>
- /// Gets a collection containing all child nodes of this node.
- /// </summary>
- public GeckoNodeCollection ChildNodes
- {
- get { return new GeckoNodeCollection(_DomObject.GetChildNodes()); }
- }
-
- public GeckoNode FirstChild { get { return GeckoNode.Create(_DomObject.GetFirstChild()); } }
- public GeckoNode LastChild { get { return GeckoNode.Create(_DomObject.GetLastChild()); } }
- public GeckoNode NextSibling { get { return GeckoNode.Create(_DomObject.GetNextSibling()); } }
- public GeckoNode PreviousSibling { get { return GeckoNode.Create(_DomObject.GetPreviousSibling()); } }
- public bool HasChildNodes { get { return _DomObject.HasChildNodes(); } }
- public bool HasAttributes { get { return _DomObject.HasAttributes(); } }
-
- public GeckoDocument OwnerDocument { get { return GeckoDocument.Create(Xpcom.QueryInterface<nsIDOMHTMLDocument>(_DomObject.GetOwnerDocument())); } }
-
- public GeckoNode AppendChild(GeckoNode node)
- {
- if (node == null)
- throw new ArgumentNullException("node");
-
- _DomObject.AppendChild(node._DomObject);
- return node;
- }
-
- public GeckoNode CloneNode(bool deep)
- {
- return GeckoNode.Create(_DomObject.CloneNode(deep));
- }
-
- public GeckoNode InsertBefore(GeckoNode newChild, GeckoNode before)
- {
- if (newChild == null)
- throw new ArgumentNullException("newChild");
- if (before == null)
- throw new ArgumentNullException("before");
-
- _DomObject.InsertBefore(newChild._DomObject, before._DomObject);
- return newChild;
- }
-
- public GeckoNode RemoveChild(GeckoNode node)
- {
- if (node == null)
- throw new ArgumentNullException("node");
-
- _DomObject.RemoveChild(node._DomObject);
- return node;
- }
-
- public GeckoNode ReplaceChild(GeckoNode newChild, GeckoNode oldChild)
- {
- if (newChild == null)
- throw new ArgumentNullException("newChild");
- if (oldChild == null)
- throw new ArgumentNullException("oldChild");
-
- _DomObject.ReplaceChild(newChild._DomObject, oldChild._DomObject);
- return newChild;
- }
-
- public GeckoNamedNodeMap Attributes
- {
- get { return new GeckoNamedNodeMap(_DomObject.GetAttributes()); }
- }
- }
-
- /// <summary>
- /// Represents a DOM attribute.
- /// </summary>
- public class GeckoAttribute : GeckoNode
- {
- internal GeckoAttribute(nsIDOMAttr attr) : base(attr)
- {
- this.DomAttr = attr;
- }
- nsIDOMAttr DomAttr;
-
- internal static GeckoAttribute Create(nsIDOMAttr attr)
- {
- return (attr == null) ? null : new GeckoAttribute(attr);
- }
-
- /// <summary>
- /// Gets the name of the attribute.
- /// </summary>
- public string Name
- {
- get { return nsString.Get(DomAttr.GetName); }
- }
-
- /// <summary>
- /// Gets the value of the attribute.
- /// </summary>
- public string Value
- {
- get { return nsString.Get(DomAttr.GetValue); }
- set { nsString.Set(DomAttr.SetValue, value); }
- }
-
- /// <summary>
- /// Gets a value indicating whether the attribute is specified.
- /// </summary>
- public bool Specified
- {
- get { return DomAttr.GetSpecified(); }
- }
-
- /// <summary>
- /// Gets the <see cref="GeckoElement"/> which contains this attribute.
- /// </summary>
- public GeckoElement OwnerElement
- {
- get { return GeckoElement.Create((nsIDOMHTMLElement)DomAttr.GetOwnerElement()); }
- }
- }
-
- /// <summary>
- /// Represents a DOM element.
- /// </summary>
- public class GeckoElement : GeckoNode
- {
- internal GeckoElement(nsIDOMHTMLElement element) : base(element)
- {
- this.DomElement = element;
- this.DomNSElement = (nsIDOMNSElement)element;
- this.DomNSHTMLElement = (nsIDOMNSHTMLElement)element;
-
- // since a reference is stored in the base class, we only need weak references here
- Marshal.ChangeWrapperHandleStrength(DomNSElement, true);
- Marshal.ChangeWrapperHandleStrength(DomNSHTMLElement, true);
- }
-
- internal static GeckoElement Create(nsIDOMHTMLElement element)
- {
- return (element == null) ? null : new GeckoElement(element);
- }
-
- nsIDOMHTMLElement DomElement;
- nsIDOMNSElement DomNSElement;
- nsIDOMNSHTMLElement DomNSHTMLElement;
-
- /// <summary>
- /// Gets the parent element of this one.
- /// </summary>
- public GeckoElement Parent
- {
- get
- {
- // note: the parent node could also be the document
- return GeckoElement.Create(Xpcom.QueryInterface<nsIDOMHTMLElement>(DomElement.GetParentNode()));
- }
- }
-
- /// <summary>
- /// Gets the name of the tag.
- /// </summary>
- public string TagName
- {
- get { return nsString.Get(DomElement.GetTagName); }
- }
-
- /// <summary>
- /// Gets the value of the id attribute.
- /// </summary>
- public string Id
- {
- get { return nsString.Get(DomElement.GetId); }
- set { nsString.Set(DomElement.SetId, value); }
- }
-
- /// <summary>
- /// Gets the value of the class attribute.
- /// </summary>
- public string ClassName
- {
- get { return nsString.Get(DomElement.GetClassName); }
- set { nsString.Set(DomElement.SetClassName, value); }
- }
-
- /// <summary>
- /// Returns a collection containing the child elements of this element with a given tag name.
- /// </summary>
- /// <param name="tagName"></param>
- /// <returns></returns>
- public GeckoElementCollection GetElementsByTagName(string tagName)
- {
- if (string.IsNullOrEmpty(tagName))
- return null;
-
- return new GeckoElementCollection(DomElement.GetElementsByTagName(new nsAString(tagName)));
- }
-
- /// <summary>
- /// Gets the value of an attribute on this element with the specified name.
- /// </summary>
- /// <param name="attributeName"></param>
- /// <returns></returns>
- public string GetAttribute(string attributeName)
- {
- if (string.IsNullOrEmpty(attributeName))
- throw new ArgumentException("attributeName");
-
- using (nsAString retval = new nsAString())
- {
- DomElement.GetAttribute(new nsAString(attributeName), retval);
- return retval.ToString();
- }
- }
-
- /// <summary>
- /// Gets the value of an attribute on this element with the specified name and namespace.
- /// </summary>
- /// <param name="attributeName"></param>
- /// <returns></returns>
- public string GetAttributeNS(string namespaceUri, string attributeName)
- {
- if (string.IsNullOrEmpty(namespaceUri))
- return GetAttribute(attributeName);
-
- if (string.IsNullOrEmpty(attributeName))
- throw new ArgumentException("attributeName");
-
- using (nsAString retval = new nsAString())
- {
- DomElement.GetAttributeNS(new nsAString(namespaceUri), new nsAString(attributeName), retval);
- return retval.ToString();
- }
- }
-
- /// <summary>
- /// Sets the value of an attribute on this element with the specified name.
- /// </summary>
- /// <param name="attributeName"></param>
- /// <param name="value"></param>
- public void SetAttribute(string attributeName, string value)
- {
- if (string.IsNullOrEmpty(attributeName))
- throw new ArgumentException("attributeName");
-
- DomElement.SetAttribute(new nsAString(attributeName), new nsAString(value));
- }
-
- /// <summary>
- /// Sets the value of an attribute on this element with the specified name and namespace.
- /// </summary>
- /// <param name="attributeName"></param>
- /// <param name="value"></param>
- public void SetAttributeNS(string namespaceUri, string attributeName, string value)
- {
- if (string.IsNullOrEmpty(namespaceUri))
- {
- SetAttribute(attributeName, value);
- }
- else
- {
- if (string.IsNullOrEmpty(attributeName))
- throw new ArgumentException("attributeName");
-
- DomElement.SetAttributeNS(new nsAString(namespaceUri), new nsAString(attributeName), new nsAString(value));
- }
- }
-
- /// <summary>
- /// Removes an attribute from this element.
- /// </summary>
- /// <param name="attributeName"></param>
- public void RemoveAttribute(string attributeName)
- {
- if (string.IsNullOrEmpty(attributeName))
- throw new ArgumentException("attributeName");
-
- DomElement.RemoveAttribute(new nsAString(attributeName));
- }
-
- #if GECKO_1_9_1
- public int ScrollLeft { get { return DomNSElement.GetScrollLeft(); } set { DomNSElement.SetScrollLeft(value); } }
- public int ScrollTop { get { return DomNSElement.GetScrollTop(); } set { DomNSElement.SetScrollTop(value); } }
- public int ScrollWidth { get { return DomNSElement.GetScrollWidth(); } }
- public int ScrollHeight { get { return DomNSElement.GetScrollHeight(); } }
- public int ClientWidth { get { return DomNSElement.GetClientWidth(); } }
- public int ClientHeight { get { return DomNSElement.GetClientHeight(); } }
- #else
+ /// <summary>
+ /// Provides a base class for DOM nodes.
+ /// </summary>
+ public class GeckoNode
+ {
+ internal GeckoNode(nsIDOMNode domObject)
+ {
+ _DomObject = domObject;
+ }
+
+ internal static GeckoNode Create(nsIDOMNode domObject)
+ {
+ if (domObject == null)
+ return null;
+
+ nsIDOMHTMLElement element = Xpcom.QueryInterface<nsIDOMHTMLElement>(domObject);
+ if (element != null)
+ return GeckoElement.Create(element);
+
+ nsIDOMAttr attr = Xpcom.QueryInterface<nsIDOMAttr>(domObject);
+ if (attr != null)
+ return GeckoAttribute.Create(attr);
+
+ return new GeckoNode(domObject);
+ }
+
+ /// <summary>
+ /// Gets the underlying XPCOM object.
+ /// </summary>
+ public object DomObject
+ {
+ get { return _DomObject; }
+ }
+ nsIDOMNode _DomObject;
+
+ public override bool Equals(object obj)
+ {
+ if (this == obj)
+ return true;
+ else if (obj is GeckoNode)
+ return this.GetHashCode() == (obj as GeckoNode).GetHashCode();
+
+ return base.Equals(obj);
+ }
+
+ public override int GetHashCode()
+ {
+ IntPtr pUnk = Marshal.GetIUnknownForObject(this._DomObject);
+ try
+ {
+ return pUnk.GetHashCode();
+ }
+ finally
+ {
+ if (pUnk != IntPtr.Zero)
+ Marshal.Release(pUnk);
+ }
+ }
+
+ /// <summary>
+ /// Gets the text contents of the node.
+ /// </summary>
+ public string TextContent
+ {
+ get { return nsString.Get(((nsIDOM3Node)_DomObject).GetTextContent); }
+ set { nsString.Set(((nsIDOM3Node)_DomObject).SetTextContent, value); }
+ }
+
+ /// <summary>
+ /// Gets or sets the value of the node.
+ /// </summary>
+ public string NodeValue
+ {
+ get { return nsString.Get(((nsIDOMNode)_DomObject).GetNodeValue); }
+ set { nsString.Set(((nsIDOMNode)_DomObject).SetNodeValue, value); }
+ }
+
+ /// <summary>
+ /// Gets a collection containing all child nodes of this node.
+ /// </summary>
+ public GeckoNodeCollection ChildNodes
+ {
+ get { return new GeckoNodeCollection(_DomObject.GetChildNodes()); }
+ }
+
+ public GeckoNode ParentNode { get { return GeckoNode.Create(_DomObject.GetParentNode()); } }
+ public GeckoNode FirstChild { get { return GeckoNode.Create(_DomObject.GetFirstChild()); } }
+ public GeckoNode LastChild { get { return GeckoNode.Create(_DomObject.GetLastChild()); } }
+ public GeckoNode NextSibling { get { return GeckoNode.Create(_DomObject.GetNextSibling()); } }
+ public GeckoNode PreviousSibling { get { return GeckoNode.Create(_DomObject.GetPreviousSibling()); } }
+ public bool HasChildNodes { get { return _DomObject.HasChildNodes(); } }
+ public bool HasAttributes { get { return _DomObject.HasAttributes(); } }
+
+ public GeckoDocument OwnerDocument { get { return GeckoDocument.Create(Xpcom.QueryInterface<nsIDOMHTMLDocument>(_DomObject.GetOwnerDocument())); } }
+
+ public GeckoNode AppendChild(GeckoNode node)
+ {
+ if (node == null)
+ throw new ArgumentNullException("node");
+
+ _DomObject.AppendChild(node._DomObject);
+ return node;
+ }
+
+ public GeckoNode CloneNode(bool deep)
+ {
+ return GeckoNode.Create(_DomObject.CloneNode(deep));
+ }
+
+ public GeckoNode InsertBefore(GeckoNode newChild, GeckoNode before)
+ {
+ if (newChild == null)
+ throw new ArgumentNullException("newChild");
+ if (before == null)
+ throw new ArgumentNullException("before");
+
+ _DomObject.InsertBefore(newChild._DomObject, before._DomObject);
+ return newChild;
+ }
+
+ public GeckoNode RemoveChild(GeckoNode node)
+ {
+ if (node == null)
+ throw new ArgumentNullException("node");
+
+ _DomObject.RemoveChild(node._DomObject);
+ return node;
+ }
+
+ public GeckoNode ReplaceChild(GeckoNode newChild, GeckoNode oldChild)
+ {
+ if (newChild == null)
+ throw new ArgumentNullException("newChild");
+ if (oldChild == null)
+ throw new ArgumentNullException("oldChild");
+
+ _DomObject.ReplaceChild(newChild._DomObject, oldChild._DomObject);
+ return newChild;
+ }
+
+ public GeckoNamedNodeMap Attributes
+ {
+ get { return new GeckoNamedNodeMap(_DomObject.GetAttributes()); }
+ }
+ }
+
+ /// <summary>
+ /// Represents a DOM attribute.
+ /// </summary>
+ public class GeckoAttribute : GeckoNode
+ {
+ internal GeckoAttribute(nsIDOMAttr attr)
+ : base(attr)
+ {
+ this.DomAttr = attr;
+ }
+ nsIDOMAttr DomAttr;
+
+ internal static GeckoAttribute Create(nsIDOMAttr attr)
+ {
+ return (attr == null) ? null : new GeckoAttribute(attr);
+ }
+
+ /// <summary>
+ /// Gets the name of the attribute.
+ /// </summary>
+ public string Name
+ {
+ get { return nsString.Get(DomAttr.GetName); }
+ }
+
+ /// <summary>
+ /// Gets the value of the attribute.
+ /// </summary>
+ public string Value
+ {
+ get { return nsString.Get(DomAttr.GetValue); }
+ set { nsString.Set(DomAttr.SetValue, value); }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether the attribute is specified.
+ /// </summary>
+ public bool Specified
+ {
+ get { return DomAttr.GetSpecified(); }
+ }
+
+ /// <summary>
+ /// Gets the <see cref="GeckoElement"/> which contains this attribute.
+ /// </summary>
+ public GeckoElement OwnerElement
+ {
+ get { return GeckoElement.Create((nsIDOMHTMLElement)DomAttr.GetOwnerElement()); }
+ }
+ }
+
+ /// <summary>
+ /// Represents a DOM element.
+ /// </summary>
+ public class GeckoElement : GeckoNode
+ {
+ internal GeckoElement(nsIDOMHTMLElement element)
+ : base(element)
+ {
+ this.DomElement = element;
+ this.DomNSElement = (nsIDOMNSElement)element;
+ this.DomNSHTMLElement = (nsIDOMNSHTMLElement)element;
+
+ // since a reference is stored in the base class, we only need weak references here
+ Marshal.ChangeWrapperHandleStrength(DomNSElement, true);
+ Marshal.ChangeWrapperHandleStrength(DomNSHTMLElement, true);
+ }
+
+ internal static GeckoElement Create(nsIDOMHTMLElement element)
+ {
+ return (element == null) ? null : new GeckoElement(element);
+ }
+
+ nsIDOMHTMLElement DomElement;
+ nsIDOMNSElement DomNSElement;
+ nsIDOMNSHTMLElement DomNSHTMLElement;
+
+ /// <summary>
+ /// Gets the parent element of this one.
+ /// </summary>
+ public GeckoElement Parent
+ {
+ get
+ {
+ // note: the parent node could also be the document
+ return GeckoElement.Create(Xpcom.QueryInterface<nsIDOMHTMLElement>(DomElement.GetParentNode()));
+ }
+ }
+
+ /// <summary>
+ /// Gets the name of the tag.
+ /// </summary>
+ public string TagName
+ {
+ get { return nsString.Get(DomElement.GetTagName); }
+ }
+
+ /// <summary>
+ /// Gets the value of the id attribute.
+ /// </summary>
+ public string Id
+ {
+ get { return nsString.Get(DomElement.GetId); }
+ set { nsString.Set(DomElement.SetId, value); }
+ }
+
+ /// <summary>
+ /// Gets the value of the class attribute.
+ /// </summary>
+ public string ClassName
+ {
+ get { return nsString.Get(DomElement.GetClassName); }
+ set { nsString.Set(DomElement.SetClassName, value); }
+ }
+
+ /// <summary>
+ /// Returns a collection containing the child elements of this element with a given tag name.
+ /// </summary>
+ /// <param name="tagName"></param>
+ /// <returns></returns>
+ public GeckoElementCollection GetElementsByTagName(string tagName)
+ {
+ if (string.IsNullOrEmpty(tagName))
+ return null;
+
+ return new GeckoElementCollection(DomElement.GetElementsByTagName(new nsAString(tagName)));
+ }
+
+ /// <summary>
+ /// Gets the value of an attribute on this element with the specified name.
+ /// </summary>
+ /// <param name="attributeName"></param>
+ /// <returns></returns>
+ public string GetAttribute(string attributeName)
+ {
+ if (string.IsNullOrEmpty(attributeName))
+ throw new ArgumentException("attributeName");
+
+ using (nsAString retval = new nsAString())
+ {
+ DomElement.GetAttribute(new nsAString(attributeName), retval);
+ return retval.ToString();
+ }
+ }
+
+ /// <summary>
+ /// Gets the value of an attribute on this element with the specified name and namespace.
+ /// </summary>
+ /// <param name="attributeName"></param>
+ /// <returns></returns>
+ public string GetAttributeNS(string namespaceUri, string attributeName)
+ {
+ if (string.IsNullOrEmpty(namespaceUri))
+ return GetAttribute(attributeName);
+
+ if (string.IsNullOrEmpty(attributeName))
+ throw new ArgumentException("attributeName");
+
+ using (nsAString retval = new nsAString())
+ {
+ DomElement.GetAttributeNS(new nsAString(namespaceUri), new nsAString(attributeName), retval);
+ return retval.ToString();
+ }
+ }
+
+ /// <summary>
+ /// Sets the value of an attribute on this element with the specified name.
+ /// </summary>
+ /// <param name="attributeName"></param>
+ /// <param name="value"></param>
+ public void SetAttribute(string attributeName, string value)
+ {
+ if (string.IsNullOrEmpty(attributeName))
+ throw new ArgumentException("attributeName");
+
+ DomElement.SetAttribute(new nsAString(attributeName), new nsAString(value));
+ }
+
+ /// <summary>
+ /// Sets the value of an attribute on this element with the specified name and namespace.
+ /// </summary>
+ /// <param name="attributeName"></param>
+ /// <param name="value"></param>
+ public void SetAttributeNS(string namespaceUri, string attributeName, string value)
+ {
+ if (string.IsNullOrEmpty(namespaceUri))
+ {
+ SetAttribute(attributeName, value);
+ }
+ else
+ {
+ if (string.IsNullOrEmpty(attributeName))
+ throw new ArgumentException("attributeName");
+
+ DomElement.SetAttributeNS(new nsAString(namespaceUri), new nsAString(attributeName), new nsAString(value));
+ }
+ }
+
+ /// <summary>
+ /// Removes an attribute from this element.
+ /// </summary>
+ /// <param name="attributeName"></param>
+ public void RemoveAttribute(string attributeName)
+ {
+ if (string.IsNullOrEmpty(attributeName))
+ throw new ArgumentException("attributeName");
+
+ DomElement.RemoveAttribute(new nsAString(attributeName));
+ }
+
+#if GECKO_1_9_1
+ public int ScrollLeft { get { return DomNSElement.GetScrollLeft(); } set { DomNSElement.SetScrollLeft(value); } }
+ public int ScrollTop { get { return DomNSElement.GetScrollTop(); } set { DomNSElement.SetScrollTop(value); } }
+ public int ScrollWidth { get { return DomNSElement.GetScrollWidth(); } }
+ public int ScrollHeight { get { return DomNSElement.GetScrollHeight(); } }
+ public int ClientWidth { get { return DomNSElement.GetClientWidth(); } }
+ public int ClientHeight { get { return DomNSElement.GetClientHeight(); } }
+#else
public int ScrollLeft { get { return DomNSHTMLElement.GetScrollLeft(); } set { DomNSHTMLElement.SetScrollLeft(value); } }
public int ScrollTop { get { return DomNSHTMLElement.GetScrollTop(); } set { DomNSHTMLElement.SetScrollTop(value); } }
public int ScrollWidth { get { return DomNSHTMLElement.GetScrollWidth(); } }
public int ScrollHeight { get { return DomNSHTMLElement.GetScrollHeight(); } }
public int ClientWidth { get { return DomNSHTMLElement.GetClientWidth(); } }
public int ClientHeight { get { return DomNSHTMLElement.GetClientHeight(); } }
- #endif
- public int OffsetLeft { get { return DomNSHTMLElement.GetOffsetLeft(); } }
- public int OffsetTop { get { return DomNSHTMLElement.GetOffsetTop(); } }
- public int OffsetWidth { get { return DomNSHTMLElement.GetOffsetWidth(); } }
- public int OffsetHeight { get { return DomNSHTMLElement.GetOffsetHeight(); } }
-
- public GeckoElement OffsetParent
- {
- get { return GeckoElement.Create((nsIDOMHTMLElement)DomNSHTMLElement.GetOffsetParent()); }
- }
-
- public void ScrollIntoView(bool top)
- {
- DomNSHTMLElement.ScrollIntoView(top);
- }
-
- public string InnerHtml
- {
- get { return nsString.Get(DomNSHTMLElement.GetInnerHTML); }
- set { nsString.Set(DomNSHTMLElement.SetInnerHTML, value); }
- }
-
- public void Focus()
- {
- DomNSHTMLElement.Focus();
- }
-
- public void Blur()
- {
- DomNSHTMLElement.Blur();
- }
+#endif
+ public int OffsetLeft { get { return DomNSHTMLElement.GetOffsetLeft(); } }
+ public int OffsetTop { get { return DomNSHTMLElement.GetOffsetTop(); } }
+ public int OffsetWidth { get { return DomNSHTMLElement.GetOffsetWidth(); } }
+ public int OffsetHeight { get { return DomNSHTMLElement.GetOffsetHeight(); } }
- public int TabIndex
- {
- get { return DomNSHTMLElement.GetTabIndex(); }
- set { DomNSHTMLElement.SetTabIndex(value); }
- }
-
- #if GECKO_1_9
- /// <summary>
- /// Returns a set of elements with the given class name. This element and all child elements are searched.
- /// </summary>
- /// <param name="classes"></param>
- /// <returns></returns>
- public GeckoNodeCollection GetElementsByClassName(string classes)
- {
- using (nsAString str = new nsAString(classes))
- return new GeckoNodeCollection(((nsIDOMNSElement)DomElement).GetElementsByClassName(str));
- }
-
- /// <summary>
- /// Gets a rectangle which represents the union of all bounding rectangles within the element.
- /// </summary>
- public RectangleF BoundingClientRect
- {
- get
- {
- nsIDOMNSElement ns = (nsIDOMNSElement)DomElement;
- nsIDOMClientRect rect = ns.GetBoundingClientRect();
- return RectangleF.FromLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom());
- }
- }
-
- /// <summary>
- /// Returns an array containing all bounding rectangles within the element.
- /// </summary>
- /// <returns></returns>
- public RectangleF [] GetClientRects()
- {
- nsIDOMNSElement ns = (nsIDOMNSElement)DomElement;
- nsIDOMClientRectList rects = ns.GetClientRects();
- RectangleF [] result = new RectangleF[rects.GetLength()];
- for (int i = 0; i < result.Length; i++)
- {
- nsIDOMClientRect rect = rects.Item(i);
- result[i] = RectangleF.FromLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom());
- }
- return result;
- }
- #endif
- }
-
- /// <summary>
- /// Represents a DOM document.
- /// </summary>
- public class GeckoDocument : GeckoNode
- {
- internal GeckoDocument(nsIDOMHTMLDocument document) : base(document)
- {
- this.DomDocument = document;
- }
-
- internal static GeckoDocument Create(nsIDOMHTMLDocument document)
- {
- return (document == null) ? null : new GeckoDocument(document);
- }
-
- nsIDOMHTMLDocument DomDocument;
-
- /// <summary>
- /// Gets the document title.
- /// </summary>
- public string Title
- {
- get { return nsString.Get(DomDocument.GetTitle); }
- set { nsString.Set(DomDocument.SetTitle, value); }
- }
-
- /// <summary>
- /// Gets the HTML body element.
- /// </summary>
- public GeckoElement Body
- {
- get { return GeckoElement.Create(DomDocument.GetBody()); }
- }
-
- /// <summary>
- /// Gets the top-level document element (for HTML documents, this is the html tag).
- /// </summary>
- public GeckoElement DocumentElement
- {
- get { return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.GetDocumentElement()); }
- }
-
- /// <summary>
- /// Searches for and returns the element in the document with the given id.
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public GeckoElement GetElementById(string id)
- {
- if (string.IsNullOrEmpty(id))
- return null;
-
- return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.GetElementById(new nsAString(id)));
- }
-
- /// <summary>
- /// Represents a collection of style sheets in a <see cref="GeckoDocument"/>.
- /// </summary>
- public class StyleSheetCollection : IEnumerable<GeckoStyleSheet>
- {
- internal StyleSheetCollection(GeckoDocument document)
- {
- this.List = ((nsIDOMDocumentStyle)document.DomDocument).GetStyleSheets();
- }
- nsIDOMStyleSheetList List;
-
- /// <summary>
- /// Gets the number of items in the collection.
- /// </summary>
- public int Count
- {
- get { return (List == null) ? 0 : List.GetLength(); }
- }
-
- /// <summary>
- /// Gets the item at the specified index in the collection.
- /// </summary>
- /// <param name="index"></param>
- /// <returns></returns>
- public GeckoStyleSheet this[int index]
- {
- get
- {
- if (index < 0 || index >= Count)
- throw new ArgumentOutOfRangeException("index");
-
- return GeckoStyleSheet.Create((nsIDOMCSSStyleSheet)List.Item(index));
- }
- }
-
- #region IEnumerable<GeckoStyleSheet> Members
-
- /// <summary>
- /// Returns an <see cref="IEnumerator{GeckoStyleSheet}"/> which can enumerate through the collection.
- /// </summary>
- /// <returns></returns>
- public IEnumerator<GeckoStyleSheet> GetEnumerator()
- {
- int length = Count;
- for (int i = 0; i < length; i++)
- {
- yield return GeckoStyleSheet.Create((nsIDOMCSSStyleSheet)List.Item(i));
- }
- }
-
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
- {
- foreach (GeckoStyleSheet element in this)
- yield return element;
- }
+ public GeckoElement OffsetParent
+ {
+ get { return GeckoElement.Create((nsIDOMHTMLElement)DomNSHTMLElement.GetOffsetParent()); }
+ }
- #endregion
- }
-
- /// <summary>
- /// Gets the collection of style sheets in the <see cref="GeckoDocument"/>.
- /// </summary>
- public StyleSheetCollection StyleSheets
- {
- get { return (_StyleSheets == null) ? ( _StyleSheets = new StyleSheetCollection(this)) : _StyleSheets; }
- }
- StyleSheetCollection _StyleSheets;
-
- /// <summary>
- /// Gets the URL of the document.
- /// </summary>
- public Uri Url
- {
- get { return new Uri(nsString.Get(DomDocument.GetURL)); }
- }
-
- public GeckoElementCollection Frames
- {
- get { return new GeckoHtmlElementCollection(DomDocument.GetForms()); }
- }
-
- public GeckoElementCollection Images
- {
- get { return new GeckoHtmlElementCollection(DomDocument.GetImages()); }
- }
-
- public GeckoElementCollection Anchors
- {
- get { return new GeckoHtmlElementCollection(DomDocument.GetAnchors()); }
- }
-
- public GeckoElementCollection Applets
- {
- get { return new GeckoHtmlElementCollection(DomDocument.GetApplets()); }
- }
-
- public GeckoElementCollection Links
- {
- get { return new GeckoHtmlElementCollection(DomDocument.GetLinks()); }
- }
-
- public string Cookie
- {
- get { return nsString.Get(DomDocument.GetCookie); }
- set { nsString.Set(DomDocument.SetCookie, value); }
- }
-
- public string Domain
- {
- get { return nsString.Get(DomDocument.GetDomain); }
- }
-
- /// <summary>
- /// Returns a collection containing all elements in the document with a given tag name.
- /// </summary>
- /// <param name="tagName"></param>
- /// <returns></returns>
- public GeckoElementCollection GetElementsByTagName(string tagName)
- {
- if (string.IsNullOrEmpty(tagName))
- return null;
-
- return new GeckoElementCollection(DomDocument.GetElementsByTagName(new nsAString(tagName)));
- }
-
- /// <summary>
- /// Returns a collection containing all elements in the document with a given name.
- /// </summary>
- /// <param name="name"></param>
- /// <returns></returns>
- public GeckoElementCollection GetElementsByName(string name)
- {
- if (string.IsNullOrEmpty(name))
- return null;
-
- return new GeckoElementCollection(DomDocument.GetElementsByName(new nsAString(name)));
- }
-
- public GeckoElement CreateElement(string tagName)
- {
- if (string.IsNullOrEmpty(tagName))
- throw new ArgumentException("tagName");
-
- return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.CreateElement(new nsAString(tagName)));
- }
-
- public GeckoElement CreateElement(string tagName, string qualifiedName)
- {
- if (string.IsNullOrEmpty(tagName))
- throw new ArgumentException("tagName");
- if (string.IsNullOrEmpty(qualifiedName))
- throw new ArgumentException("qualifiedName");
-
- return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.CreateElementNS(new nsAString(tagName), new nsAString(qualifiedName)));
- }
-
- public GeckoAttribute CreateAttribute(string name)
- {
- if (string.IsNullOrEmpty(name))
- throw new ArgumentException("name");
-
- return GeckoAttribute.Create(DomDocument.CreateAttribute(new nsAString(name)));
- }
-
- public GeckoAttribute CreateAttribute(string namespaceUri, string qualifiedName)
- {
- if (string.IsNullOrEmpty(namespaceUri))
- throw new ArgumentException("namespaceUri");
- if (string.IsNullOrEmpty(qualifiedName))
- throw new ArgumentException("qualifiedName");
-
- return GeckoAttribute.Create(DomDocument.CreateAttributeNS(new nsAString(namespaceUri), new nsAString(qualifiedName)));
- }
-
- public GeckoNode ImportNode(GeckoNode node, bool deep)
- {
- if (node == null)
- throw new ArgumentNullException("node");
-
- return GeckoNode.Create(DomDocument.ImportNode((nsIDOMNode)node.DomObject, deep));
- }
-
- public bool IsSupported(string feature, string version)
- {
- if (string.IsNullOrEmpty(feature))
- throw new ArgumentException("feature");
- if (string.IsNullOrEmpty(version))
- throw new ArgumentException("version");
-
- return DomDocument.IsSupported(new nsAString(feature), new nsAString(version));
- }
-
- #if GECKO_1_9
- /// <summary>
- /// Gets the currently focused element.
- /// </summary>
- public GeckoElement ActiveElement
- {
- get { return (GeckoElement)GeckoElement.Create(((nsIDOMNSDocument)DomDocument).GetActiveElement()); }
- }
-
- /// <summary>
- /// Returns a set of elements with the given class name. When called on the document object, the complete document is searched, including the root node.
- /// </summary>
- /// <param name="classes"></param>
- /// <returns></returns>
- public GeckoNodeCollection GetElementsByClassName(string classes)
- {
- using (nsAString str = new nsAString(classes))
- return new GeckoNodeCollection(((nsIDOMNSDocument)DomDocument).GetElementsByClassName(str));
- }
-
- /// <summary>
- /// Returns the element visible at the given point, relative to the upper-left-most visible point in the document.
- /// </summary>
- /// <param name="x"></param>
- /// <param name="y"></param>
- /// <returns></returns>
- public GeckoElement ElementFromPoint(int x, int y)
- {
- return GeckoElement.Create((nsIDOMHTMLElement)((nsIDOMNSDocument)DomDocument).ElementFromPoint(x, y));
- }
- #endif
- }
-
- public class GeckoNamedNodeMap : IEnumerable<GeckoNode>
- {
- internal GeckoNamedNodeMap(nsIDOMNamedNodeMap map)
- {
- this.Map = map;
- }
-
- nsIDOMNamedNodeMap Map;
-
- /// <summary>
- /// Gets the number of items in the map.
- /// </summary>
- public int Count
- {
- get { return (Map == null) ? 0 : Map.GetLength(); }
- }
-
- public GeckoNode this[int index]
- {
- get
- {
- if (index < 0 || index >= Count)
- throw new ArgumentOutOfRangeException("index");
-
- return GeckoNode.Create(Map.Item(index));
- }
- }
-
- public GeckoNode this[string name]
- {
- get
- {
- return GeckoNode.Create(Map.GetNamedItem(new nsAString(name)));
- }
- }
-
- public GeckoNode this[string namespaceUri, string localName]
- {
- get
- {
- return GeckoNode.Create(Map.GetNamedItemNS(new nsAString(namespaceUri), new nsAString(localName)));
- }
- }
+ public void ScrollIntoView(bool top)
+ {
+ DomNSHTMLElement.ScrollIntoView(top);
+ }
- #region IEnumerable<GeckoNode> Members
+ public string InnerHtml
+ {
+ get { return nsString.Get(DomNSHTMLElement.GetInnerHTML); }
+ set { nsString.Set(DomNSHTMLElement.SetInnerHTML, value); }
+ }
- public IEnumerator<GeckoNode> GetEnumerator()
- {
- int length = Count;
- for (int i = 0; i < length; i++)
- {
- yield return GeckoNode.Create(Map.Item(i));
- }
- }
+ public void Focus()
+ {
+ DomNSHTMLElement.Focus();
+ }
- #endregion
+ public void Blur()
+ {
+ DomNSHTMLElement.Blur();
+ }
- #region IEnumerable Members
+ public int TabIndex
+ {
+ get { return DomNSHTMLElement.GetTabIndex(); }
+ set { DomNSHTMLElement.SetTabIndex(value); }
+ }
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
- {
- foreach (GeckoNode node in this)
- yield return node;
- }
+#if GECKO_1_9
+ /// <summary>
+ /// Returns a set of elements with the given class name. This element and all child elements are searched.
+ /// </summary>
+ /// <param name="classes"></param>
+ /// <returns></returns>
+ public GeckoNodeCollection GetElementsByClassName(string classes)
+ {
+ using (nsAString str = new nsAString(classes))
+ return new GeckoNodeCollection(((nsIDOMNSElement)DomElement).GetElementsByClassName(str));
+ }
- #endregion
- }
-
- /// <summary>
- /// Represents a DOM window.
- /// </summary>
- public class GeckoWindow
- {
- private GeckoWindow(nsIDOMWindow window)
- {
- _DomWindow = window;
- }
-
- /// <summary>
- /// Gets the underlying unmanaged DOM object.
- /// </summary>
- public object DomWindow
- {
- get { return _DomWindow; }
- }
- nsIDOMWindow _DomWindow;
-
- internal static GeckoWindow Create(nsIDOMWindow window)
- {
- return (window == null) ? null : new GeckoWindow(window);
- }
-
- /// <summary>
- /// Gets the document displayed in the window.
- /// </summary>
- public GeckoDocument Document
- {
- get { return GeckoDocument.Create((nsIDOMHTMLDocument)_DomWindow.GetDocument()); }
- }
-
- /// <summary>
- /// Gets the parent window of this one.
- /// </summary>
- public GeckoWindow Parent
- {
- get { return GeckoWindow.Create((nsIDOMWindow)_DomWindow.GetParent()); }
- }
+ /// <summary>
+ /// Gets a rectangle which represents the union of all bounding rectangles within the element.
+ /// </summary>
+ public RectangleF BoundingClientRect
+ {
+ get
+ {
+ nsIDOMNSElement ns = (nsIDOMNSElement)DomElement;
+ nsIDOMClientRect rect = ns.GetBoundingClientRect();
+ return RectangleF.FromLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom());
+ }
+ }
- public int ScrollX
- {
- get { return _DomWindow.GetScrollX(); }
- }
-
- public int ScrollY
- {
- get { return _DomWindow.GetScrollY(); }
- }
+ /// <summary>
+ /// Returns an array containing all bounding rectangles within the element.
+ /// </summary>
+ /// <returns></returns>
+ public RectangleF[] GetClientRects()
+ {
+ nsIDOMNSElement ns = (nsIDOMNSElement)DomElement;
+ nsIDOMClientRectList rects = ns.GetClientRects();
+ RectangleF[] result = new RectangleF[rects.GetLength()];
+ for (int i = 0; i < result.Length; i++)
+ {
+ nsIDOMClientRect rect = rects.Item(i);
+ result[i] = RectangleF.FromLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom());
+ }
+ return result;
+ }
+#endif
+ }
- public float TextZoom
- {
- get { return _DomWindow.GetTextZoom(); }
- set { _DomWindow.SetTextZoom(value); }
- }
+ /// <summary>
+ /// Represents a DOM document.
+ /// </summary>
+ public class GeckoDocument : GeckoNode
+ {
+ internal GeckoDocument(nsIDOMHTMLDocument document)
+ : base(document)
+ {
+ this.DomDocument = document;
+ }
- public void ScrollTo(int x, int y)
+ internal static GeckoDocument Create(nsIDOMHTMLDocument document)
+ {
+ return (document == null) ? null : new GeckoDocument(document);
+ }
+
+ nsIDOMHTMLDocument DomDocument;
+
+ /// <summary>
+ /// Gets the document title.
+ /// </summary>
+ public string Title
+ {
+ get { return nsString.Get(DomDocument.GetTitle); }
+ set { nsString.Set(DomDocument.SetTitle, value); }
+ }
+
+ /// <summary>
+ /// Gets the HTML body element.
+ /// </summary>
+ public GeckoElement Body
+ {
+ get { return GeckoElement.Create(DomDocument.GetBody()); }
+ }
+
+ /// <summary>
+ /// Gets the top-level document element (for HTML documents, this is the html tag).
+ /// </summary>
+ public GeckoElement DocumentElement
+ {
+ get { return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.GetDocumentElement()); }
+ }
+
+ /// <summary>
+ /// Searches for and returns the element in the document with the given id.
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public GeckoElement GetElementById(string id)
+ {
+ if (string.IsNullOrEmpty(id))
+ return null;
+
+ return GeckoElement.Create((nsIDOMHTMLElement)DomDocument.GetElementById(new nsAString(id)));
+ }
+
+ /// <summary>
+ /// Represents a collection of style sheets in a <see cref="GeckoDocument"/>.
+ /// </summary>
+ public class StyleSheetCollection : IEnumerable<GeckoStyleSheet>
+ {
+ internal StyleSheetCollection(GeckoDocument document)
+ {
+ this.List = ((nsIDOMDocumentStyle)document.DomDocument).GetStyleSheets();
+ }
+ nsIDOMStyleSheetList List;
+
+ /// <summary>
+ /// Gets the number of items in the collection.
+ /// </summary>
+ public int Count
+ {
+ get { return (List == null) ? 0 : List.GetLength(); }
+ }
+
+ /// <summary>
+ /// Gets the item at the specified index in the collection.
+ /// </summary>
+ /// <param name="index"></param>
+ /// <returns></returns>
+ public GeckoStyleSheet this[int index]
+ {
+ get
+ {
+ if (index < 0 || index >= Count)
+ throw new ArgumentOutOfRangeException("index");
+
+ return GeckoStyleSheet.Create((nsIDOMCSSStyleSheet)List.Item(index));
+ }
+ }
+
+ #region IEnumerable<GeckoStyleSheet> Members
+
+ /// <summary>
+ /// Returns an <see cref="IEnumerator{GeckoStyleSheet}"/> which can enumerate through the collection.
+ /// </summary>
+ /// <returns></returns>
+ public IEnumerator<GeckoStyleSheet> GetEnumerator()
+ {
+ int length = Count;
+ for (int i = 0; i < length; i++)
+ {
+ yield return GeckoStyleSheet.Create((nsIDOMCSSStyleSheet)List.Item(i));
+ }
+ }
+
+ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ ...
[truncated message content] |
|
From: <dos...@us...> - 2012-04-15 14:09:01
|
Revision: 4480
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4480&view=rev
Author: doskabouter
Date: 2012-04-15 14:08:54 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
fixed homepage & forumpage
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-14 21:01:09 UTC (rev 4479)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-15 14:08:54 UTC (rev 4480)
@@ -116,8 +116,8 @@
<Description />
</SectionParam>
<SectionParam Name="Description">
- <Value>This will install [Name] version [Version] on your computer.
-It is recommended that you close all other applications before continuing.
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
Click Next to continue or Cancel to exit Setup.</Value>
<ValueType>String</ValueType>
<Description />
@@ -203,7 +203,7 @@
<SectionParam Name="Path to plugin">
<Value>%Plugins%\windows\browsetheweb.dll</Value>
<ValueType>Template</ValueType>
- <Description>Path to the plugin like
+ <Description>Path to the plugin like
%Plugins%\Windows\plugin.dll</Description>
</SectionParam>
</Items>
@@ -298,8 +298,8 @@
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
<Author>Mark Koenig (kroko) 2010</Author>
- <HomePage>http://www.team-mediaportal.com</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>0</Major>
@@ -329,8 +329,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <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">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-14 21:01:16
|
Revision: 4479
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4479&view=rev
Author: doskabouter
Date: 2012-04-14 21:01:09 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
- improved display of the numbers of the urls
- fixed the password dialog to show '*' instead of the actual characters
- fixed mouse cursor not disappearing
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-09 12:21:20 UTC (rev 4478)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-14 21:01:09 UTC (rev 4479)
@@ -50,13 +50,11 @@
private const int MOUSEEVENTF_RIGHTUP = 0x10;
#region Links
- private static GeckoElementCollection _links;
- private static GeckoElementCollection _forms;
- private static Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
+ private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
#endregion
#region Constants
- private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\">{0}</span>";
+ private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\" class=\"{3}\">{0}</span>";
#endregion
#region declare vars
@@ -65,7 +63,7 @@
private Mouse mouse;
private string linkId = string.Empty;
private int linkTime = 0;
- private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
+ private Timer timer = new Timer();
private string lastDomain = string.Empty;
private float zoom = Settings.Instance.DefaultZoom;
@@ -231,6 +229,7 @@
{
MyLog.debug("Mouse support is enabled");
GUIGraphicsContext.MouseSupport = true;
+ Cursor.Show();
}
Parameter = null;
@@ -242,10 +241,9 @@
#region init browser
webBrowser.Visible = true;
- if (!settings.UseMouse) webBrowser.Enabled = false;
- else webBrowser.Enabled = true;
+ webBrowser.Enabled = settings.UseMouse;
- webBrowser.Dock = System.Windows.Forms.DockStyle.None;
+ webBrowser.Dock = DockStyle.None;
webBrowser.Location = new System.Drawing.Point(0, 0);
MyLog.debug("Create eventhandler");
@@ -336,7 +334,8 @@
timer.Tick -= new EventHandler(timer_Tick);
timer.Stop();
-
+ if (settings.UseMouse)
+ Cursor.Hide();
base.OnPageDestroy(new_windowId);
}
@@ -371,9 +370,6 @@
private void timer_Tick(object sender, EventArgs e)
{
- if (settings.UseMouse)
- Cursor.Show();
-
if (linkId != string.Empty)
{
if (settings.OSD)
@@ -594,10 +590,10 @@
case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM:
if (mouse.Visible)
{
- //System.Windows.Forms.Cursor.Show();
+ //Cursor.Show();
int x = GUIGraphicsContext.form.Location.X + mouse.Location.X + 20;
int y = GUIGraphicsContext.form.Location.Y + mouse.Location.Y + 50;
- System.Windows.Forms.Cursor.Position = new Point(x, y);
+ Cursor.Position = new Point(x, y);
}
return;
#endregion
@@ -674,7 +670,7 @@
selectedUrl = settings.LastUrl;
}
- if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
+ if (ShowKeyboard(ref selectedUrl, false) == DialogResult.OK)
{
if (Bookmark.isValidUrl(selectedUrl))
{
@@ -702,8 +698,8 @@
title = title.Replace("\0", "");
- System.Windows.Forms.DialogResult result = ShowKeyboard(ref title, false);
- if (result == System.Windows.Forms.DialogResult.OK)
+ DialogResult result = ShowKeyboard(ref title, false);
+ if (result == DialogResult.OK)
{
bool hasSaved = BookmarkXml.AddBookmark(title, actualUrl, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", 0);
if (hasSaved)
@@ -881,20 +877,30 @@
#region add links to page
_htmlLinkNumbers.Clear();
- _links = webBrowser.Document.Links;
+ GeckoElementCollection links = webBrowser.Document.Links;
int i = 1;
- MyLog.debug("page links cnt : " + _links.Count);
+ MyLog.debug("page links cnt : " + links.Count);
- foreach (GeckoElement element in _links)
+ foreach (GeckoElement element in links)
{
string link = element.GetAttribute("href");
if (!link.StartsWith("javascript:"))
{
+ GeckoElement lastSpan = element;
+ bool ready = false;
+ while (!ready)
+ {
+ GeckoElement ls = lastSpan.LastChild as GeckoElement;
+ if (ls == null || ls.TagName != "SPAN")
+ ready = true;
+ else
+ lastSpan = ls;
+ };
if (!element.InnerHtml.Contains("gecko_id"))
{
- element.InnerHtml += string.Format(_span, i, "", "LINK");
+ element.InnerHtml += string.Format(_span, i, "", "LINK", lastSpan.ClassName);
}
string gb = element.GetAttribute("gb");
@@ -914,12 +920,12 @@
}
}
- _forms = webBrowser.Document.GetElementsByTagName("form");
+ GeckoElementCollection forms = webBrowser.Document.GetElementsByTagName("form");
HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
- MyLog.debug("page forms cnt : " + _forms.Count);
+ MyLog.debug("page forms cnt : " + forms.Count);
- foreach (GeckoElement element in _forms)
+ foreach (GeckoElement element in forms)
{
string action = element.GetAttribute("action");
doc.LoadHtml(element.InnerHtml);
@@ -948,7 +954,7 @@
if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
{
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
+ string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT", "");
element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
}
if (link.Attributes["type"].Value == "submit" ||
@@ -961,7 +967,10 @@
}
else
{
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ if (link.Attributes["type"].Value == "password")
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.InputPassword));
+ else
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
}
i++;
}
@@ -984,7 +993,7 @@
if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
{
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
+ string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT", "");
element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
}
@@ -1040,6 +1049,7 @@
MyLog.debug("navigate to linkid=" + LinkId + " URL=" + hln.Link);
break;
case HtmlInputType.Input:
+ case HtmlInputType.InputPassword:
ShowInputDialog(hln);
break;
case HtmlInputType.Action:
@@ -1075,12 +1085,15 @@
return true;
}
case HtmlInputType.Input:
+ case HtmlInputType.InputPassword:
case HtmlInputType.Action:
hln = id;
return true;
//return "javascript:document.getElementById(\"" + id.Name + "\").click()";
}
}
+ else
+ MyLog.debug(String.Format("LinkId {0} not found in _htmlLinkNumbers", value));
hln = null;
return false;
}
@@ -1090,7 +1103,7 @@
webBrowser.Visible = false;
string result = string.Empty;
- if (ShowKeyboard(ref result, false) == System.Windows.Forms.DialogResult.OK)
+ if (ShowKeyboard(ref result, id.Type == HtmlInputType.InputPassword) == DialogResult.OK)
{
SetInputFieldText(id.Number, result);
}
@@ -1116,7 +1129,7 @@
}
}
- public static System.Windows.Forms.DialogResult ShowKeyboard(ref string DefaultText, bool PasswordInput)
+ public static DialogResult ShowKeyboard(ref string DefaultText, bool PasswordInput)
{
VirtualKeyboard vk = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
@@ -1128,10 +1141,10 @@
if (vk.IsConfirmed)
{
DefaultText = vk.Text;
- return System.Windows.Forms.DialogResult.OK;
+ return DialogResult.OK;
}
else
- return System.Windows.Forms.DialogResult.Cancel;
+ return DialogResult.Cancel;
}
public static void ShowAlert(String headline, String line1, String line2, String line3)
{
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-09 12:21:20 UTC (rev 4478)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-14 21:01:09 UTC (rev 4479)
@@ -28,6 +28,7 @@
public enum HtmlInputType
{
Input,
+ InputPassword,
Link,
Action
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-09 12:21:26
|
Revision: 4478
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4478&view=rev
Author: doskabouter
Date: 2012-04-09 12:21:20 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
- fixed zooming (again)
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 21:50:59 UTC (rev 4477)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-09 12:21:20 UTC (rev 4478)
@@ -19,8 +19,8 @@
public int DefaultZoom_percentage { get; set; }
public int FontZoom_percentage { get; set; }
- public float FontZoom { get { return FontZoom_percentage / 100; } }
- public float DefaultZoom { get { return DefaultZoom_percentage / 100; } }
+ public float FontZoom { get { return (float)FontZoom_percentage / 100; } }
+ public float DefaultZoom { get { return (float)DefaultZoom_percentage / 100; } }
public bool ZoomPage { get; set; }
public bool ZoomDomain { get; set; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 21:51:07
|
Revision: 4477
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4477&view=rev
Author: doskabouter
Date: 2012-04-08 21:50:59 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
general cleanup/formatting
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/OSD_LinkId.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,8 +23,6 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Xml;
using System.IO;
using System.Windows.Forms;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,21 +23,19 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public class BookmarkElement
- {
- public string Name = string.Empty;
- public string Url = string.Empty;
+ public class BookmarkElement
+ {
+ public string Name = string.Empty;
+ public string Url = string.Empty;
- public int Visited = 0;
- public DateTime LastVisited;
- public DateTime Created = DateTime.Now;
+ public int Visited = 0;
+ public DateTime LastVisited;
+ public DateTime Created = DateTime.Now;
- public bool isFolder = false;
- public bool isSubFolder = false;
- }
+ public bool isFolder = false;
+ public bool isSubFolder = false;
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,167 +24,166 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Xml;
using System.IO;
namespace BrowseTheWeb
{
- public class BookmarkXml
- {
- public static List<BookmarkElement> BookmarkItems = new List<BookmarkElement>();
-
- private static void InitBookmarks(string Path)
+ public class BookmarkXml
{
- if (!File.Exists(Path))
- {
- string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
- StreamWriter sr = new StreamWriter(Path);
- sr.Write(s);
- sr.Close();
- }
- }
+ public static List<BookmarkElement> BookmarkItems = new List<BookmarkElement>();
- public static bool LoadBookmarks(string Path)
- {
- InitBookmarks(Path);
-
- BookmarkItems = new List<BookmarkElement>();
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
+ private static void InitBookmarks(string Path)
{
- BookmarkElement elem = GetData(node);
- BookmarkItems.Add(elem);
+ if (!File.Exists(Path))
+ {
+ string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
+ StreamWriter sr = new StreamWriter(Path);
+ sr.Write(s);
+ sr.Close();
+ }
}
- }
- catch
- {
- return false;
- }
- return true;
- }
- public static BookmarkElement GetData(XmlNode Node)
- {
- BookmarkElement result = new BookmarkElement();
- result.Name = Node.SelectSingleNode("Name").InnerText;
- result.Url = Node.SelectSingleNode("URL").InnerText;
+ public static bool LoadBookmarks(string Path)
+ {
+ InitBookmarks(Path);
- result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
- result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
- result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
+ BookmarkItems = new List<BookmarkElement>();
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
- result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement elem = GetData(node);
+ BookmarkItems.Add(elem);
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ return true;
+ }
+ public static BookmarkElement GetData(XmlNode Node)
+ {
+ BookmarkElement result = new BookmarkElement();
- return result;
- }
+ result.Name = Node.SelectSingleNode("Name").InnerText;
+ result.Url = Node.SelectSingleNode("URL").InnerText;
- public static void AddFolder(string Path, string FolderName)
- {
- InitBookmarks(Path);
+ result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
+ result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
+ result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
+ result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
+ result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
- bool found = false;
-
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == FolderName) found = true;
- }
+ return result;
}
- if (!found)
+ public static void AddFolder(string Path, string FolderName)
{
- XmlElement childElement = xmlDocument.CreateElement("Entry");
+ InitBookmarks(Path);
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = "0";
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "true";
- childElement.AppendChild(sub7);
- XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "false";
- childElement.AppendChild(sub8);
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertBefore(childElement, parentNode.FirstChild);
- }
- xmlDocument.Save(Path);
- }
- catch
- { }
- }
- public static bool AddBookmark(string Title, string Url, string Path, long ID)
- {
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
+ bool found = false;
- bool found = false;
- XmlNode folder = null;
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == FolderName) found = true;
+ }
+ }
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
+ if (!found)
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == Title) found = true;
- if (one.FirstChild.InnerText == "Saved by MP") folder = one;
- }
- }
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = "0";
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "true";
+ childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "false";
+ childElement.AppendChild(sub8);
- if ((!found) && (folder != null))
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertBefore(childElement, parentNode.FirstChild);
+ }
+ xmlDocument.Save(Path);
+ }
+ catch
+ { }
+ }
+ public static bool AddBookmark(string Title, string Url, string Path, long ID)
{
- XmlElement childElement = xmlDocument.CreateElement("Entry");
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = ID.ToString();
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "false";
- childElement.AppendChild(sub7);
- XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "true";
- childElement.AppendChild(sub8);
+ bool found = false;
+ XmlNode folder = null;
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertAfter(childElement, folder);
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
- xmlDocument.Save(Path);
- return true;
- }
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == Title) found = true;
+ if (one.FirstChild.InnerText == "Saved by MP") folder = one;
+ }
+ }
- }
- catch
- { }
- return false;
+ if ((!found) && (folder != null))
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = ID.ToString();
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "false";
+ childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "true";
+ childElement.AppendChild(sub8);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertAfter(childElement, folder);
+
+ xmlDocument.Save(Path);
+ return true;
+ }
+
+ }
+ catch
+ { }
+ return false;
+ }
}
- }
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,15 +22,8 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Drawing;
using MediaPortal.GUI.Library;
-using MediaPortal.Dialogs;
-using MediaPortal.Util;
using MediaPortal.Configuration;
using System.Xml;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,13 +24,10 @@
using System;
using System.Collections.Generic;
-using System.Text;
-using System.IO;
using System.Drawing;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
-using MediaPortal.Util;
using MediaPortal.Configuration;
using System.Windows.Forms;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,52 +23,47 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
namespace BrowseTheWeb
{
- public partial class GetFolder : Form
- {
- public string SelectedFolderName = string.Empty;
-
- public GetFolder()
+ public partial class GetFolder : Form
{
- InitializeComponent();
- this.DialogResult = DialogResult.Cancel;
- }
- private void GetFolder_Load(object sender, EventArgs e)
- {
- txtName.Text = SelectedFolderName;
- }
+ public string SelectedFolderName = string.Empty;
- private void btnOK_Click(object sender, EventArgs e)
- {
- if (txtName.Text != string.Empty)
- {
- this.DialogResult = DialogResult.OK;
- SelectedFolderName = txtName.Text;
- Close();
- }
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.DialogResult = DialogResult.Cancel;
- Close();
- }
+ public GetFolder()
+ {
+ InitializeComponent();
+ this.DialogResult = DialogResult.Cancel;
+ }
+ private void GetFolder_Load(object sender, EventArgs e)
+ {
+ txtName.Text = SelectedFolderName;
+ }
- private void txtName_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- btnOK_Click(this, new EventArgs());
- }
- }
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ if (txtName.Text != string.Empty)
+ {
+ this.DialogResult = DialogResult.OK;
+ SelectedFolderName = txtName.Text;
+ Close();
+ }
+ }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ Close();
+ }
-
- }
+ private void txtName_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ btnOK_Click(this, new EventArgs());
+ }
+ }
+
+
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,80 +23,76 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using Skybound.Gecko;
namespace BrowseTheWeb
{
- public partial class GetThumb : Form
- {
- public string SelectedUrl = string.Empty;
- private GeckoWebBrowser browser;
- private Bitmap snap;
+ public partial class GetThumb : Form
+ {
+ public string SelectedUrl = string.Empty;
+ private GeckoWebBrowser browser;
+ private Bitmap snap;
- private bool received = false;
- private int time = 0;
- private int cancel = 0;
+ private bool received = false;
+ private int time = 0;
+ private int cancel = 0;
- public GetThumb()
- {
- InitializeComponent();
+ public GetThumb()
+ {
+ InitializeComponent();
- browser = new GeckoWebBrowser();
- this.Controls.Add(browser);
- }
- private void GetThumb_Load(object sender, EventArgs e)
- {
- browser.Visible = false;
- chkUrl.Checked = true;
+ browser = new GeckoWebBrowser();
+ this.Controls.Add(browser);
+ }
+ private void GetThumb_Load(object sender, EventArgs e)
+ {
+ browser.Visible = false;
+ chkUrl.Checked = true;
- txtUrl.Text = SelectedUrl;
+ txtUrl.Text = SelectedUrl;
- browser.Size = new Size(800, 1024);
- browser.DocumentCompleted += new EventHandler(browser_DocumentCompleted);
- browser.Navigate(SelectedUrl);
- }
+ browser.Size = new Size(800, 1024);
+ browser.DocumentCompleted += new EventHandler(browser_DocumentCompleted);
+ browser.Navigate(SelectedUrl);
+ }
- private void browser_DocumentCompleted(object sender, EventArgs e)
- {
- if (browser.Url.ToString() != "about:blank")
- {
- snap = new Bitmap(browser.Width, browser.Height);
- browser.DrawToBitmap(snap, new Rectangle(0, 0, browser.Width, browser.Height));
+ private void browser_DocumentCompleted(object sender, EventArgs e)
+ {
+ if (browser.Url.ToString() != "about:blank")
+ {
+ snap = new Bitmap(browser.Width, browser.Height);
+ browser.DrawToBitmap(snap, new Rectangle(0, 0, browser.Width, browser.Height));
- snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
+ snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
- Graphics g = Graphics.FromImage((Image)snap);
- g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
+ Graphics g = Graphics.FromImage((Image)snap);
+ g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
- Bookmark.SaveSnap(snap, SelectedUrl);
- received = true;
- chkGetThumb.Checked = true;
- }
- }
+ Bookmark.SaveSnap(snap, SelectedUrl);
+ received = true;
+ chkGetThumb.Checked = true;
+ }
+ }
- private void button1_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void button1_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- private void timer1_Tick(object sender, EventArgs e)
- {
- cancel++;
- if (cancel > 100) this.Close();
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ cancel++;
+ if (cancel > 100) this.Close();
- if (received)
- {
- time++;
- // implemented maybe later to get flash loaded...
- if (time > 0) this.Close();
- }
+ if (received)
+ {
+ time++;
+ // implemented maybe later to get flash loaded...
+ if (time > 0) this.Close();
+ }
+ }
}
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,71 +23,66 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
namespace BrowseTheWeb
{
- public partial class GetUrl : Form
- {
- public string SelectedName = string.Empty;
- public string SelectedUrl = string.Empty;
-
- public GetUrl()
+ public partial class GetUrl : Form
{
- InitializeComponent();
- this.DialogResult = DialogResult.Cancel;
- }
- private void GetUrl_Load(object sender, EventArgs e)
- {
- txtName.Text = SelectedName;
- txtUrl.Text = SelectedUrl;
- }
+ public string SelectedName = string.Empty;
+ public string SelectedUrl = string.Empty;
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.DialogResult = DialogResult.Cancel;
- this.Close();
- }
- private void btnOK_Click(object sender, EventArgs e)
- {
- try
- {
- Uri u = new Uri(txtUrl.Text);
- if (SelectedName != string.Empty)
+ public GetUrl()
{
- SelectedName = txtName.Text;
- SelectedUrl = txtUrl.Text;
+ InitializeComponent();
+ this.DialogResult = DialogResult.Cancel;
+ }
+ private void GetUrl_Load(object sender, EventArgs e)
+ {
+ txtName.Text = SelectedName;
+ txtUrl.Text = SelectedUrl;
+ }
- if (SelectedName.EndsWith("/")) SelectedName = SelectedName.Substring(0, SelectedName.Length - 1);
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ this.Close();
+ }
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ Uri u = new Uri(txtUrl.Text);
+ if (SelectedName != string.Empty)
+ {
+ SelectedName = txtName.Text;
+ SelectedUrl = txtUrl.Text;
- this.DialogResult = DialogResult.OK;
- this.Close();
+ if (SelectedName.EndsWith("/")) SelectedName = SelectedName.Substring(0, SelectedName.Length - 1);
+
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+ }
+ catch
+ {
+ MessageBox.Show("Wrong URL !!!");
+ }
}
- }
- catch
- {
- MessageBox.Show("Wrong URL !!!");
- }
- }
- private void txtUrl_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- btnOK_Click(this, new EventArgs());
- }
+ private void txtUrl_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ btnOK_Click(this, new EventArgs());
+ }
+ }
+ private void txtName_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtUrl.Focus();
+ }
+ }
}
- private void txtName_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- txtUrl.Focus();
- }
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,16 +22,13 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public enum HtmlInputType
+ public enum HtmlInputType
{
- Input,
- Link,
- Action
+ Input,
+ Link,
+ Action
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,28 +22,25 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public class HtmlLinkNumber
- {
- public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type)
+ public class HtmlLinkNumber
{
- Type = type;
- Number = number;
- Name = name;
- Id = id;
- Link = link;
+ public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type)
+ {
+ Type = type;
+ Number = number;
+ Name = name;
+ Id = id;
+ Link = link;
- }
+ }
- public int Number { get; set; }
- public string Id { get; set; }
- public string Name { get; set; }
- public HtmlInputType Type { get; set; }
- public string Link { get; set; }
- }
+ public int Number { get; set; }
+ public string Id { get; set; }
+ public string Name { get; set; }
+ public HtmlInputType Type { get; set; }
+ public string Link { get; set; }
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,211 +24,206 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
namespace BrowseTheWeb
{
- public partial class ImportChrome : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportChrome(TreeView SetupTreeview)
+ public partial class ImportChrome : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import Chrome")
+ public ImportChrome(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import Chrome")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
}
- }
- counter++;
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
}
- }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void ImportChr_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+ path += "\\Google\\Chrome\\User Data\\Default";
- private void ImportChr_Load(object sender, EventArgs e)
- {
- try
- {
- string path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
- path += "\\Google\\Chrome\\User Data\\Default";
+ MyLog.debug("Chrome folder is " + path);
- MyLog.debug("Chrome folder is " + path);
+ if (Directory.Exists(path))
+ {
+ if (File.Exists(path + "\\Bookmarks"))
+ {
+ MyLog.debug("Open bookmarks");
- if (Directory.Exists(path))
- {
- if (File.Exists(path + "\\Bookmarks"))
- {
- MyLog.debug("Open bookmarks");
+ StreamReader sr = new StreamReader(path + "\\Bookmarks");
+ string line = sr.ReadToEnd();
+ sr.Close();
- StreamReader sr = new StreamReader(path + "\\Bookmarks");
- string line = sr.ReadToEnd();
- sr.Close();
+ MyLog.debug("Read " + line.Length + " bytes");
- MyLog.debug("Read " + line.Length + " bytes");
+ int x = 0;
+ int secNo = 1;
- int x = 0;
- int secNo = 1;
+ while ((x = line.IndexOf("children\": [", x + 1)) > 0)
+ {
+ int y = line.IndexOf("]", x + 12);
+ string section = line.Substring(x + 12, y - x - 12);
- while ((x = line.IndexOf("children\": [", x + 1)) > 0)
- {
- int y = line.IndexOf("]", x + 12);
- string section = line.Substring(x + 12, y - x - 12);
+ MyLog.debug("Read section " + secNo);
+ secNo++;
- MyLog.debug("Read section " + secNo);
- secNo++;
+ int start = 0;
+ while ((start = section.IndexOf("{", start + 1)) > 0)
+ {
+ int stop = section.IndexOf("}", start + 1);
+ string entry = section.Substring(start + 1, stop - start - 3);
- int start = 0;
- while ((start = section.IndexOf("{", start + 1)) > 0)
- {
- int stop = section.IndexOf("}", start + 1);
- string entry = section.Substring(start + 1, stop - start - 3);
+ string[] sep = new string[1];
+ sep[0] = "\r\n";
+ string[] lines = entry.Split(sep, StringSplitOptions.RemoveEmptyEntries);
- string[] sep = new string[1];
- sep[0] = "\r\n";
- string[] lines = entry.Split(sep, StringSplitOptions.RemoveEmptyEntries);
+ for (int i = 0; i < lines.Length; i++)
+ {
+ lines[i] = lines[i].Replace("\"", "");
+ lines[i] = lines[i].Trim();
+ }
- for (int i = 0; i < lines.Length; i++)
- {
- lines[i] = lines[i].Replace("\"", "");
- lines[i] = lines[i].Trim();
- }
+ string name = string.Empty;
+ string url = string.Empty;
+ string typ = string.Empty;
- string name = string.Empty;
- string url = string.Empty;
- string typ = string.Empty;
+ for (int i = 0; i < lines.Length; i++)
+ {
+ if (lines[i].StartsWith("type:"))
+ {
+ typ = lines[i].Replace("type:", "").Trim();
+ if (typ.EndsWith(",")) typ = typ.Substring(0, typ.Length - 1);
+ }
+ if (lines[i].StartsWith("name:"))
+ {
+ name = lines[i].Replace("name:", "").Trim();
+ if (name.EndsWith(",")) name = name.Substring(0, name.Length - 1);
+ }
+ if (lines[i].StartsWith("url:"))
+ { // with /
+ url = lines[i].Replace("url:", "").Trim();
+ }
+ }
- for (int i = 0; i < lines.Length; i++)
- {
- if (lines[i].StartsWith("type:"))
- {
- typ = lines[i].Replace("type:", "").Trim();
- if (typ.EndsWith(",")) typ = typ.Substring(0, typ.Length - 1);
- }
- if (lines[i].StartsWith("name:"))
- {
- name = lines[i].Replace("name:", "").Trim();
- if (name.EndsWith(",")) name = name.Substring(0, name.Length - 1);
- }
- if (lines[i].StartsWith("url:"))
- { // with /
- url = lines[i].Replace("url:", "").Trim();
- }
- }
+ if ((name != "") && (typ == "url") && (url != ""))
+ {
+ MyLog.debug("Found bookmark " + name);
- if ((name != "") && (typ == "url") && (url != ""))
- {
- MyLog.debug("Found bookmark " + name);
+ BookmarkElement bkm = new BookmarkElement();
+ bkm.Url = url;
+ bkm.Name = name;
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = name;
+ EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
+ }
+ }
+ }
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
- }
- }
- }
+ }
- }
+ }
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("Exception import chrome : " + ex.Message);
+ MyLog.debug("Exception import chrome : " + ex.StackTrace);
+ }
+ }
+ private BookmarkElement GetBookmark(string Name)
+ {
+ foreach (BookmarkElement bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
}
- }
- catch (Exception ex)
- {
- MyLog.debug("Exception import chrome : " + ex.Message);
- MyLog.debug("Exception import chrome : " + ex.StackTrace);
- }
- }
- private BookmarkElement GetBookmark(string Name)
- {
- foreach (BookmarkElement bkm in EntryList)
- {
- if (bkm.Name == Name) return bkm;
- }
- return null;
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
}
-
- private void btnSelect_Click(object sender, EventArgs e)
- {
- for (int i = 0; i < listBox1.Items.Count; i++)
- {
- listBox1.SetSelected(i, select);
- }
- select = !select;
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,166 +24,161 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
using SQLite.NET;
namespace BrowseTheWeb
{
- public partial class ImportFF : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportFF(TreeView SetupTreeview)
+ public partial class ImportFF : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import FF")
+ public ImportFF(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import FF")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
}
- }
- counter++;
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
}
- }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void ImportFF_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+ path += "\\Mozilla\\Firefox\\Profiles";
- private void ImportFF_Load(object sender, EventArgs e)
- {
- try
- {
- string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
- path += "\\Mozilla\\Firefox\\Profiles";
+ MyLog.debug("Morzilla folder is " + path);
- MyLog.debug("Morzilla folder is " + path);
+ if (Directory.Exists(path))
+ {
+ string[] dir = Directory.GetDirectories(path);
+ if (dir.Length == 1)
+ {
+ MyLog.debug("Morzilla profile under " + dir[0]);
+ path = dir[0] + "\\places.sqlite";
- if (Directory.Exists(path))
- {
- string[] dir = Directory.GetDirectories(path);
- if (dir.Length == 1)
- {
- MyLog.debug("Morzilla profile under " + dir[0]);
- path = dir[0] + "\\places.sqlite";
+ MyLog.debug("open database");
+ SQLiteClient client = new SQLiteClient(path);
- MyLog.debug("open database");
- SQLiteClient client = new SQLiteClient(path);
+ SQLiteResultSet result = client.Execute("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
+ "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
- SQLiteResultSet result = client.Execute("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
- "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
+ MyLog.debug("Morzilla bookmarks found : " + result.Rows.Count);
- MyLog.debug("Morzilla bookmarks found : " + result.Rows.Count);
+ foreach (SQLite.NET.SQLiteResultSet.Row row in result.Rows)
+ {
+ string title = row.fields[0].ToString();
+ string url = row.fields[1].ToString();
- foreach (SQLite.NET.SQLiteResultSet.Row row in result.Rows)
- {
- string title = row.fields[0].ToString();
- string url = row.fields[1].ToString();
+ BookmarkElement bkm = new BookmarkElement();
+ bkm.Url = url;
+ bkm.Name = title;
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = title;
+ EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
+ }
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
+ MyLog.debug("close database");
+ client.Close();
+ }
+ }
}
+ catch (Exception ex)
+ {
+ MyLog.debug("Exception import ff : " + ex.Message);
+ MyLog.debug("Exception import ff : " + ex.StackTrace);
+ }
+ }
- MyLog.debug("close database");
- client.Close();
- }
+ private BookmarkElement GetBookmark(string Name)
+ {
+ foreach (BookmarkElement bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
}
- }
- catch (Exception ex)
- {
- MyLog.debug("Exception import ff : " + ex.Message);
- MyLog.debug("Exception import ff : " + ex.StackTrace);
- }
- }
- private BookmarkElement GetBookmark(string Name)
- {
- foreach (BookmarkElement bkm in EntryList)
- {
- if (bkm.Name == Name) return bkm;
- }
- return null;
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
}
-
- private void btnSelect_Click(object sender, EventArgs e)
- {
- for (int i = 0; i < listBox1.Items.Count; i++)
- {
- listBox1.SetSelected(i, select);
- }
- select = !select;
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,193 +24,188 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
namespace BrowseTheWeb
{
- public partial class ImportIE : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportIE(TreeView SetupTreeview)
+ public partial class ImportIE : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import IE")
+ public ImportIE(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import IE")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
- }
- }
- counter++;
- }
- }
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
- private void ImportIE_Load(object sender, EventArgs e)
- {
- string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
- string[] favFiles;
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
- MyLog.debug("Import folder is " + favPath);
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
+ }
- if (Directory.Exists(favPath))
- {
- string[] favDirs = Directory.GetDirectories(favPath);
- MyLog.debug("Found " + favDirs.Length.ToString() + " folder");
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
+ }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- foreach (string folder in favDirs)
+ private void ImportIE_Load(object sender, EventArgs e)
{
- MyLog.debug("Work on folder '" + Path.GetFileName(folder) + "'");
+ string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
+ string[] favFiles;
- favFiles = Directory.GetFiles(folder, "*.url", SearchOption.TopDirectoryOnly);
- MyLog.debug(favFiles.Length.ToString() + " files to import");
+ MyLog.debug("Import folder is " + favPath);
- foreach (string s in favFiles)
- {
- FileInfo f = new FileInfo(s);
- string name = Path.GetFileNameWithoutExtension(f.Name);
+ if (Directory.Exists(favPath))
+ {
+ string[] favDirs = Directory.GetDirectories(favPath);
+ MyLog.debug("Found " + favDirs.Length.ToString() + " folder");
- string url = GetUrlFile(s);
+ foreach (string folder in favDirs)
+ {
+ MyLog.debug("Work on folder '" + Path.GetFileName(folder) + "'");
- if (url != null)
- {
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = name;
+ favFiles = Directory.GetFiles(folder, "*.url", SearchOption.TopDirectoryOnly);
+ MyLog.debug(favFiles.Length.ToString() + " files to import");
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
- }
- }
- }
+ ...
[truncated message content] |
|
From: <dos...@us...> - 2012-04-08 18:36:08
|
Revision: 4476
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4476&view=rev
Author: doskabouter
Date: 2012-04-08 18:36:02 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
release 0.3.5
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 18:36:02 UTC (rev 4476)
@@ -1480,5 +1480,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>5</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Fixed initial defaultzoom, Fixed crash in configuration</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-04-08T20:35:02.246943+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</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>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 18:36:02 UTC (rev 4476)
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>4</Build>
+ <Build>5</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
+ <VersionDescription>Fixed initial defaultzoom, Fixed crash in configuration</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T18:29:34.428053+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T20:35:02.246943+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 18:36:02 UTC (rev 4476)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.4.0")]
-[assembly: AssemblyFileVersion("0.3.4.0")]
+[assembly: AssemblyVersion("0.3.5.0")]
+[assembly: AssemblyFileVersion("0.3.5.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 18:36:02 UTC (rev 4476)
@@ -84,8 +84,8 @@
Windowed = xmlreader.GetValueAsBool(section, "window", false);
UseMouse = xmlreader.GetValueAsBool(section, "mouse", false);
- DefaultZoom_percentage = xmlreader.GetValueAsInt(section, "zoom", 100); // /100
- FontZoom_percentage = xmlreader.GetValueAsInt(section, "font", 100);// /100
+ DefaultZoom_percentage = xmlreader.GetValueAsInt(section, "zoom", 100);
+ FontZoom_percentage = xmlreader.GetValueAsInt(section, "font", 100);
ZoomPage = xmlreader.GetValueAsBool(section, "page", true);
ZoomDomain = xmlreader.GetValueAsBool(section, "domain", false);
@@ -108,15 +108,20 @@
Server = xmlreader.GetValueAsString(section, "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt(section, "proxy_port", 8888);
string tmp = xmlreader.GetValueAsString(section, "bookmark", GUIFacadeControl.Layout.LargeIcons.ToString());
- tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
- try
+ if (tmp == "List view") // for backwards compatibility
+ View = GUIFacadeControl.Layout.List;
+ else
{
- View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
+ try
+ {
+ View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ }
+ catch
+ {
+ View = GUIFacadeControl.Layout.List;
+ }
}
- catch
- {
- View = GUIFacadeControl.Layout.LargeIcons;
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 17:33:30
|
Revision: 4475
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4475&view=rev
Author: doskabouter
Date: 2012-04-08 17:33:24 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
- fixed initial DefaultZoom
- fixed crash in configuration
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 16:30:48 UTC (rev 4474)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 17:33:24 UTC (rev 4475)
@@ -71,7 +71,7 @@
private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
private string lastDomain = string.Empty;
- private float zoom = 1.0f;
+ private float zoom = Settings.Instance.DefaultZoom;
private Settings settings = Settings.Instance;
public static bool ParameterSupported = false;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 16:30:48 UTC (rev 4474)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 17:33:24 UTC (rev 4475)
@@ -109,7 +109,14 @@
Port = xmlreader.GetValueAsInt(section, "proxy_port", 8888);
string tmp = xmlreader.GetValueAsString(section, "bookmark", GUIFacadeControl.Layout.LargeIcons.ToString());
tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
- View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ try
+ {
+ View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ }
+ catch
+ {
+ View = GUIFacadeControl.Layout.LargeIcons;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 16:30:54
|
Revision: 4474
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4474&view=rev
Author: doskabouter
Date: 2012-04-08 16:30:48 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
fixed config-bug again
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:52:20 UTC (rev 4473)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 16:30:48 UTC (rev 4474)
@@ -1442,7 +1442,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T18:29:34.428053+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:52:20 UTC (rev 4473)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 16:30:48 UTC (rev 4474)
@@ -311,7 +311,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T18:29:34.428053+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 15:52:26
|
Revision: 4473
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4473&view=rev
Author: doskabouter
Date: 2012-04-08 15:52:20 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
fixed config-bug
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:52:20 UTC (rev 4473)
@@ -1442,7 +1442,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:52:20 UTC (rev 4473)
@@ -311,7 +311,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 15:52:20 UTC (rev 4473)
@@ -54,7 +54,7 @@
public int Port { get; set; }
public GUIFacadeControl.Layout View { get; set; }
- private const string section = "btweb";
+ private const string section = "btWeb";
#region Singleton
private static Settings _Instance = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 15:34:27
|
Revision: 4472
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4472&view=rev
Author: doskabouter
Date: 2012-04-08 15:34:21 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
release 0.3.4
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:34:21 UTC (rev 4472)
@@ -1348,5 +1348,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>4</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</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>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:34:21 UTC (rev 4472)
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>3</Build>
+ <Build>4</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Bugfixes</VersionDescription>
+ <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 15:34:21 UTC (rev 4472)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.3.3.0")]
+[assembly: AssemblyVersion("0.3.4.0")]
+[assembly: AssemblyFileVersion("0.3.4.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 15:18:16
|
Revision: 4471
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4471&view=rev
Author: doskabouter
Date: 2012-04-08 15:18:09 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
fixed missing some bookmark thumbs
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-04 21:12:44 UTC (rev 4470)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 15:18:09 UTC (rev 4471)
@@ -35,238 +35,236 @@
namespace BrowseTheWeb
{
- public class Bookmark
- {
- private static XmlTextWriter textWriter;
-
- public static bool Save(TreeView Treeview, string Path)
+ public class Bookmark
{
- bool result = false;
+ private static XmlTextWriter textWriter;
- try
- {
- textWriter = new XmlTextWriter(Path, null);
- textWriter.Formatting = Formatting.Indented;
-
- textWriter.WriteStartDocument();
- textWriter.WriteStartElement("Bookmarks");
-
- foreach (TreeNode t in Treeview.Nodes[0].Nodes)
+ public static bool Save(TreeView Treeview, string Path)
{
- BookmarkElement bkm = (BookmarkElement)t.Tag;
- if (bkm != null)
- {
- WriteOneEntry(bkm);
+ bool result = false;
- foreach (TreeNode sub in t.Nodes)
+ try
{
- BookmarkElement bkm2 = (BookmarkElement)sub.Tag;
- WriteOneEntry(bkm2);
- }
- }
- }
+ textWriter = new XmlTextWriter(Path, null);
+ textWriter.Formatting = Formatting.Indented;
- textWriter.WriteEndElement();
+ textWriter.WriteStartDocument();
+ textWriter.WriteStartElement("Bookmarks");
- textWriter.WriteEndDocument();
- textWriter.Close();
+ foreach (TreeNode t in Treeview.Nodes[0].Nodes)
+ {
+ BookmarkElement bkm = (BookmarkElement)t.Tag;
+ if (bkm != null)
+ {
+ WriteOneEntry(bkm);
- result = true;
- }
- catch
- {
- // error
- }
- finally
- {
- if (textWriter != null) textWriter.Close();
- }
+ foreach (TreeNode sub in t.Nodes)
+ {
+ BookmarkElement bkm2 = (BookmarkElement)sub.Tag;
+ WriteOneEntry(bkm2);
+ }
+ }
+ }
- return result;
- }
- public static void Load(TreeView Treeview, string Path)
- {
- Treeview.Nodes.Clear();
+ textWriter.WriteEndElement();
- TreeNode main = Treeview.Nodes.Add("Bookmarks", "Bookmarks");
- main.ImageIndex = 2;
- main.SelectedImageIndex = 2;
+ textWriter.WriteEndDocument();
+ textWriter.Close();
- try
- {
- BookmarkXml.LoadBookmarks(Path);
- TreeNode akt = new TreeNode();
+ result = true;
+ }
+ catch
+ {
+ // error
+ }
+ finally
+ {
+ if (textWriter != null) textWriter.Close();
+ }
- foreach (BookmarkElement bkm in BookmarkXml.BookmarkItems)
- {
- if (bkm.isFolder)
- {
- akt = main.Nodes.Add(bkm.Name);
- akt.Tag = bkm;
- akt.ImageIndex = 1;
- akt.SelectedImageIndex = 1;
- }
- if (bkm.isSubFolder)
- {
- TreeNode sub = akt.Nodes.Add(bkm.Name);
- sub.Tag = bkm;
- }
- if ((!bkm.isFolder) && (!bkm.isSubFolder))
- {
- TreeNode add = main.Nodes.Add(bkm.Name);
- add.Tag = bkm;
- }
+ return result;
}
+ public static void Load(TreeView Treeview, string Path)
+ {
+ Treeview.Nodes.Clear();
- Treeview.Invalidate();
+ TreeNode main = Treeview.Nodes.Add("Bookmarks", "Bookmarks");
+ main.ImageIndex = 2;
+ main.SelectedImageIndex = 2;
- }
- catch { }
- }
+ try
+ {
+ BookmarkXml.LoadBookmarks(Path);
+ TreeNode akt = new TreeNode();
- private static void WriteOneEntry(BookmarkElement bkm)
- {
- textWriter.WriteStartElement("Entry");
+ foreach (BookmarkElement bkm in BookmarkXml.BookmarkItems)
+ {
+ if (bkm.isFolder)
+ {
+ akt = main.Nodes.Add(bkm.Name);
+ akt.Tag = bkm;
+ akt.ImageIndex = 1;
+ akt.SelectedImageIndex = 1;
+ }
+ if (bkm.isSubFolder)
+ {
+ TreeNode sub = akt.Nodes.Add(bkm.Name);
+ sub.Tag = bkm;
+ }
+ if ((!bkm.isFolder) && (!bkm.isSubFolder))
+ {
+ TreeNode add = main.Nodes.Add(bkm.Name);
+ add.Tag = bkm;
+ }
+ }
- textWriter.WriteStartElement("Name");
- textWriter.WriteValue(bkm.Name);
- textWriter.WriteEndElement();
+ Treeview.Invalidate();
- textWriter.WriteStartElement("URL");
- textWriter.WriteValue(bkm.Url);
- textWriter.WriteEndElement();
+ }
+ catch { }
+ }
- textWriter.WriteStartElement("Visited");
- textWriter.WriteValue(bkm.Visited);
- textWriter.WriteEndElement();
+ private static void WriteOneEntry(BookmarkElement bkm)
+ {
+ textWriter.WriteStartElement("Entry");
- textWriter.WriteStartElement("LastVisited");
- textWriter.WriteValue(bkm.LastVisited);
- textWriter.WriteEndElement();
+ textWriter.WriteStartElement("Name");
+ textWriter.WriteValue(bkm.Name);
+ textWriter.WriteEndElement();
- textWriter.WriteStartElement("Created");
- textWriter.WriteValue(bkm.Created);
- textWriter.WriteEndElement();
+ textWriter.WriteStartElement("URL");
+ textWriter.WriteValue(bkm.Url);
+ textWriter.WriteEndElement();
- textWriter.WriteStartElement("isFolder");
- textWriter.WriteValue(bkm.isFolder);
- textWriter.WriteEndElement();
+ textWriter.WriteStartElement("Visited");
+ textWriter.WriteValue(bkm.Visited);
+ textWriter.WriteEndElement();
- textWriter.WriteStartElement("isSubFolder");
- textWriter.WriteValue(bkm.isSubFolder);
- textWriter.WriteEndElement();
+ textWriter.WriteStartElement("LastVisited");
+ textWriter.WriteValue(bkm.LastVisited);
+ textWriter.WriteEndElement();
- textWriter.WriteEndElement();
+ textWriter.WriteStartElement("Created");
+ textWriter.WriteValue(bkm.Created);
+ textWriter.WriteEndElement();
- }
+ textWriter.WriteStartElement("isFolder");
+ textWriter.WriteValue(bkm.isFolder);
+ textWriter.WriteEndElement();
- public static bool Exists(TreeView Treeview, string Name)
- {
- foreach (TreeNode t in Treeview.Nodes[0].Nodes)
- {
- if (Name == t.Text)
- return true;
- foreach (TreeNode sub in t.Nodes)
- {
- if (Name == sub.Text)
- return true;
- }
- }
- return false;
- }
+ textWriter.WriteStartElement("isSubFolder");
+ textWriter.WriteValue(bkm.isSubFolder);
+ textWriter.WriteEndElement();
- public static bool isValidUrl(string URL)
- {
- try
- {
- Uri urlCheck = new Uri(URL);
- WebRequest request = WebRequest.Create(urlCheck);
- request.Timeout = 10000;
+ textWriter.WriteEndElement();
- WebResponse response;
+ }
- response = request.GetResponse();
- }
- catch (Exception)
- {
- return false; //url does not exist
- }
- return true;
- }
+ public static bool Exists(TreeView Treeview, string Name)
+ {
+ foreach (TreeNode t in Treeview.Nodes[0].Nodes)
+ {
+ if (Name == t.Text)
+ return true;
+ foreach (TreeNode sub in t.Nodes)
+ {
+ if (Name == sub.Text)
+ return true;
+ }
+ }
+ return false;
+ }
- public static void SaveSnap(Bitmap Snap, string Url)
- {
- try
- {
- string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ public static bool isValidUrl(string URL)
+ {
+ try
+ {
+ Uri urlCheck = new Uri(URL);
+ WebRequest request = WebRequest.Create(urlCheck);
+ request.Timeout = 10000;
- Snap.Save(filename);
- }
- catch { }
- }
- public static Bitmap GetSnap(string Url)
- {
- Bitmap snap = null;
+ WebResponse response;
- try
- {
- string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ response = request.GetResponse();
+ }
+ catch (Exception)
+ {
+ return false; //url does not exist
+ }
+ return true;
+ }
- if (File.Exists(filename))
+ public static void SaveSnap(Bitmap Snap, string Url)
{
- snap = (Bitmap)Bitmap.FromFile(filename);
- return snap;
+ try
+ {
+ string filename = GetThumbString(Url);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+
+ Snap.Save(filename);
+ }
+ catch { }
}
- }
- catch { }
+ public static Bitmap GetSnap(string Url)
+ {
+ Bitmap snap = null;
- return snap;
- }
+ try
+ {
+ string filename = GetThumbString(Url);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
- public static string GetSnapPath(string Url)
- {
- string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ if (File.Exists(filename))
+ {
+ snap = (Bitmap)Bitmap.FromFile(filename);
+ return snap;
+ }
+ }
+ catch { }
- return filename;
- }
- public static void InitCachePath()
- {
- if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb"))
- Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb");
+ return snap;
+ }
-
- if (Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
- {
- string[] files = Directory.GetFiles(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb", "*.*");
- foreach (string f in files)
+ public static string GetSnapPath(string Url)
{
- File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f));
+ string filename = GetThumbString(Url);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+
+ return filename;
}
- }
+ public static void InitCachePath()
+ {
+ if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb"))
+ Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb");
- }
- private static string GetThumbString(string Name)
- {
- string result = Name;
+ if (Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
+ {
+ string[] files = Directory.GetFiles(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb", "*.*");
+ foreach (string f in files)
+ {
+ File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f));
+ }
+ }
- if (result.EndsWith("/")) result = result.Substring(0, result.Length - 1);
+ }
- int x = result.IndexOf("//");
- if (x > 0)
- {
- result = result.Substring(x + 2);
- }
+ private static string GetThumbString(string Name)
+ {
+ string result = Name;
- result = result.Replace("/", "_");
- result = result.Replace(".", "_");
- result = result.Replace("?", "_");
- result = result + ".png";
+ if (result.EndsWith("/")) result = result.Substring(0, result.Length - 1);
- return result;
+ int x = result.IndexOf("//");
+ if (x > 0)
+ {
+ result = result.Substring(x + 2);
+ }
+
+ foreach (char c in Path.GetInvalidFileNameChars())
+ result = result.Replace(c, '_');
+ result = result + ".png";
+ return result;
+ }
}
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-04 21:12:52
|
Revision: 4470
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4470&view=rev
Author: doskabouter
Date: 2012-04-04 21:12:44 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
- skybound.gecko now on 3.5 also
- rework of configuration settings
- added pageup/pagedown functionality
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-04-02 12:04:32 UTC (rev 4469)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-04-04 21:12:44 UTC (rev 4470)
@@ -145,6 +145,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="Settings.cs" />
<Compile Include="Setup.cs">
<SubType>Form</SubType>
</Compile>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-02 12:04:32 UTC (rev 4469)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-04 21:12:44 UTC (rev 4470)
@@ -46,8 +46,6 @@
[SkinControlAttribute(3)]
protected GUISortButtonControl btnSortBy = null;
- private static string view = string.Empty;
-
public override int GetID
{
get
@@ -67,27 +65,10 @@
protected override void OnPageLoad()
{
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
-
- view = "Large icons";
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
- }
-
LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
Bookmark.InitCachePath();
base.OnPageLoad();
}
- protected override void OnPageDestroy(int new_windowId)
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- xmlwriter.SetValue("btWeb", "bookmark", view);
- }
- base.OnPageDestroy(new_windowId);
- }
protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
{
if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM)
@@ -112,32 +93,21 @@
if (control == btnViewAs)
{
- switch (view)
- {
- case "Small icons":
- view = "Large icons";
- break;
- case "Large icons":
- view = "List view";
- break;
- case "List view":
- view = "Small icons";
- break;
- }
+ Settings.Instance.View++;
+ if (Settings.Instance.View > GUIFacadeControl.Layout.LargeIcons)
+ Settings.Instance.View = GUIFacadeControl.Layout.List;
string strLine = string.Empty;
- switch (view)
+ facade.CurrentLayout = Settings.Instance.View;
+ switch (Settings.Instance.View)
{
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ case GUIFacadeControl.Layout.SmallIcons:
strLine = GUILocalizeStrings.Get(100);
break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ case GUIFacadeControl.Layout.LargeIcons:
strLine = GUILocalizeStrings.Get(417);
break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
+ case GUIFacadeControl.Layout.List:
strLine = GUILocalizeStrings.Get(101);
break;
}
@@ -147,18 +117,7 @@
public void LoadFacade(string Path, string Folder)
{
- switch (view)
- {
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
- break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
- break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
- break;
- }
+ facade.CurrentLayout = Settings.Instance.View;
facade.Clear();
GUIListItem item = new GUIListItem();
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-02 12:04:32 UTC (rev 4469)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-04 21:12:44 UTC (rev 4470)
@@ -70,40 +70,15 @@
private int linkTime = 0;
private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
- private bool usehome = false;
- private string homepage = string.Empty;
- private int remoteTime = 0;
- private string pluginName = "Browse Web";
- private bool blankBrowser = false;
- private bool statusBar = true;
- private bool osd = false;
- private bool windowed = false;
- private bool useMouse = false;
- private bool zoomPage = false;
- private bool zoomDomain = false;
private string lastDomain = string.Empty;
- private bool cacheThumbs = false;
- private bool remote = false;
- private string remote_confirm = string.Empty;
- private string remote_bookmark = string.Empty;
- private string remote_zoom_in = string.Empty;
- private string remote_zoom_out = string.Empty;
- private string remote_status = string.Empty;
-
- private bool useProxy = false;
- private string Server = string.Empty;
- private int Port = 8080;
-
- private float defaultZoom = 1.0f;
private float zoom = 1.0f;
- private float font = 1.0f;
+ private Settings settings = Settings.Instance;
public static bool ParameterSupported = false;
public static string Parameter = string.Empty;
public static string loadFav = string.Empty;
- private string lastUrl = string.Empty;
#endregion
@@ -127,7 +102,7 @@
}
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- strButtonText = pluginName;
+ strButtonText = settings.PluginName;
strButtonImage = String.Empty;
strButtonImageFocus = String.Empty;
strPictureImage = @"hover_browsetheweb.png";
@@ -201,7 +176,7 @@
}
#endregion
- LoadSettings();
+ TrySetProxy();
BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
"\\bookmarks.xml", "Saved by MP");
@@ -245,7 +220,7 @@
protected override void OnPageLoad()
{
- GUIPropertyManager.SetProperty("#currentmodule", pluginName);
+ GUIPropertyManager.SetProperty("#currentmodule", settings.PluginName);
try
{
@@ -255,7 +230,7 @@
GUIPropertyManager.SetProperty("#btWeb.linkid", "");
linkId = string.Empty;
- if (useMouse)
+ if (settings.UseMouse)
{
MyLog.debug("Mouse support is enabled");
GUIGraphicsContext.MouseSupport = true;
@@ -270,7 +245,7 @@
#region init browser
webBrowser.Visible = true;
- if (!useMouse) webBrowser.Enabled = false;
+ if (!settings.UseMouse) webBrowser.Enabled = false;
else webBrowser.Enabled = true;
webBrowser.Dock = System.Windows.Forms.DockStyle.None;
@@ -285,17 +260,17 @@
webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
- if (statusBar)
+ if (settings.StatusBar)
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
else
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
- MyLog.debug("set zoom size to " + font + "/" + zoom);
+ MyLog.debug("set zoom size to " + settings.FontZoom + "/" + zoom);
- webBrowser.Window.TextZoom = font;
+ webBrowser.Window.TextZoom = settings.FontZoom;
webBrowser.Zoom = zoom;
- if (windowed)
+ if (settings.Windowed)
{
MyLog.debug("switch to windowed fullscreen mode");
GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null);
@@ -306,10 +281,10 @@
if (webBrowser.Document.Domain == string.Empty)
{
- if ((usehome) && (string.IsNullOrEmpty(loadFav)))
+ if ((settings.UseHome) && (string.IsNullOrEmpty(loadFav)))
{
- webBrowser.Navigate(homepage);
- MyLog.debug("load home page " + homepage);
+ webBrowser.Navigate(settings.HomePage);
+ MyLog.debug("load home page " + settings.HomePage);
}
}
@@ -329,7 +304,7 @@
timer.Tick += new EventHandler(timer_Tick);
timer.Start();
- if (useMouse)
+ if (settings.UseMouse)
GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
}
catch (Exception ex)
@@ -345,12 +320,13 @@
{
if (new_windowId != 54537688)
{ // not if you got favs
- if (blankBrowser)
+ if (settings.BlankBrowser)
{
webBrowser.Navigate("about:blank");
MyLog.debug("blank on destroy");
}
}
+ settings.SaveToXml(false);
webBrowser.Visible = false;
GUIGraphicsContext.form.Focus();
@@ -367,64 +343,16 @@
base.OnPageDestroy(new_windowId);
}
- private void LoadSettings()
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- usehome = xmlreader.GetValueAsBool("btWeb", "usehome", true);
- homepage = xmlreader.GetValueAsString("btWeb", "homepage", "http://team-mediaportal.com");
- remoteTime = xmlreader.GetValueAsInt("btWeb", "remotetime", 15);
- pluginName = xmlreader.GetValueAsString("btWeb", "name", "Browse Web");
- blankBrowser = xmlreader.GetValueAsBool("btWeb", "blank", false);
- statusBar = xmlreader.GetValueAsBool("btWeb", "status", true);
- osd = xmlreader.GetValueAsBool("btWeb", "osd", true);
- windowed = xmlreader.GetValueAsBool("btWeb", "window", false);
- useMouse = xmlreader.GetValueAsBool("btWeb", "mouse", false);
-
- defaultZoom = (float)xmlreader.GetValueAsInt("btWeb", "zoom", 100) / 100;
- zoom = defaultZoom;
- font = (float)xmlreader.GetValueAsInt("btWeb", "font", 100) / 100;
- zoomPage = xmlreader.GetValueAsBool("btWeb", "page", true);
- zoomDomain = xmlreader.GetValueAsBool("btWeb", "domain", false);
-
- cacheThumbs = xmlreader.GetValueAsBool("btWeb", "cachethumbs", false);
-
- remote = xmlreader.GetValueAsBool("btWeb", "remote", false);
-
- remote_confirm = xmlreader.GetValueAsString("btWeb", "key_1", "ACTION_SELECT_ITEM");
- remote_bookmark = xmlreader.GetValueAsString("btWeb", "key_2", "ACTION_SHOW_INFO");
- remote_zoom_in = xmlreader.GetValueAsString("btWeb", "key_3", "ACTION_PAGE_DOWN");
- remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_UP");
- remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
-
- lastUrl = xmlreader.GetValueAsString("btWeb", "lastUrl", string.Empty);
-
- useProxy = xmlreader.GetValueAsBool("btWeb", "proxy", false);
- Server = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
- Port = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888);
- TrySetProxy();
- }
- }
- private void SaveSettings()
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- xmlwriter.SetValue("btWeb", "lastUrl", lastUrl);
- }
- }
-
private void TrySetProxy()
{
try
{
- if (useProxy)
+ if (settings.UseProxy)
MyLog.debug("use proxy settings");
else
MyLog.debug("no proxy selected");
- SetProxy(Server, Port, useProxy);
+ SetProxy(settings.Server, settings.Port, settings.UseProxy);
}
catch (Exception ex)
{
@@ -446,12 +374,12 @@
private void timer_Tick(object sender, EventArgs e)
{
- if (useMouse)
+ if (settings.UseMouse)
Cursor.Show();
if (linkId != string.Empty)
{
- if (osd)
+ if (settings.OSD)
{
osd_linkID.Visible = true;
osd_linkID.BringToFront();
@@ -464,7 +392,7 @@
osd_linkID.Visible = false;
}
- if (linkTime > remoteTime)
+ if (linkTime > settings.RemoteTime)
{
linkId = string.Empty;
linkTime = 0;
@@ -487,7 +415,7 @@
GUIPropertyManager.SetProperty("#btWeb.linkid", linkId);
#region remote diagnostic
- if (remote)
+ if (settings.Remote)
{
if (action.wID != MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED)
GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
@@ -498,13 +426,12 @@
}
#endregion
- string strAction = action.wID.ToString();
#region selectable buttons
- if (strAction == remote_confirm)
+ if (action.wID == settings.Remote_Confirm)
{
if (!mouse.Visible)
{
- if (!useMouse)
+ if (!settings.UseMouse)
{
if (linkId != string.Empty)
@@ -538,29 +465,37 @@
mouse.BringToFront();
}
}
- if (strAction == remote_bookmark)
+ if (action.wID == settings.Remote_Bookmark)
{
GUIWindowManager.ActivateWindow(54537688);
return;
}
- if ((strAction == remote_zoom_in) ||
+ if ((action.wID == settings.Remote_Zoom_In) ||
(action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_FORWARD))
{
OnZoomIn();
}
- if ((strAction == remote_zoom_out) ||
+ if ((action.wID == settings.Remote_Zoom_Out) ||
(action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_REWIND))
{
OnZoomOut();
}
- if (strAction == remote_status)
+ if (action.wID == settings.Remote_Status)
{
- statusBar = !statusBar;
- if (statusBar)
+ settings.StatusBar = !settings.StatusBar;
+ if (settings.StatusBar)
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
else
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
}
+ if (action.wID == settings.Remote_PageUp)
+ {
+ OnPageUp();
+ }
+ if (action.wID == settings.Remote_PageDown)
+ {
+ OnPageDown();
+ }
#endregion
switch (action.wID)
@@ -570,7 +505,7 @@
break;
}
case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOUSE_MOVE:
- if (useMouse)
+ if (settings.UseMouse)
{
}
@@ -590,7 +525,7 @@
}
break;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED:
- if (!useMouse)
+ if (!settings.UseMouse)
{
linkTime = 0;
MyLog.debug("action key press=" + action.m_key.KeyChar);
@@ -622,24 +557,24 @@
OnEnterNewLink();
return;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAUSE:
- webBrowser.Navigate(homepage);
- MyLog.debug("load home page " + homepage);
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
+ webBrowser.Navigate(settings.HomePage);
+ MyLog.debug("load home page " + settings.HomePage);
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
return;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_STOP:
webBrowser.Navigate("about:blank");
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
return;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREV_ITEM:
case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND:
webBrowser.GoBack();
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
MyLog.debug("navigate go back");
return;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_ITEM:
case MediaPortal.GUI.Library.Action.ActionType.ACTION_FORWARD:
webBrowser.GoForward();
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
MyLog.debug("navigate go forward");
return;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_RECORD:
@@ -675,7 +610,7 @@
private void webBrowser_DomKeyDown(object sender, GeckoDomKeyEventArgs e)
{
- if (useMouse)
+ if (settings.UseMouse)
{
//System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString());
@@ -706,7 +641,7 @@
}
void webBrowser_DomClick(object sender, GeckoDomEventArgs e)
{
- if (useMouse)
+ if (settings.UseMouse)
{
// this is a workarround until i know what wrong on the links...
GeckoWebBrowser g = (GeckoWebBrowser)sender;
@@ -737,9 +672,9 @@
GUIGraphicsContext.form.Focus();
string selectedUrl = "http://";
- if (lastUrl != string.Empty)
+ if (settings.LastUrl != string.Empty)
{
- selectedUrl = lastUrl;
+ selectedUrl = settings.LastUrl;
}
if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
@@ -749,15 +684,14 @@
webBrowser.Navigate(selectedUrl);
MyLog.debug("navigate to " + selectedUrl);
- lastUrl = selectedUrl;
- SaveSettings();
+ settings.LastUrl = selectedUrl;
}
else
ShowAlert("Wrong link ?", " The link you entered seems to be not valid.", "Input:", selectedUrl);
}
webBrowser.Visible = true;
- if (useMouse)
+ if (settings.UseMouse)
GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
}
@@ -807,20 +741,20 @@
}
webBrowser.Visible = true;
- if (useMouse)
+ if (settings.UseMouse)
GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
}
private void OnZoomIn()
{
if (zoom < 3) zoom += 0.1f;
webBrowser.Zoom = zoom;
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
}
private void OnZoomOut()
{
if (zoom > 0.1f) zoom -= 0.1f;
webBrowser.Zoom = zoom;
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
}
private void OnMoveLeft()
{
@@ -870,6 +804,34 @@
Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
}
}
+ private void OnPageUp()
+ {
+ if (!mouse.Visible)
+ {
+ int height = webBrowser.Size.Height;
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - height + 100);
+ }
+ else
+ {
+ //not yet tested
+ mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
+ }
+ }
+ private void OnPageDown()
+ {
+ if (!mouse.Visible)
+ {
+ int height = webBrowser.Size.Height;
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + height - 100);
+ }
+ else
+ {
+ //not yet tested
+ mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
+ }
+ }
private Bitmap CopyBitmap(Bitmap srcBitmap, Rectangle section)
{
@@ -917,7 +879,7 @@
GUIPropertyManager.SetProperty("#btWeb.status", str);
#endregion
- if (!useMouse)
+ if (!settings.UseMouse)
{
#region add links to page
_htmlLinkNumbers.Clear();
@@ -1039,19 +1001,19 @@
}
#region reset zoom
- if (zoomPage)
+ if (settings.ZoomPage)
{
- webBrowser.Zoom = defaultZoom;
- zoom = defaultZoom;
+ webBrowser.Zoom = settings.DefaultZoom;
+ zoom = settings.DefaultZoom;
GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
}
- if (zoomDomain)
+ if (settings.ZoomDomain)
{
if (lastDomain != webBrowser.Document.Domain)
{
{
- webBrowser.Zoom = defaultZoom;
- zoom = defaultZoom;
+ webBrowser.Zoom = settings.DefaultZoom;
+ zoom = settings.DefaultZoom;
GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
}
}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-04 21:12:44 UTC (rev 4470)
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MediaPortal.GUI.Library;
+using MediaPortal.Dialogs;
+using MediaPortal.Util;
+using MediaPortal.Configuration;
+using Action = MediaPortal.GUI.Library.Action;
+
+namespace BrowseTheWeb
+{
+ public class Settings
+ {
+ public bool UseHome { get; set; }
+ public string HomePage { get; set; }
+ public int RemoteTime { get; set; }
+ public string PluginName { get; set; }
+ public bool BlankBrowser { get; set; }
+ public bool StatusBar { get; set; }
+ public bool OSD { get; set; }
+ public bool Windowed { get; set; }
+ public bool UseMouse { get; set; }
+
+ public int DefaultZoom_percentage { get; set; }
+ public int FontZoom_percentage { get; set; }
+ public float FontZoom { get { return FontZoom_percentage / 100; } }
+ public float DefaultZoom { get { return DefaultZoom_percentage / 100; } }
+
+ public bool ZoomPage { get; set; }
+ public bool ZoomDomain { get; set; }
+ public bool UseThumbs { get; set; }
+ public bool CacheThumbs { get; set; }
+ public bool Remote { get; set; }
+ public Action.ActionType Remote_Confirm { get; set; }
+ public Action.ActionType Remote_Bookmark { get; set; }
+ public Action.ActionType Remote_Zoom_In { get; set; }
+ public Action.ActionType Remote_Zoom_Out { get; set; }
+ public Action.ActionType Remote_Status { get; set; }
+ public Action.ActionType Remote_PageUp { get; set; }
+ public Action.ActionType Remote_PageDown { get; set; }
+
+ public static Action.ActionType Default_Remote_Confirm = Action.ActionType.ACTION_SELECT_ITEM;
+ public static Action.ActionType Default_Remote_Bookmark = Action.ActionType.ACTION_SHOW_INFO;
+ public static Action.ActionType Default_Remote_Zoom_In = Action.ActionType.ACTION_ZOOM_IN;
+ public static Action.ActionType Default_Remote_Zoom_Out = Action.ActionType.ACTION_ZOOM_OUT;
+ public static Action.ActionType Default_Remote_Status = Action.ActionType.ACTION_SHOW_GUI;
+ public static Action.ActionType Default_Remote_PageUp = Action.ActionType.ACTION_PAGE_UP;
+ public static Action.ActionType Default_Remote_PageDown = Action.ActionType.ACTION_PAGE_DOWN;
+
+ public string LastUrl { get; set; }
+ public bool UseProxy { get; set; }
+ public string Server { get; set; }
+ public int Port { get; set; }
+ public GUIFacadeControl.Layout View { get; set; }
+
+ private const string section = "btweb";
+
+ #region Singleton
+ private static Settings _Instance = null;
+ public static Settings Instance
+ {
+ get
+ {
+ if (_Instance == null) _Instance = new Settings();
+ return _Instance;
+ }
+ }
+ private Settings() { LoadFromXml(); }
+ #endregion
+
+ private void LoadFromXml()
+ {
+ string dir = Config.GetFolder(Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ UseHome = xmlreader.GetValueAsBool(section, "usehome", true);
+ HomePage = xmlreader.GetValueAsString(section, "homepage", "http://team-mediaportal.com");
+ RemoteTime = xmlreader.GetValueAsInt(section, "remotetime", 15);
+ PluginName = xmlreader.GetValueAsString(section, "name", "Browse Web");
+ BlankBrowser = xmlreader.GetValueAsBool(section, "blank", false);
+ StatusBar = xmlreader.GetValueAsBool(section, "status", true);
+ OSD = xmlreader.GetValueAsBool(section, "osd", true);
+ Windowed = xmlreader.GetValueAsBool(section, "window", false);
+ UseMouse = xmlreader.GetValueAsBool(section, "mouse", false);
+
+ DefaultZoom_percentage = xmlreader.GetValueAsInt(section, "zoom", 100); // /100
+ FontZoom_percentage = xmlreader.GetValueAsInt(section, "font", 100);// /100
+ ZoomPage = xmlreader.GetValueAsBool(section, "page", true);
+ ZoomDomain = xmlreader.GetValueAsBool(section, "domain", false);
+
+ UseThumbs = xmlreader.GetValueAsBool(section, "usethumbs", true);
+ CacheThumbs = xmlreader.GetValueAsBool(section, "cachethumbs", false);
+
+ Remote = xmlreader.GetValueAsBool(section, "remote", false);
+
+ Remote_Confirm = GetActionFromString(xmlreader, "remote_confirm", Default_Remote_Confirm);
+ Remote_Bookmark = GetActionFromString(xmlreader, "remote_bookmark", Default_Remote_Bookmark);
+ Remote_Zoom_In = GetActionFromString(xmlreader, "remote_zoom_in", Default_Remote_Zoom_In);
+ Remote_Zoom_Out = GetActionFromString(xmlreader, "remote_zoom_out", Default_Remote_Zoom_Out);
+ Remote_Status = GetActionFromString(xmlreader, "remote_status", Default_Remote_Status);
+ Remote_PageUp = GetActionFromString(xmlreader, "remote_pageup", Default_Remote_PageUp);
+ Remote_PageDown = GetActionFromString(xmlreader, "remote_pagedown", Default_Remote_PageDown);
+
+ LastUrl = xmlreader.GetValueAsString(section, "lastUrl", string.Empty);
+
+ UseProxy = xmlreader.GetValueAsBool(section, "proxy", false);
+ Server = xmlreader.GetValueAsString(section, "proxy_server", "127.0.0.1");
+ Port = xmlreader.GetValueAsInt(section, "proxy_port", 8888);
+ string tmp = xmlreader.GetValueAsString(section, "bookmark", GUIFacadeControl.Layout.LargeIcons.ToString());
+ tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
+ View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ }
+ }
+
+ private Action.ActionType GetActionFromString(MediaPortal.Profile.Settings xmlReader, string entry, Action.ActionType defaultAction)
+ {
+ return (Action.ActionType)Enum.Parse(typeof(Action.ActionType), xmlReader.GetValueAsString(section, entry, defaultAction.ToString()), true);
+ }
+
+ public void SaveToXml(bool fromSetup)
+ {
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ if (fromSetup)
+ {
+ xmlwriter.SetValueAsBool(section, "usehome", UseHome);
+ xmlwriter.SetValue(section, "homepage", HomePage);
+ xmlwriter.SetValue(section, "remotetime", RemoteTime);
+ xmlwriter.SetValue(section, "name", PluginName);
+ xmlwriter.SetValueAsBool(section, "blank", BlankBrowser);
+ xmlwriter.SetValueAsBool(section, "status", StatusBar);
+ xmlwriter.SetValueAsBool(section, "osd", OSD);
+ xmlwriter.SetValueAsBool(section, "window", Windowed);
+ xmlwriter.SetValueAsBool(section, "mouse", UseMouse);
+
+ xmlwriter.SetValue(section, "zoom", DefaultZoom_percentage);
+ xmlwriter.SetValue(section, "font", FontZoom_percentage);
+ xmlwriter.SetValueAsBool(section, "page", ZoomPage);
+ xmlwriter.SetValueAsBool(section, "domain", ZoomDomain);
+
+ xmlwriter.SetValueAsBool(section, "usethumbs", UseThumbs);
+ xmlwriter.SetValueAsBool(section, "cachethumbs", CacheThumbs);
+
+ xmlwriter.SetValueAsBool(section, "remote", Remote);
+ xmlwriter.SetValue(section, "remote_confirm", Remote_Confirm);
+ xmlwriter.SetValue(section, "remote_bookmark", Remote_Bookmark);
+ xmlwriter.SetValue(section, "remote_zoom_in", Remote_Zoom_In);
+ xmlwriter.SetValue(section, "remote_zoom_out", Remote_Zoom_Out);
+ xmlwriter.SetValue(section, "remote_status", Remote_Status);
+ xmlwriter.SetValue(section, "remote_pageup", Remote_PageUp);
+ xmlwriter.SetValue(section, "remote_pagedown", Remote_PageDown);
+
+ xmlwriter.SetValue(section, "bookmark", View);
+
+ xmlwriter.SetValueAsBool(section, "proxy", UseProxy);
+ xmlwriter.SetValue(section, "proxy_server", Server);
+ xmlwriter.SetValue(section, "proxy_port", Port);
+ }
+ else
+ {
+ xmlwriter.SetValue(section, "bookmark", View);
+ xmlwriter.SetValue(section, "lastUrl", LastUrl);
+ }
+ }
+ }
+
+ }
+}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2012-04-02 12:04:32 UTC (rev 4469)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2012-04-04 21:12:44 UTC (rev 4470)
@@ -1,203 +1,207 @@
namespace BrowseTheWeb
{
- partial class Setup
- {
- /// <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)
+ partial class Setup
{
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
- #region Windows Form Designer generated code
+ /// <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);
+ }
- /// <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();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
- this.treeView1 = new System.Windows.Forms.TreeView();
- this.imageList1 = new System.Windows.Forms.ImageList(this.components);
- this.btnSave = new System.Windows.Forms.Button();
- this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.titelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
- this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
- this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.btnCancel = new System.Windows.Forms.Button();
- this.txtLink = new System.Windows.Forms.Label();
- this.txtHome = new System.Windows.Forms.TextBox();
- this.chkHome = new System.Windows.Forms.CheckBox();
- this.tabControl1 = new System.Windows.Forms.TabControl();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.chkMouse = new System.Windows.Forms.CheckBox();
- this.chkWindowed = new System.Windows.Forms.CheckBox();
- this.chkOSD = new System.Windows.Forms.CheckBox();
- this.chkStatus = new System.Windows.Forms.CheckBox();
- this.chkBlank = new System.Windows.Forms.CheckBox();
- this.txtName = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.txtRemote = new System.Windows.Forms.Label();
- this.trkRemote = new System.Windows.Forms.TrackBar();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.tabPage2 = new System.Windows.Forms.TabPage();
- this.groupBox12 = new System.Windows.Forms.GroupBox();
- this.cmbBookmarkView = new System.Windows.Forms.ComboBox();
- this.groupBox7 = new System.Windows.Forms.GroupBox();
- this.chkThumbsOnVisit = new System.Windows.Forms.CheckBox();
- this.chkUseThumbs = new System.Windows.Forms.CheckBox();
- this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.optNoZoom = new System.Windows.Forms.RadioButton();
- this.optZoomDomain = new System.Windows.Forms.RadioButton();
- this.optZoomPage = new System.Windows.Forms.RadioButton();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.txtFont = new System.Windows.Forms.Label();
- this.trkFont = new System.Windows.Forms.TrackBar();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txtZoom = new System.Windows.Forms.Label();
- this.trkZoom = new System.Windows.Forms.TrackBar();
- this.tabPage3 = new System.Windows.Forms.TabPage();
- this.btnImportFF = new System.Windows.Forms.Button();
- this.btnImportIE = new System.Windows.Forms.Button();
- this.label7 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.tabPage5 = new System.Windows.Forms.TabPage();
- this.groupBox8 = new System.Windows.Forms.GroupBox();
- this.txtHttpPort = new System.Windows.Forms.TextBox();
- this.txtHttpServer = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.chkProxy = new System.Windows.Forms.CheckBox();
- this.tabPage4 = new System.Windows.Forms.TabPage();
- this.btnDefault = new System.Windows.Forms.Button();
- this.groupBox11 = new System.Windows.Forms.GroupBox();
- this.label33 = new System.Windows.Forms.Label();
- this.label34 = new System.Windows.Forms.Label();
- this.cmbZoomOut = new System.Windows.Forms.ComboBox();
- this.label31 = new System.Windows.Forms.Label();
- this.label32 = new System.Windows.Forms.Label();
- this.cmbZoomIn = new System.Windows.Forms.ComboBox();
- this.groupBox10 = new System.Windows.Forms.GroupBox();
- this.label35 = new System.Windows.Forms.Label();
- this.cmbShowBookmarks = new System.Windows.Forms.ComboBox();
- this.label29 = new System.Windows.Forms.Label();
- this.label30 = new System.Windows.Forms.Label();
- this.label27 = new System.Windows.Forms.Label();
- this.label28 = new System.Windows.Forms.Label();
- this.label25 = new System.Windows.Forms.Label();
- this.label26 = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.label24 = new System.Windows.Forms.Label();
- this.label13 = new System.Windows.Forms.Label();
- this.label14 = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.label12 = new System.Windows.Forms.Label();
- this.groupBox9 = new System.Windows.Forms.GroupBox();
- this.cmbStatusBar = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.cmbConfirmLink = new System.Windows.Forms.ComboBox();
- this.chkRemote = new System.Windows.Forms.CheckBox();
- this.label15 = new System.Windows.Forms.Label();
- this.label16 = new System.Windows.Forms.Label();
- this.label17 = new System.Windows.Forms.Label();
- this.label18 = new System.Windows.Forms.Label();
- this.comboBox3 = new System.Windows.Forms.ComboBox();
- this.label19 = new System.Windows.Forms.Label();
- this.label20 = new System.Windows.Forms.Label();
- this.label21 = new System.Windows.Forms.Label();
- this.label22 = new System.Windows.Forms.Label();
- this.comboBox4 = new System.Windows.Forms.ComboBox();
- this.checkBox1 = new System.Windows.Forms.CheckBox();
- this.btnImportChr = new System.Windows.Forms.Button();
- this.contextMenuStrip1.SuspendLayout();
- this.tabControl1.SuspendLayout();
- this.tabPage1.SuspendLayout();
- this.groupBox5.SuspendLayout();
- this.groupBox4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.trkRemote)).BeginInit();
- this.groupBox3.SuspendLayout();
- this.tabPage2.SuspendLayout();
- this.groupBox12.SuspendLayout();
- this.groupBox7.SuspendLayout();
- this.groupBox6.SuspendLayout();
- this.groupBox2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.trkFont)).BeginInit();
- this.groupBox1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.trkZoom)).BeginInit();
- this.tabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.tabPage5.SuspendLayout();
- this.groupBox8.SuspendLayout();
- this.tabPage4.SuspendLayout();
- this.groupBox11.SuspendLayout();
- this.groupBox10.SuspendLayout();
- this.groupBox9.SuspendLayout();
- this.SuspendLayout();
- //
- // treeView1
- //
- this.treeView1.AllowDrop = true;
- this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.treeView1.ImageIndex = 0;
- this.treeView1.ImageList = this.imageList1;
- this.treeView1.Location = new System.Drawing.Point(6, 34);
- this.treeView1.Name = "treeView1";
- this.treeView1.SelectedImageIndex = 0;
- this.treeView1.Size = new System.Drawing.Size(539, 313);
- this.treeView1.TabIndex = 9;
- this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop);
- this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
- this.treeView1.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView1_DragEnter);
- this.treeView1.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeView1_ItemDrag);
- this.treeView1.Click += new System.EventHandler(this.treeView1_Click);
- //
- // imageList1
- //
- this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
- this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList1.Images.SetKeyName(0, "file-icon.png");
- this.imageList1.Images.SetKeyName(1, "folder-icon.png");
- this.imageList1.Images.SetKeyName(2, "fav-b-icon.png");
- //
- // btnSave
- //
- this.btnSave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnSave.Location = new System.Drawing.Point(12, 523);
- this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(104, 38);
- this.btnSave.TabIndex = 10;
- this.btnSave.Text = "Save";
- this.btnSave.UseVisualStyleBackColor = true;
- this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
- //
- // contextMenuStrip1
- //
- this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ #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();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setup));
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+ this.btnOk = new System.Windows.Forms.Button();
+ this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.titelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
+ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
+ this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.txtLink = new System.Windows.Forms.Label();
+ this.txtHome = new System.Windows.Forms.TextBox();
+ this.chkHome = new System.Windows.Forms.CheckBox();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.chkMouse = new System.Windows.Forms.CheckBox();
+ this.chkWindowed = new System.Windows.Forms.CheckBox();
+ this.chkOSD = new System.Windows.Forms.CheckBox();
+ this.chkStatus = new System.Windows.Forms.CheckBox();
+ this.chkBlank = new System.Windows.Forms.CheckBox();
+ this.txtName = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.txtRemote = new System.Windows.Forms.Label();
+ this.trkRemote = new System.Windows.Forms.TrackBar();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
+ this.cmbBookmarkView = new System.Windows.Forms.ComboBox();
+ this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.chkThumbsOnVisit = new System.Windows.Forms.CheckBox();
+ this.chkUseThumbs = new System.Windows.Forms.CheckBox();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.optNoZoom = new System.Windows.Forms.RadioButton();
+ this.optZoomDomain = new System.Windows.Forms.RadioButton();
+ this.optZoomPage = new System.Windows.Forms.RadioButton();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.txtFont = new System.Windows.Forms.Label();
+ this.trkFont = new System.Windows.Forms.TrackBar();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtZoom = new System.Windows.Forms.Label();
+ this.trkZoom = new System.Windows.Forms.TrackBar();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.btnImportChr = new System.Windows.Forms.Button();
+ this.btnImportFF = new System.Windows.Forms.Button();
+ this.btnImportIE = new System.Windows.Forms.Button();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.tabPage5 = new System.Windows.Forms.TabPage();
+ this.groupBox8 = new System.Windows.Forms.GroupBox();
+ this.txtHttpPort = new System.Windows.Forms.TextBox();
+ this.txtHttpServer = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.chkProxy = new System.Windows.Forms.CheckBox();
+ this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.btnDefault = new System.Windows.Forms.Button();
+ this.groupBox11 = new System.Windows.Forms.GroupBox();
+ this.cmbPageDown = new System.Windows.Forms.ComboBox();
+ this.cmbPageUp = new System.Windows.Forms.ComboBox();
+ this.label37 = new System.Windows.Forms.Label();
+ this.label36 = new System.Windows.Forms.Label();
+ this.label33 = new System.Windows.Forms.Label();
+ this.label34 = new System.Windows.Forms.Label();
+ this.cmbZoomOut = new System.Windows.Forms.ComboBox();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label32 = new System.Windows.Forms.Label();
+ this.cmbZoomIn = new System.Windows.Forms.ComboBox();
+ this.groupBox10 = new System.Windows.Forms.GroupBox();
+ this.label35 = new System.Windows.Forms.Label();
+ this.cmbShowBookmarks = new System.Windows.Forms.ComboBox();
+ this.label29 = new System.Windows.Forms.Label();
+ this.label30 = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.label28 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.label26 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.groupBox9 = new System.Windows.Forms.GroupBox();
+ this.cmbStatusBar = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.cmbConfirmLink = new System.Windows.Forms.ComboBox();
+ this.chkRemote = new System.Windows.Forms.CheckBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.comboBox3 = new System.Windows.Forms.ComboBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.label22 = new System.Windows.Forms.Label();
+ this.comboBox4 = new System.Windows.Forms.ComboBox();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.contextMenuStrip1.SuspendLayout();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trkRemote)).BeginInit();
+ this.groupBox3.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ this.groupBox12.SuspendLayout();
+ this.groupBox7.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trkFont)).BeginInit();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trkZoom)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.tabPage5.SuspendLayout();
+ this.groupBox8.SuspendLayout();
+ this.tabPage4.SuspendLayout();
+ this.groupBox11.SuspendLayout();
+ this.groupBox10.SuspendLayout();
+ this.groupBox9.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // treeView1
+ //
+ this.treeView1.AllowDrop = true;
+ this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.treeView1.ImageIndex = 0;
+ this.treeView1.ImageList = this.imageList1;
+ this.treeView1.Location = new System.Drawing.Point(6, 34);
+ this.treeView1.Name = "treeView1";
+ this.treeView1.SelectedImageIndex = 0;
+ this.treeView1.Size = new System.Drawing.Size(539, 313);
+ this.treeView1.TabIndex = 9;
+ this.treeView1.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeView1_ItemDrag);
+ this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
+ this.treeView1.Click += new System.EventHandler(this.treeView1_Click);
+ this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop);
+ this.treeView1.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView1_DragEnter);
+ //
+ // imageList1
+ //
+ this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+ this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList1.Images.SetKeyName(0, "file-icon.png");
+ this.imageList1.Images.SetKeyName(1, "folder-icon.png");
+ this.imageList1.Images.SetKeyName(2, "fav-b-icon.png");
+ //
+ // btnOk
+ //
+ this.btnOk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btnOk.Location = new System.Drawing.Point(12, 523);
+ this.btnOk.Name = "btnOk";
+ this.btnOk.Size = new System.Drawing.Size(104, 38);
+ this.btnOk.TabIndex = 10;
+ this.btnOk.Text = "OK";
+ this.btnOk.UseVisualStyleBackColor = true;
+ this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+ //
+ // contextMenuStrip1
+ //
+ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.titelToolStripMenuItem,
this.toolStripMenuItem4,
this.toolStripMenuItem1,
@@ -206,1172 +210,1232 @@
this.editToolStripMenuItem,
this.toolStripMenuItem5,
this.deleteToolStripMenuItem});
- this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(154, 142);
- this.contextMenuStrip1.MouseLeave += new System.EventHandler(this.contextMenuStrip1_MouseLeave);
- //
- // titelToolStripMenuItem
- //
- this.titelToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
- this.titelToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.titelToolStripMenuItem.Name = "titelToolStripMenuItem";
- this.titelToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
- this.titelToolStripMenuItem.Text = "Titel";
- //
- // toolStripMenuItem4
- //
- this.toolStripMenuItem4.Name = "toolStripMenuItem4";
- this.toolStripMenuItem4.Size = new System.Drawing.Size(150, 6);
- //
- ...
[truncated message content] |
|
From: <do...@us...> - 2012-04-02 12:04:43
|
Revision: 4469
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4469&view=rev
Author: dot-i
Date: 2012-04-02 12:04:32 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Updated source to 1.6.0.2 version.
Modified Paths:
--------------
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropManager.cs
trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2012-03-29 20:37:48 UTC (rev 4468)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs 2012-04-02 12:04:32 UTC (rev 4469)
@@ -486,6 +486,17 @@
if (zappingTo != null)
{
+ if ((this.IsLiveStreamOn
+ && _currentChannel != null
+ && zappingTo.ChannelType != _currentChannel.ChannelType)
+ || (g_Player.Playing && !this.IsLiveStreamOn))
+ {
+ //g_Player needs a comlete stop when the ChannelType changes
+ g_Player.Stop(true);
+ this.StopLiveStream();
+ Thread.Sleep(250);
+ }
+
Channel prevChannel = _currentChannel;
ChannelGroup prevGroup = _currentChannelGroup;
TuneLiveStream(zappingTo);
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2012-03-29 20:37:48 UTC (rev 4468)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs 2012-04-02 12:04:32 UTC (rev 4469)
@@ -92,6 +92,7 @@
private RecordingGroupMode _currentGroupByMode = RecordingGroupMode.GroupByProgramTitle;
private SortMethod _currentSortMethod = SortMethod.Date;
private bool _sortAscending = true;
+ private bool _enableThumbs = true;
private int _selectedItemIndex;
private int _selectedParentItemIndex;
@@ -234,6 +235,10 @@
{
jumpToTime = rec.LastWatchedPosition.Value;
}
+ else
+ {
+ return false;
+ }
}
}
if (jumpToTime == 0)
@@ -272,7 +277,7 @@
}
if (g_Player.Play(fileName,
- rec.ChannelType == ChannelType.Television ? g_Player.MediaType.Recording : g_Player.MediaType.Radio))
+ rec.ChannelType == ChannelType.Television ? g_Player.MediaType.TV : g_Player.MediaType.Radio))
{
if (Utils.IsVideo(fileName))
{
@@ -325,6 +330,7 @@
else if (strTmp == "name") _currentSortMethod = SortMethod.Name;
_sortAscending = xmlreader.GetValueAsBool(this.SettingsSection, "sortascending", true);
+ _enableThumbs = xmlreader.GetValueAsBool(this.SettingsSection, "userecordingthumbs", true);
strTmp = xmlreader.GetValueAsString(this.SettingsSection, "group", "title");
if (strTmp == "channel") _currentGroupByMode = RecordingGroupMode.GroupByChannel;
@@ -776,9 +782,6 @@
item.Label = rec.CreateProgramTitle();
item.TVTag = rec;
- // Set a default logo indicating the watched status
- string previewThumb = rec.ThumbnailFileName;
-
// Get the channel logo for the small icons
string logo = Utility.GetLogoImage(rec.ChannelId, rec.ChannelDisplayName, TvSchedulerAgent);
if (!System.IO.File.Exists(logo))
@@ -786,11 +789,18 @@
logo = rec.LastWatchedTime.HasValue ? strDefaultSeenIcon : strDefaultUnseenIcon;
}
- if (!File.Exists(previewThumb)
- || new FileInfo(previewThumb).Length == 0)
+ string previewThumb = logo;
+ if (_enableThumbs)
{
- // Fallback to Logo/Default icon
- previewThumb = logo;
+ // Set a default logo indicating the watched status
+ previewThumb = rec.ThumbnailFileName;
+
+ if (!File.Exists(previewThumb)
+ || new FileInfo(previewThumb).Length == 0)
+ {
+ // Fallback to Logo/Default icon
+ previewThumb = logo;
+ }
}
if (ForTheRecordMain.IsRecordingStillActive(rec.RecordingId))
@@ -1535,22 +1545,24 @@
private void OnPlayRecordingBackStarted(global::MediaPortal.Player.g_Player.MediaType type, string filename)
{
- if (type == g_Player.MediaType.Recording
- && _playingRecording != null)
+ if (filename == _playingRecordingFileName)
{
- // set audio track based on user prefs.
- int prefLangIdx = HomeBase.GetPreferedAudioStreamIndex();
- g_Player.CurrentAudioStream = prefLangIdx;
+ if (g_Player.IsTVRecording || g_Player.IsVideo)
+ {
+ // set audio track based on user prefs.
+ int prefLangIdx = HomeBase.GetPreferedAudioStreamIndex();
+ g_Player.CurrentAudioStream = prefLangIdx;
+ }
+ else if (g_Player.IsRadio && _playingRecording != null)
+ {
+ RadioHome.UpdateMusicProperties();
+ }
}
- else if (type != g_Player.MediaType.Recording && _playingRecording != null)
+ else
{
_playingRecordingFileName = null;
_playingRecording = null;
}
- if (type == g_Player.MediaType.Radio)
- {
- RadioHome.UpdateMusicProperties();
- }
}
private static void StopCurrentPlayback(TvControlServiceAgent tvControlAgent)
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropManager.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropManager.cs 2012-03-29 20:37:48 UTC (rev 4468)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropManager.cs 2012-04-02 12:04:32 UTC (rev 4469)
@@ -92,7 +92,7 @@
/// <param name="filename"></param>
void g_Player_PlayBackStarted(g_Player.MediaType type, string filename)
{
- if (type == g_Player.MediaType.TV || type == g_Player.MediaType.Recording)
+ if (g_Player.IsTV || g_Player.IsTVRecording)
{
try
{
Modified: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs
===================================================================
--- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs 2012-03-29 20:37:48 UTC (rev 4468)
+++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs 2012-04-02 12:04:32 UTC (rev 4469)
@@ -509,7 +509,7 @@
{
Log.Debug("TvHome: GUI_MSG_STOP_SERVER_TIMESHIFTING, stopped livestream = navigator livestream");
- if (g_Player.Playing && (g_Player.IsTV || g_Player.IsRadio))
+ if (g_Player.Playing && g_Player.IsTimeShifting)
{
if (GUIWindowManager.ActiveWindow == (int)(int)GUIWindow.Window.WINDOW_TVFULLSCREEN)
{
@@ -733,6 +733,24 @@
}
}
break;*/
+
+
+ //this (GUI_MSG_RECORDER_VIEW_CHANNEL) event is used to let other plugins play a recording,
+ //lastMediaHandler does this (with param1 = 5577 for indentification).
+ case GUIMessage.MessageType.GUI_MSG_RECORDER_VIEW_CHANNEL:
+ if (message.Param1 == 5577)
+ {
+ try
+ {
+ Recording rec = message.Object as Recording;
+ RecordedBase.PlayRecording(rec, message.Param2);
+ }
+ catch
+ {
+ Log.Error("TVHome: error on GUI_MSG_RECORDER_VIEW_CHANNEL event");
+ }
+ }
+ break;
}
}
@@ -763,8 +781,7 @@
{
if (ForTheRecordMain.Navigator.IsLiveStreamOn)
{
- if (type == g_Player.MediaType.TV
- || type == g_Player.MediaType.Radio)
+ if (g_Player.IsTV || g_Player.IsRadio)
{
// set audio track based on user prefs.
int prefLangIdx = HomeBase.GetPreferedAudioStreamIndex();
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-03-29 20:37:54
|
Revision: 4468
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4468&view=rev
Author: doskabouter
Date: 2012-03-29 20:37:48 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
minor cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-16 12:28:28 UTC (rev 4467)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-29 20:37:48 UTC (rev 4468)
@@ -594,43 +594,8 @@
{
linkTime = 0;
MyLog.debug("action key press=" + action.m_key.KeyChar);
- switch (action.m_key.KeyChar)
+ if (action.m_key.KeyChar == 27)
{
- #region 0..9
- case '1':
- linkId += "1";
- break;
- case '2':
- linkId += "2";
- break;
- case '3':
- linkId += "3";
- break;
- case '4':
- linkId += "4";
- break;
- case '5':
- linkId += "5";
- break;
- case '6':
- linkId += "6";
- break;
- case '7':
- linkId += "7";
- break;
- case '8':
- linkId += "8";
- break;
- case '9':
- linkId += "9";
- break;
- case '0':
- linkId += "0";
- break;
- #endregion
- }
- if ((int)action.m_key.KeyChar == 27)
- {
// escape
if (!osd_linkID.Visible)
{
@@ -643,6 +608,9 @@
Application.DoEvents();
}
}
+ else
+ if (action.m_key.KeyChar >= '0' && action.m_key.KeyChar <= '9')
+ linkId += (char)action.m_key.KeyChar;
if (linkId.Length > 4) linkId = linkId.Substring(0, 1);
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2012-03-16 12:28:37
|
Revision: 4467
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4467&view=rev
Author: anthrax-leprosy
Date: 2012-03-16 12:28:28 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/MySleepTimer/MySleepTimer/
trunk/plugins/MySleepTimer/MySleepTimer/Extension/
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_01.png
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_02.png
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_03.png
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_04.png
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_logo.png
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.mpe1
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/update.xml
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.Designer.cs
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.cs
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.resx
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/Settings.cs
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Window/
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Window/MySleepTimer.cs
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Window/MySleepTimerOld.cs
trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Window/Translation.cs
trunk/plugins/MySleepTimer/MySleepTimer/Resources/
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Common.Utils.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Common.Utils.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Core.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Core.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Dialogs.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Dialogs.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Stateless.XML
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Stateless.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Stateless.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Utils.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/Utils.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/WindowPlugins.dll
trunk/plugins/MySleepTimer/MySleepTimer/Resources/dll/WindowPlugins.pdb
trunk/plugins/MySleepTimer/MySleepTimer/Resources/img/
trunk/plugins/MySleepTimer/MySleepTimer/Resources/img/MySleepTimer_disabled.png
trunk/plugins/MySleepTimer/MySleepTimer/Resources/img/MySleepTimer_enabled.png
trunk/plugins/MySleepTimer/MySleepTimer/Skin/
trunk/plugins/MySleepTimer/MySleepTimer/Skin/Media/
trunk/plugins/MySleepTimer/MySleepTimer/Skin/Media/MySleepTimer_enabled.png
Removed Paths:
-------------
trunk/plugins/MySleepTimer/Build/
trunk/plugins/MySleepTimer/MpeRelease/
trunk/plugins/MySleepTimer/MySleepTimer/
trunk/plugins/MySleepTimer/MySleepTimer.5.1.resharper
trunk/plugins/MySleepTimer/MySleepTimer.sln
trunk/plugins/MySleepTimer/releases/
trunk/plugins/MySleepTimer/screenshots/
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_03.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_04.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_04.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Forum/MySleepTimer_logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.xmp2 (rev 0)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.xmp2 2012-03-16 12:28:28 UTC (rev 4467)
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\bin\Release\MySleepTimer.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{24ae0d76-6bf8-4999-b326-841d08571444}-MySleepTimer.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\MySleepTimer.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\bin\Release\Stateless.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a35707b7-2f81-433d-ba56-0fceea5d18d1}-Stateless.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Stateless.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="GenericSkinFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\Skin\Media\MySleepTimer_enabled.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3e7ffc52-c3ec-4232-9eb1-ad6ac0aa6cb4}-MySleepTimer_enabled.png</ZipFileName>
+ <DestinationFilename>%Skin%\[DEFAULT]\Media\MySleepTimer_enabled.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\Language\de.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6edce84f-fd94-438d-9b25-249b74a9a592}-de.xml</ZipFileName>
+ <DestinationFilename>%Language%\MySleepTimer\de.xml</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="7d214f70-ef9e-45e2-b567-a9bcc3921f1f" Name="Welcome Screen" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>Welcome to the Extension Installer for [Name]</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Description">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value>..\..\Skin\Media\MySleepTimer_enabled.png</Value>
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Welcome Screen</PanelName>
+ <WizardButtonsEnum>NextCancel</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="9bcdd6ec-a0e1-4660-a4f1-da7eac9f64db" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value>..\..\Skin\Media\MySleepTimer_enabled.png</Value>
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="">
+ <Params>
+ <Items />
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="6d1f688f-c543-4341-b133-9b81df81f8b5" Name="Setup Complete" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value>..\..\Skin\Media\MySleepTimer_enabled.png</Value>
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Setup Complete</PanelName>
+ <WizardButtonsEnum>Finish</WizardButtonsEnum>
+ </SectionItem>
+ </Items>
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MySleepTimer.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>MySleepTimer</Name>
+ <Id>05afd608-7fb0-4738-85b3-250bb8e521a6</Id>
+ <Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/system/mysleeptimer</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/mysleeptimer.47353/</ForumPage>
+ <UpdateUrl>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
+If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
+ <VersionDescription>added support for MediaPortal 1.2.2.0 final</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/MySleepTimer.mpe1</OnlineLocation>
+ <ReleaseDate>2012-03-16T00:54:51</ReleaseDate>
+ <Tags>standby, suspend, sleeptimer, sleep</Tags>
+ <Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MySleepTimer\Extension\Installer\MySleepTimer.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value>..\..\Skin\Media\MySleepTimer_enabled.png</Value>
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Online Icon">
+ <Value>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/img/MySleepTimer_enabled.png</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value>%Plugins%\process\MySleepTimer.dll</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>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\bin\Release\MySleepTimer.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{24ae0d76-6bf8-4999-b326-841d08571444}-MySleepTimer.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\MySleepTimer.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\bin\Release\Stateless.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a35707b7-2f81-433d-ba56-0fceea5d18d1}-Stateless.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Stateless.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="GenericSkinFile" SystemFile="true" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\Skin\Media\MySleepTimer_enabled.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3e7ffc52-c3ec-4232-9eb1-ad6ac0aa6cb4}-MySleepTimer_enabled.png</ZipFileName>
+ <DestinationFilename>%Skin%\[DEFAULT]\Media\MySleepTimer_enabled.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\..\Language\de.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6edce84f-fd94-438d-9b25-249b74a9a592}-de.xml</ZipFileName>
+ <DestinationFilename>%Language%\MySleepTimer\de.xml</DestinationFilename>
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ <ProjectFilename>MySleepTimer.xmp2</ProjectFilename>
+ <UpdatePath1>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MySleepTimer\Extension\Installer\update.xml</UpdatePath1>
+ <UpdatePath2 />
+ <UpdatePath3 />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/update.xml (rev 0)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Extension/Installer/update.xml 2012-03-16 12:28:28 UTC (rev 4467)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Items>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MySleepTimer.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>MySleepTimer</Name>
+ <Id>05afd608-7fb0-4738-85b3-250bb8e521a6</Id>
+ <Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
+ <HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
+ <UpdateUrl>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>6</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
+If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
+ <VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1</OnlineLocation>
+ <ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
+ <Tags>standby, suspend, sleeptimer, sleep</Tags>
+ <Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/img/MySleepTimer_enabled.png</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value>%Plugins%\process\MySleepTimer.dll</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="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MySleepTimer.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>MySleepTimer</Name>
+ <Id>05afd608-7fb0-4738-85b3-250bb8e521a6</Id>
+ <Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/system/mysleeptimer</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/mysleeptimer.47353/</ForumPage>
+ <UpdateUrl>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
+If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
+ <VersionDescription>added support for MediaPortal 1.2.2.0 final</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1</OnlineLocation>
+ <ReleaseDate>2012-03-16T00:54:51</ReleaseDate>
+ <Tags>standby, suspend, sleeptimer, sleep</Tags>
+ <Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MySleepTimer\Extension\Installer\MySleepTimer.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/img/MySleepTimer_enabled.png</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value>%Plugins%\process\MySleepTimer.dll</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>
+ </Items>
+</ExtensionCollection>
\ No newline at end of file
Added: trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.Designer.cs
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.Designer.cs (rev 0)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.Designer.cs 2012-03-16 12:28:28 UTC (rev 4467)
@@ -0,0 +1,365 @@
+namespace MySleepTimer.Plugin.Configuration {
+ partial class MySleepTimerConfig {
+ /// <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.comboBoxActionType = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.numericUpDownSleepTimeMax = new System.Windows.Forms.NumericUpDown();
+ this.numericUpDownSleepTimeStep = new System.Windows.Forms.NumericUpDown();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.comboBoxShutDownType = new System.Windows.Forms.ComboBox();
+ this.checkBoxShutDownForce = new System.Windows.Forms.CheckBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.numericUpDownNotifyBeforeSleep = new System.Windows.Forms.NumericUpDown();
+ this.label2 = new System.Windows.Forms.Label();
+ this.comboBoxSleepBehavior = new System.Windows.Forms.ComboBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.numericUpDownTimeOutN = new System.Windows.Forms.NumericUpDown();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.checkBoxUsePSSettings = new System.Windows.Forms.CheckBox();
+ this.groupBoxTimer = new System.Windows.Forms.GroupBox();
+ this.cancelButton = new System.Windows.Forms.Button();
+ this.okButton = new System.Windows.Forms.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSleepTimeMax)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSleepTimeStep)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownNotifyBeforeSleep)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeOutN)).BeginInit();
+ this.groupBox1.SuspendLayout();
+ this.groupBoxTimer.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // comboBoxActionType
+ //
+ this.comboBoxActionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxActionType.DropDownWidth = 250;
+ this.comboBoxActionType.FormattingEnabled = true;
+ this.comboBoxActionType.Location = new System.Drawing.Point(169, 6);
+ this.comboBoxActionType.Name = "comboBoxActionType";
+ this.comboBoxActionType.Size = new System.Drawing.Size(168, 21);
+ this.comboBoxActionType.TabIndex = 5;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 9);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(146, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "ActionType to set sleep timer:";
+ //
+ // numericUpDownSleepTimeMax
+ //
+ this.numericUpDownSleepTimeMax.Increment = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSleepTimeMax.Location = new System.Drawing.Point(210, 19);
+ this.numericUpDownSleepTimeMax.Maximum = new decimal(new int[] {
+ 1440,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSleepTimeMax.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSleepTimeMax.Name = "numericUpDownSleepTimeMax";
+ this.numericUpDownSleepTimeMax.Size = new System.Drawing.Size(71, 20);
+ this.numericUpDownSleepTimeMax.TabIndex = 25;
+ this.numericUpDownSleepTimeMax.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
+ // numericUpDownSleepTimeStep
+ //
+ this.numericUpDownSleepTimeStep.Location = new System.Drawing.Point(210, 45);
+ this.numericUpDownSleepTimeStep.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownSleepTimeStep.Name = "numericUpDownSleepTimeStep";
+ this.numericUpDownSleepTimeStep.Size = new System.Drawing.Size(71, 20);
+ this.numericUpDownSleepTimeStep.TabIndex = 30;
+ this.numericUpDownSleepTimeStep.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(69, 21);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(130, 13);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Sleep time maximum [min]:";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(87, 47);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(112, 13);
+ this.label5.TabIndex = 0;
+ this.label5.Text = "Sleep time steps [min]:";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(6, 45);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(81, 13);
+ this.label3.TabIndex = 0;
+ this.label3.Text = "Shutdown type:";
+ //
+ // comboBoxShutDownType
+ //
+ this.comboBoxShutDownType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxShutDownType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxShutDownType.FormattingEnabled = true;
+ this.comboBoxShutDownType.Location = new System.Drawing.Point(93, 42);
+ this.comboBoxShutDownType.Name = "comboBoxShutDownType";
+ this.comboBoxShutDownType.Size = new System.Drawing.Size(168, 21);
+ this.comboBoxShutDownType.TabIndex = 15;
+ //
+ // checkBoxShutDownForce
+ //
+ this.checkBoxShutDownForce.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.checkBoxShutDownForce.AutoSize = true;
+ this.checkBoxShutDownForce.Location = new System.Drawing.Point(267, 44);
+ this.checkBoxShutDownForce.Name = "checkBoxShutDownForce";
+ this.checkBoxShutDownForce.Size = new System.Drawing.Size(50, 17);
+ this.checkBoxShutDownForce.TabIndex = 20;
+ this.checkBoxShutDownForce.Text = "force";
+ this.checkBoxShutDownForce.UseVisualStyleBackColor = true;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(25, 99);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(174, 13);
+ this.label7.TabIndex = 0;
+ this.label7.Text = "Start notification prior to sleep [min]:";
+ //
+ // numericUpDownNotifyBeforeSleep
+ //
+ this.numericUpDownNotifyBeforeSleep.Location = new System.Drawing.Point(210, 97);
+ this.numericUpDownNotifyBeforeSleep.Name = "numericUpDownNotifyBeforeSleep";
+ this.numericUpDownNotifyBeforeSleep.Size = new System.Drawing.Size(71, 20);
+ this.numericUpDownNotifyBeforeSleep.TabIndex = 40;
+ this.numericUpDownNotifyBeforeSleep.ValueChanged += new System.EventHandler(this.numericUpDownNotifyBeforeSleep_ValueChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(77, 35);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(81, 13);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "Sleep behavior:";
+ //
+ // comboBoxSleepBehavior
+ //
+ this.comboBoxSleepBehavior.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
+ this.comboBoxSleepBehavior.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxSleepBehavior.DropDownWidth = 250;
+ this.comboBoxSleepBehavior.FormattingEnabled = true;
+ this.comboBoxSleepBehavior.Items.AddRange(new object[] {
+ "Shutdown",
+ "Exit MediaPortal",
+ "Show Basic Home"});
+ this.comboBoxSleepBehavior.Location = new System.Drawing.Point(169, 33);
+ this.comboBoxSleepBehavior.Name = "comboBoxSleepBehavior";
+ this.comboBoxSleepBehavior.Size = new System.Drawing.Size(168, 21);
+ this.comboBoxSleepBehavior.TabIndex = 10;
+ this.comboBoxSleepBehavior.SelectedIndexChanged += new System.EventHandler(this.comboBoxSleepBehavior_SelectedIndexChanged);
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(79, 73);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(120, 13);
+ this.label9.TabIndex = 0;
+ this.label9.Text = "Notification TimeOut [s]:";
+ //
+ // numericUpDownTimeOutN
+ //
+ this.numericUpDownTimeOutN.Location = new System.Drawing.Point(210, 71);
+ this.numericUpDownTimeOutN.Maximum = new decimal(new int[] {
+ 65,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownTimeOutN.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.numericUpDownTimeOutN.Name = "numericUpDownTimeOutN";
+ this.numericUpDownTimeOutN.Size = new System.Drawing.Size(71, 20);
+ this.numericUpDownTimeOutN.TabIndex = 50;
+ this.numericUpDownTimeOutN.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
+ // groupBox1
+ //
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox1.Controls.Add(this.checkBoxUsePSSettings);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.comboBoxShutDownType);
+ this.groupBox1.Controls.Add(this.checkBoxShutDownForce);
+ this.groupBox1.Location = new System.Drawing.Point(12, 73);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(323, 75);
+ this.groupBox1.TabIndex = 56;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Shutdown options";
+ //
+ // checkBoxUsePSSettings
+ //
+ this.checkBoxUsePSSettings.AutoSize = true;
+ this.checkBoxUsePSSettings.Location = new System.Drawing.Point(9, 19);
+ this.checkBoxUsePSSettings.Name = "checkBoxUsePSSettings";
+ this.checkBoxUsePSSettings.Size = new System.Drawing.Size(234, 17);
+ this.checkBoxUsePSSettings.TabIndex = 21;
+ this.checkBoxUsePSSettings.Text = "Use settings of Powerscheduler client plugin";
+ this.checkBoxUsePSSettings.UseVisualStyleBackColor = true;
+ this.checkBoxUsePSSettings.CheckedChanged += new System.EventHandler(this.checkBoxUsePSSettings_CheckedChanged);
+ //
+ // groupBoxTimer
+ //
+ this.groupBoxTimer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxTimer.Controls.Add(this.label4);
+ this.groupBoxTimer.Controls.Add(this.numericUpDownSleepTimeMax);
+ this.groupBoxTimer.Controls.Add(this.label9);
+ this.groupBoxTimer.Controls.Add(this.numericUpDownSleepTimeStep);
+ this.groupBoxTimer.Controls.Add(this.numericUpDownTimeOutN);
+ this.groupBoxTimer.Controls.Add(this.label5);
+ this.groupBoxTimer.Controls.Add(this.numericUpDownNotifyBeforeSleep);
+ this.groupBoxTimer.Controls.Add(this.label7);
+ this.groupBoxTimer.Location = new System.Drawing.Point(12, 154);
+ this.groupBoxTimer.Name = "groupBoxTimer";
+ this.groupBoxTimer.Size = new System.Drawing.Size(323, 129);
+ this.groupBoxTimer.TabIndex = 57;
+ this.groupBoxTimer.TabStop = false;
+ this.groupBoxTimer.Text = "Timer && notify settings";
+ //
+ // cancelButton
+ //
+ this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.cancelButton.Location = new System.Drawing.Point(260, 303);
+ this.cancelButton.Name = "cancelButton";
+ this.cancelButton.Size = new System.Drawing.Size(75, 23);
+ this.cancelButton.TabIndex = 58;
+ this.cancelButton.Text = "Cancel";
+ this.cancelButton.UseVisualStyleBackColor = true;
+ this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+ //
+ // okButton
+ //
+ this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.okButton.Location = new System.Drawing.Point(179, 303);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(75, 23);
+ this.okButton.TabIndex = 59;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // MySleepTimerConfig
+ //
+ this.AcceptButton = this.okButton;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.cancelButton;
+ this.ClientSize = new System.Drawing.Size(347, 334);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.cancelButton);
+ this.Controls.Add(this.groupBoxTimer);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.comboBoxSleepBehavior);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.comboBoxActionType);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "MySleepTimerConfig";
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "MySleepTimer - Configuration";
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSleepTimeMax)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSleepTimeStep)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownNotifyBeforeSleep)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeOutN)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBoxTimer.ResumeLayout(false);
+ this.groupBoxTimer.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ComboBox comboBoxActionType;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.NumericUpDown numericUpDownSleepTimeMax;
+ private System.Windows.Forms.NumericUpDown numericUpDownSleepTimeStep;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ComboBox comboBoxShutDownType;
+ private System.Windows.Forms.CheckBox checkBoxShutDownForce;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.NumericUpDown numericUpDownNotifyBeforeSleep;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.ComboBox comboBoxSleepBehavior;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.NumericUpDown numericUpDownTimeOutN;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox checkBoxUsePSSettings;
+ private System.Windows.Forms.GroupBox groupBoxTimer;
+ private System.Windows.Forms.Button cancelButton;
+ private System.Windows.Forms.Button okButton;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.cs
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.cs (rev 0)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.cs 2012-03-16 12:28:28 UTC (rev 4467)
@@ -0,0 +1,215 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+// Copyright (C) 2005-2010 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// MediaPortal 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 of the License, or
+// (at your option) any later version.
+//
+// MediaPortal 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 MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using MediaPortal.Configuration;
+using MediaPortal.GUI.Library;
+using MediaPortal.UserInterface.Controls;
+using MediaPortal.Util;
+using MySleepTimer.Plugin.Window;
+using Action = MediaPortal.GUI.Library.Action;
+
+namespace MySleepTimer.Plugin.Configuration {
+
+ public partial class MySleepTimerConfig : MPConfigForm{
+ public MySleepTimerConfig() {
+ InitializeComponent();
+ LoadSettings();
+ }
+
+ #region Settings
+
+ private void LoadSettings() {
+ try {
+ comboBoxActionType.DataSource = GenerateActionList();
+ comboBoxActionType.DisplayMember = "ActionName";
+ comboBoxActionType.ValueMember = "ActionType";
+ comboBoxShutDownType.DataSource = GenerateShutdownList();
+ comboBoxShutDownType.DisplayMember = "ShutdownName";
+ comboBoxShutDownType.ValueMember = "ShutdownType";
+
+ Settings.Load();
+ comboBoxActionType.SelectedValue = Settings.ActionType;
+ comboBoxSleepBehavior.Text = Settings.SleepBehavior;
+
+ checkBoxUsePSSettings.Checked = Settings.UsePowerSchedulerSettings;
+ comboBoxShutDownType.SelectedValue = Settings.ShutdownType;
+ checkBoxShutDownForce.Checked = Settings.ShutdownForce;
+
+ numericUpDownSleepTimeMax.Value = Settings.SleepTimeMaxium;
+ numericUpDownSleepTimeStep.Value = Settings.SleepTimeStep;
+ numericUpDownNotifyBeforeSleep.Value = Settings.NotifyBeforeSleep;
+ numericUpDownTimeOutN.Value = Settings.NotifyTimeOutMs;
+
+ SetUpShutDownTypeControls();
+ SetUpNotifyControls();
+ } catch (Exception ex) {
+ Log.Error(ex);
+ }
+ }
+
+ private void SaveSettings() {
+ Settings.ActionType = (Action.ActionType)comboBoxActionType.SelectedValue;
+ Settings.SleepBehavior = comboBoxSleepBehavior.Text;
+
+ Settings.UsePowerSchedulerSettings = checkBoxUsePSSettings.Checked;
+ Settings.ShutdownType = (RestartOptions)comboBoxShutDownType.SelectedValue;
+ Settings.ShutdownForce = checkBoxShutDownForce.Checked;
+
+ Settings.SleepTimeMaxium = (int)numericUpDownSleepTimeMax.Value;
+ Settings.SleepTimeStep = (int)numericUpDownSleepTimeStep.Value;
+ Settings.NotifyBeforeSleep = (int)numericUpDownNotifyBeforeSleep.Value;
+ Settings.NotifyTimeOutMs = (int)numericUpDownTimeOutN.Value;
+ Settings.Save();
+ }
+
+ #endregion
+
+ #region Windows Forms events
+
+ private void okButton_Click(object sender, EventArgs e) {
+ SaveSettings();
+ Close();
+ }
+
+ private void cancelButton_Click(object sender, EventArgs e) {
+ Close();
+ }
+
+
+ private void comboBoxSleepBehavior_SelectedIndexChanged(object sender, EventArgs e) {
+ SetUpShutDownTypeControls();
+ }
+
+ private void checkBoxUsePSSettings_CheckedChanged(object sender, EventArgs e) {
+ SetUpShutDownTypeControls();
+ }
+
+ private void numericUpDownNotifyBeforeSleep_ValueChanged(object sender, EventArgs e) {
+ SetUpNotifyControls();
+ }
+
+ private void numericUpDownNotifyInterval_ValueChanged(object sender, EventArgs e) {
+ SetUpNotifyControls();
+ }
+
+ #endregion
+
+ private static List<ActionEntry> GenerateActionList() {
+ var ret = new List<ActionEntry>();
+
+ foreach (var variable in Enum.GetValues(typeof(Action.ActionType)))
+ ret.Add(new ActionEntry((Action.ActionType)variable));
+
+ ret.Sort();
+
+ return ret;
+ }
+
+ private static List<ShutdownEntry> GenerateShutdownList() {
+ var ret = new List<ShutdownEntry>();
+
+ foreach (var variable in Enum.GetValues(typeof(RestartOptions)))
+ ret.Add(new ShutdownEntry((RestartOptions)variable));
+
+ ret.Sort();
+
+ return ret;
+ }
+
+ private void SetUpShutDownTypeControls() {
+ groupBox1.Enabled = comboBoxSleepBehavior.Text == "Shutdown";
+
+ checkBoxUsePSSettings.Enabled = Settings.PowerSchedulerAvailable;
+
+ if (checkBoxUsePSSettings.Enabled && checkBoxUsePSSettings.Checked) {
+ comboBoxShutDownType.Enabled = false;
+ checkBoxShutDownForce.Enabled = false;
+ } else {
+ comboBoxShutDownType.Enabled = true;
+ checkBoxShutDownForce.Enabled = true;
+ }
+ }
+
+ private void SetUpNotifyControls() {
+ try {
+ if (numericUpDownNotifyBeforeSleep.Value != 0) {
+ label9.Enabled = true;
+ numericUpDownTimeOutN.Enabled = true;
+ } else {
+ label9.Enabled = false;
+ numericUpDownTimeOutN.Enabled = false;
+ }
+ } catch (Exception ex) {
+ Log.Error(ex);
+ }
+ }
+ }
+
+ internal class ActionEntry : IComparable<ActionEntry> {
+ public Action.ActionType ActionType { get; private set; }
+
+ public string ActionName {
+ get { return ActionType.ToString(); }
+ }
+
+ public int ActionID {
+ get { return (int)ActionType; }
+ }
+
+ public ActionEntry(Action.ActionType actionType) {
+ ActionType = actionType;
+ }
+
+ #region IComparable<ActionEntry> Member
+
+ public int CompareTo(ActionEntry other) {
+ return ActionName.CompareTo(other.ActionName);
+ }
+
+ #endregion
+ }
+
+ internal class ShutdownEntry : IComparable<ShutdownEntry> {
+ public RestartOptions ShutDownType { get; private set; }
+
+ public string ShutdownName {
+ get { return ShutDownType.ToString(); }
+ }
+
+ public int ShutdownID {
+ get { return (int)ShutDownType; }
+ }
+
+ public ShutdownEntry(RestartOptions restartOptions) {
+ ShutDownType = restartOptions;
+ }
+
+ #region IComparable<ShutdownEntry> Member
+
+ public int CompareTo(ShutdownEntry other) {
+ return ShutdownName.CompareTo(other.ShutdownName);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.resx
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.resx (rev 0)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Plugin/Configuration/MySleepTimerConfig.resx 2012-03-16 12:28:28 UTC (rev 4467)
@@ -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 f...
[truncated message content] |
|
From: <dos...@us...> - 2012-03-12 21:40:25
|
Revision: 4466
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4466&view=rev
Author: doskabouter
Date: 2012-03-12 21:40:16 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
- fixed bug with missing '/'
- converted solution to .NET 3.5
- general cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-03-12 21:40:16 UTC (rev 4466)
@@ -37,6 +37,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -97,6 +100,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -134,6 +138,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -196,6 +203,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -233,6 +241,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -293,6 +304,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -330,6 +342,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -390,6 +405,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -427,6 +443,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -487,6 +506,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -524,6 +544,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -584,6 +607,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -621,6 +645,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -681,6 +708,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -718,6 +746,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -778,6 +809,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -815,6 +847,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -875,6 +910,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -912,6 +948,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -972,6 +1011,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -1009,6 +1049,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -1069,6 +1112,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -1106,6 +1150,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -1122,7 +1169,7 @@
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>import from chrome
+ <VersionDescription>import from chrome
new for the beta 1.2</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
@@ -1167,6 +1214,139 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>3</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Bugfixes</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</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>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-03-12 21:40:16 UTC (rev 4466)
@@ -251,31 +251,69 @@
</Items>
</Sections>
<Dependencies>
- <Items />
+ <Items>
+ <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
<Author>Mark Koenig (kroko) 2010</Author>
<HomePage>http://www.team-mediaportal.com</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-browse-web-webbrowser-89101/</ForumPage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>0</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
-
-</ExtensionDescription>
- <VersionDescription>import from chrome
-new for the beta 1.2</VersionDescription>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Bugfixes</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2010-11-06T15:09:04.5514802+01:00</ReleaseDate>
+ <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
- <Location>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.mpe1</Location>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
@@ -292,8 +330,8 @@
<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>
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
<Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
@@ -301,7 +339,7 @@
<Description>Online stored screenshot urls separated by ; </Description>
</SectionParam>
<SectionParam Name="Force to uninstall on update">
- <Value>yes</Value>
+ <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>
@@ -384,16 +422,17 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{80ee4eea-74d9-4dc8-b672-d0c792c9a6f9}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{110abcb7-bb33-4c64-ac7f-ad0e6accd506}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
<FolderGroups />
- <ProjectFilename>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xmp2</ProjectFilename>
- <UpdatePath1>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xml</UpdatePath1>
+ <ProjectFilename>BrowseTheWeb.xmp2</ProjectFilename>
+ <UpdatePath1>BrowseTheWeb.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-03-12 21:40:16 UTC (rev 4466)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,14 +10,35 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BrowseTheWeb</RootNamespace>
<AssemblyName>BrowseTheWeb</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <OutputPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -27,57 +48,38 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\Release\Plugins\Windows\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Common.Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
</Reference>
- <Reference Include="Core, Version=1.1.1.11854, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Core">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.1.1.11856, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Databases">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=1.1.1.11860, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Dialogs">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="HtmlAgilityPack, Version=1.4.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\HtmlAgilityPack.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="HtmlAgilityPack">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\HtmlAgilityPack.dll</HintPath>
</Reference>
- <Reference Include="Ionic.Zip, Version=1.7.2.18, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Ionic.Zip">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
</Reference>
- <Reference Include="Skybound.Gecko, Version=1.9.1.1, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Skybound.Gecko.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.7.11849, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -209,6 +211,29 @@
<EmbeddedResource Include="xulrunner.png" />
<EmbeddedResource Include="xulrunnerOff.png" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Skybound.Gecko\Skybound.Gecko.csproj">
+ <Project>{877D1A24-2D5E-4C46-A933-FCF11EA0403B}</Project>
+ <Name>Skybound.Gecko</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
@@ -218,6 +243,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>copy $(TargetName).dll "C:\AAA\BrowseTheWeb\Release\Plugins\Windows\"</PostBuildEvent>
+ <PostBuildEvent>if $(ConfigurationName) == Release "C:\Program Files\Team MediaPortal\MediaPortal\MpeMaker" ..\..\BrowseTheWeb.xmp2 /B /UpdateXML</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-03-12 21:40:16 UTC (rev 4466)
@@ -37,217 +37,217 @@
namespace BrowseTheWeb
{
- public class GUIBookmark : GUIWindow
- {
- [SkinControlAttribute(50)]
- private GUIFacadeControl facade = null;
- [SkinControlAttribute(2)]
- protected GUIButtonControl btnViewAs = null;
- [SkinControlAttribute(3)]
- protected GUISortButtonControl btnSortBy = null;
-
- private static string view = string.Empty;
-
- public override int GetID
+ public class GUIBookmark : GUIWindow
{
- get
- {
- return 54537688;
- }
- set
- {
- base.GetID = value;
- }
- }
- public override bool Init()
- {
- bool result = Load(GUIGraphicsContext.Skin + @"\BrowseTheWebBook.xml");
- return result;
- }
+ [SkinControlAttribute(50)]
+ private GUIFacadeControl facade = null;
+ [SkinControlAttribute(2)]
+ protected GUIButtonControl btnViewAs = null;
+ [SkinControlAttribute(3)]
+ protected GUISortButtonControl btnSortBy = null;
- protected override void OnPageLoad()
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ private static string view = string.Empty;
- view = "Large icons";
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
- }
-
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
- Bookmark.InitCachePath();
- base.OnPageLoad();
- }
- protected override void OnPageDestroy(int new_windowId)
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- xmlwriter.SetValue("btWeb", "bookmark", view);
- }
- base.OnPageDestroy(new_windowId);
- }
- protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
- {
- if (actionType == Action.ActionType.ACTION_SELECT_ITEM)
- {
- GUIListItem item = facade.SelectedListItem;
- if (item != null)
+ public override int GetID
{
- if (item.IsFolder)
- {
- if (item.Label == "..")
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
- else
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", item.Label);
- }
- else
- {
- GUIPlugin.StartupLink = item.Path;
- GUIWindowManager.ActivateWindow(54537689);
- }
+ get
+ {
+ return 54537688;
+ }
+ set
+ {
+ base.GetID = value;
+ }
}
- }
+ public override bool Init()
+ {
+ bool result = Load(GUIGraphicsContext.Skin + @"\BrowseTheWebBook.xml");
+ return result;
+ }
- if (control == btnViewAs)
- {
- switch (view)
+ protected override void OnPageLoad()
{
- case "Small icons":
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+
view = "Large icons";
- break;
- case "Large icons":
- view = "List view";
- break;
- case "List view":
- view = "Small icons";
- break;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+ }
+
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
+ Bookmark.InitCachePath();
+ base.OnPageLoad();
}
-
- string strLine = string.Empty;
- switch (view)
+ protected override void OnPageDestroy(int new_windowId)
{
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
- strLine = GUILocalizeStrings.Get(100);
- break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
- strLine = GUILocalizeStrings.Get(417);
- break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
- strLine = GUILocalizeStrings.Get(101);
- break;
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ xmlwriter.SetValue("btWeb", "bookmark", view);
+ }
+ base.OnPageDestroy(new_windowId);
}
- btnViewAs.Label = strLine;
- }
- }
+ protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
+ {
+ if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM)
+ {
+ GUIListItem item = facade.SelectedListItem;
+ if (item != null)
+ {
+ if (item.IsFolder)
+ {
+ if (item.Label == "..")
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
+ else
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", item.Label);
+ }
+ else
+ {
+ GUIPlugin.StartupLink = item.Path;
+ GUIWindowManager.ActivateWindow(54537689);
+ }
+ }
+ }
- public void LoadFacade(string Path, string Folder)
- {
- switch (view)
- {
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
- break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
- break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
- break;
- }
- facade.Clear();
+ if (control == btnViewAs)
+ {
+ switch (view)
+ {
+ case "Small icons":
+ view = "Large icons";
+ break;
+ case "Large icons":
+ view = "List view";
+ break;
+ case "List view":
+ view = "Small icons";
+ break;
+ }
- GUIListItem item = new GUIListItem();
+ string strLine = string.Empty;
+ switch (view)
+ {
+ case "Small icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ strLine = GUILocalizeStrings.Get(100);
+ break;
+ case "Large icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ strLine = GUILocalizeStrings.Get(417);
+ break;
+ case "List view":
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
+ strLine = GUILocalizeStrings.Get(101);
+ break;
+ }
+ btnViewAs.Label = strLine;
+ }
+ }
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- if (Folder == string.Empty)
+ public void LoadFacade(string Path, string Folder)
{
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
- {
- BookmarkElement bkm = BookmarkXml.GetData(node);
+ switch (view)
+ {
+ case "Small icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ break;
+ case "Large icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ break;
+ case "List view":
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
+ break;
+ }
+ facade.Clear();
- string name = bkm.Name.Replace(" ", "_");
- name = name.Replace(".", "_");
+ GUIListItem item = new GUIListItem();
- if ((bkm.isFolder) ||
- (!bkm.isFolder) && (!bkm.isSubFolder))
+ try
{
- item = new GUIListItem();
- item.IsFolder = bkm.isFolder;
- item.Label = bkm.Name;
- item.Path = bkm.Url;
- if (item.IsFolder)
- {
- item.IconImage = "defaultFolder.png";
- item.IconImageBig = "defaultFolderBig.png";
- }
- else
- {
- string file = Bookmark.GetSnapPath(bkm.Url);
- item.IconImage = file;
- item.IconImageBig = file;
- }
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- facade.Add(item);
- }
- }
- }
+ if (Folder == string.Empty)
+ {
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement bkm = BookmarkXml.GetData(node);
- if (Folder != string.Empty)
- {
- item = new GUIListItem();
- item.IsFolder = true;
- item.Label = "..";
- item.Path = "..";
- item.IconImage = "defaultFolderBack.png";
- item.IconImageBig = "defaultFolderBackBig.png";
- facade.Add(item);
+ string name = bkm.Name.Replace(" ", "_");
+ name = name.Replace(".", "_");
- bool found = false;
+ if ((bkm.isFolder) ||
+ (!bkm.isFolder) && (!bkm.isSubFolder))
+ {
+ item = new GUIListItem();
+ item.IsFolder = bkm.isFolder;
+ item.Label = bkm.Name;
+ item.Path = bkm.Url;
+ if (item.IsFolder)
+ {
+ item.IconImage = "defaultFolder.png";
+ item.IconImageBig = "defaultFolderBig.png";
+ }
+ else
+ {
+ string file = Bookmark.GetSnapPath(bkm.Url);
+ item.IconImage = file;
+ item.IconImageBig = file;
+ }
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
- {
- BookmarkElement bkm = BookmarkXml.GetData(node);
+ facade.Add(item);
+ }
+ }
+ }
- if ((bkm.isFolder) || ((!bkm.isSubFolder && !bkm.isFolder))) found = false;
+ if (Folder != string.Empty)
+ {
+ item = new GUIListItem();
+ item.IsFolder = true;
+ item.Label = "..";
+ item.Path = "..";
+ item.IconImage = "defaultFolderBack.png";
+ item.IconImageBig = "defaultFolderBackBig.png";
+ facade.Add(item);
- if (Folder == bkm.Name)
- {
- found = true;
- }
- if (found)
- {
- if (bkm.isSubFolder)
- {
- item = new GUIListItem();
- item.IsFolder = bkm.isFolder;
- item.Label = bkm.Name;
- item.Path = bkm.Url;
+ bool found = false;
- string file = Bookmark.GetSnapPath(bkm.Url);
- item.IconImage = file;
- item.IconImageBig = file;
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement bkm = BookmarkXml.GetData(node);
- facade.Add(item);
- }
+ if ((bkm.isFolder) || ((!bkm.isSubFolder && !bkm.isFolder))) found = false;
+
+ if (Folder == bkm.Name)
+ {
+ found = true;
+ }
+ if (found)
+ {
+ if (bkm.isSubFolder)
+ {
+ item = new GUIListItem();
+ item.IsFolder = bkm.isFolder;
+ item.Label = bkm.Name;
+ item.Path = bkm.Url;
+
+ string file = Bookmark.GetSnapPath(bkm.Url);
+ item.IconImage = file;
+ item.IconImageBig = file;
+
+ facade.Add(item);
+ }
+ }
+ }
+ }
+
+ GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
+ facade.SelectedListItemIndex = 0;
}
- }
+ catch { }
}
-
- GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
- facade.SelectedListItemIndex = 0;
- }
- catch { }
}
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-12 21:40:16 UTC (rev 4466)
@@ -40,1201 +40,1184 @@
namespace BrowseTheWeb
{
- [PluginIcons("BrowseTheWeb.xulrunner.png", "BrowseTheWeb.xulrunnerOff.png")]
+ [PluginIcons("BrowseTheWeb.xulrunner.png", "BrowseTheWeb.xulrunnerOff.png")]
- public class GUIPlugin : GUIWindow, ISetupForm
- {
- [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
- public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo);
+ public class GUIPlugin : GUIWindow, ISetupForm
+ {
+ [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
+ public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo);
- private const int MOUSEEVENTF_LEFTDOWN = 0x02;
- private const int MOUSEEVENTF_LEFTUP = 0x04;
- private const int MOUSEEVENTF_RIGHTDOWN = 0x08;
- private const int MOUSEEVENTF_RIGHTUP = 0x10;
+ private const int MOUSEEVENTF_LEFTDOWN = 0x02;
+ private const int MOUSEEVENTF_LEFTUP = 0x04;
+ private const int MOUSEEVENTF_RIGHTDOWN = 0x08;
+ private const int MOUSEEVENTF_RIGHTUP = 0x10;
- #region Links
- private static GeckoElementCollection _links;
- private static GeckoElementCollection _forms;
- private static List<HtmlLinkNumber> _htmlLinkNumbers;
- #endregion
+ #region Links
+ private static GeckoElementCollection _links;
+ private static GeckoElementCollection _forms;
+ private static Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
+ #endregion
- #region Constants
- private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\">{0}</span>";
- #endregion
+ #region Constants
+ private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\">{0}</span>";
+ #endregion
- #region declare vars
- private GeckoWebBrowser webBrowser;
- private OSD_LinkId osd_linkID;
- private Mouse mouse;
- private string linkId = string.Empty;
- private int linkTime = 0;
- private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
+ #region declare vars
+ private GeckoWebBrowser webBrowser;
+ private OSD_LinkId osd_linkID;
+ private Mouse mouse;
+ private string linkId = string.Empty;
+ private int linkTime = 0;
+ private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
- private bool usehome = false;
- private string homepage = string.Empty;
- private int remoteTime = 0;
- private string pluginName = "Browse Web";
- private bool blankBrowser = false;
- private bool statusBar = true;
- private bool osd = false;
- private bool windowed = false;
- private bool useMouse = false;
- private bool zoomPage = false;
- private bool zoomDomain = false;
- private string lastDomain = string.Empty;
- private bool cacheThumbs = false;
- private bool remote = false;
- private string remote_confirm = string.Empty;
- private string remote_bookmark = string.Empty;
- private string remote_zoom_in = string.Empty;
- private string remote_zoom_out = string.Empty;
- private string remote_status = string.Empty;
+ private bool usehome = false;
+ private string homepage = string.Empty;
+ private int remoteTime = 0;
+ private string pluginName = "Browse Web";
+ private bool blankBrowser = false;
+ private bool statusBar = true;
+ private bool osd = false;
+ private bool windowed = false;
+ private bool useMouse = false;
+ private bool zoomPage = false;
+ private bool zoomDomain = false;
+ private string lastDomain = string.Empty;
+ private bool cacheThumbs = false;
+ private bool remote = false;
+ private string remote_confirm = string.Empty;
+ private string remote_bookmark = string.Empty;
+ private string remote_zoom_in = string.Empty;
+ private string remote_zoom_out = string.Empty;
+ private string remote_status = string.Empty;
- private bool useProxy = false;
- private string Server = string.Empty;
- private int Port = 8080;
+ private bool useProxy = false;
+ private string Server = string.Empty;
+ private int Port = 8080;
- private float defaultZoom = 1.0f;
- private float zoom = 1.0f;
- private float font = 1.0f;
+ private float defaultZoom = 1.0f;
+ private float zoom = 1.0f;
+ private float font = 1.0f;
- public static bool ParameterSupported = false;
- public static string Parameter = string.Empty;
+ public static bool ParameterSupported = false;
+ public static string Parameter = string.Empty;
- public static string loadFav = string.Empty;
+ public static string loadFav = string.Empty;
- private string lastUrl = string.Empty;
+ private string lastUrl = string.Empty;
- #endregion
+ #endregion
- #region ISetupForm Member
+ #region ISetupForm Member
- public string Author()
- {
- return "Mark Koenig (kroko) 2010";
- }
- public bool CanEnable()
- {
- return true;
- }
- public bool DefaultEnabled()
- {
- return true;
- }
- public string Description()
- {
- return "Browse the web and have fun. Webbrowser based on XULrunner.";
- }
- public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
- {
- strButtonText = pluginName;
- strButtonImage = String.Empty;
- strButtonImageFocus = String.Empty;
- strPictureImage = @"hover_browsetheweb.png";
- return true;
+ public string Author()
+ {
+ return "Mark Koenig (kroko) 2010";
+ }
+ public bool CanEnable()
+ {
+ return true;
+ }
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+ public string Description()
+ {
+ return "Browse the web and have fun. Webbrowser based on XULrunner.";
+ }
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = pluginName;
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = @"hover_browsetheweb.png";
+ return true;
- }
- public int GetWindowId()
- {
- return GetID;
- }
- public bool HasSetup()
- {
- return true;
- }
- public string PluginName()
- {
- return "BrowseTheWeb";
- }
- public void ShowPlugin()
- {
- Setup setup = new Setup();
- setup.ShowDialog();
- }
-
- #endregion
-
- public override int GetID
- {
- get
- {
- return 54537689;
- }
- set
- {
- base.GetID = value;
- }
- }
-
- public static string StartupLink
- {
- get
- {
- string value = Parameter;
- if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ }
+ public int GetWindowId()
{
- return value.Trim();
+ return GetID;
}
- else
+ public bool HasSetup()
{
- value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
- if (null != value && !string.IsNullOrEmpty(value.Trim()))
- return value.Trim();
+ return true;
}
- return string.Empty;
- }
- set { GUIPropertyManager.SetProperty("#btWeb.startup.link", string.IsNullOrEmpty(value) ? " " : value.Trim()); }
- }
+ public string PluginName()
+ {
+ return "BrowseTheWeb";
+ }
+ public void ShowPlugin()
+ {
+ Setup setup = new Setup();
+ setup.ShowDialog();
+ }
- public override bool Init()
- {
- MyLog.debug("Init Browse the web");
+ #endregion
- AddFormsDelegate d = AddForms;
- GUIGraphicsContext.form.Invoke(d);
+ public override int GetID
+ {
+ get
+ {
+ return 54537689;
+ }
+ set
+ {
+ base.GetID = value;
+ }
+ }
- #region parameters test
- ParameterSupported = false;
- if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
- {
- ParameterSupported = true;
- }
- #endregion
+ public static string StartupLink
+ {
+ get
+ {
+ string value = Parameter;
+ if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ {
+ return value.Trim();
+ }
+ else
+ {
+ value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
+ if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ return value.Trim();
+ }
+ return string.Empty;
+ }
+ set { GUIPropertyManager.SetProperty("#btWeb.startup.link", string.IsNullOrEmpty(value) ? " " : value.Trim()); }
+ }
- LoadSettings();
- BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
- "\\bookmarks.xml", "Saved by MP");
+ public override bool Init()
+ {
+ MyLog.debug("Init Browse the web");
- MyLog.debug("Init Browse the web finished");
+ AddFormsDelegate d = AddForms;
+ GUIGraphicsContext.form.Invoke(d);
- return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
- }
+ #region parameters test
+ ParameterSupported = false;
+ if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
+ {
+ ParameterSupported = true;
+ }
+ #endregion
- private delegate void AddFormsDelegate();
+ LoadSettings();
+ BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
+ "\\bookmarks.xml", "Saved by MP");
- private void AddForms() {
- try
- {
- Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
- }
- catch (Exception ex)
- {
- MyLog.debug("Could not find xulrunner under : " + Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
- MyLog.debug("Reason : " + ex.Message);
- }
+ MyLog.debug("Init Browse the web finished");
- #region add forms
- webBrowser = new GeckoWebBrowser();
- webBrowser.Name = "BrowseTheWeb";
- webBrowser.NoDefaultContextMenu = true;
+ return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
+ }
- GUIGraphicsContext.form.Controls.Add(webBrowser);
- webBrowser.Enabled = false;
- webBrowser.Visible = false;
+ private delegate void AddFormsDelegate();
- osd_linkID = new OSD_LinkId();
- GUIGraphicsContext.form.Controls.Add(osd_linkID);
- osd_linkID.Visible = false;
+ private void AddForms()
+ {
+ try
+ {
+ Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("Could not find xulrunner under : " + Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
+ MyLog.debug("Reason : " + ex.Message);
+ }
- mouse = new Mouse();
- GUIGraphicsContext.form.Controls.Add(mouse);
- mouse.Visible = false;
- #endregion
- }
+ #region add forms
+ webBrowser = new GeckoWebBrowser();
+ webBrowser.Name = "BrowseTheWeb";
+ webBrowser.NoDefaultContextMenu = true;
- protected override void OnPageLoad()
- {
- GUIPropertyManager.SetProperty("#currentmodule", pluginName);
+ GUIGraphicsContext.form.Controls.Add(webBrowser);
+ webBrowser.Enabled = false;
+ webBrowser.Visible = false;
- try
- {
- MyLog.debug("Init browser");
+ osd_linkID = new OSD_LinkId();
+ GUIGraphicsContext.form.Controls.Add(osd_linkID);
+ osd_linkID.Visible = false;
- GUIPropertyManager.SetProperty("#btWeb.status", "Init browser");
- GUIPropertyManager.SetProperty("#btWeb.linkid", "");
- linkId = string.Empty;
-
- if (useMouse)
- {
- MyLog.debug("Mouse support is enabled");
- GUIGraphicsContext.MouseSupport = true;
+ mouse = new Mouse();
+ GUIGraphicsContext.form.Controls.Add(mouse);
+ mouse.Visible = false;
+ #endregion
}
- Parameter = null;
- if (ParameterSupported)
+ protected override void OnPageLoad()
{
- Parameter = _loadParameter;
- }
+ GUIPropertyManager.SetProperty("#currentmodule", pluginName);
- #region init browser
- webBrowser.Visible = true;
+ try
+ {
+ MyLog.debug("Init browser");
- if (!useMouse) webBrowser.Enabled = false;
- else webBrowser.Enabled = true;
+ GUIPropertyManager.SetProperty("#btWeb.status", "Init browser");
+ GUIPropertyManager.SetProperty("#btWeb.linkid", "");
+ linkId = string.Empty;
- webBrowser.Dock = System.Windows.Forms.DockStyle.None;
- webBrowser.Location = new System.Drawing.Point(0, 0);
+ if (useMouse)
+ {
+ MyLog.debug("Mouse support is enabled");
+ GUIGraphicsContext.MouseSupport = true;
+ }
- MyLog.debug("Create eventhandler");
+ Parameter = null;
+ if (ParameterSupported)
+ {
+ Parameter = _loadParameter;
+ }
- webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
- webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
+ #region init browser
+ webBrowser.Visible = true;
- MyLog.debug("Create dom eventhandler");
- webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
- webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
+ if (!useMouse) webBrowser.Enabled = false;
+ else webBrowser.Enabled = true;
- if (statusBar)
- webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
- else
- webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
+ webBrowser.Dock = System.Windows.Forms.DockStyle.None;
+ webBrowser.Location = new System.Drawing.Point(0, 0);
- MyLog.debug("set zoom size to " + font + "/" + zoom);
+ MyLog.debug("Create eventhandler");
- webBrowser.Window.TextZoom = font;
- webBrowser.Zoom = zoom;
+ webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
+ webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
- if (windowed)
- {
- MyLog.debug("switch to windowed fullscreen mode");
- GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null);
- GUIWindowManager.SendMessage(msg);
- }
+ MyLog.debug("Create dom eventhandler");
+ webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
+ webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
- string loadFav = StartupLink;
+ if (statusBar)
+ webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
+ else
+ webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
- if (webBrowser.Document.Domain == string.Empty)
- {
- if ((usehome) && (string.IsNullOrEmpty(loadFav)))
- {
- webBrowser.Navigate(homepage);
- MyLog.debug("load home page " + homepage);
- }
- }
+ MyLog.debug("set zoom size to " + font + "/" + zoom);
- if (!string.IsNullOrEmpty(loadFav))
- {
- webBrowser.Naviga...
[truncated message content] |
|
From: <dos...@us...> - 2012-03-12 19:34:34
|
Revision: 4465
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4465&view=rev
Author: doskabouter
Date: 2012-03-12 19:34:28 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
deleted user-specific files
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj.user
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2012-03-05 20:45:05 UTC (rev 4464)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2012-03-12 19:34:28 UTC (rev 4465)
@@ -1,9 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <StartAction>Program</StartAction>
- <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
- </PropertyGroup>
- <PropertyGroup>
- <ProjectView>ProjectFiles</ProjectView>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj.user 2012-03-05 20:45:05 UTC (rev 4464)
+++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj.user 2012-03-12 19:34:28 UTC (rev 4465)
@@ -1,16 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <PublishUrlHistory>
- </PublishUrlHistory>
- <InstallUrlHistory>
- </InstallUrlHistory>
- <SupportUrlHistory>
- </SupportUrlHistory>
- <UpdateUrlHistory>
- </UpdateUrlHistory>
- <BootstrapperUrlHistory>
- </BootstrapperUrlHistory>
- <FallbackCulture>de-DE</FallbackCulture>
- <VerifyUploadedFiles>false</VerifyUploadedFiles>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
