Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3922] trunk/plugins/BrowseTheWeb
|
From: <kro...@us...> - 2010-11-10 21:06:09
|
Revision: 3922
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3922&view=rev
Author: kroko_koenig
Date: 2010-11-10 21:06:01 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
v0.2 add thumbs, info service and skin changes also remote experimental
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/Skin/Blue3/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.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/BrowseTheWeb/todo.txt
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/bookmarks1.jpg
trunk/plugins/BrowseTheWeb/Release/bookmarks2.jpg
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.resx
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/bookmarks.jpg
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-10 21:06:01 UTC (rev 3922)
@@ -98,5 +98,104 @@
<FolderGroups />
</ProjectSettings>
</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 />
+ </Dependencies>
+ <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>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>2</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add thumbs for bookmarks
+ready for info service by silent exception
+skin changes for bookmarks</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>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value>C:\AAA\BrowseTheWeb\Source\BrowseTheWeb\xulrunner.png</Value>
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <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>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-10 21:06:01 UTC (rev 3922)
@@ -267,14 +267,16 @@
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>0</Major>
- <Minor>1</Minor>
- <Build>1</Build>
+ <Minor>2</Minor>
+ <Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>inital release</VersionDescription>
+ <VersionDescription>add thumbs for bookmarks
+ready for info service by silent exception
+skin changes for bookmarks</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>
@@ -395,7 +397,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3e02e324-41b2-4de9-82f4-959298f2e173}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{9a94ef91-aa09-44e9-8f71-1036499d40dc}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-10 21:06:01 UTC (rev 3922)
@@ -1,34 +1,130 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>54537689</id>
+ <id>54537688</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <autohidetopbar>yes</autohidetopbar>
+ <disabletopbar>yes</disabletopbar>
+
<controls>
+ <import>common.time.xml</import>
+
<control>
- <description>BackGround</description>
+ <description>background image</description>
<type>image</type>
<id>1</id>
- <posX>0</posX>
- <posY>0</posY>
<width>720</width>
<height>576</height>
- <texture>background.png</texture>
</control>
-
-
+
<control>
- <description>listcontrol</description>
- <type>listcontrol</type>
- <id>50</id>
- <posX>120</posX>
- <posY>120</posY>
- <width>480</width>
- <height>450</height>
- <animation effect="zoom" start="20,20" end="100,100" center="640,360" time="250">WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="1,1" center="640,360" time="250">WindowClose</animation>
- </control>
-
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>700</posX>
+ <posY>70</posY>
+ <width>355</width>
+ <align>right</align>
+ <label>#selecteditem</label>
+ <font>font14</font>
+ </control>
+
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <control>
+ <description>composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>50</id>
+ <control>
+ <description>listcontrol</description>
+ <type>listcontrol</type>
+ <id>50</id>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <scrollOffset>2</scrollOffset>
+ </control>
+ <control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <id>50</id>
+ <posX>50</posX>
+ <posY>105</posY>
+ <width>660</width>
+ <height>471</height>
+ <scrollOffset>1</scrollOffset>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <itemWidth>72</itemWidth>
+ <textureWidth>58</textureWidth>
+ <thumbWidth>51</thumbWidth>
+ <thumbHeight>73</thumbHeight>
+ <thumbPosX>4</thumbPosX>
+ <thumbPosY>4</thumbPosY>
+ <textureWidthBig>85</textureWidthBig>
+ <textureHeightBig>116</textureHeightBig>
+ <itemWidthBig>108</itemWidthBig>
+ <itemHeightBig>138</itemHeightBig>
+ <thumbWidthBig>77</thumbWidthBig>
+ <thumbHeightBig>106</thumbHeightBig>
+ <thumbPosXBig>5</thumbPosXBig>
+ <thumbPosYBig>5</thumbPosYBig>
+ <zoomXPixels>20</zoomXPixels>
+ <zoomYPixels>20</zoomYPixels>
+ <hideUnfocusTexture>no</hideUnfocusTexture>
+ <renderFocusText>no</renderFocusText>
+ <renderUnfocusText>yes</renderUnfocusText>
+ <showFrame>true</showFrame>
+ </control>
+ <control>
+ <description>Filmstrip view</description>
+ <type>filmstrip</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <scrollOffset>2</scrollOffset>
+ <posX>0</posX>
+ <posY>225</posY>
+ <width>1244</width>
+ <height>720</height>
+ <onup>2</onup>
+ <onleft>2</onleft>
+ <thumbWidth>194</thumbWidth>
+ <thumbHeight>295</thumbHeight>
+ <thumbPosX>3</thumbPosX>
+ <thumbPosY>2</thumbPosY>
+ <itemWidth>238</itemWidth>
+ <itemHeight>231</itemHeight>
+ <textureWidth>206</textureWidth>
+ <textureHeight>307</textureHeight>
+ <imageFolderFocus>Picture_cover.png</imageFolderFocus>
+ <frame>Picture_cover.png</frame>
+ <frameFocus>Picture_cover.png</frameFocus>
+ <background>emtpy.png</background>
+ <thumbs flipY="true" diffuse="Thumb_Mask.png">
+ </thumbs>
+ <InfoImage flipY="true" diffuse="Thumb_Mask.png">
+ </InfoImage>
+ <showFrame>yes</showFrame>
+ <showFolder>yes</showFolder>
+ <showBackGround>no</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <visible>facadeview.filmstrip</visible>
+ <thumbAnimation effect="zoom" start="100,100" end="130,130" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="130,130" end="100,100" time="200">unfocus</thumbAnimation>
+ </control>
+ <control>
+ <description>playlist listcontrol</description>
+ <type>playlistcontrol</type>
+ <id>50</id>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <itemWidth>32</itemWidth>
+ <itemHeight>32</itemHeight>
+ <IconXOff>12</IconXOff>
+ <IconYOff>4</IconYOff>
+ <scrollOffset>2</scrollOffset>
+ </control>
+ </control>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-10 21:06:01 UTC (rev 3922)
@@ -1,34 +1,136 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>54537689</id>
+ <id>54537688</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <autohidetopbar>yes</autohidetopbar>
+ <disabletopbar>yes</disabletopbar>
+
<controls>
+ <import>common.time.xml</import>
+
<control>
- <description>BackGround</description>
+ <description>background image</description>
<type>image</type>
<id>1</id>
- <posX>0</posX>
- <posY>0</posY>
<width>1280</width>
<height>720</height>
- <texture>background.png</texture>
</control>
+
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>1244</posX>
+ <posY>70</posY>
+ <width>355</width>
+ <align>right</align>
+ <label>#selecteditem</label>
+ <font>font14</font>
+ </control>
+
+
+
<control>
- <description>listcontrol</description>
- <type>listcontrol</type>
- <id>50</id>
- <posX>120</posX>
- <posY>120</posY>
- <width>580</width>
- <height>450</height>
- <animation effect="zoom" start="20,20" end="100,100" center="640,360" time="250">WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="1,1" center="640,360" time="250">WindowClose</animation>
- </control>
-
+ <description>group element</description>
+ <type>group</type>
+ <control>
+ <description>composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>50</id>
+ <control>
+ <description>listcontrol</description>
+ <type>listcontrol</type>
+ <id>50</id>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <scrollOffset>2</scrollOffset>
+ </control>
+ <control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <id>50</id>
+ <posX>88</posX>
+ <posY>131</posY>
+ <width>1173</width>
+ <height>588</height>
+ <scrollOffset>1</scrollOffset>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <itemWidth>157</itemWidth>
+ <itemHeight>185</itemHeight>
+ <textureWidth>97</textureWidth>
+ <textureHeight>140</textureHeight>
+ <thumbWidth>90</thumbWidth>
+ <thumbHeight>133</thumbHeight>
+ <thumbPosX>5</thumbPosX>
+ <thumbPosY>6</thumbPosY>
+ <itemWidthBig>195</itemWidthBig>
+ <itemHeightBig>250</itemHeightBig>
+ <thumbWidthBig>135</thumbWidthBig>
+ <thumbHeightBig>200</thumbHeightBig>
+ <textureWidthBig>150</textureWidthBig>
+ <textureHeightBig>216</textureHeightBig>
+ <thumbPosXBig>10</thumbPosXBig>
+ <thumbPosYBig>8</thumbPosYBig>
+ <zoomXPixels>30</zoomXPixels>
+ <zoomYPixels>30</zoomYPixels>
+ <hideUnfocusTexture>no</hideUnfocusTexture>
+ <renderFocusText>no</renderFocusText>
+ <renderUnfocusText>yes</renderUnfocusText>
+ <showFrame>true</showFrame>
+ </control>
+ <control>
+ <description>Filmstrip view</description>
+ <type>filmstrip</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <scrollOffset>2</scrollOffset>
+ <posX>0</posX>
+ <posY>225</posY>
+ <width>1244</width>
+ <height>720</height>
+ <onup>2</onup>
+ <onleft>2</onleft>
+ <thumbWidth>194</thumbWidth>
+ <thumbHeight>295</thumbHeight>
+ <thumbPosX>3</thumbPosX>
+ <thumbPosY>2</thumbPosY>
+ <itemWidth>238</itemWidth>
+ <itemHeight>231</itemHeight>
+ <textureWidth>206</textureWidth>
+ <textureHeight>307</textureHeight>
+ <imageFolderFocus>Picture_cover.png</imageFolderFocus>
+ <frame>Picture_cover.png</frame>
+ <frameFocus>Picture_cover.png</frameFocus>
+ <background>emtpy.png</background>
+ <thumbs flipY="true" diffuse="Thumb_Mask.png">
+ </thumbs>
+ <InfoImage flipY="true" diffuse="Thumb_Mask.png">
+ </InfoImage>
+ <showFrame>yes</showFrame>
+ <showFolder>yes</showFolder>
+ <showBackGround>no</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <visible>facadeview.filmstrip</visible>
+ <thumbAnimation effect="zoom" start="100,100" end="130,130" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="130,130" end="100,100" time="200">unfocus</thumbAnimation>
+ </control>
+ <control>
+ <description>playlist listcontrol</description>
+ <type>playlistcontrol</type>
+ <id>50</id>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <itemWidth>32</itemWidth>
+ <itemHeight>32</itemHeight>
+ <IconXOff>12</IconXOff>
+ <IconYOff>4</IconYOff>
+ <scrollOffset>2</scrollOffset>
+ </control>
+ </control>
+ </control>
</controls>
</window>
\ No newline at end of file
Deleted: trunk/plugins/BrowseTheWeb/Release/bookmarks.jpg
===================================================================
(Binary files differ)
Added: trunk/plugins/BrowseTheWeb/Release/bookmarks1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/bookmarks1.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/bookmarks2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/bookmarks2.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -29,7 +29,10 @@
using System.IO;
using System.Windows.Forms;
using System.Net;
+using MediaPortal.Configuration;
+using System.Drawing;
+
namespace BrowseTheWeb
{
public class Bookmark
@@ -316,7 +319,7 @@
{
Uri urlCheck = new Uri(URL);
WebRequest request = WebRequest.Create(urlCheck);
- request.Timeout = 3000;
+ request.Timeout = 10000;
WebResponse response;
@@ -328,5 +331,82 @@
}
return true;
}
+
+ public static void SaveSnap(Bitmap Snap, string Url)
+ {
+ try
+ {
+ string filename = Url;
+
+ if (filename.EndsWith("/")) filename = filename.Substring(0, filename.Length - 1);
+
+ int x = filename.IndexOf("//");
+ if (x > 0)
+ {
+ filename = filename.Substring(x + 2);
+ filename = filename.Replace("/", "_");
+ filename = filename.Replace(".", "_");
+ filename = filename + ".png";
+
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ Snap.Save(filename);
+ }
+ }
+ catch { }
+ }
+ public static Bitmap GetSnap(string Url)
+ {
+ Bitmap snap = null;
+
+ try
+ {
+ string filename = Url;
+
+ if (filename.EndsWith("/")) filename = filename.Substring(0, filename.Length - 1);
+
+ int x = filename.IndexOf("//");
+ if (x > 0)
+ {
+ filename = filename.Substring(x + 2);
+ filename = filename.Replace("/", "_");
+ filename = filename.Replace(".", "_");
+ filename = filename + ".png";
+
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ if (File.Exists(filename))
+ snap = (Bitmap)Bitmap.FromFile(filename);
+
+ return snap;
+ }
+ }
+ catch { }
+
+ return snap;
+ }
+
+ public static string GetSnapPath(string Url)
+ {
+ string filename = Url;
+ if (filename.EndsWith("/")) filename = filename.Substring(0, filename.Length - 1);
+
+ int x = filename.IndexOf("//");
+ if (x > 0)
+ {
+ filename = filename.Substring(x + 2);
+ }
+
+ filename = filename.Replace("/", "_");
+ filename = filename.Replace(".", "_");
+ filename = filename + ".png";
+
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+
+ return filename;
+ }
+ public static void InitCachePath()
+ {
+ if(!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
+ Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb");
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-10 21:06:01 UTC (rev 3922)
@@ -67,6 +67,12 @@
<Compile Include="GetFolder.designer.cs">
<DependentUpon>GetFolder.cs</DependentUpon>
</Compile>
+ <Compile Include="GetThumb.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GetThumb.Designer.cs">
+ <DependentUpon>GetThumb.cs</DependentUpon>
+ </Compile>
<Compile Include="GetUrl.cs">
<SubType>Form</SubType>
</Compile>
@@ -129,6 +135,9 @@
<None Include="res\edit-icon.png" />
<Content Include="res\fav-b-icon.png" />
<Content Include="todo.txt" />
+ <EmbeddedResource Include="GetThumb.resx">
+ <DependentUpon>GetThumb.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="OSD_LinkId.resx">
<DependentUpon>OSD_LinkId.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-10 21:06:01 UTC (rev 3922)
@@ -1,7 +1,7 @@
<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\Configuration.exe</StartProgram>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\Mediaportal.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -25,6 +25,8 @@
using System;
using System.Collections.Generic;
using System.Text;
+using System.IO;
+using System.Drawing;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
@@ -38,7 +40,7 @@
public class GUIBookmark : GUIWindow
{
[SkinControlAttribute(50)]
- private GUIListControl facade = null;
+ private GUIFacadeControl facade = null;
public override int GetID
{
@@ -60,6 +62,7 @@
protected override void OnPageLoad()
{
LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
+ Bookmark.InitCachePath();
base.OnPageLoad();
}
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
@@ -87,7 +90,11 @@
public void LoadFacade(string Path, string Folder)
{
+ string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb";
+
+ facade.View = GUIFacadeControl.ViewMode.LargeIcons;
facade.Clear();
+
GUIListItem item = new GUIListItem();
try
@@ -102,6 +109,9 @@
{
Bookmark bkm = GetData(node);
+ string name = bkm.Name.Replace(" ", "_");
+ name = name.Replace(".", "_");
+
if ((bkm.isFolder) ||
(!bkm.isFolder) && (!bkm.isSubFolder))
{
@@ -110,7 +120,16 @@
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;
+ }
facade.Add(item);
}
@@ -124,6 +143,7 @@
item.Label = "..";
item.Path = "..";
item.IconImage = "defaultFolderBack.png";
+ item.IconImageBig = "defaultFolderBackBig.png";
facade.Add(item);
bool found = false;
@@ -148,6 +168,10 @@
item.Label = bkm.Name;
item.Path = bkm.Url;
+ string file = Bookmark.GetSnapPath(bkm.Url);
+ item.IconImage = file;
+ item.IconImageBig = file;
+
facade.Add(item);
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -25,6 +25,8 @@
using System;
using System.Collections.Generic;
using System.Text;
+using System.IO;
+using System.Drawing;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
@@ -66,7 +68,9 @@
private bool zoomPage = false;
private bool zoomDomain = false;
private string lastDomain = string.Empty;
+ private bool cacheThumbs = false;
private bool remote = false;
+ private string remote_1 = string.Empty;
private float defaultZoom = 1.0f;
private float zoom = 1.0f;
@@ -137,14 +141,14 @@
public static string StartupLink
{
- get
- {
- string 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()); }
+ get
+ {
+ string 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()); }
}
public override bool Init()
@@ -214,7 +218,7 @@
#endregion
osd_linkID.Location = new System.Drawing.Point((GUIGraphicsContext.form.Width / 2) - (osd_linkID.Width / 2),
- (GUIGraphicsContext.form.Height / 2) - (osd_linkID.Height / 2));
+ (GUIGraphicsContext.form.Height / 2) - (osd_linkID.Height / 2));
base.OnPageLoad();
}
@@ -238,7 +242,10 @@
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_1 = xmlreader.GetValueAsString("btWeb", "key_1", "REMOTE_1");
}
}
@@ -298,6 +305,21 @@
else
GUIPropertyManager.SetProperty("#btWeb.status", action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
}
+
+ string strAction = action.wID.ToString();
+ if (strAction == remote_1)
+ {
+ if (linkId != string.Empty)
+ {
+ MyLog.debug("confirm2 link pressed");
+ OnLinkId(linkId);
+ }
+ else
+ {
+ MyLog.debug("confirm2 link pressed, no link present");
+ }
+ }
+
switch (action.wID)
{
case Action.ActionType.ACTION_KEY_PRESSED:
@@ -613,6 +635,25 @@
lastDomain = webBrowser.Document.Domain;
}
#endregion
+
+ #region save snapshot
+
+ if (webBrowser.Url.ToString() != "about:blank")
+ {
+ if (cacheThumbs)
+ {
+ Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
+ webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
+
+ 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));
+
+ Bookmark.SaveSnap(snap, webBrowser.Url.ToString());
+ }
+ }
+ #endregion
}
private void OnLinkId(string LinkId)
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -0,0 +1,139 @@
+namespace BrowseTheWeb
+{
+ partial class GetThumb
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.chkUrl = new System.Windows.Forms.CheckBox();
+ this.chkGetThumb = new System.Windows.Forms.CheckBox();
+ this.progressBar1 = new System.Windows.Forms.ProgressBar();
+ this.button1 = new System.Windows.Forms.Button();
+ this.txtUrl = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.chkWait = new System.Windows.Forms.CheckBox();
+ this.SuspendLayout();
+ //
+ // chkUrl
+ //
+ this.chkUrl.AutoCheck = false;
+ this.chkUrl.AutoSize = true;
+ this.chkUrl.Location = new System.Drawing.Point(12, 34);
+ this.chkUrl.Name = "chkUrl";
+ this.chkUrl.Size = new System.Drawing.Size(82, 17);
+ this.chkUrl.TabIndex = 0;
+ this.chkUrl.Text = "Check URL";
+ this.chkUrl.UseVisualStyleBackColor = true;
+ //
+ // chkGetThumb
+ //
+ this.chkGetThumb.AutoCheck = false;
+ this.chkGetThumb.AutoSize = true;
+ this.chkGetThumb.Location = new System.Drawing.Point(12, 57);
+ this.chkGetThumb.Name = "chkGetThumb";
+ this.chkGetThumb.Size = new System.Drawing.Size(89, 17);
+ this.chkGetThumb.TabIndex = 1;
+ this.chkGetThumb.Text = "Cache thumb";
+ this.chkGetThumb.UseVisualStyleBackColor = true;
+ //
+ // progressBar1
+ //
+ this.progressBar1.Location = new System.Drawing.Point(12, 116);
+ this.progressBar1.Name = "progressBar1";
+ this.progressBar1.Size = new System.Drawing.Size(295, 23);
+ this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
+ this.progressBar1.TabIndex = 2;
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(12, 145);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(295, 23);
+ this.button1.TabIndex = 3;
+ this.button1.Text = "Cancel";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // txtUrl
+ //
+ this.txtUrl.AutoSize = true;
+ this.txtUrl.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtUrl.Location = new System.Drawing.Point(12, 9);
+ this.txtUrl.Name = "txtUrl";
+ this.txtUrl.Size = new System.Drawing.Size(45, 16);
+ this.txtUrl.TabIndex = 4;
+ this.txtUrl.Text = "label1";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Interval = 300;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // chkWait
+ //
+ this.chkWait.AutoCheck = false;
+ this.chkWait.AutoSize = true;
+ this.chkWait.Location = new System.Drawing.Point(12, 80);
+ this.chkWait.Name = "chkWait";
+ this.chkWait.Size = new System.Drawing.Size(98, 17);
+ this.chkWait.TabIndex = 5;
+ this.chkWait.Text = "Wait some time";
+ this.chkWait.UseVisualStyleBackColor = true;
+ //
+ // GetThumb
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(319, 183);
+ this.Controls.Add(this.chkWait);
+ this.Controls.Add(this.txtUrl);
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.progressBar1);
+ this.Controls.Add(this.chkGetThumb);
+ this.Controls.Add(this.chkUrl);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "GetThumb";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "Status";
+ this.Load += new System.EventHandler(this.GetThumb_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.CheckBox chkUrl;
+ private System.Windows.Forms.CheckBox chkGetThumb;
+ private System.Windows.Forms.ProgressBar progressBar1;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label txtUrl;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.CheckBox chkWait;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -0,0 +1,79 @@
+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;
+ private int value;
+
+ private bool received = false;
+ private int time = 0;
+
+ public GetThumb()
+ {
+ InitializeComponent();
+
+ browser = new GeckoWebBrowser();
+ this.Controls.Add(browser);
+ }
+ private void GetThumb_Load(object sender, EventArgs e)
+ {
+ browser.Visible = false;
+ chkUrl.Checked = true;
+
+ txtUrl.Text = SelectedUrl;
+
+ browser.Size = new Size(600, 800);
+ 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));
+
+ 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));
+
+ Bookmark.SaveSnap(snap, SelectedUrl);
+ received = true;
+ chkGetThumb.Checked = true;
+
+ }
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ value++;
+ if (value > 100) value = 1;
+ progressBar1.Value = value;
+
+ if (received)
+ {
+ time++;
+ if (time > 20) this.Close();
+ }
+ }
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.resx (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.resx 2010-11-10 21:06:01 UTC (rev 3922)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -63,6 +63,8 @@
SelectedName = txtName.Text;
SelectedUrl = txtUrl.Text;
+ if (SelectedName.EndsWith("/")) SelectedName = SelectedName.Substring(0, SelectedName.Length - 1);
+
this.DialogResult = DialogResult.OK;
this.Close();
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -59,6 +59,9 @@
this.trkRemote = new System.Windows.Forms.TrackBar();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ 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();
@@ -70,9 +73,14 @@
this.txtZoom = new System.Windows.Forms.Label();
this.trkZoom = new System.Windows.Forms.TrackBar();
this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.label1 = new System.Windows.Forms.Label();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.chkRemote = new System.Windows.Forms.CheckBox();
this.listBox1 = new System.Windows.Forms.ListBox();
- this.chkRemote = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -81,12 +89,14 @@
((System.ComponentModel.ISupportInitialize)(this.trkRemote)).BeginInit();
this.groupBox3.SuspendLayout();
this.tabPage2.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.tabPage4.SuspendLayout();
this.SuspendLayout();
//
@@ -99,9 +109,8 @@
this.treeView1.Location = new System.Drawing.Point(6, 17);
this.treeView1.Name = "treeView1";
this.treeView1.SelectedImageIndex = 0;
- this.treeView1.Size = new System.Drawing.Size(539, 378);
+ this.treeView1.Size = new System.Drawing.Size(539, 330);
this.treeView1.TabIndex = 9;
- this.treeView1.DoubleClick += new System.EventHandler(this.treeView1_DoubleClick);
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);
@@ -210,11 +219,10 @@
//
// txtLink
//
- this.txtLink.AutoSize = true;
this.txtLink.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txtLink.Location = new System.Drawing.Point(6, 398);
+ this.txtLink.Location = new System.Drawing.Point(6, 353);
this.txtLink.Name = "txtLink";
- this.txtLink.Size = new System.Drawing.Size(89, 20);
+ this.txtLink.Size = new System.Drawing.Size(433, 74);
this.txtLink.TabIndex = 13;
this.txtLink.Text = "Bookmarks";
//
@@ -370,6 +378,7 @@
// tabPage2
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.groupBox6);
this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Controls.Add(this.groupBox1);
@@ -380,6 +389,37 @@
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Appeareance";
//
+ // groupBox7
+ //
+ this.groupBox7.Controls.Add(this.chkThumbsOnVisit);
+ this.groupBox7.Controls.Add(this.chkUseThumbs);
+ this.groupBox7.Location = new System.Drawing.Point(22, 382);
+ this.groupBox7.Name = "groupBox7";
+ this.groupBox7.Size = new System.Drawing.Size(534, 88);
+ this.groupBox7.TabIndex = 21;
+ this.groupBox7.TabStop = false;
+ this.groupBox7.Text = "Thumbs caching";
+ //
+ // chkThumbsOnVisit
+ //
+ this.chkThumbsOnVisit.AutoSize = true;
+ this.chkThumbsOnVisit.Location = new System.Drawing.Point(26, 47);
+ this.chkThumbsOnVisit.Name = "chkThumbsOnVisit";
+ this.chkThumbsOnVisit.Size = new System.Drawing.Size(213, 20);
+ this.chkThumbsOnVisit.TabIndex = 1;
+ this.chkThumbsOnVisit.Text = "cache thumb if a page is visited";
+ this.chkThumbsOnVisit.UseVisualStyleBackColor = true;
+ //
+ // chkUseThumbs
+ //
+ this.chkUseThumbs.AutoSize = true;
+ this.chkUseThumbs.Location = new System.Drawing.Point(26, 21);
+ this.chkUseThumbs.Name = "chkUseThumbs";
+ this.chkUseThumbs.Size = new System.Drawing.Size(167, 20);
+ this.chkUseThumbs.TabIndex = 0;
+ this.chkUseThumbs.Text = "use thumbs for favorites";
+ this.chkUseThumbs.UseVisualStyleBackColor = true;
+ //
// groupBox6
//
this.groupBox6.Controls.Add(this.optNoZoom);
@@ -387,7 +427,7 @@
this.groupBox6.Controls.Add(this.optZoomPage);
this.groupBox6.Location = new System.Drawing.Point(22, 239);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(537, 137);
+ this.groupBox6.Size = new System.Drawing.Size(534, 137);
this.groupBox6.TabIndex = 20;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Zoom settings";
@@ -430,7 +470,7 @@
this.groupBox2.Controls.Add(this.trkFont);
this.groupBox2.Location = new System.Drawing.Point(22, 130);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(537, 97);
+ this.groupBox2.Size = new System.Drawing.Size(534, 97);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Font";
@@ -495,6 +535,9 @@
// tabPage3
//
this.tabPage3.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage3.Controls.Add(this.label4);
+ this.tabPage3.Controls.Add(this.label3);
+ this.tabPage3.Controls.Add(this.pictureBox1);
this.tabPage3.Controls.Add(this.treeView1);
this.tabPage3.Controls.Add(this.txtLink);
this.tabPage3.Location = new System.Drawing.Point(4, 25);
@@ -504,9 +547,42 @@
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "Bookmarks";
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label4.Location = new System.Drawing.Point(323, 452);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(113, 13);
+ this.label4.TabIndex = 16;
+ this.label4.Text = "Doubleclick to refresh";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.Location = new System.Drawing.Point(376, 427);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(63, 20);
+ this.label3.TabIndex = 15;
+ this.label3.Text = "Preview";
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pictureBox1.Location = new System.Drawing.Point(445, 353);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(100, 112);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 14;
+ this.pictureBox1.TabStop = false;
+ this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
+ //
// tabPage4
//
this.tabPage4.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage4.Controls.Add(this.label1);
+ this.tabPage4.Controls.Add(this.comboBox1);
this.tabPage4.Controls.Add(this.chkRemote);
this.tabPage4.Controls.Add(this.listBox1);
this.tabPage4.Location = new System.Drawing.Point(4, 25);
@@ -516,15 +592,23 @@
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "Keyboard";
//
- // listBox1
+ // label1
//
- this.listBox1.FormattingEnabled = true;
- this.listBox1.ItemHeight = 16;
- this.listBox1.Location = new System.Drawing.Point(6, 15);
- this.listBox1.Name = "listBox1";
- this.listBox1.Size = new System.Drawing.Size(550, 420);
- this.listBox1.TabIndex = 0;
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(284, 397);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(92, 16);
+ this.label1.TabIndex = 7;
+ this.label1.Text = "Confirm link ID";
//
+ // comboBox1
+ //
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Location = new System.Drawing.Point(6, 393);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(272, 24);
+ this.comboBox1.TabIndex = 6;
+ //
// chkRemote
//
this.chkRemote.AutoSize = true;
@@ -535,6 +619,15 @@
this.chkRemote.Text = "Show diagnose on status bar";
this.chkRemote.UseVisualStyleBackColor = true;
//
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.ItemHeight = 16;
+ this.listBox1.Location = new System.Drawing.Point(6, 15);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(550, 372);
+ this.listBox1.TabIndex = 0;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -562,6 +655,8 @@
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage2.ResumeLayout(false);
+ this.groupBox7.ResumeLayout(false);
+ this.groupBox7.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.groupBox2.ResumeLayout(false);
@@ -572,6 +667,7 @@
((System.ComponentModel.ISupportInitialize)(this.trkZoom)).EndInit();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.ResumeLayout(false);
@@ -623,5 +719,13 @@
private System.Windows.Forms.CheckBox chkOSD;
private System.Windows.Forms.RadioButton optNoZoom;
private System.Windows.Forms.CheckBox chkRemote;
+ private System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.GroupBox groupBox7;
+ private System.Windows.Forms.CheckBox chkThumbsOnVisit;
+ private System.Windows.Forms.CheckBox chkUseThumbs;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-10 17:09:40 UTC (rev 3921)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-10 21:06:01 UTC (rev 3922)
@@ -33,27 +33,55 @@
using System.Reflection;
using System.IO;
-
+using Skybound.Gecko;
using MediaPortal.Configuration;
namespace BrowseTheWeb
{
public partial class Setup : Form
{
+ #region declare vars
private TreeNode sourceNode;
+ private string remote_1 = string.Empty;
+ private string remote_2 = string.Empty;
+ private string remote_3 = string.Empty;
+ private string remote_4 = string.Empty;
+
+ #endregion
+
public Setup()
{
InitializeComponent();
+ Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
}
private...
[truncated message content] |
