Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4466] trunk/plugins/BrowseTheWeb
|
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] |
