Menu
▾
▴
mp-plugins-svn
|
From: <kro...@us...> - 2010-11-07 16:52:29
|
Revision: 3906
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3906&view=rev
Author: kroko_koenig
Date: 2010-11-07 16:52:18 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
initial release
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Files/
trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip
trunk/plugins/BrowseTheWeb/Release/Plugins/
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/HtmlAgilityPack.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Release/Skin/
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/hover_browsetheweb.png
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsetheweb.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/hover_browsetheweb.png
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsetheweb.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Release/bookmarks.jpg
trunk/plugins/BrowseTheWeb/Release/browser1.jpg
trunk/plugins/BrowseTheWeb/Release/browser2.jpg
trunk/plugins/BrowseTheWeb/Release/browserOSD.jpg
trunk/plugins/BrowseTheWeb/Release/readme.txt
trunk/plugins/BrowseTheWeb/Release/setup1.jpg
trunk/plugins/BrowseTheWeb/Release/setup2.jpg
trunk/plugins/BrowseTheWeb/Release/setup3.jpg
trunk/plugins/BrowseTheWeb/Release/setup4.jpg
trunk/plugins/BrowseTheWeb/Source/
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/
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/GetFolder.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.resx
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.resx
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/OSD_LinkId.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/OSD_LinkId.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/OSD_LinkId.resx
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx
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/res/
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/delete-icon.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/edit-icon.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/fav-b-icon.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/file-icon.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/folder-icon.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/xulrunner.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/xulrunnerOff.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDomEvents.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoFX.snk
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoHistoryEntry.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoPreferences.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoResponse.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoSelection.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoStyle.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.Designer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.Designer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptService.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Properties/
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.Designer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.resx
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Readme.txt
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj.user
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.sln
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Xpcom.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIContentViewer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDOMStorage.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocShell.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocShellLoadInfo.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocumentCharsetInfo.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIMarkupDocumentViewer.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsISHEntry.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsISecureBrowserUI.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsInterfaces.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsString.cs
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsURI.cs
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner.zip</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName>
+ <DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\unzip.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName>
+ <DestinationFilename>%Cache%\unzip.exe</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\BrowseTheWeb.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1506466c-26c2-4a8f-bbe3-20b5be6eefdf}-BrowseTheWeb.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\BrowseTheWeb.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\HtmlAgilityPack.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3c35cede-0ef8-455e-8ea5-f341e7d0398e}-HtmlAgilityPack.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\HtmlAgilityPack.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\Skybound.Gecko.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a57471fc-683c-417b-8a58-b57de15ace66}-Skybound.Gecko.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Skybound.Gecko.dll</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\browsetheweb.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\browsethewebbook.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\Media\hover_browsetheweb.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\browsetheweb.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\browsethewebbook.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\Media\hover_browsetheweb.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="0e2b5186-4083-4773-992d-669cce5d27f7" Name="Welcome Screen" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>Welcome to the Extension Installer for [Name]</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Description">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Welcome Screen</PanelName>
+ <WizardButtonsEnum>NextCancel</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="f787cbf1-9aaa-46eb-8e68-d8a0eb6dd35d" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value>Install files</Value>
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="Default">
+ <Params>
+ <Items />
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="e0c3a914-a347-4f81-ad22-0c87e70ecbe6" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value>Configure plugin</Value>
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="ConfigurePlugin" ActionType="ConfigurePlugin" ConditionGroup="Default">
+ <Params>
+ <Items>
+ <SectionParam Name="Path to plugin">
+ <Value>%Plugins%\windows\browsetheweb.dll</Value>
+ <ValueType>Template</ValueType>
+ <Description>Path to the plugin like
+ %Plugins%\Windows\plugin.dll</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="67389f75-db2b-4081-b553-91600f1cbcca" Name="Setup Complete" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Show radio buttons">
+ <Value />
+ <ValueType>Bool</ValueType>
+ <Description>Use radiobutton in place of combobox</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Setup Complete</PanelName>
+ <WizardButtonsEnum>Finish</WizardButtonsEnum>
+ </SectionItem>
+ </Items>
+ </Sections>
+ <Dependencies>
+ <Items />
+ </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 />
+ <UpdateUrl />
+ <Version>
+ <Major>0</Major>
+ <Minor>1</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>inital release</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <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 />
+ <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 />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner.zip</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName>
+ <DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\unzip.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName>
+ <DestinationFilename>%Cache%\unzip.exe</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\BrowseTheWeb.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1506466c-26c2-4a8f-bbe3-20b5be6eefdf}-BrowseTheWeb.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\BrowseTheWeb.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\HtmlAgilityPack.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3c35cede-0ef8-455e-8ea5-f341e7d0398e}-HtmlAgilityPack.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\HtmlAgilityPack.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Plugins\Windows\Skybound.Gecko.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a57471fc-683c-417b-8a58-b57de15ace66}-Skybound.Gecko.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Skybound.Gecko.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\browsetheweb.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\browsethewebbook.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3\Media\hover_browsetheweb.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\browsetheweb.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\browsethewebbook.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide\Media\hover_browsetheweb.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{65cd0963-1418-4979-8453-c97cd8dcb02e}-</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows</DestinationFilename>
+ <Folder>Plugins\Windows</Folder>
+ <Group>Default</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{8b965339-4bf4-4bd8-af6b-3e88ccd8dcc5}-</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3wide</DestinationFilename>
+ <Folder>Skin\Blue3wide</Folder>
+ <Group>Blue3wide</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{498c8a98-0745-46db-b751-8090812bde0d}-</ZipFileName>
+ <DestinationFilename>%Skin%\Blue3</DestinationFilename>
+ <Folder>Skin\Blue3</Folder>
+ <Group>Blue3</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ </FolderGroups>
+ <ProjectFilename>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xmp2</ProjectFilename>
+ <UpdatePath1 />
+ <UpdatePath2 />
+ <UpdatePath3 />
+ </ProjectSettings>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/HtmlAgilityPack.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/HtmlAgilityPack.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/hover_browsetheweb.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/hover_browsetheweb.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsetheweb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsetheweb.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsetheweb.xml 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>54537689</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <disabletopbar>true</disabletopbar>
+ <controls>
+ <control>
+ <description>background image</description>
+ <type>image</type>
+ <id>1</id>
+ <width>720</width>
+ <height>576</height>
+ </control>
+
+ <control>
+ <description>Status label</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>7</posX>
+ <posY>540</posY>
+ <label>#btWeb.status</label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>Link id label</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>900</posX>
+ <posY>540</posY>
+ <label>#btWeb.linkid</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>54537689</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <autohidetopbar>yes</autohidetopbar>
+ <controls>
+
+ <control>
+ <description>BackGround</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>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/hover_browsetheweb.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/hover_browsetheweb.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsetheweb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsetheweb.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsetheweb.xml 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>54537689</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <disabletopbar>true</disabletopbar>
+ <controls>
+ <control>
+ <description>background image</description>
+ <type>image</type>
+ <id>1</id>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+
+ <control>
+ <description>Status label</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>7</posX>
+ <posY>690</posY>
+ <label>#btWeb.status</label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>Link id label</description>
+ <type>label</type>
+ <id>9</id>
+ <posX>900</posX>
+ <posY>690</posY>
+ <label>#btWeb.linkid</label>
+ <font>font10</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>54537689</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <autohidetopbar>yes</autohidetopbar>
+ <controls>
+
+ <control>
+ <description>BackGround</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>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>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/bookmarks.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/bookmarks.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/browser1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/browser1.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/browser2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/browser2.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/browserOSD.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/browserOSD.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/readme.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/readme.txt (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/readme.txt 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,68 @@
+[Plugin] Browse The Web
+
+Hi there,
+
+yes I know there are other webbrowser plugins as well, but I found both of them have their advantages but I missed some features.
+Also I like to play with HTML and web content so I started to biuld my own webbrowser.
+
+see
+
+FirefoxIntegrator
+http://forum.team-mediaportal.com/mediaportal-plugins-47/webbrowser-firefoxintegrator-48903/
+
+Author : zunixnuz
+
+or
+
+GeckoBrowser
+http://forum.team-mediaportal.com/mediaportal-plugins-47/geckobrowser-v0-1-21-04-2010-new-70005/
+
+Author : edsche
+
+
+Anyhow I like the design of the GeckoBrowser browsing by ID. Also I a fan of fullscreen action. And of course we need bookmarks...
+So because of missing features I started to play arround. Very interessting is the Skybound.Gecko engine. I just add the zoom function
+and ScrollTo funtion to the interface and this works great.
+
+So what is this plugin for ? Browse the web and have fun !
+
+Features:
+
+Set homepage / blank screen
+Edit/Save bookmarks in the setup
+Save bookmark inside the MP
+Zomm in/out
+Move the window in all direction
+Set font / zoom size in setup
+Rename the plugin
+Alternate OSD to show selected link ID
+Optional show staus bar on bottom
+
+Keyboard / Remote layout:
+
+Keyboard Remote Function
+------------------------------------------------
+P Play select a url
+B Stop blank page
+Space Pause home page
+0-9 0-9 Select a link ID
+U # confirm link ID
+Page up P+ zoom out
+Page down P- zoom in
+F7 Step backw go backward
+F8 Step forw. go forward
+F9 Yellow show favorites
+R Rec add bookmark
+up up move up
+down down move down
+left left move left
+right right move right
+ESC ESC leave plugin
+M Mute toggle mute
+X Red toggle statusbar
+
+Thanks goes to the authors from the other plugins for many ideas.
+This is also using the xulrunner engine.
+
+Cheers
+kroko
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Release/setup1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/setup1.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/setup2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/setup2.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/setup3.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/setup3.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Release/setup4.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Release/setup4.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,332 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+using System.IO;
+using System.Windows.Forms;
+using System.Net;
+
+namespace BrowseTheWeb
+{
+ public class Bookmark
+ {
+ private static XmlTextWriter textWriter;
+ private static XmlDocument xmlDocument;
+
+ // main
+ public string Name = string.Empty;
+ public string Url = string.Empty;
+ // statistics
+ public int Visited = 0;
+ public DateTime LastVisited;
+ public DateTime Created = DateTime.Now;
+ // helper for folder / sub-folder
+ public bool isFolder = false;
+ public bool isSubFolder = false;
+
+ public static bool Save(TreeView Treeview, string Path)
+ {
+ bool result = false;
+
+ try
+ {
+ textWriter = new XmlTextWriter(Path, null);
+ textWriter.Formatting = Formatting.Indented;
+
+ textWriter.WriteStartDocument();
+ textWriter.WriteStartElement("Bookmarks");
+
+ foreach (TreeNode t in Treeview.Nodes[0].Nodes)
+ {
+ Bookmark bkm = (Bookmark)t.Tag;
+ if (bkm != null)
+ {
+ WriteOneEntry(bkm);
+
+ foreach (TreeNode sub in t.Nodes)
+ {
+ Bookmark bkm2 = (Bookmark)sub.Tag;
+ WriteOneEntry(bkm2);
+ }
+ }
+ }
+
+ textWriter.WriteEndElement();
+
+ textWriter.WriteEndDocument();
+ textWriter.Close();
+
+ result = true;
+ }
+ catch
+ {
+ // error
+ }
+ finally
+ {
+ if (textWriter != null) textWriter.Close();
+ }
+
+ return result;
+ }
+ public static void Load(TreeView Treeview, string Path)
+ {
+ Treeview.Nodes.Clear();
+
+ TreeNode main = Treeview.Nodes.Add("Bookmarks", "Bookmarks");
+ main.ImageIndex = 2;
+ main.SelectedImageIndex = 2;
+
+ try
+ {
+ xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ TreeNode akt = new TreeNode();
+
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ Bookmark bkm = GetData(node);
+
+ if (bkm.isFolder)
+ {
+ akt = main.Nodes.Add(bkm.Name);
+ akt.Tag = bkm;
+ akt.ImageIndex = 1;
+ akt.SelectedImageIndex = 1;
+ }
+ if (bkm.isSubFolder)
+ {
+ string name = bkm.Name.Replace("\0", "");
+ TreeNode sub = akt.Nodes.Add(name);
+ sub.Tag = bkm;
+ }
+ if ((!bkm.isFolder) && (!bkm.isSubFolder))
+ {
+ TreeNode add = main.Nodes.Add(bkm.Name);
+ add.Tag = bkm;
+ }
+
+ }
+
+ Treeview.Invalidate();
+
+ }
+ catch { }
+ }
+
+ public static void AddSavedFolder(string Path)
+ {
+ if (!File.Exists(Path))
+ {
+ string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
+ StreamWriter sr = new StreamWriter(Path);
+ sr.Write(s);
+ sr.Close();
+ }
+ try
+ {
+ xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ bool found = false;
+
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == "Saved by MP") found = true;
+ }
+ }
+
+ if (!found)
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = "Saved by MP";
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "true";
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "false";
+ childElement.AppendChild(sub7);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertBefore(childElement, parentNode.FirstChild);
+ }
+ xmlDocument.Save(Path);
+ }
+ catch
+ { }
+ }
+ public static bool SavaBookmark(string Title, string Url, string Path)
+ {
+ try
+ {
+ xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ bool found = false;
+ XmlNode folder = null;
+
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == Title) found = true;
+ if (one.FirstChild.InnerText == "Saved by MP") folder = one;
+ }
+ }
+
+ if ((!found) && (folder != null))
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "false";
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "true";
+ childElement.AppendChild(sub7);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertAfter(childElement, folder);
+
+ xmlDocument.Save(Path);
+ return true;
+ }
+
+ }
+ catch
+ { }
+ return false;
+ }
+
+ private static void WriteOneEntry(Bookmark bkm)
+ {
+ textWriter.WriteStartElement("Entry");
+
+ textWriter.WriteStartElement("Name");
+ textWriter.WriteValue(bkm.Name);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("URL");
+ textWriter.WriteValue(bkm.Url);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("Visited");
+ textWriter.WriteValue(bkm.Visited);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("LastVisited");
+ textWriter.WriteValue(bkm.LastVisited);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("Created");
+ textWriter.WriteValue(bkm.Created);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("isFolder");
+ textWriter.WriteValue(bkm.isFolder);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteStartElement("isSubFolder");
+ textWriter.WriteValue(bkm.isSubFolder);
+ textWriter.WriteEndElement();
+
+ textWriter.WriteEndElement();
+
+ }
+ private static Bookmark GetData(XmlNode Node)
+ {
+ Bookmark result = new Bookmark();
+
+ result.Name = Node.SelectSingleNode("Name").InnerText;
+ result.Url = Node.SelectSingleNode("URL").InnerText;
+
+ result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
+ result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
+ result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
+
+ result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
+ result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
+
+ return result;
+ }
+
+ public static bool Exists(TreeView Treeview, string Name)
+ {
+ foreach (TreeNode t in Treeview.Nodes[0].Nodes)
+ {
+ if (Name == t.Text)
+ return true;
+ foreach (TreeNode sub in t.Nodes)
+ {
+ if (Name == sub.Text)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static bool isValidUrl(string URL)
+ {
+ try
+ {
+ Uri urlCheck = new Uri(URL);
+ WebRequest request = WebRequest.Create(urlCheck);
+ request.Timeout = 3000;
+
+ WebResponse response;
+
+ response = request.GetResponse();
+ }
+ catch (Exception)
+ {
+ return false; //url does not exist
+ }
+ return true;
+ }
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>BrowseTheWeb</RootNamespace>
+ <AssemblyName>BrowseTheWeb</AssemblyName>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </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>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Core, Version=1.1.1.11854, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.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>
+ </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>
+ </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>
+ </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>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Bookmark.cs" />
+ <Compile Include="GetFolder.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GetFolder.designer.cs">
+ <DependentUpon>GetFolder.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GetUrl.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GetUrl.designer.cs">
+ <DependentUpon>GetUrl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUIBookmark.cs" />
+ <Compile Include="GUIPlugin.cs" />
+ <Compile Include="HtmlInputType.cs" />
+ <Compile Include="HtmlLinkNumber.cs" />
+ <Compile Include="OSD_LinkId.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="OSD_LinkId.Designer.cs">
+ <DependentUpon>OSD_LinkId.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Setup.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Setup.Designer.cs">
+ <DependentUpon>Setup.cs</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="GetFolder.resx">
+ <DependentUpon>GetFolder.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GetUrl.resx">
+ <DependentUpon>GetUrl.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Setup.resx">
+ <DependentUpon>Setup.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\folder-icon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\delete-icon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\file-icon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\edit-icon.png" />
+ <Content Include="res\fav-b-icon.png" />
+ <Content Include="todo.txt" />
+ <EmbeddedResource Include="OSD_LinkId.resx">
+ <DependentUpon>OSD_LinkId.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="xulrunner.png" />
+ <EmbeddedResource Include="xulrunnerOff.png" />
+ </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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-07 16:52:18 UTC (rev 3906)
@@ -0,0 +1,9 @@
+<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>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ProjectView>ProjectFiles</ProjectView>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- ...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-07 18:57:02
|
Revision: 3907
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3907&view=rev
Author: kroko_koenig
Date: 2010-11-07 18:56:55 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
add some logs and diagnostic
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.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/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-07 18:56:55 UTC (rev 3907)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Items>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <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.mpe1</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>1</Minor>
+ <Build>1</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>inital release</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</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-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-07 18:56:55 UTC (rev 3907)
@@ -263,12 +263,12 @@
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
<Author>Mark Koenig (kroko) 2010</Author>
<HomePage>http://www.team-mediaportal.com</HomePage>
- <ForumPage />
- <UpdateUrl />
+ <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.mpe1</UpdateUrl>
<Version>
<Major>0</Major>
<Minor>1</Minor>
- <Build>0</Build>
+ <Build>1</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
@@ -276,14 +276,14 @@
</ExtensionDescription>
<VersionDescription>inital release</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation />
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</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 />
+ <Value>..\Source\BrowseTheWeb\xulrunner.png</Value>
<ValueType>File</ValueType>
<Description>The icon file of the package (jpg,png,bmp)</Description>
</SectionParam>
@@ -300,7 +300,7 @@
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
- <Value />
+ <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>
@@ -391,6 +391,13 @@
<ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName>
<DestinationFilename>%Skin%\Blue3wide\Media\hover_browsetheweb.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ae79ffc1-4c93-4417-9842-359b85693512}-xulrunner.png</ZipFileName>
+ <DestinationFilename />
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
@@ -427,7 +434,7 @@
</FolderGroup>
</FolderGroups>
<ProjectFilename>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xmp2</ProjectFilename>
- <UpdatePath1 />
+ <UpdatePath1>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-07 18:56:55 UTC (rev 3907)
@@ -77,6 +77,7 @@
<Compile Include="GUIPlugin.cs" />
<Compile Include="HtmlInputType.cs" />
<Compile Include="HtmlLinkNumber.cs" />
+ <Compile Include="MyLog.cs" />
<Compile Include="OSD_LinkId.cs">
<SubType>UserControl</SubType>
</Compile>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-07 18:56:55 UTC (rev 3907)
@@ -66,6 +66,7 @@
private bool zoomPage = false;
private bool zoomDomain = false;
private string lastDomain = string.Empty;
+ private bool remote = false;
private float defaultZoom = 1.0f;
private float zoom = 1.0f;
@@ -184,11 +185,13 @@
if ((usehome) && (loadFav == string.Empty))
{
webBrowser.Navigate(homepage);
+ MyLog.debug("load home page " + homepage);
}
}
if (loadFav != string.Empty)
{
webBrowser.Navigate(loadFav);
+ MyLog.debug("load favorite " + loadFav);
loadFav = string.Empty;
}
@@ -218,6 +221,8 @@
font = (float)xmlreader.GetValueAsInt("btWeb", "font", 100) / 100;
zoomPage = xmlreader.GetValueAsBool("btWeb", "page", true);
zoomDomain = xmlreader.GetValueAsBool("btWeb", "domain", false);
+
+ remote = xmlreader.GetValueAsBool("btWeb", "remote", false);
}
}
@@ -250,7 +255,11 @@
{
if (new_windowId != 54537688)
{ // not if you got favs
- if (blankBrowser) webBrowser.Navigate("about:blank");
+ if (blankBrowser)
+ {
+ webBrowser.Navigate("about:blank");
+ MyLog.debug("blank on destroy");
+ }
}
webBrowser.Visible = false;
osd_linkID.Visible = false;
@@ -266,10 +275,18 @@
public override void OnAction(Action action)
{
+ if (remote)
+ {
+ if (action.wID != Action.ActionType.ACTION_KEY_PRESSED)
+ GUIPropertyManager.SetProperty("#btWeb.status", action.wID.ToString());
+ else
+ GUIPropertyManager.SetProperty("#btWeb.status", action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
+ }
switch (action.wID)
{
case Action.ActionType.ACTION_KEY_PRESSED:
linkTime = 0;
+ MyLog.debug("action key press=" + action.m_key.KeyChar);
switch (action.m_key.KeyChar)
{
#region 0..9
@@ -316,6 +333,7 @@
if (Bookmark.isValidUrl(selectedUrl))
{
webBrowser.Navigate(selectedUrl);
+ MyLog.debug("navigate to " + selectedUrl);
}
else
ShowAlert("Wrong link ?", " The link you entered seems to be not valid.", "Input:", selectedUrl);
@@ -324,6 +342,7 @@
break;
case Action.ActionType.ACTION_PAUSE:
webBrowser.Navigate(homepage);
+ MyLog.debug("load home page " + homepage);
GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
break;
case Action.ActionType.ACTION_STOP:
@@ -331,7 +350,16 @@
GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
break;
case Action.ActionType.ACTION_PARENT_DIR:
- if (linkId != string.Empty) OnLinkId(linkId);
+ case Action.ActionType.ACTION_ASPECT_RATIO:
+ if (linkId != string.Empty)
+ {
+ MyLog.debug("confirm link pressed");
+ OnLinkId(linkId);
+ }
+ else
+ {
+ MyLog.debug("confirm link pressed, no link present");
+ }
break;
case Action.ActionType.ACTION_CONTEXT_MENU:
case Action.ActionType.ACTION_SHOW_INFO:
@@ -340,10 +368,12 @@
case Action.ActionType.ACTION_PREV_ITEM:
webBrowser.GoBack();
GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
+ MyLog.debug("navigate go back");
break;
case Action.ActionType.ACTION_NEXT_ITEM:
webBrowser.GoForward();
GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
+ MyLog.debug("navigate go forward");
break;
case Action.ActionType.ACTION_RECORD:
string title = webBrowser.Document.Title;
@@ -578,12 +608,14 @@
{
case HtmlInputType.Link:
webBrowser.Navigate(hln.Link);
+ MyLog.debug("navigate to linkid=" + LinkId + " URL=" + hln.Link);
break;
case HtmlInputType.Input:
ShowInputDialog(hln);
break;
case HtmlInputType.Action:
webBrowser.Navigate("javascript:document.getElementById(\"" + hln.Id + "\").click()");
+ MyLog.debug("action linkid=" + LinkId);
break;
}
}
@@ -684,6 +716,5 @@
{
MediaPortal.Util.Utils.PlaySound(strFilePath, false, true);
}
-
}
}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs 2010-11-07 18:56:55 UTC (rev 3907)
@@ -0,0 +1,41 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using MediaPortal.GUI.Library;
+
+namespace BrowseTheWeb
+{
+ /// <summary>
+ /// just some log if needed
+ /// </summary>
+ public static class MyLog
+ {
+ public static void debug(string str)
+ {
+ Log.Debug("BrowseTheWeb | " + str, new object[0]);
+ }
+ }
+}
+
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-07 18:56:55 UTC (rev 3907)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.1.0")]
+[assembly: AssemblyFileVersion("0.1.1.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-07 18:56:55 UTC (rev 3907)
@@ -72,6 +72,7 @@
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.listBox1 = new System.Windows.Forms.ListBox();
+ this.chkRemote = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -506,6 +507,7 @@
// tabPage4
//
this.tabPage4.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage4.Controls.Add(this.chkRemote);
this.tabPage4.Controls.Add(this.listBox1);
this.tabPage4.Location = new System.Drawing.Point(4, 25);
this.tabPage4.Name = "tabPage4";
@@ -520,9 +522,19 @@
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, 452);
+ this.listBox1.Size = new System.Drawing.Size(550, 420);
this.listBox1.TabIndex = 0;
//
+ // chkRemote
+ //
+ this.chkRemote.AutoSize = true;
+ this.chkRemote.Location = new System.Drawing.Point(6, 441);
+ this.chkRemote.Name = "chkRemote";
+ this.chkRemote.Size = new System.Drawing.Size(199, 20);
+ this.chkRemote.TabIndex = 5;
+ this.chkRemote.Text = "Show diagnose on status bar";
+ this.chkRemote.UseVisualStyleBackColor = true;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -561,6 +573,7 @@
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.tabPage4.ResumeLayout(false);
+ this.tabPage4.PerformLayout();
this.ResumeLayout(false);
}
@@ -609,5 +622,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5;
private System.Windows.Forms.CheckBox chkOSD;
private System.Windows.Forms.RadioButton optNoZoom;
+ private System.Windows.Forms.CheckBox chkRemote;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-07 18:56:55 UTC (rev 3907)
@@ -554,7 +554,7 @@
{
chkHome.Checked = xmlreader.GetValueAsBool("btWeb", "usehome", true);
txtHome.Text = xmlreader.GetValueAsString("btWeb", "homepage", "http://team-mediaportal.com");
- trkRemote.Value = xmlreader.GetValueAsInt("btWeb", "remote", 15);
+ trkRemote.Value = xmlreader.GetValueAsInt("btWeb", "remote", 25);
txtName.Text = xmlreader.GetValueAsString("btWeb", "name", "Browse Web");
chkBlank.Checked = xmlreader.GetValueAsBool("btWeb", "blank", false);
chkStatus.Checked = xmlreader.GetValueAsBool("btWeb", "status", false);
@@ -564,6 +564,8 @@
trkFont.Value = xmlreader.GetValueAsInt("btWeb", "font", 100);
optZoomPage.Checked = xmlreader.GetValueAsBool("btWeb", "page", true);
optZoomDomain.Checked = xmlreader.GetValueAsBool("btWeb", "domain", false);
+
+ chkRemote.Checked = xmlreader.GetValueAsBool("btWeb", "remote", false);
}
}
private void SaveSettings()
@@ -583,6 +585,8 @@
xmlwriter.SetValue("btWeb", "font", trkFont.Value);
xmlwriter.SetValueAsBool("btWeb", "page", optZoomPage.Checked);
xmlwriter.SetValueAsBool("btWeb", "domain", optZoomDomain.Checked);
+
+ xmlwriter.SetValueAsBool("btWeb", "remote", chkRemote.Checked);
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-07 18:56:55 UTC (rev 3907)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-07 16:52:18 UTC (rev 3906)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-07 18:56:55 UTC (rev 3907)
@@ -1,4 +1,5 @@
V0.1 inital release
+V0.1.1 add diagnose remote / logs
todo:
nothing yet
@@ -7,4 +8,4 @@
better alternate OSD
speed up (if possible), partly done
add statistics and sort functions
-show circle on loading
\ No newline at end of file
+show circle on loading ??
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <kro...@us...> - 2010-11-11 13:42:36
|
Revision: 3925
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3925&view=rev
Author: kroko_koenig
Date: 2010-11-11 13:42:29 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
xulrunner needs to be extracted first in Setup
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/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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-11 12:43:03 UTC (rev 3924)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-11 13:42:29 UTC (rev 3925)
@@ -150,8 +150,8 @@
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>add thumbs for bookmarks
-ready for info service by silent exception
+ <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>
@@ -197,5 +197,102 @@
<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>1</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>extract xulrunner first in setup</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-11 12:43:03 UTC (rev 3924)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-11 13:42:29 UTC (rev 3925)
@@ -268,15 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>0</Build>
+ <Build>1</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>
+ <VersionDescription>extract xulrunner first in setup</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>
@@ -397,7 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{9a94ef91-aa09-44e9-8f71-1036499d40dc}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{debd9c09-d52c-4596-9ee1-447c6aeb3022}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-11 12:43:03 UTC (rev 3924)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-11 13:42:29 UTC (rev 3925)
@@ -495,62 +495,102 @@
}
private void webBrowser_DocumentCompleted(object sender, EventArgs e)
{
- #region MP gui stuff
- string str = DateTime.Now.ToLongTimeString();
- str += " Completed";
+ MyLog.debug("page completetd : " + webBrowser.Url.ToString());
- GUIPropertyManager.SetProperty("#btWeb.status", str);
- #endregion
+ try
+ {
+ #region MP gui stuff
+ string str = DateTime.Now.ToLongTimeString();
+ str += " Completed";
- #region add links to page
- _htmlLinkNumbers = new List<HtmlLinkNumber>();
+ GUIPropertyManager.SetProperty("#btWeb.status", str);
+ #endregion
- _links = webBrowser.Document.Links;
- int i = 1;
+ #region add links to page
+ _htmlLinkNumbers = new List<HtmlLinkNumber>();
- foreach (GeckoElement element in _links)
- {
- string link = element.GetAttribute("href");
+ _links = webBrowser.Document.Links;
+ int i = 1;
- if (!link.StartsWith("javascript:"))
+ foreach (GeckoElement element in _links)
{
- if (!element.InnerHtml.Contains("gecko_id"))
+ string link = element.GetAttribute("href");
+
+ if (!link.StartsWith("javascript:"))
{
- element.InnerHtml += string.Format(_span, i, "", "LINK");
- }
+ if (!element.InnerHtml.Contains("gecko_id"))
+ {
+ element.InnerHtml += string.Format(_span, i, "", "LINK");
+ }
- string gb = element.GetAttribute("gb");
- string id = element.GetAttribute("id");
- string name = element.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- element.SetAttribute("gb", "gecko_link" + i);
+ string gb = element.GetAttribute("gb");
+ string id = element.GetAttribute("id");
+ string name = element.GetAttribute("name");
+ if (string.IsNullOrEmpty(gb))
+ {
+ element.SetAttribute("gb", "gecko_link" + i);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ element.SetAttribute("id", "gb" + i);
+ id = "gb" + i;
+ }
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
+ i++;
}
- if (string.IsNullOrEmpty(id))
- {
- element.SetAttribute("id", "gb" + i);
- id = "gb" + i;
- }
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
- i++;
}
- }
- _forms = webBrowser.Document.GetElementsByTagName("form");
- HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
- foreach (GeckoElement element in _forms)
- {
- string action = element.GetAttribute("action");
- doc.LoadHtml(element.InnerHtml);
- foreach (HtmlAgilityPack.HtmlNode link in doc.DocumentNode.SelectNodes("//*"))
+ _forms = webBrowser.Document.GetElementsByTagName("form");
+ HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
+ foreach (GeckoElement element in _forms)
{
- if (link.OriginalName == "input")
+ string action = element.GetAttribute("action");
+ doc.LoadHtml(element.InnerHtml);
+ foreach (HtmlAgilityPack.HtmlNode link in doc.DocumentNode.SelectNodes("//*"))
{
- if (link.Attributes["type"] != null)
+ if (link.OriginalName == "input")
{
- if (link.Attributes["type"].Value != "hidden")
+ if (link.Attributes["type"] != null)
{
+ if (link.Attributes["type"].Value != "hidden")
+ {
+ string gb = link.GetAttributeValue("gb", "");
+ string id = link.GetAttributeValue("id", "");
+ string name = link.GetAttributeValue("name", "");
+ string outerHtml = link.OuterHtml;
+ if (string.IsNullOrEmpty(gb))
+ {
+ link.SetAttributeValue("gb", "gecko_link" + i);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ link.SetAttributeValue("id", "gb" + i);
+ id = "gb" + i;
+ }
+
+ if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
+ {
+ string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
+ element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
+ }
+ if (link.Attributes["type"].Value == "submit" ||
+ link.Attributes["type"].Value == "reset" ||
+ link.Attributes["type"].Value == "radio" ||
+ link.Attributes["type"].Value == "image" ||
+ link.Attributes["type"].Value == "checkbox")
+ {
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
+ }
+ else
+ {
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ }
+ i++;
+ }
+ }
+ else
+ {
string gb = link.GetAttributeValue("gb", "");
string id = link.GetAttributeValue("id", "");
string name = link.GetAttributeValue("name", "");
@@ -570,90 +610,59 @@
string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
}
- if (link.Attributes["type"].Value == "submit" ||
- link.Attributes["type"].Value == "reset" ||
- link.Attributes["type"].Value == "radio" ||
- link.Attributes["type"].Value == "image" ||
- link.Attributes["type"].Value == "checkbox")
- {
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
- }
- else
- {
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- }
+
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
i++;
}
}
- else
- {
- string gb = link.GetAttributeValue("gb", "");
- string id = link.GetAttributeValue("id", "");
- string name = link.GetAttributeValue("name", "");
- string outerHtml = link.OuterHtml;
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttributeValue("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttributeValue("id", "gb" + i);
- id = "gb" + i;
- }
-
- if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
- element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
- }
-
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- i++;
- }
}
}
- }
- #endregion
+ #endregion
- #region reset zoom
- if (zoomPage)
- {
- webBrowser.Zoom = defaultZoom;
- zoom = defaultZoom;
- GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
- }
- if (zoomDomain)
- {
- if (lastDomain != webBrowser.Document.Domain)
+ #region reset zoom
+ if (zoomPage)
{
+ webBrowser.Zoom = defaultZoom;
+ zoom = defaultZoom;
+ GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
+ if (zoomDomain)
+ {
+ if (lastDomain != webBrowser.Document.Domain)
{
- webBrowser.Zoom = defaultZoom;
- zoom = defaultZoom;
- GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ {
+ webBrowser.Zoom = defaultZoom;
+ zoom = defaultZoom;
+ GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
}
+ lastDomain = webBrowser.Document.Domain;
}
- lastDomain = webBrowser.Document.Domain;
- }
- #endregion
+ #endregion
- #region save snapshot
+ #region save snapshot
- if (webBrowser.Url.ToString() != "about:blank")
- {
- if (cacheThumbs)
+ if (webBrowser.Url.ToString() != "about:blank")
{
- Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
- webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
+ 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);
+ snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
- Graphics g = Graphics.FromImage((Image)snap);
- g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
+ Graphics g = Graphics.FromImage((Image)snap);
+ g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
- Bookmark.SaveSnap(snap, webBrowser.Url.ToString());
+ Bookmark.SaveSnap(snap, webBrowser.Url.ToString());
+ }
}
+ #endregion
}
- #endregion
+ catch (Exception ex)
+ {
+ MyLog.debug("on completed exception : " + ex.Message + "\n" + ex.StackTrace);
+ }
}
private void OnLinkId(string LinkId)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-11 12:43:03 UTC (rev 3924)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-11 13:42:29 UTC (rev 3925)
@@ -53,6 +53,34 @@
public Setup()
{
InitializeComponent();
+
+ #region create xulrunner if needed
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner";
+ string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache);
+
+ try
+ {
+ if (!Directory.Exists(dir))
+ {
+ System.Diagnostics.ProcessStartInfo procStartInfo =
+ new System.Diagnostics.ProcessStartInfo("cmd", "/c unzip.exe -o xulrunner -d ../");
+ procStartInfo.WorkingDirectory = dirCache;
+
+ procStartInfo.RedirectStandardOutput = true;
+ procStartInfo.UseShellExecute = false;
+
+ procStartInfo.CreateNoWindow = true;
+
+ System.Diagnostics.Process proc = new System.Diagnostics.Process();
+ proc.StartInfo = procStartInfo;
+ proc.Start();
+
+ string result = proc.StandardOutput.ReadToEnd();
+ }
+ }
+ catch { }
+ #endregion
+
Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
}
@@ -102,33 +130,6 @@
listBox1.Items.Add("right\t\tright\t\tmove right");
listBox1.Items.Add("X\t\tRed\t\ttoggle statusbar");
#endregion
-
- #region create xulrunner if needed
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner";
- string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache);
-
- try
- {
- if (!Directory.Exists(dir))
- {
- System.Diagnostics.ProcessStartInfo procStartInfo =
- new System.Diagnostics.ProcessStartInfo("cmd", "/c unzip.exe -o xulrunner -d ../");
- procStartInfo.WorkingDirectory = dirCache;
-
- procStartInfo.RedirectStandardOutput = true;
- procStartInfo.UseShellExecute = false;
-
- procStartInfo.CreateNoWindow = true;
-
- System.Diagnostics.Process proc = new System.Diagnostics.Process();
- proc.StartInfo = procStartInfo;
- proc.Start();
-
- string result = proc.StandardOutput.ReadToEnd();
- }
- }
- catch { }
- #endregion
}
private void btnSave_Click(object sender, EventArgs e)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-11 19:12:42
|
Revision: 3927
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3927&view=rev
Author: kroko_koenig
Date: 2010-11-11 19:12:35 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
add proxy support
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/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx
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.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/Files/bookmarks.xml
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-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-11 19:12:35 UTC (rev 3927)
@@ -294,5 +294,102 @@
<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>2</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>proxy support</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-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-11 19:12:35 UTC (rev 3927)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>1</Build>
+ <Build>2</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>extract xulrunner first in setup</VersionDescription>
+ <VersionDescription>proxy support</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{debd9c09-d52c-4596-9ee1-447c6aeb3022}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{47fddbcd-ab4a-4f9a-9602-a3aee65e2320}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
@@ -406,16 +406,6 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName />
- <ZipFileName>Installer{CopyFile}\{65cd0963-1418-4979-8453-c97cd8dcb02e}-</ZipFileName>
- <DestinationFilename>%Plugins%\Windows</DestinationFilename>
- <Folder>Plugins\Windows</Folder>
- <Group>Default</Group>
- <Recursive>true</Recursive>
- </FolderGroup>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
<ZipFileName>Installer{CopyFile}\{8b965339-4bf4-4bd8-af6b-3e88ccd8dcc5}-</ZipFileName>
<DestinationFilename>%Skin%\Blue3wide</DestinationFilename>
<Folder>Skin\Blue3wide</Folder>
Added: trunk/plugins/BrowseTheWeb/Release/Files/bookmarks.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Files/bookmarks.xml (rev 0)
+++ trunk/plugins/BrowseTheWeb/Release/Files/bookmarks.xml 2010-11-11 19:12:35 UTC (rev 3927)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<Bookmarks>
+ <Entry>
+ <Name>Saved by MP</Name>
+ <URL>
+ </URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>0001-01-01T00:00:00</Created>
+ <isFolder>true</isFolder>
+ <isSubFolder>false</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>MediaPortal</Name>
+ <URL />
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T17:57:14.8274734+01:00</Created>
+ <isFolder>true</isFolder>
+ <isSubFolder>false</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>MediaPortal Home</Name>
+ <URL>http://www.team-mediaportal.com</URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T17:57:55.3597918+01:00</Created>
+ <isFolder>false</isFolder>
+ <isSubFolder>true</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>Forum</Name>
+ <URL>http://forum.team-mediaportal.com/</URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T17:58:42.4794868+01:00</Created>
+ <isFolder>false</isFolder>
+ <isSubFolder>true</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>Plugins</Name>
+ <URL>http://forum.team-mediaportal.com/mediaportal-plugins-47/</URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T18:00:00.9229736+01:00</Created>
+ <isFolder>false</isFolder>
+ <isSubFolder>true</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>Blog</Name>
+ <URL>http://www.team-mediaportal.com/team-blogs</URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T18:00:33.8388562+01:00</Created>
+ <isFolder>false</isFolder>
+ <isSubFolder>true</isSubFolder>
+ </Entry>
+ <Entry>
+ <Name>BrowseTheWeb</Name>
+ <URL>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-browse-web-webbrowser-89101/</URL>
+ <Visited>0</Visited>
+ <LastVisited>0001-01-01T00:00:00</LastVisited>
+ <Created>2010-11-11T18:01:21.1245608+01:00</Created>
+ <isFolder>false</isFolder>
+ <isSubFolder>true</isSubFolder>
+ </Entry>
+</Bookmarks>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-11 19:12:35 UTC (rev 3927)
@@ -83,6 +83,12 @@
<Compile Include="GUIPlugin.cs" />
<Compile Include="HtmlInputType.cs" />
<Compile Include="HtmlLinkNumber.cs" />
+ <Compile Include="Mouse.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Mouse.Designer.cs">
+ <DependentUpon>Mouse.cs</DependentUpon>
+ </Compile>
<Compile Include="MyLog.cs" />
<Compile Include="OSD_LinkId.cs">
<SubType>UserControl</SubType>
@@ -134,10 +140,15 @@
<ItemGroup>
<None Include="res\edit-icon.png" />
<Content Include="res\fav-b-icon.png" />
+ <None Include="res\icon-48x48-mouse.png" />
<Content Include="todo.txt" />
<EmbeddedResource Include="GetThumb.resx">
<DependentUpon>GetThumb.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Mouse.resx">
+ <DependentUpon>Mouse.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </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-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-11 19:12:35 UTC (rev 3927)
@@ -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\Mediaportal.exe</StartProgram>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\COnfiguration.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-11 19:12:35 UTC (rev 3927)
@@ -54,6 +54,7 @@
#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();
@@ -72,6 +73,10 @@
private bool remote = false;
private string remote_1 = string.Empty;
+ private bool useProxy = false;
+ private string Server = string.Empty;
+ private int Port = 8080;
+
private float defaultZoom = 1.0f;
private float zoom = 1.0f;
private float font = 1.0f;
@@ -163,6 +168,10 @@
GUIGraphicsContext.form.Controls.Add(osd_linkID);
osd_linkID.Visible = false;
+ mouse = new Mouse();
+ GUIGraphicsContext.form.Controls.Add(mouse);
+ mouse.Visible = false;
+
LoadSettings();
Bookmark.AddSavedFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml");
@@ -246,9 +255,43 @@
remote = xmlreader.GetValueAsBool("btWeb", "remote", false);
remote_1 = xmlreader.GetValueAsString("btWeb", "key_1", "REMOTE_1");
+
+ useProxy = xmlreader.GetValueAsBool("btWeb", "proxy", false);
+ Server = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
+ Port = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888);
+ TrySetProxy();
}
}
+ private void TrySetProxy()
+ {
+ try
+ {
+ if (useProxy)
+ MyLog.debug("use proxy settings");
+ else
+ MyLog.debug("no proxy selected");
+
+ SetProxy(Server, Port, useProxy);
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("proxy exception : " + ex.Message + "\n" + ex.StackTrace);
+ }
+ }
+ private void SetProxy(string Server, int Port, bool useProxy)
+ {
+ // http://geckofx.org/viewtopic.php?id=832
+ GeckoPreferences.User["network.proxy.http"] = Server;
+ GeckoPreferences.User["network.proxy.http_port"] = Port;
+ int ena = 0; if (useProxy) ena = 1;
+ GeckoPreferences.User["network.proxy.type"] = ena;
+
+ // maybe possible... not sure...
+ // network.proxy.login
+ // network.proxy.password
+ }
+
private void timer_Tick(object sender, EventArgs e)
{
if (linkId != string.Empty)
@@ -322,6 +365,8 @@
switch (action.wID)
{
+ case Action.ActionType.ACTION_VOLUME_MUTE:
+ break;
case Action.ActionType.ACTION_KEY_PRESSED:
linkTime = 0;
MyLog.debug("action key press=" + action.m_key.KeyChar);
@@ -512,6 +557,8 @@
_links = webBrowser.Document.Links;
int i = 1;
+ MyLog.debug("page links cnt : " + _links.Count);
+
foreach (GeckoElement element in _links)
{
string link = element.GetAttribute("href");
@@ -542,6 +589,9 @@
_forms = webBrowser.Document.GetElementsByTagName("form");
HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
+
+ MyLog.debug("page forms cnt : " + _forms.Count);
+
foreach (GeckoElement element in _forms)
{
string action = element.GetAttribute("action");
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2010-11-11 19:12:35 UTC (rev 3927)
@@ -87,5 +87,12 @@
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap icon_48x48_mouse {
+ get {
+ object obj = ResourceManager.GetObject("icon-48x48-mouse", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2010-11-11 19:12:35 UTC (rev 3927)
@@ -118,16 +118,19 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="delete-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\res\delete-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\res\edit-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\folder-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="delete-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\res\delete-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="file-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\file-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\res\edit-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon-48x48-mouse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\res\icon-48x48-mouse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-11 19:12:35 UTC (rev 3927)
@@ -76,11 +76,19 @@
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.tabPage5 = new System.Windows.Forms.TabPage();
+ this.groupBox8 = new System.Windows.Forms.GroupBox();
+ this.txtHttpPort = new System.Windows.Forms.TextBox();
+ this.txtHttpServer = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.chkProxy = new System.Windows.Forms.CheckBox();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.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.label7 = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -97,6 +105,8 @@
((System.ComponentModel.ISupportInitialize)(this.trkZoom)).BeginInit();
this.tabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.tabPage5.SuspendLayout();
+ this.groupBox8.SuspendLayout();
this.tabPage4.SuspendLayout();
this.SuspendLayout();
//
@@ -106,10 +116,10 @@
this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.treeView1.ImageIndex = 0;
this.treeView1.ImageList = this.imageList1;
- this.treeView1.Location = new System.Drawing.Point(6, 17);
+ this.treeView1.Location = new System.Drawing.Point(6, 34);
this.treeView1.Name = "treeView1";
this.treeView1.SelectedImageIndex = 0;
- this.treeView1.Size = new System.Drawing.Size(539, 330);
+ this.treeView1.Size = new System.Drawing.Size(539, 313);
this.treeView1.TabIndex = 9;
this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop);
this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
@@ -250,6 +260,7 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControl1.Location = new System.Drawing.Point(12, 12);
@@ -535,6 +546,7 @@
// tabPage3
//
this.tabPage3.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage3.Controls.Add(this.label7);
this.tabPage3.Controls.Add(this.label4);
this.tabPage3.Controls.Add(this.label3);
this.tabPage3.Controls.Add(this.pictureBox1);
@@ -553,9 +565,9 @@
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.Size = new System.Drawing.Size(116, 13);
this.label4.TabIndex = 16;
- this.label4.Text = "Doubleclick to refresh";
+ this.label4.Text = "Double click to refresh";
//
// label3
//
@@ -578,9 +590,82 @@
this.pictureBox1.TabStop = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
//
+ // tabPage5
+ //
+ this.tabPage5.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage5.Controls.Add(this.groupBox8);
+ this.tabPage5.Location = new System.Drawing.Point(4, 25);
+ this.tabPage5.Name = "tabPage5";
+ this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage5.Size = new System.Drawing.Size(562, 476);
+ this.tabPage5.TabIndex = 4;
+ this.tabPage5.Text = "Proxy";
+ //
+ // groupBox8
+ //
+ this.groupBox8.Controls.Add(this.txtHttpPort);
+ this.groupBox8.Controls.Add(this.txtHttpServer);
+ this.groupBox8.Controls.Add(this.label6);
+ this.groupBox8.Controls.Add(this.label5);
+ this.groupBox8.Controls.Add(this.chkProxy);
+ this.groupBox8.Location = new System.Drawing.Point(6, 6);
+ this.groupBox8.Name = "groupBox8";
+ this.groupBox8.Size = new System.Drawing.Size(550, 145);
+ this.groupBox8.TabIndex = 1;
+ this.groupBox8.TabStop = false;
+ this.groupBox8.Text = "Proxy settings";
+ //
+ // txtHttpPort
+ //
+ this.txtHttpPort.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtHttpPort.Location = new System.Drawing.Point(137, 86);
+ this.txtHttpPort.Name = "txtHttpPort";
+ this.txtHttpPort.Size = new System.Drawing.Size(60, 22);
+ this.txtHttpPort.TabIndex = 17;
+ this.txtHttpPort.Text = "8080";
+ this.txtHttpPort.TextChanged += new System.EventHandler(this.txtHttpPort_TextChanged);
+ //
+ // txtHttpServer
+ //
+ this.txtHttpServer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtHttpServer.Location = new System.Drawing.Point(137, 58);
+ this.txtHttpServer.Name = "txtHttpServer";
+ this.txtHttpServer.Size = new System.Drawing.Size(108, 22);
+ this.txtHttpServer.TabIndex = 16;
+ this.txtHttpServer.Text = "127.0.0.1";
+ this.txtHttpServer.TextChanged += new System.EventHandler(this.txtHttpServer_TextChanged);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(41, 88);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(71, 16);
+ this.label6.TabIndex = 2;
+ this.label6.Text = "HTTP port";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(41, 58);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(81, 16);
+ this.label5.TabIndex = 1;
+ this.label5.Text = "HTTP proxy";
+ //
+ // chkProxy
+ //
+ this.chkProxy.AutoSize = true;
+ this.chkProxy.Location = new System.Drawing.Point(21, 21);
+ this.chkProxy.Name = "chkProxy";
+ this.chkProxy.Size = new System.Drawing.Size(85, 20);
+ this.chkProxy.TabIndex = 0;
+ this.chkProxy.Text = "use proxy";
+ this.chkProxy.UseVisualStyleBackColor = true;
+ this.chkProxy.CheckedChanged += new System.EventHandler(this.chkProxy_CheckedChanged);
+ //
// 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);
@@ -628,6 +713,15 @@
this.listBox1.Size = new System.Drawing.Size(550, 372);
this.listBox1.TabIndex = 0;
//
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(7, 15);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(126, 16);
+ this.label7.TabIndex = 17;
+ this.label7.Text = "Right click to modify";
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -668,6 +762,9 @@
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.tabPage5.ResumeLayout(false);
+ this.groupBox8.ResumeLayout(false);
+ this.groupBox8.PerformLayout();
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.ResumeLayout(false);
@@ -727,5 +824,13 @@
private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.CheckBox chkThumbsOnVisit;
private System.Windows.Forms.CheckBox chkUseThumbs;
+ private System.Windows.Forms.TabPage tabPage5;
+ private System.Windows.Forms.GroupBox groupBox8;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.CheckBox chkProxy;
+ private System.Windows.Forms.TextBox txtHttpPort;
+ private System.Windows.Forms.TextBox txtHttpServer;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label7;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-11 19:12:35 UTC (rev 3927)
@@ -613,6 +613,12 @@
chkRemote.Checked = xmlreader.GetValueAsBool("btWeb", "remote", false);
remote_1 = xmlreader.GetValueAsString("btWeb", "key_1", "REMOTE_1");
+
+ chkProxy.Checked = xmlreader.GetValueAsBool("btWeb", "proxy", false);
+ txtHttpServer.Text = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
+ txtHttpPort.Text = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888).ToString();
+
+ TrySetProxy();
}
}
private void SaveSettings()
@@ -638,6 +644,10 @@
xmlwriter.SetValueAsBool("btWeb", "remote", chkRemote.Checked);
xmlwriter.SetValue("btWeb", "key_1", comboBox1.SelectedItem.ToString());
+
+ xmlwriter.SetValueAsBool("btWeb", "proxy", chkProxy.Checked);
+ xmlwriter.SetValue("btWeb", "proxy_server", txtHttpServer.Text);
+ xmlwriter.SetValue("btWeb", "proxy_port", txtHttpPort.Text);
}
}
@@ -673,5 +683,40 @@
}
}
}
+
+ private void TrySetProxy()
+ {
+ try
+ {
+ int port = Convert.ToInt32(txtHttpPort.Text);
+ SetProxy(txtHttpServer.Text, port, chkProxy.Checked);
+ }
+ catch { }
+ }
+ private void SetProxy(string Server, int Port, bool useProxy)
+ {
+ // http://geckofx.org/viewtopic.php?id=832
+ GeckoPreferences.User["network.proxy.http"] = Server;
+ GeckoPreferences.User["network.proxy.http_port"] = Port;
+ int ena = 0; if (useProxy) ena = 1;
+ GeckoPreferences.User["network.proxy.type"] = ena;
+
+ // maybe possible... not sure...
+ // network.proxy.login
+ // network.proxy.password
+ }
+
+ private void txtHttpServer_TextChanged(object sender, EventArgs e)
+ {
+ TrySetProxy();
+ }
+ private void txtHttpPort_TextChanged(object sender, EventArgs e)
+ {
+ TrySetProxy();
+ }
+ private void chkProxy_CheckedChanged(object sender, EventArgs e)
+ {
+ TrySetProxy();
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-11 13:42:38 UTC (rev 3926)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-11 19:12:35 UTC (rev 3927)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAAdABAAHQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-12 08:40:57
|
Revision: 3928
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3928&view=rev
Author: kroko_koenig
Date: 2010-11-12 08:40:45 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
add force windowed mode
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/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.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.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx
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-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-12 08:40:45 UTC (rev 3928)
@@ -391,5 +391,102 @@
<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>3</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add force windowed mode</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-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-12 08:40:45 UTC (rev 3928)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>2</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>proxy support</VersionDescription>
+ <VersionDescription>add force windowed mode</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{47fddbcd-ab4a-4f9a-9602-a3aee65e2320}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{03576131-4705-4966-917b-ed60d4c7c6ec}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-12 08:40:45 UTC (rev 3928)
@@ -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/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -33,6 +33,9 @@
using MediaPortal.Util;
using MediaPortal.Configuration;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
using Skybound.Gecko;
namespace BrowseTheWeb
@@ -41,6 +44,14 @@
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;
+
#region Links
private static GeckoElementCollection _links;
private static GeckoElementCollection _forms;
@@ -66,6 +77,7 @@
private bool blankBrowser = false;
private bool statusBar = true;
private bool osd = false;
+ private bool windowed = false;
private bool zoomPage = false;
private bool zoomDomain = false;
private string lastDomain = string.Empty;
@@ -206,6 +218,13 @@
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);
+ }
+
string loadFav = StartupLink;
if (webBrowser.Document.Domain == string.Empty)
@@ -244,6 +263,7 @@
blankBrowser = xmlreader.GetValueAsBool("btWeb", "blank", false);
statusBar = xmlreader.GetValueAsBool("btWeb", "status", true);
osd = xmlreader.GetValueAsBool("btWeb", "osd", true);
+ windowed = xmlreader.GetValueAsBool("btWeb", "window", false);
defaultZoom = (float)xmlreader.GetValueAsInt("btWeb", "zoom", 100) / 100;
zoom = defaultZoom;
@@ -366,6 +386,14 @@
switch (action.wID)
{
case Action.ActionType.ACTION_VOLUME_MUTE:
+ /*
+ * test *
+ Cursor.Position = new Point(250, 350);
+
+ Cursor.Show();
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, Cursor.Position.X, Cursor.Position.Y, 0, 0);
+ Cursor.Hide();
+ */
break;
case Action.ActionType.ACTION_KEY_PRESSED:
linkTime = 0;
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -0,0 +1,64 @@
+namespace BrowseTheWeb
+{
+ partial class Mouse
+ {
+ /// <summary>
+ /// Erforderliche Designervariable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Verwendete Ressourcen bereinigen.
+ /// </summary>
+ /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Vom Komponenten-Designer generierter Code
+
+ /// <summary>
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Image = global::BrowseTheWeb.Properties.Resources.icon_48x48_mouse;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(48, 48);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // Mouse
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.Controls.Add(this.pictureBox1);
+ this.Name = "Mouse";
+ this.Size = new System.Drawing.Size(48, 48);
+ this.Load += new System.EventHandler(this.Mouse_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BrowseTheWeb
+{
+ public partial class Mouse : UserControl
+ {
+ public Mouse()
+ {
+ InitializeComponent();
+ }
+
+ private void label1_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void Mouse_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx 2010-11-12 08:40:45 UTC (rev 3928)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.1.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyVersion("0.2.3.0")]
+[assembly: AssemblyFileVersion("0.2.3.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -73,6 +73,7 @@
this.txtZoom = new System.Windows.Forms.Label();
this.trkZoom = new System.Windows.Forms.TrackBar();
this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.label7 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -88,7 +89,7 @@
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.chkRemote = new System.Windows.Forms.CheckBox();
this.listBox1 = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
+ this.chkWindowed = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -284,6 +285,7 @@
//
// groupBox5
//
+ this.groupBox5.Controls.Add(this.chkWindowed);
this.groupBox5.Controls.Add(this.chkOSD);
this.groupBox5.Controls.Add(this.chkStatus);
this.groupBox5.Controls.Add(this.chkBlank);
@@ -301,9 +303,9 @@
this.chkOSD.AutoSize = true;
this.chkOSD.Location = new System.Drawing.Point(19, 129);
this.chkOSD.Name = "chkOSD";
- this.chkOSD.Size = new System.Drawing.Size(149, 20);
+ this.chkOSD.Size = new System.Drawing.Size(147, 20);
this.chkOSD.TabIndex = 4;
- this.chkOSD.Text = "Show OSD for link ID";
+ this.chkOSD.Text = "show OSD for link ID";
this.chkOSD.UseVisualStyleBackColor = true;
//
// chkStatus
@@ -311,9 +313,9 @@
this.chkStatus.AutoSize = true;
this.chkStatus.Location = new System.Drawing.Point(19, 103);
this.chkStatus.Name = "chkStatus";
- this.chkStatus.Size = new System.Drawing.Size(189, 20);
+ this.chkStatus.Size = new System.Drawing.Size(188, 20);
this.chkStatus.TabIndex = 3;
- this.chkStatus.Text = "Enable statusbar as default";
+ this.chkStatus.Text = "enable statusbar as default";
this.chkStatus.UseVisualStyleBackColor = true;
//
// chkBlank
@@ -321,9 +323,9 @@
this.chkBlank.AutoSize = true;
this.chkBlank.Location = new System.Drawing.Point(19, 77);
this.chkBlank.Name = "chkBlank";
- this.chkBlank.Size = new System.Drawing.Size(225, 20);
+ this.chkBlank.Size = new System.Drawing.Size(224, 20);
this.chkBlank.TabIndex = 2;
- this.chkBlank.Text = "Blank browser on window change";
+ this.chkBlank.Text = "blank browser on window change";
this.chkBlank.UseVisualStyleBackColor = true;
//
// txtName
@@ -358,9 +360,9 @@
this.txtRemote.AutoSize = true;
this.txtRemote.Location = new System.Drawing.Point(16, 53);
this.txtRemote.Name = "txtRemote";
- this.txtRemote.Size = new System.Drawing.Size(139, 16);
+ this.txtRemote.Size = new System.Drawing.Size(133, 16);
this.txtRemote.TabIndex = 2;
- this.txtRemote.Text = "Reset link ID after 1,5s";
+ this.txtRemote.Text = "reset link ID after 1,5s";
//
// trkRemote
//
@@ -559,6 +561,15 @@
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "Bookmarks";
//
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(7, 15);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(126, 16);
+ this.label7.TabIndex = 17;
+ this.label7.Text = "Right click to modify";
+ //
// label4
//
this.label4.AutoSize = true;
@@ -713,14 +724,15 @@
this.listBox1.Size = new System.Drawing.Size(550, 372);
this.listBox1.TabIndex = 0;
//
- // label7
+ // chkWindowed
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(7, 15);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(126, 16);
- this.label7.TabIndex = 17;
- this.label7.Text = "Right click to modify";
+ this.chkWindowed.AutoSize = true;
+ this.chkWindowed.Location = new System.Drawing.Point(19, 155);
+ this.chkWindowed.Name = "chkWindowed";
+ this.chkWindowed.Size = new System.Drawing.Size(223, 20);
+ this.chkWindowed.TabIndex = 5;
+ this.chkWindowed.Text = "use windowed mode in fullscreen";
+ this.chkWindowed.UseVisualStyleBackColor = true;
//
// Setup
//
@@ -832,5 +844,6 @@
private System.Windows.Forms.TextBox txtHttpServer;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.CheckBox chkWindowed;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-12 08:40:45 UTC (rev 3928)
@@ -602,6 +602,7 @@
chkBlank.Checked = xmlreader.GetValueAsBool("btWeb", "blank", false);
chkStatus.Checked = xmlreader.GetValueAsBool("btWeb", "status", false);
chkOSD.Checked = xmlreader.GetValueAsBool("btWeb", "osd", true);
+ chkWindowed.Checked = xmlreader.GetValueAsBool("btWeb", "window", false);
trkZoom.Value = xmlreader.GetValueAsInt("btWeb", "zoom", 100);
trkFont.Value = xmlreader.GetValueAsInt("btWeb", "font", 100);
@@ -633,6 +634,7 @@
xmlwriter.SetValueAsBool("btWeb", "blank", chkBlank.Checked);
xmlwriter.SetValueAsBool("btWeb", "status", chkStatus.Checked);
xmlwriter.SetValueAsBool("btWeb", "osd", chkOSD.Checked);
+ xmlwriter.SetValueAsBool("btWeb", "window", chkWindowed.Checked);
xmlwriter.SetValue("btWeb", "zoom", trkZoom.Value);
xmlwriter.SetValue("btWeb", "font", trkFont.Value);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-11 19:12:35 UTC (rev 3927)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-12 08:40:45 UTC (rev 3928)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAfABAAHwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-14 15:11:43
|
Revision: 3934
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3934&view=rev
Author: kroko_koenig
Date: 2010-11-14 15:11:31 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
import bookmarks for IE and FF
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/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.resx
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/SqlLite.cs
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-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-14 15:11:31 UTC (rev 3934)
@@ -488,5 +488,102 @@
<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>4</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add import for IE and FF</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-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-14 15:11:31 UTC (rev 3934)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>3</Build>
+ <Build>4</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>add force windowed mode</VersionDescription>
+ <VersionDescription>add import for IE and FF</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{03576131-4705-4966-917b-ed60d4c7c6ec}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{eb11fd4f-fcca-4943-a16d-c1f6f8f00ad5}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -346,6 +346,7 @@
filename = filename.Substring(x + 2);
filename = filename.Replace("/", "_");
filename = filename.Replace(".", "_");
+ filename = filename.Replace("?", "_");
filename = filename + ".png";
filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
@@ -370,6 +371,7 @@
filename = filename.Substring(x + 2);
filename = filename.Replace("/", "_");
filename = filename.Replace(".", "_");
+ filename = filename.Replace("?", "_");
filename = filename + ".png";
filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-14 15:11:31 UTC (rev 3934)
@@ -16,7 +16,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
@@ -38,6 +38,11 @@
<HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
<Private>False</Private>
</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>
<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>
@@ -95,6 +100,12 @@
<Compile Include="ImportIE.Designer.cs">
<DependentUpon>ImportIE.cs</DependentUpon>
</Compile>
+ <Compile Include="ImportFF.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ImportFF.Designer.cs">
+ <DependentUpon>ImportFF.cs</DependentUpon>
+ </Compile>
<Compile Include="Mouse.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -120,7 +131,6 @@
<Compile Include="Setup.Designer.cs">
<DependentUpon>Setup.cs</DependentUpon>
</Compile>
- <Compile Include="SqlLite.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GetFolder.resx">
@@ -162,6 +172,10 @@
<EmbeddedResource Include="ImportIE.resx">
<DependentUpon>ImportIE.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ImportFF.resx">
+ <DependentUpon>ImportFF.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Mouse.resx">
<DependentUpon>Mouse.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-14 15:11:31 UTC (rev 3934)
@@ -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\Mediaportal.exe</StartProgram>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\COnfiguration.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -209,6 +209,11 @@
webBrowser.Dock = System.Windows.Forms.DockStyle.None;
webBrowser.Location = new System.Drawing.Point(0, 0);
+ MyLog.debug("Create eventhandler");
+
+ webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
+ webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
+
if (statusBar)
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
else
@@ -217,11 +222,6 @@
webBrowser.Window.TextZoom = font;
webBrowser.Zoom = zoom;
- MyLog.debug("Create eventhandler");
-
- webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
- webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
-
if (windowed)
{
MyLog.debug("switch to windowed fullscreen mode");
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.Designer.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -31,7 +31,6 @@
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);
@@ -60,19 +59,11 @@
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.Location = new System.Drawing.Point(12, 103);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(295, 23);
+ this.button1.Size = new System.Drawing.Size(295, 30);
this.button1.TabIndex = 3;
this.button1.Text = "Cancel";
this.button1.UseVisualStyleBackColor = true;
@@ -109,11 +100,10 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(319, 183);
+ this.ClientSize = new System.Drawing.Size(319, 149);
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;
@@ -130,7 +120,6 @@
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;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -15,10 +15,10 @@
public string SelectedUrl = string.Empty;
private GeckoWebBrowser browser;
private Bitmap snap;
- private int value;
private bool received = false;
private int time = 0;
+ private int cancel = 0;
public GetThumb()
{
@@ -54,7 +54,6 @@
Bookmark.SaveSnap(snap, SelectedUrl);
received = true;
chkGetThumb.Checked = true;
-
}
}
@@ -65,9 +64,8 @@
private void timer1_Tick(object sender, EventArgs e)
{
- value++;
- if (value > 100) value = 1;
- progressBar1.Value = value;
+ cancel++;
+ if (cancel > 30) this.Close();
if (received)
{
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.Designer.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.Designer.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -0,0 +1,143 @@
+namespace BrowseTheWeb
+{
+ partial class ImportFF
+ {
+ /// <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.listBox1 = new System.Windows.Forms.ListBox();
+ this.btnImport = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.btnSelect = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.prgState = new System.Windows.Forms.ProgressBar();
+ this.chkThumbs = new System.Windows.Forms.CheckBox();
+ this.SuspendLayout();
+ //
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.Location = new System.Drawing.Point(12, 35);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+ this.listBox1.Size = new System.Drawing.Size(502, 225);
+ this.listBox1.TabIndex = 0;
+ //
+ // btnImport
+ //
+ this.btnImport.Location = new System.Drawing.Point(12, 341);
+ this.btnImport.Name = "btnImport";
+ this.btnImport.Size = new System.Drawing.Size(139, 31);
+ this.btnImport.TabIndex = 1;
+ this.btnImport.Text = "Import";
+ this.btnImport.UseVisualStyleBackColor = true;
+ this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 9);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(135, 13);
+ this.label1.TabIndex = 2;
+ this.label1.Text = "Select bookmarks to import";
+ //
+ // btnSelect
+ //
+ this.btnSelect.Location = new System.Drawing.Point(12, 266);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(139, 23);
+ this.btnSelect.TabIndex = 3;
+ this.btnSelect.Text = "select / deselect all";
+ this.btnSelect.UseVisualStyleBackColor = true;
+ this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Location = new System.Drawing.Point(375, 341);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(139, 31);
+ this.btnCancel.TabIndex = 4;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // prgState
+ //
+ this.prgState.Location = new System.Drawing.Point(12, 302);
+ this.prgState.Name = "prgState";
+ this.prgState.Size = new System.Drawing.Size(502, 23);
+ this.prgState.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
+ this.prgState.TabIndex = 5;
+ this.prgState.Visible = false;
+ //
+ // chkThumbs
+ //
+ this.chkThumbs.AutoSize = true;
+ this.chkThumbs.Location = new System.Drawing.Point(187, 270);
+ this.chkThumbs.Name = "chkThumbs";
+ this.chkThumbs.Size = new System.Drawing.Size(164, 17);
+ this.chkThumbs.TabIndex = 6;
+ this.chkThumbs.Text = "make thumbs (take long time)";
+ this.chkThumbs.UseVisualStyleBackColor = true;
+ //
+ // ImportIE
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(526, 384);
+ this.Controls.Add(this.chkThumbs);
+ this.Controls.Add(this.prgState);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnSelect);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.btnImport);
+ this.Controls.Add(this.listBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "ImportIE";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "Import Internet Explorer";
+ this.Load += new System.EventHandler(this.ImportFF_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ListBox listBox1;
+ private System.Windows.Forms.Button btnImport;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button btnSelect;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.ProgressBar prgState;
+ private System.Windows.Forms.CheckBox chkThumbs;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -0,0 +1,189 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using MediaPortal.Configuration;
+
+using SQLite.NET;
+
+namespace BrowseTheWeb
+{
+ public partial class ImportFF : Form
+ {
+ private List<Bookmark> EntryList = new List<Bookmark>();
+ private TreeView tree;
+ private bool select = true;
+
+ public ImportFF(TreeView SetupTreeview)
+ {
+ InitializeComponent();
+ tree = SetupTreeview;
+ }
+
+ private void btnImport_Click(object sender, EventArgs e)
+ {
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
+
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
+
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
+ {
+ if (n.Text == "Import FF")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
+
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
+
+ string name = (string)item;
+ Bookmark bkm = GetBookmark(name);
+
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
+
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ Bookmark addBkm = new Bookmark();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
+ }
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
+ }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void ImportFF_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+ path += "\\Mozilla\\Firefox\\Profiles";
+
+ MyLog.debug("Morzilla folder is " + path);
+
+ if (Directory.Exists(path))
+ {
+ string[] dir = Directory.GetDirectories(path);
+ if (dir.Length == 1)
+ {
+ MyLog.debug("Morzilla profile under " + dir[0]);
+ path = dir[0] + "\\places.sqlite";
+
+ MyLog.debug("open database");
+ SQLiteClient client = new SQLiteClient(path);
+
+
+ SQLiteResultSet result = client.Execute("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
+ "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
+
+ MyLog.debug("Morzilla bookmarks found : " + result.Rows.Count);
+
+ foreach (SQLite.NET.SQLiteResultSet.Row row in result.Rows)
+ {
+ string title = row.fields[0].ToString();
+ string url = row.fields[1].ToString();
+
+ Bookmark bkm = new Bookmark();
+ bkm.Url = url;
+ bkm.Name = title;
+
+ EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
+ }
+
+ MyLog.debug("close database");
+ client.Close();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("Exception import ff : " + ex.Message);
+ MyLog.debug("Exception import ff : " + ex.StackTrace);
+ }
+ }
+
+ private Bookmark GetBookmark(string Name)
+ {
+ foreach (Bookmark bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
+ }
+
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.resx (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.resx 2010-11-14 15:11:31 UTC (rev 3934)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.Designer.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.Designer.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -29,33 +29,92 @@
private void InitializeComponent()
{
this.listBox1 = new System.Windows.Forms.ListBox();
- this.btnClose = new System.Windows.Forms.Button();
+ this.btnImport = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.btnSelect = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.prgState = new System.Windows.Forms.ProgressBar();
+ this.chkThumbs = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// listBox1
//
this.listBox1.FormattingEnabled = true;
- this.listBox1.Location = new System.Drawing.Point(12, 22);
+ this.listBox1.Location = new System.Drawing.Point(12, 35);
this.listBox1.Name = "listBox1";
- this.listBox1.Size = new System.Drawing.Size(502, 251);
+ this.listBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+ this.listBox1.Size = new System.Drawing.Size(502, 225);
this.listBox1.TabIndex = 0;
//
- // btnClose
+ // btnImport
//
- this.btnClose.Location = new System.Drawing.Point(12, 279);
- this.btnClose.Name = "btnClose";
- this.btnClose.Size = new System.Drawing.Size(502, 31);
- this.btnClose.TabIndex = 1;
- this.btnClose.Text = "Close";
- this.btnClose.UseVisualStyleBackColor = true;
- this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+ this.btnImport.Location = new System.Drawing.Point(12, 341);
+ this.btnImport.Name = "btnImport";
+ this.btnImport.Size = new System.Drawing.Size(139, 31);
+ this.btnImport.TabIndex = 1;
+ this.btnImport.Text = "Import";
+ this.btnImport.UseVisualStyleBackColor = true;
+ this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 9);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(135, 13);
+ this.label1.TabIndex = 2;
+ this.label1.Text = "Select bookmarks to import";
+ //
+ // btnSelect
+ //
+ this.btnSelect.Location = new System.Drawing.Point(12, 266);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(139, 23);
+ this.btnSelect.TabIndex = 3;
+ this.btnSelect.Text = "select / deselect all";
+ this.btnSelect.UseVisualStyleBackColor = true;
+ this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Location = new System.Drawing.Point(375, 341);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(139, 31);
+ this.btnCancel.TabIndex = 4;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // prgState
+ //
+ this.prgState.Location = new System.Drawing.Point(12, 302);
+ this.prgState.Name = "prgState";
+ this.prgState.Size = new System.Drawing.Size(502, 23);
+ this.prgState.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
+ this.prgState.TabIndex = 5;
+ this.prgState.Visible = false;
+ //
+ // chkThumbs
+ //
+ this.chkThumbs.AutoSize = true;
+ this.chkThumbs.Location = new System.Drawing.Point(187, 270);
+ this.chkThumbs.Name = "chkThumbs";
+ this.chkThumbs.Size = new System.Drawing.Size(164, 17);
+ this.chkThumbs.TabIndex = 6;
+ this.chkThumbs.Text = "make thumbs (take long time)";
+ this.chkThumbs.UseVisualStyleBackColor = true;
+ //
// ImportIE
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(526, 323);
- this.Controls.Add(this.btnClose);
+ this.ClientSize = new System.Drawing.Size(526, 384);
+ this.Controls.Add(this.chkThumbs);
+ this.Controls.Add(this.prgState);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnSelect);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.btnImport);
this.Controls.Add(this.listBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.MaximizeBox = false;
@@ -67,12 +126,18 @@
this.Text = "Import Internet Explorer";
this.Load += new System.EventHandler(this.ImportIE_Load);
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
private System.Windows.Forms.ListBox listBox1;
- private System.Windows.Forms.Button btnClose;
+ private System.Windows.Forms.Button btnImport;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button btnSelect;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.ProgressBar prgState;
+ private System.Windows.Forms.CheckBox chkThumbs;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -1,4 +1,28 @@
-using System;
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -12,43 +36,109 @@
{
public partial class ImportIE : Form
{
- public List<Bookmark> EntryList = new List<Bookmark>();
+ private List<Bookmark> EntryList = new List<Bookmark>();
+ private TreeView tree;
+ private bool select = true;
- public ImportIE()
+ public ImportIE(TreeView SetupTreeview)
{
InitializeComponent();
+ tree = SetupTreeview;
}
- private void btnClose_Click(object sender, EventArgs e)
+ private void btnImport_Click(object sender, EventArgs e)
{
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
+
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
+
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
+ {
+ if (n.Text == "Import IE")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
+
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
+
+ string name = (string)item;
+ Bookmark bkm = GetBookmark(name);
+
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
+
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ Bookmark addBkm = new Bookmark();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
+ }
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
this.Close();
}
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
private void ImportIE_Load(object sender, EventArgs e)
{
string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
string[] favFiles;
- listBox1.Items.Add("Import folder is " + favPath);
- listBox1.Items.Add("Reading folder");
+ MyLog.debug("Import folder is " + favPath);
if (Directory.Exists(favPath))
{
string[] favDirs = Directory.GetDirectories(favPath);
- listBox1.Items.Add("Found " + favDirs.Length.ToString() + " folder");
+ MyLog.debug("Found " + favDirs.Length.ToString() + " folder");
foreach (string folder in favDirs)
{
- listBox1.Items.Add("Work on folder '" + Path.GetFileName(folder) + "'");
+ MyLog.debug("Work on folder '" + Path.GetFileName(folder) + "'");
favFiles = Directory.GetFiles(folder, "*.url", SearchOption.TopDirectoryOnly);
- listBox1.Items.Add(favFiles.Length.ToString() + " files to import");
+ MyLog.debug(favFiles.Length.ToString() + " files to import");
foreach (string s in favFiles)
{
FileInfo f = new FileInfo(s);
string name = Path.GetFileNameWithoutExtension(f.Name);
- listBox1.Items.Add("Found '" + name + "'");
string url = GetUrlFile(s);
if (url != null)
@@ -58,21 +148,21 @@
bkm.Name = name;
EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
}
}
}
- listBox1.Items.Add("Reading root folder");
+ MyLog.debug("Reading root folder");
favFiles = Directory.GetFiles(Environment.GetFolderPath(Environment.SpecialFolder.Favorites), "*.url", SearchOption.TopDirectoryOnly);
- listBox1.Items.Add(favFiles.Length.ToString() + " files to import");
+ MyLog.debug(favFiles.Length.ToString() + " files to import");
foreach (string s in favFiles)
{
FileInfo f = new FileInfo(s);
string name = Path.GetFileNameWithoutExtension(f.Name);
- listBox1.Items.Add("Found '" + name + "'");
string url = GetUrlFile(s);
if (url != null)
@@ -82,16 +172,16 @@
bkm.Name = name;
EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
}
}
- listBox1.Items.Add("Reading finished. Found " + EntryList.Count + " bookmarks");
+ MyLog.debug("Reading finished. Found " + EntryList.Count + " bookmarks");
}
else
{
- listBox1.Items.Add("Directory does not exist.");
+ MyLog.debug("Directory does not exist.");
}
}
-
private string GetUrlFile(string File)
{
using (StreamReader sr = new StreamReader(File))
@@ -105,5 +195,22 @@
}
return null;
}
+ private Bookmark GetBookmark(string Name)
+ {
+ foreach (Bookmark bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
+ }
+
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -1,4 +1,28 @@
-using System;
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -8,9 +8,9 @@
[assembly: AssemblyTitle("BrowseTheWeb")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
+[assembly: AssemblyCompany("MP")]
[assembly: AssemblyProduct("BrowseTheWeb")]
-[assembly: AssemblyCopyright("Copyright © HP 2010")]
+[assembly: AssemblyCopyright("Copyright © 2010")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.3.0")]
-[assembly: AssemblyFileVersion("0.2.3.0")]
+[assembly: AssemblyVersion("0.2.4.0")]
+[assembly: AssemblyFileVersion("0.2.4.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -726,6 +726,7 @@
private void btnImportIE_Click(object sender, EventArgs e)
{
+ #region generate folder
if (!Bookmark.Exists(treeView1, "Import IE"))
{
TreeNode newNode = treeView1.Nodes[0].Nodes.Add("Import IE");
@@ -739,81 +740,35 @@
treeView1.Nodes[0].ExpandAll();
}
+ #endregion
- ImportIE import = new ImportIE();
+ ImportIE import = new ImportIE(treeView1);
import.ShowDialog();
- int max = import.EntryList.Count;
- int imported = 0;
-
- TreeNode node = null;
- foreach (TreeNode n in treeView1.Nodes[0].Nodes)
- {
- if (n.Text == "Import IE")
- {
- node = n;
- break;
- }
- }
-
- if (node != null)
- {
- foreach (Bookmark bkm in import.EntryList)
- {
- if (!Bookmark.Exists(treeView1, bkm.Name))
- {
- if (!Bookmark.isValidUrl(bkm.Url))
- {
- DialogResult res = MessageBox.Show("The url seems not to be valid !\nContinue anyway ?", "Error home page address", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
- //if (res != DialogResult.Yes) break;
- }
-
- if (chkUseThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
-
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
-
- Bookmark addBkm = new Bookmark();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
-
- node.ExpandAll();
-
- }
- }
- }
+ treeView1.Invalidate();
}
private void btnImportFF_Click(object sender, EventArgs e)
{
- SQLite db = new SQLite();
-
- string path = @"C:\Users\mka\AppData\Roaming\Mozilla\Firefox\Profiles\wyhhe7f5.default\places.sqlite";
-
- db.OpenDatabase(path);
- //db.OpenDatabase(path);"Data Source=" + path + ";Version=3;New=True;Compress=True;"
-
- //DataTable table = db.ExecuteQuery("select * from moz_places");
- DataTable table = db.ExecuteQuery("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
- "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
-
-
- foreach (DataRow row in table.Rows)
+ #region generate folder
+ if (!Bookmark.Exists(treeView1, "Import FF"))
{
- string t = Convert.ToString(row["title"]);
- string u = Convert.ToString(row["url"]);
+ TreeNode newNode = treeView1.Nodes[0].Nodes.Add("Import FF");
+ newNode.ImageIndex = 1;
+ newNode.SelectedImageIndex = 1;
- System.Diagnostics.Debug.WriteLine("--------");
- System.Diagnostics.Debug.WriteLine(t);
- System.Diagnostics.Debug.WriteLine(u);
+ Bookmark bkm = new Bookmark();
+ bkm.Name = "Import FF";
+ bkm.isFolder = true;
+ newNode.Tag = bkm;
+
+ treeView1.Nodes[0].ExpandAll();
}
+ #endregion
- db.CloseDatabase();
+ ImportFF import = new ImportFF(treeView1);
+ import.ShowDialog();
+
+ treeView1.Invalidate();
}
}
}
Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/SqlLite.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/SqlLite.cs 2010-11-14 14:20:19 UTC (rev 3933)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/SqlLite.cs 2010-11-14 15:11:31 UTC (rev 3934)
@@ -1,191 +0,0 @@
-using System;
-using System.Data;
-using System.Runtime.InteropServices;
-
-namespace BrowseTheWeb
-{
- public class SQLiteException : Exception
- {
- public SQLiteException(string message) :
- base(message)
- {
-
- }
- }
-
- public class SQLite
- {
- const int SQLITE_OK = 0;
- const int SQLITE_ROW = 100;
- const int SQLITE_DONE = 101;
- const int SQLITE_INTEGER = 1;
- const int SQLITE_FLOAT = 2;
- const int SQLITE_TEXT = 3;
- const int SQLITE_BLOB = 4;
- const int SQLITE_NULL = 5;
-
- //const string path = @"C:\Program Files\Team MediaPortal\MediaPortal\Plugins\Windows\";
- const string path = "";
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_open")]
- static extern int sqlite3_open(string filename, out IntPtr db);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_close")]
- static extern int sqlite3_close(IntPtr db);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_prepare_v2")]
- static extern int sqlite3_prepare_v2(IntPtr db, string zSql,
- int nByte, out IntPtr ppStmpt, IntPtr pzTail);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_step")]
- static extern int sqlite3_step(IntPtr stmHandle);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_finalize")]
- static extern int sqlite3_finalize(IntPtr stmHandle);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_errmsg")]
- static extern string sqlite3_errmsg(IntPtr db);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_count")]
- static extern int sqlite3_column_count(IntPtr stmHandle);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_origin_name")]
- static extern string sqlite3_column_origin_name(
- IntPtr stmHandle, int iCol);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_type")]
- static extern int sqlite3_column_type(IntPtr stmHandle, int iCol);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_int")]
- static extern int sqlite3_column_int(IntPtr stmHandle, int iCol);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_text")]
- static extern string sqlite3_column_text(IntPtr stmHandle, int iCol);
-
- [DllImport(path + "sqlite3.dll", EntryPoint = "sqlite3_column_double")]
- static extern double sqlite3_column_double(IntPtr stmHandle, int iCol);
-
- private IntPtr _db; //pointer to SQLite database
- private bool _open; //whether or not the database is open
-
- /// <summary>
- /// Opens or creates SQLite database with the specified path
- /// </summary>
- /// <param name="path">Path to SQLite database</param>
- public void OpenDatabase(string path)
- {
- if (sqlite3_open(path, out _db) != SQLITE_OK)
- throw new SQLiteException("Could not open database file: " + path);
-
- _open = true;
- }
-
- /// <summary>
- /// Closes the SQLite database
- /// </summary>
- public void CloseDatabase()
- {
- if (_open)
- sqlite3_close(_db);
-
- _open = false;
- }
-
- /// <summary>
- /// Executes a query that returns no results
- /// </summary>
- /// <param name="query">SQL query to execute</param>
- public void ExecuteNonQuery(string query)
- {
- if (!_open)
- throw new SQLiteException("SQLite database is not open.");
-
- //prepare the statement
- IntPtr stmHandle = Prepare(query);
-
- if (sqlite3_step(stmHandle) != SQLITE_DONE)
- throw new SQLiteException("Could not execute SQL statement.");
-
- Finalize(stmHandle);
- }
-
- /// <summary>
- /// Executes a query and stores the results in
- /// a DataTable
- /// </summary>
- /// <param name="query">SQL query to execute</param>
- /// <returns>DataTable of results</returns>
- public DataTable ExecuteQuery(string query)
- {
- if (!_open)
- throw new SQLiteException("SQLite database is not open.");
-
- //prepare the statement
- IntPtr stmHandle = Prepare(query);
-
- //get the number of returned columns
- int columnCount = sqlite3_column_count(stmHandle);
-
- //create datatable and columns
- DataTable dTable = new DataTable();
- for (int i = 0; i < columnCount; i++)
- dTable.Columns.Add(sqlite3_column_origin_name(stmHandle, i));
-
- //populate datatable
- while (sqlite3_step(stmHandle) == SQLITE_ROW)
- {
- object[] row = new object[columnCount];
- for (int i = 0; i < columnCount; i++)
- {
- switch (sqlite3_column_type(stmHandle, i))
- {
- case SQLITE_INTEGER:
- row[i] = sqlite3_column_int(stmHandle, i);
- break;
- case SQLITE_TEXT:
- row[i] = sqlite3_column_text(stmHandle, i);
- break;
- case SQLITE_FLOAT:
- row[i] = sqlite3_column_double(stmHandle, i);
- break;
- }
- }
-
- dTable.Rows.Add(row);
- }
-
- Finalize(stmHandle);
-
- return dTable;
- }
-
- /// <summary>
- /// Prepares a SQL statement for execution
- /// </summary>
- /// <param name="query">SQL query</param>
- /// <returns>Pointer to SQLite prepared statement</returns>
- private IntPtr Prepare(string query)
- {
- IntPtr stmHandle;
-
- if (sqlite3_prepare_v2(_db, query, query.Length,
- out stmHandle, IntPtr.Zero) != SQLITE_OK)
- throw new SQLiteException(sqlite3_errmsg(_db));
-
- return stmHandle;
- }
-
- /// <summary>
- /// Finalizes a SQLite statement
- /// </summary>
- /// <param name="stmHandle">
- /// Pointer to SQLite prepared statement
- /// </param>
- private void Finalize(IntPtr stmHandle)
- {
- if (sqlite3_finalize(stmHandle) != SQLITE_OK)
- throw new SQLiteException("Could not finalize SQL statement.");
- }
- }
-}
-
Modified: trunk/plugins/BrowseTheWeb/Source/Bro...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-15 08:54:31
|
Revision: 3936
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3936&view=rev
Author: kroko_koenig
Date: 2010-11-15 08:54:20 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
fixed osd time
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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-14 15:51:46 UTC (rev 3935)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-15 08:54:20 UTC (rev 3936)
@@ -585,5 +585,102 @@
<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>4</Build>
+ <Revision>1</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>time OSD fixed</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-14 15:51:46 UTC (rev 3935)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-15 08:54:20 UTC (rev 3936)
@@ -269,12 +269,12 @@
<Major>0</Major>
<Minor>2</Minor>
<Build>4</Build>
- <Revision>0</Revision>
+ <Revision>1</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>add import for IE and FF</VersionDescription>
+ <VersionDescription>time OSD fixed</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{eb11fd4f-fcca-4943-a16d-c1f6f8f00ad5}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{821cca7b-a756-4778-9877-df3bf6602bcd}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-14 15:51:46 UTC (rev 3935)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-15 08:54:20 UTC (rev 3936)
@@ -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/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-14 15:51:46 UTC (rev 3935)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-15 08:54:20 UTC (rev 3936)
@@ -343,7 +343,7 @@
osd_linkID.Visible = false;
}
- if (linkTime > 15)
+ if (linkTime > remoteTime)
{
linkId = string.Empty;
linkTime = 0;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-14 15:51:46 UTC (rev 3935)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-15 08:54:20 UTC (rev 3936)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.4.0")]
-[assembly: AssemblyFileVersion("0.2.4.0")]
+[assembly: AssemblyVersion("0.2.4.1")]
+[assembly: AssemblyFileVersion("0.2.4.1")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-15 09:46:48
|
Revision: 3937
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3937&view=rev
Author: kroko_koenig
Date: 2010-11-15 09:46:38 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
add file
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/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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-15 08:54:20 UTC (rev 3936)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-15 09:46:38 UTC (rev 3937)
@@ -682,5 +682,102 @@
<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>4</Build>
+ <Revision>2</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>time OSD fixed AND file added</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-15 08:54:20 UTC (rev 3936)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-15 09:46:38 UTC (rev 3937)
@@ -269,12 +269,12 @@
<Major>0</Major>
<Minor>2</Minor>
<Build>4</Build>
- <Revision>1</Revision>
+ <Revision>2</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>time OSD fixed</VersionDescription>
+ <VersionDescription>time OSD fixed AND file added</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{821cca7b-a756-4778-9877-df3bf6602bcd}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d910f133-7a92-4258-8585-71c44208d78f}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-15 08:54:20 UTC (rev 3936)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-15 09:46:38 UTC (rev 3937)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.4.1")]
-[assembly: AssemblyFileVersion("0.2.4.1")]
+[assembly: AssemblyVersion("0.2.4.2")]
+[assembly: AssemblyFileVersion("0.2.4.2")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-15 19:49:24
|
Revision: 3938
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3938&view=rev
Author: kroko_koenig
Date: 2010-11-15 19:49:11 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
rework thumb section / bookmarks, remote can be configured
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/hover_browsetheweb.png
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/hover_browsetheweb.png
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
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/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.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/Source/BrowseTheWeb/BookmarkElement.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/Media/hover_browsetheweb.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/Media/hover_browsetheweb.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -38,19 +38,7 @@
public class Bookmark
{
private static XmlTextWriter textWriter;
- private static XmlDocument xmlDocument;
- // main
- public string Name = string.Empty;
- public string Url = string.Empty;
- // statistics
- public int Visited = 0;
- public DateTime LastVisited;
- public DateTime Created = DateTime.Now;
- // helper for folder / sub-folder
- public bool isFolder = false;
- public bool isSubFolder = false;
-
public static bool Save(TreeView Treeview, string Path)
{
bool result = false;
@@ -65,14 +53,14 @@
foreach (TreeNode t in Treeview.Nodes[0].Nodes)
{
- Bookmark bkm = (Bookmark)t.Tag;
+ BookmarkElement bkm = (BookmarkElement)t.Tag;
if (bkm != null)
{
WriteOneEntry(bkm);
foreach (TreeNode sub in t.Nodes)
{
- Bookmark bkm2 = (Bookmark)sub.Tag;
+ BookmarkElement bkm2 = (BookmarkElement)sub.Tag;
WriteOneEntry(bkm2);
}
}
@@ -106,16 +94,11 @@
try
{
- xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
+ BookmarkXml.LoadBookmarks(Path);
TreeNode akt = new TreeNode();
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
+ foreach (BookmarkElement bkm in BookmarkXml.BookmarkItems)
{
- Bookmark bkm = GetData(node);
-
if (bkm.isFolder)
{
akt = main.Nodes.Add(bkm.Name);
@@ -125,8 +108,7 @@
}
if (bkm.isSubFolder)
{
- string name = bkm.Name.Replace("\0", "");
- TreeNode sub = akt.Nodes.Add(name);
+ TreeNode sub = akt.Nodes.Add(bkm.Name);
sub.Tag = bkm;
}
if ((!bkm.isFolder) && (!bkm.isSubFolder))
@@ -134,7 +116,6 @@
TreeNode add = main.Nodes.Add(bkm.Name);
add.Tag = bkm;
}
-
}
Treeview.Invalidate();
@@ -143,111 +124,8 @@
catch { }
}
- public static void AddFolder(string Path, string FolderName)
+ private static void WriteOneEntry(BookmarkElement bkm)
{
- if (!File.Exists(Path))
- {
- string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
- StreamWriter sr = new StreamWriter(Path);
- sr.Write(s);
- sr.Close();
- }
- try
- {
- xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- bool found = false;
-
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == FolderName) found = true;
- }
- }
-
- if (!found)
- {
- XmlElement childElement = xmlDocument.CreateElement("Entry");
-
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "true";
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "false";
- childElement.AppendChild(sub7);
-
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertBefore(childElement, parentNode.FirstChild);
- }
- xmlDocument.Save(Path);
- }
- catch
- { }
- }
- public static bool SavaBookmark(string Title, string Url, string Path)
- {
- try
- {
- xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- bool found = false;
- XmlNode folder = null;
-
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
-
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == Title) found = true;
- if (one.FirstChild.InnerText == "Saved by MP") folder = one;
- }
- }
-
- if ((!found) && (folder != null))
- {
- XmlElement childElement = xmlDocument.CreateElement("Entry");
-
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "false";
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "true";
- childElement.AppendChild(sub7);
-
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertAfter(childElement, folder);
-
- xmlDocument.Save(Path);
- return true;
- }
-
- }
- catch
- { }
- return false;
- }
-
- private static void WriteOneEntry(Bookmark bkm)
- {
textWriter.WriteStartElement("Entry");
textWriter.WriteStartElement("Name");
@@ -258,6 +136,10 @@
textWriter.WriteValue(bkm.Url);
textWriter.WriteEndElement();
+ textWriter.WriteStartElement("ID");
+ textWriter.WriteValue(bkm.Id);
+ textWriter.WriteEndElement();
+
textWriter.WriteStartElement("Visited");
textWriter.WriteValue(bkm.Visited);
textWriter.WriteEndElement();
@@ -281,23 +163,7 @@
textWriter.WriteEndElement();
}
- private static Bookmark GetData(XmlNode Node)
- {
- Bookmark result = new Bookmark();
- result.Name = Node.SelectSingleNode("Name").InnerText;
- result.Url = Node.SelectSingleNode("URL").InnerText;
-
- result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
- result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
- result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
-
- result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
- result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
-
- return result;
- }
-
public static bool Exists(TreeView Treeview, string Name)
{
foreach (TreeNode t in Treeview.Nodes[0].Nodes)
@@ -332,75 +198,39 @@
return true;
}
- public static void SaveSnap(Bitmap Snap, string Url)
+ public static void SaveSnap(Bitmap Snap, long ID)
{
try
{
- string filename = Url;
+ string filename = ID.ToString() + ".png";
- 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.Replace("?", "_");
- filename = filename + ".png";
-
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
- Snap.Save(filename);
- }
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ Snap.Save(filename);
}
catch { }
}
- public static Bitmap GetSnap(string Url)
+ public static Bitmap GetSnap(long ID)
{
Bitmap snap = null;
try
{
- string filename = Url;
+ string filename = ID.ToString() + ".png";
- if (filename.EndsWith("/")) filename = filename.Substring(0, filename.Length - 1);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ if (File.Exists(filename))
+ snap = (Bitmap)Bitmap.FromFile(filename);
- int x = filename.IndexOf("//");
- if (x > 0)
- {
- filename = filename.Substring(x + 2);
- filename = filename.Replace("/", "_");
- 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;
- }
+ return snap;
}
catch { }
return snap;
}
- public static string GetSnapPath(string Url)
+ public static string GetSnapPath(long ID)
{
- 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";
-
+ string filename = ID.ToString() + ".png";
filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
return filename;
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -0,0 +1,44 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BrowseTheWeb
+{
+ public class BookmarkElement
+ {
+ public string Name = string.Empty;
+ public string Url = string.Empty;
+ public Int64 Id = 0;
+
+ public int Visited = 0;
+ public DateTime LastVisited;
+ public DateTime Created = DateTime.Now;
+
+ public bool isFolder = false;
+ public bool isSubFolder = false;
+ }
+}
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -0,0 +1,193 @@
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+using System.IO;
+
+namespace BrowseTheWeb
+{
+ public class BookmarkXml
+ {
+ public static List<BookmarkElement> BookmarkItems = new List<BookmarkElement>();
+
+ private static void InitBookmarks(string Path)
+ {
+ if (!File.Exists(Path))
+ {
+ string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
+ StreamWriter sr = new StreamWriter(Path);
+ sr.Write(s);
+ sr.Close();
+ }
+ }
+
+ public static bool LoadBookmarks(string Path)
+ {
+ InitBookmarks(Path);
+
+ BookmarkItems = new List<BookmarkElement>();
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement elem = GetData(node);
+ BookmarkItems.Add(elem);
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ return true;
+ }
+ public static BookmarkElement GetData(XmlNode Node)
+ {
+ BookmarkElement result = new BookmarkElement();
+
+ result.Name = Node.SelectSingleNode("Name").InnerText;
+ result.Url = Node.SelectSingleNode("URL").InnerText;
+ try
+ {
+ result.Id = Convert.ToInt64(Node.SelectSingleNode("ID").InnerText);
+ }
+ catch { }
+
+ result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
+ result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
+ result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
+
+ result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
+ result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
+
+ return result;
+ }
+
+ public static void AddFolder(string Path, string FolderName)
+ {
+ InitBookmarks(Path);
+
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ bool found = false;
+
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == FolderName) found = true;
+ }
+ }
+
+ if (!found)
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "true";
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "false";
+ childElement.AppendChild(sub7);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertBefore(childElement, parentNode.FirstChild);
+ }
+ xmlDocument.Save(Path);
+ }
+ catch
+ { }
+ }
+ public static bool AddBookmark(string Title, string Url, string Path, long ID)
+ {
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
+
+ bool found = false;
+ XmlNode folder = null;
+
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == Title) found = true;
+ if (one.FirstChild.InnerText == "Saved by MP") folder = one;
+ }
+ }
+
+ if ((!found) && (folder != null))
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = ID.ToString();
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "false";
+ childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "true";
+ childElement.AppendChild(sub8);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertAfter(childElement, folder);
+
+ xmlDocument.Save(Path);
+ return true;
+ }
+
+ }
+ catch
+ { }
+ return false;
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2010-11-15 19:49:11 UTC (rev 3938)
@@ -72,6 +72,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Bookmark.cs" />
+ <Compile Include="BookmarkElement.cs" />
+ <Compile Include="BookmarkXml.cs" />
<Compile Include="GetFolder.cs">
<SubType>Form</SubType>
</Compile>
@@ -195,4 +197,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>copy $(TargetName).dll "C:\AAA\BrowseTheWeb\Release\Plugins\Windows\"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -107,7 +107,7 @@
XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
foreach (XmlNode node in col)
{
- Bookmark bkm = GetData(node);
+ BookmarkElement bkm = BookmarkXml.GetData(node);
string name = bkm.Name.Replace(" ", "_");
name = name.Replace(".", "_");
@@ -126,7 +126,7 @@
}
else
{
- string file = Bookmark.GetSnapPath(bkm.Url);
+ string file = Bookmark.GetSnapPath(bkm.Id);
item.IconImage = file;
item.IconImageBig = file;
}
@@ -151,7 +151,7 @@
XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
foreach (XmlNode node in col)
{
- Bookmark bkm = GetData(node);
+ BookmarkElement bkm = BookmarkXml.GetData(node);
if ((bkm.isFolder) || ((!bkm.isSubFolder && !bkm.isFolder))) found = false;
@@ -168,7 +168,7 @@
item.Label = bkm.Name;
item.Path = bkm.Url;
- string file = Bookmark.GetSnapPath(bkm.Url);
+ string file = Bookmark.GetSnapPath(bkm.Id);
item.IconImage = file;
item.IconImageBig = file;
@@ -182,21 +182,5 @@
}
catch { }
}
- private static Bookmark GetData(XmlNode Node)
- {
- Bookmark result = new Bookmark();
-
- result.Name = Node.SelectSingleNode("Name").InnerText;
- result.Url = Node.SelectSingleNode("URL").InnerText;
-
- result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
- result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
- result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
-
- result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
- result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
-
- return result;
- }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -83,7 +83,11 @@
private string lastDomain = string.Empty;
private bool cacheThumbs = false;
private bool remote = false;
- private string remote_1 = string.Empty;
+ 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;
@@ -187,7 +191,8 @@
#endregion
LoadSettings();
- Bookmark.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "Saved by MP");
+ BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
+ "\\bookmarks.xml", "Saved by MP");
return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
}
@@ -288,8 +293,15 @@
cacheThumbs = xmlreader.GetValueAsBool("btWeb", "cachethumbs", false);
remote = xmlreader.GetValueAsBool("btWeb", "remote", false);
- remote_1 = xmlreader.GetValueAsString("btWeb", "key_1", "REMOTE_1");
+ remote_confirm = xmlreader.GetValueAsString("btWeb", "key_1", "ACTION_SELECT_ITEM");
+ remote_bookmark = xmlreader.GetValueAsString("btWeb", "key_2", "ACTION_SHOW_INFO");
+ remote_zoom_in = xmlreader.GetValueAsString("btWeb", "key_3", "ACTION_PAGE_DOWN");
+ remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_UP");
+ remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
+
+ Setup.actualID = Convert.ToInt64(xmlreader.GetValueAsString("btWeb", "actualID", "123"));
+
useProxy = xmlreader.GetValueAsBool("btWeb", "proxy", false);
Server = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888);
@@ -375,40 +387,66 @@
public override void OnAction(Action action)
{
+ base.OnAction(action);
+
+ #region remote diagnostic
if (remote)
{
if (action.wID != Action.ActionType.ACTION_KEY_PRESSED)
- GUIPropertyManager.SetProperty("#btWeb.status", action.wID.ToString());
+ GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
+ action.wID.ToString());
else
- GUIPropertyManager.SetProperty("#btWeb.status", action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
+ GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
+ action.wID.ToString() + " / " + action.m_key.KeyChar.ToString());
}
+ #endregion
string strAction = action.wID.ToString();
- if (strAction == remote_1)
+ #region selectable buttons
+ if (strAction == remote_confirm)
{
if (linkId != string.Empty)
{
- MyLog.debug("confirm2 link pressed");
+ MyLog.debug("confirm link pressed");
OnLinkId(linkId);
}
else
{
MyLog.debug("confirm2 link pressed, no link present");
}
+ return;
}
+ if (strAction == remote_bookmark)
+ {
+ GUIWindowManager.ActivateWindow(54537688);
+ return;
+ }
+ if ((strAction == remote_zoom_in) ||
+ (action.wID == Action.ActionType.ACTION_MUSIC_FORWARD))
+ {
+ if (zoom < 2) zoom += 0.1f;
+ webBrowser.Zoom = zoom;
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
+ if ((strAction == remote_zoom_out) ||
+ (action.wID == Action.ActionType.ACTION_MUSIC_REWIND))
+ {
+ if (zoom > 0.1f) zoom -= 0.1f;
+ webBrowser.Zoom = zoom;
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
+ if (strAction == remote_status)
+ {
+ statusBar = !statusBar;
+ 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);
+ }
+ #endregion
switch (action.wID)
{
- case Action.ActionType.ACTION_VOLUME_MUTE:
- /*
- * test *
- Cursor.Position = new Point(250, 350);
-
- Cursor.Show();
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, Cursor.Position.X, Cursor.Position.Y, 0, 0);
- Cursor.Hide();
- */
- break;
case Action.ActionType.ACTION_KEY_PRESSED:
linkTime = 0;
MyLog.debug("action key press=" + action.m_key.KeyChar);
@@ -451,7 +489,6 @@
case Action.ActionType.ACTION_PLAY:
case Action.ActionType.ACTION_MUSIC_PLAY:
webBrowser.Visible = false;
-
string selectedUrl = "http://";
if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
{
@@ -468,78 +505,29 @@
case Action.ActionType.ACTION_PAUSE:
webBrowser.Navigate(homepage);
MyLog.debug("load home page " + homepage);
- GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
break;
case Action.ActionType.ACTION_STOP:
webBrowser.Navigate("about:blank");
- GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
break;
- case Action.ActionType.ACTION_PARENT_DIR:
- case Action.ActionType.ACTION_ASPECT_RATIO:
- if (linkId != string.Empty)
- {
- MyLog.debug("confirm link pressed");
- OnLinkId(linkId);
- }
- else
- {
- MyLog.debug("confirm link pressed, no link present");
- }
- break;
- case Action.ActionType.ACTION_CONTEXT_MENU:
- case Action.ActionType.ACTION_SHOW_INFO:
- GUIWindowManager.ActivateWindow(54537688);
- return;
case Action.ActionType.ACTION_PREV_ITEM:
+ case Action.ActionType.ACTION_REWIND:
webBrowser.GoBack();
- GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
MyLog.debug("navigate go back");
break;
case Action.ActionType.ACTION_NEXT_ITEM:
+ case Action.ActionType.ACTION_FORWARD:
webBrowser.GoForward();
- GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
MyLog.debug("navigate go forward");
break;
case Action.ActionType.ACTION_RECORD:
- string title = webBrowser.Document.Title;
- string actualUrl = webBrowser.Document.Url.ToString();
- title = title.Replace("\0", "");
-
- webBrowser.Visible = false;
-
- System.Windows.Forms.DialogResult result = ShowKeyboard(ref title, false);
- if (result == System.Windows.Forms.DialogResult.OK)
- {
- bool hasSaved = Bookmark.SavaBookmark(title, actualUrl, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml");
- if (hasSaved)
- ShowAlert("Bookmark has been saved !", "Title : " + title, "URL : " + actualUrl, "");
- else
- ShowAlert("Bookmark could not been saved !", "Title : " + title, "URL : " + actualUrl, "");
- }
-
- webBrowser.Visible = true;
+ OnAddBookmark();
break;
- case Action.ActionType.ACTION_SHOW_GUI:
- statusBar = !statusBar;
- 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);
- break;
- #region zoom & move
- case Action.ActionType.ACTION_ZOOM_IN:
- case Action.ActionType.ACTION_PAGE_UP:
- if (zoom < 2) zoom += 0.1f;
- webBrowser.Zoom = zoom;
- GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
- break;
- case Action.ActionType.ACTION_ZOOM_OUT:
- case Action.ActionType.ACTION_PAGE_DOWN:
- if (zoom > 0.1f) zoom -= 0.1f;
- webBrowser.Zoom = zoom;
- GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
- break;
+ #region move
case Action.ActionType.ACTION_MOVE_RIGHT:
if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX + 100, webBrowser.Window.ScrollY);
break;
@@ -559,9 +547,65 @@
else
GUIPropertyManager.SetProperty("#btWeb.linkid", linkId);
- base.OnAction(action);
+
}
+ private void OnAddBookmark()
+ {
+ #region save snapshot
+ long id = Setup.actualID;
+
+ if (webBrowser.Url.ToString() != "about:blank")
+ {
+ int y = webBrowser.Height;
+ int x = y / 4 * 3;
+
+ int offset = (webBrowser.Width - x) / 2;
+
+ Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
+ webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
+
+ snap = CopyBitmap(snap, new Rectangle(offset, 0, x, y));
+
+ 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, id);
+ Setup.IncAndSaveID();
+ }
+ #endregion
+
+ webBrowser.Visible = false;
+
+ string title = webBrowser.Document.Title;
+ string actualUrl = webBrowser.Document.Url.ToString();
+
+ title = title.Replace("\0", "");
+
+ System.Windows.Forms.DialogResult result = ShowKeyboard(ref title, false);
+ if (result == System.Windows.Forms.DialogResult.OK)
+ {
+ bool hasSaved = BookmarkXml.AddBookmark(title, actualUrl, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", id);
+ if (hasSaved)
+ ShowAlert("Bookmark has been saved !", "Title : " + title, "URL : " + actualUrl, "");
+ else
+ ShowAlert("Bookmark could not been saved !", "Title : " + title, "URL : " + actualUrl, "");
+ }
+ webBrowser.Visible = true;
+ }
+ private Bitmap CopyBitmap(Bitmap srcBitmap, Rectangle section)
+ {
+ Bitmap bmp = new Bitmap(section.Width, section.Height);
+ Graphics g = Graphics.FromImage(bmp);
+
+ g.DrawImage(srcBitmap, 0, 0, section, GraphicsUnit.Pixel);
+ g.Dispose();
+
+ return bmp;
+ }
+
private void ScrollTo(int x, int y)
{
webBrowser.Window.ScrollTo(x, y);
@@ -731,25 +775,6 @@
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
}
catch (Exception ex)
{
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -13,6 +13,7 @@
public partial class GetThumb : Form
{
public string SelectedUrl = string.Empty;
+ private long id = 0;
private GeckoWebBrowser browser;
private Bitmap snap;
@@ -20,12 +21,14 @@
private int time = 0;
private int cancel = 0;
- public GetThumb()
+ public GetThumb(long ID)
{
InitializeComponent();
browser = new GeckoWebBrowser();
this.Controls.Add(browser);
+
+ id = ID;
}
private void GetThumb_Load(object sender, EventArgs e)
{
@@ -34,7 +37,7 @@
txtUrl.Text = SelectedUrl;
- browser.Size = new Size(600, 800);
+ browser.Size = new Size(800, 1024);
browser.DocumentCompleted += new EventHandler(browser_DocumentCompleted);
browser.Navigate(SelectedUrl);
}
@@ -51,7 +54,7 @@
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);
+ Bookmark.SaveSnap(snap, id);
received = true;
chkGetThumb.Checked = true;
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -38,7 +38,7 @@
{
public partial class ImportFF : Form
{
- private List<Bookmark> EntryList = new List<Bookmark>();
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
private TreeView tree;
private bool select = true;
@@ -79,7 +79,7 @@
prgState.Value = (counter * 100 / max);
string name = (string)item;
- Bookmark bkm = GetBookmark(name);
+ BookmarkElement bkm = GetBookmark(name);
if (bkm != null)
{
@@ -87,17 +87,21 @@
{
imported++;
+ long id = Setup.actualID;
+ Setup.IncAndSaveID();
+
TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
- Bookmark addBkm = new Bookmark();
+ BookmarkElement addBkm = new BookmarkElement();
addBkm.Name = bkm.Name;
addBkm.Url = bkm.Url;
addBkm.isSubFolder = true;
+ addBkm.Id = id;
add.Tag = addBkm;
if (chkThumbs.Checked)
{
- GetThumb thumb = new GetThumb();
+ GetThumb thumb = new GetThumb(id);
thumb.SelectedUrl = bkm.Url;
thumb.ShowDialog();
}
@@ -148,7 +152,7 @@
string title = row.fields[0].ToString();
string url = row.fields[1].ToString();
- Bookmark bkm = new Bookmark();
+ BookmarkElement bkm = new BookmarkElement();
bkm.Url = url;
bkm.Name = title;
@@ -168,9 +172,9 @@
}
}
- private Bookmark GetBookmark(string Name)
+ private BookmarkElement GetBookmark(string Name)
{
- foreach (Bookmark bkm in EntryList)
+ foreach (BookmarkElement bkm in EntryList)
{
if (bkm.Name == Name) return bkm;
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -36,7 +36,7 @@
{
public partial class ImportIE : Form
{
- private List<Bookmark> EntryList = new List<Bookmark>();
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
private TreeView tree;
private bool select = true;
@@ -77,7 +77,7 @@
prgState.Value = (counter * 100 / max);
string name = (string)item;
- Bookmark bkm = GetBookmark(name);
+ BookmarkElement bkm = GetBookmark(name);
if (bkm != null)
{
@@ -85,17 +85,21 @@
{
imported++;
+ long id = Setup.actualID;
+ Setup.IncAndSaveID();
+
TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
- Bookmark addBkm = new Bookmark();
+ BookmarkElement addBkm = new BookmarkElement();
addBkm.Name = bkm.Name;
addBkm.Url = bkm.Url;
addBkm.isSubFolder = true;
+ addBkm.Id = id;
add.Tag = addBkm;
if (chkThumbs.Checked)
{
- GetThumb thumb = new GetThumb();
+ GetThumb thumb = new GetThumb(id);
thumb.SelectedUrl = bkm.Url;
thumb.ShowDialog();
}
@@ -143,7 +147,7 @@
if (url != null)
{
- Bookmark bkm = new Bookmark();
+ BookmarkElement bkm = new BookmarkElement();
bkm.Url = url;
bkm.Name = name;
@@ -167,7 +171,7 @@
if (url != null)
{
- Bookmark bkm = new Bookmark();
+ BookmarkElement bkm = new BookmarkElement();
bkm.Url = url;
bkm.Name = name;
@@ -195,9 +199,9 @@
}
return null;
}
- private Bookmark GetBookmark(string Name)
+ private BookmarkElement GetBookmark(string Name)
{
- foreach (Bookmark bkm in EntryList)
+ foreach (BookmarkElement bkm in EntryList)
{
if (bkm.Name == Name) return bkm;
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.4.2")]
-[assembly: AssemblyFileVersion("0.2.4.2")]
+[assembly: AssemblyVersion("0.2.5.0")]
+[assembly: AssemblyFileVersion("0.2.5.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-15 09:46:38 UTC (rev 3937)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-15 19:49:11 UTC (rev 3938)
@@ -88,10 +88,48 @@
this.label5 = new System.Windows.Forms.Label();
this.chkProxy = new System.Windows.Forms.CheckBox();
this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.btnDefault = new System.Windows.Forms.Button();
+ this.groupBox11 = new System.Windows.Forms.GroupBox();
+ this.label33 = new System.Windows.Forms.Label();
+ this.label34 = new System.Windows.Forms.Label();
+ this.cmbZoomOut = new System.Windows.Forms.ComboBox();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label32 = new System.Windows.Forms.Label();
+ this.cmbZoomIn = new System.Windows.Forms.ComboBox();
+ this.groupBox10 = new System.Windows.Forms.GroupBox();
+ this.label35 = new System.Windows.Forms.Label();
+ this.cmbShowBookmarks = new System.Windows.Forms.ComboBox();
+ this.label29 = new System.Windows.Forms.Label();
+ this.label30 = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.label28 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.label26 = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.groupBox9 = new System.Windows.Forms.GroupBox();
+ this.cmbStatusBar = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
- this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.cmbConfirmLink = new System.Windows.Forms.ComboBox();
this.chkRemote = new System.Windows.Forms.CheckBox();
- this.listBox1 = new System.Windows.Forms.ListBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.comboBox3 = new System.Windows.Forms.ComboBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.label22 = new System.Windows.Forms.Label();
+ this.comboBox4 = new System.Windows.Forms.ComboBox();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -111,6 +149,9 @@
this.tabPage5.SuspendLayout();
this.groupBox8.SuspendLayout();
this.tabPage4.SuspendLayout();
+ this.groupBox11.SuspendLayout();
+ this.groupBox10.SuspendLayout();
+ this.groupBox9.SuspendLayout();
this.SuspendLayout();
//
// treeView1
@@ -434,6 +475,7 @@
this.chkThumbsOnVisit.TabIndex = 1;
this.chkThumbsOnVisit.Text = "cache thumb if a page is visited";
this.chkThumbsOnVisit.UseVisualStyleBackColor = true;
+ this.chkThumbsOnVisit.Visible = false;
//
// chkUseThumbs
//
@@ -711,10 +753,11 @@
//
// tabPage4
//
- this.tabPage4.Controls.Add(this.label1);
- this.tabPage4.Controls.Add(this.comboBox1);
+ this.tabPage4.Controls.Add(this.btnDefault);
+ this.tabPage4.Controls.Add(this.groupBox11);
+ this.tabPage4.Controls.Add(this.groupBox10);
+ this.tabPage4.Controls.Add(this.groupBox9);
this.tabPage4.Controls.Add(this.chkRemote);
- this.tabPage4.Controls.Add(this.listBox1);
this.tabPage4.Location = new System.Drawing.Point(4, 25);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
@@ -722,42 +765,406 @@
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "Keyboard";
//
+ // btnDefault
+ //
+ this.btnDefault.Location = new System.Drawing.Point(417, 439);
+ this.btnDefault.Name = "btnDefault";
+ this.btnDefault.Size = new System.Drawing.Size(119, 31);
+ this.btnDefault.TabIndex = 33;
+ this.btnDefault.Text = "set to default";
+ this.btnDefault.UseVisualStyleBackColor = true;
+ this.btnDefault.Click += new System.EventHandler(this.btnDefault_Click);
+ //
+ // groupBox11
+ //
+ this.groupBox11.Controls.Add(this.label33);
+ this.groupBox11.Controls.Add(this.label34);
+ this.groupBox11.Controls.Add(this.cmbZoomOut);
+ this.groupBox11.Controls.Add(this.label31);
+ this.groupBox11.Controls.Add(this.label32);
+ this.groupBox11.Controls.Add(this.cmbZoomIn);
+ this.groupBox11.Location = new System.Drawing.Point(25, 309);
+ this.groupBox11.Name = "groupBox11";
+ this.groupBox11.Size = new System.Drawing.Size(511, 124);
+ this.groupBox11.TabIndex = 32;
+ this.groupBox11.TabStop = false;
+ this.groupBox11.Text = "Move/Zoom";
+ //
+ // label33
+ //
+ this.label33.AutoSize = true;
+ this.label33.Location = new System.Drawing.Point(180, 96);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(149, 16);
+ this.label33.TabIndex = 29;
+ this.label33.Text = "cursor up/down/left/right";
+ //
+ // label34
+ //
+ this.label34.AutoSize = true;
+ this.label34.Location = new System.Drawing.Point(5, 96);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(42, 16);
+ this.label34.TabIndex = 28;
+ this.label34.Text = "move";
+ //
+ // cmbZoomOut
+ //
+ this.cmbZoomOut.FormattingEnabled = true;
+ this.cmbZoomOut.Location = new System.Drawing.Point(183, 67);
+ this.cmbZoomOut.Name = "cmbZoomOut";
+ this.cmbZoomOut.Size = new System.Drawing.Size(272, 24);
+ this.cmbZoomOut.TabIndex = 27;
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Location = new System.Drawing.Point(5, 75);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(62, 16);
+ this.label31.TabIndex = 26;
+ this.label31.Text = "zoom out";
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.Location = new System.Drawing.Point(5, 37);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(54, 16);
+ this.label32.TabIndex = 25;
+ this.label32.Text = "zoom in";
+ //
+ // cmbZoomIn
+ //
+ this.cmbZoomIn.FormattingEnabled = true;
+ this.cmbZoomIn.Location = new System.Drawing.Point(183, 34);
+ this.cmbZoomIn.Name = "cmbZoomIn";
+ this.cmbZoomIn.Size = new System.Drawing.Size(272, 24);
+ this.cmbZoomIn.TabIndex = 24;
+ //
+ // groupBox10
+ //
+ this.groupBox10.Controls.Add(this.label35);
+ this.groupBox10.Controls.Add(this.cmbShowBookmarks);
+ this.groupBox10.Controls.Add(this.label29);
+ this.groupBox10.Controls.Add(this.label30);
+ this.groupBox10.Controls.Add(this.label27);
+ this.groupBox10.Controls.Add(this.label28);
+ this.groupBox10.Controls.Add(this.label25);
+ this.groupBox10.Controls.Add(this.label26);
+ this.groupBox10.Controls.Add(this.label23);
+ this.groupBox10.Controls.Add(this.label24);
+ this.groupBox10.Controls.Add(this.label13);
+ this.groupBox10.Controls.Add(this.label14);
+ this.groupBox10.Controls.Add(this.label11);
+ this.groupBox10.Controls.Add(this.label12);
+ this.groupBox10.Location = new System.Drawing.Point(25, 6);
+ this.groupBox10.Name = "groupBox10";
+ this.groupBox10.Size = new System.Drawing.Size(511, 169);
+ this.groupBox10.TabIndex = 31;
+ this.groupBox10.TabStop = false;
+ this.groupBox10.Text = "Navigation";
+ //
+ // label35
+ //
+ this.label35.AutoSize = true;
+ this.label35.Location = new System.Drawing.Point(6, 126);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(112, 16);
+ this.label35.TabIndex = 25;
+ this.label35.Text = "Show bookmarks";
+ //
+ // cmbShowBookmarks
+ //
+ this.cmbShowBookmarks.FormattingEnabled = true;
+ this.cmbShowBookmarks.Location = new System.Drawing.Point(184, 123);
+ this.cmbShowBookmarks.Name = "cmbShowBookmarks";
+ this.cmbShowBookmarks.Size = new System.Drawing.Size(272, 24);
+ this.cmbShowBookmarks.TabIndex = 24;
+ //
+ // label29
+ //
+ this.label29.AutoSize = true;
+ this.label29.Location = new System.Drawing.Point(181, 101);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(74, 16);
+ this.label29.TabIndex = 23;
+ this.label29.Text = "(R) Record";
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.Location = new System.Drawing.Point(6, 101);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(96, 16);
+ this.label30.TabIndex = 22;
+ this.label30.Text = "add bookmark";
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.Location = new System.Drawing.Point(181, 85);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(124, 16);
+ this.label27.TabIndex = 21;
+ this.label27.Text = "(F8) Step backward";
+ //
+ // label28
+ //
+ this.label28.AutoSize = true;
+ this.label28.Location = new System.Drawing.Point(6, 85);
+ this.label28.Name = "label28";
+ this.label28.Size = new System.Drawing.Size(86, 16);
+ this.label28.TabIndex = 20;
+ this.label28.Text = "go backward";
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.Location = new System.Drawing.Point(181, 69);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(109, 16);
+ this.label25.TabIndex = 19;
+ this.label25.Text = "(F7) Step forward";
+ //
+ // label26
+ //
+ this.label26.AutoSize = true;
+ this.label26.Location = new System.Drawing.Point(6, 69);
+ this.label26.Name = "label26";
+ this.label26.Size = new System.Drawing.Size(71, 16);
+ this.label26.TabIndex = 18;
+ this.label26.Text = "go forward";
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(181, 53);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(56, 16);
+ this.label23.TabIndex = 17;
+ this.label23.Text = "(B) Stop";
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Location = new System.Drawing.Point(6, 53);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(85, 16);
+ this.label24.TabIndex = 16;
+ this.label24.Text = "blank screen";
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Location = new System.Drawing.Point(181, 37);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(98, 16);
+ this.label13.TabIndex = 15;
+ this.label13.Text = "(Space) Pause";
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(6, 37);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(75, 16);
+ this.label14.TabIndex = 14;
+ this.label14.Text = "go to home";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(181, 21);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(55, 16);
+ this.label11.TabIndex = 13;
+ this.label11.Text = "(P) Play";
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(6, 21);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(85, 16);
+ this.label12.TabIndex = 12;
+ this.label12.Text = "select a URL";
+ //
+ // groupBox9
+ //
+ this.groupBox9.Controls.Add(this.cmbStatusBar);
+ this.groupBox9.Controls.Add(this.label10);
+ this.groupBox9.Controls.Add(this.label9);
+ this.groupBox9.Controls.Add(this.label8);
+ this.groupBox9.Controls.Add(this.label1);
+ this.groupBox9.Controls.Add(this.cmbConfirmLink);
+ this.groupBox9.Location = new System.Drawing.Point(25, 181);
+ this.groupBox9.Name = "groupBox9";
+ this.groupBox9.Size = new System.Drawing.Size(511, 122);
+ this.groupBox9.TabIndex = 30;
+ this.groupBox9.TabStop = false;
+ this.groupBox9.Text = "Link ID";
+ //
+ // cmbStatusBar
+ //
+ this.cmbStatusBar.FormattingEnabled = true;
+ this.cmbStatusBar.Location = new System.Drawing.Point(183, 78);
+ this.cmbStatusBar.Name = "cmbStatusBar";
+ this.cmbStatusBar.Size = new System.Drawing.Size(272, 24);
+ this.cmbStatusBar.TabIndex = 11;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(5, 86);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(102, 16);
+ this.label10.TabIndex = 10;
+ this.label10.Text = "Show status bar";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(180, 20);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(52, 16);
+ this.label9.TabIndex = 9;
+ this.label9.Text = "Key 0-9";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(5, 20);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(78, 16);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Enter link ID";
+ //
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(284, 397);
+ this.label1.Location = new System.Drawing.Point(5, 48);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 16);
this.label1.TabIndex = 7;
this.label1.Text = "Confirm link ID";
//
- // comboBox1
+ // cmbConfirmLink
//
- 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;
+ this.cmbConfirmLink.FormattingEnabled = true;
+ this.cmbConfirmLink.Location = new System.Drawing.Point(183, 45);
+ this.cmbConfirmLink.Name = "cmbConfirmLink";
+ this.cmbConfirmLink.Size = new System.Drawing.Size(272, 24);
+ this.cmbConfirmLink.TabIndex = 6;
//
// chkRemote
//
this.chkRemote.AutoSize = true;
- this.chkRemote.Location = new System.Drawing.Point(6, 441);
+ this.chkRemote.Location = new System.Drawing.Point(25, 445);
this.chkRemote.Name = "chkRemote";
this.chkRemote.Size = new System.Drawing.Size(199, 20);
this.chkRemote.TabIndex = 5;
t...
[truncated message content] |
|
From: <kro...@us...> - 2010-11-17 08:14:00
|
Revision: 3939
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3939&view=rev
Author: kroko_koenig
Date: 2010-11-17 08:13:53 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
add mouse support, some codes changes
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.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
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -136,10 +136,6 @@
textWriter.WriteValue(bkm.Url);
textWriter.WriteEndElement();
- textWriter.WriteStartElement("ID");
- textWriter.WriteValue(bkm.Id);
- textWriter.WriteEndElement();
-
textWriter.WriteStartElement("Visited");
textWriter.WriteValue(bkm.Visited);
textWriter.WriteEndElement();
@@ -198,39 +194,40 @@
return true;
}
- public static void SaveSnap(Bitmap Snap, long ID)
+ public static void SaveSnap(Bitmap Snap, string Url)
{
try
{
- string filename = ID.ToString() + ".png";
+ string filename = GetThumbString(Url);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
Snap.Save(filename);
}
catch { }
}
- public static Bitmap GetSnap(long ID)
+ public static Bitmap GetSnap(string Url)
{
Bitmap snap = null;
try
{
- string filename = ID.ToString() + ".png";
+ string filename = GetThumbString(Url);
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
if (File.Exists(filename))
+ {
snap = (Bitmap)Bitmap.FromFile(filename);
-
- return snap;
+ return snap;
+ }
}
catch { }
return snap;
}
- public static string GetSnapPath(long ID)
+ public static string GetSnapPath(string Url)
{
- string filename = ID.ToString() + ".png";
+ string filename = GetThumbString(Url);
filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
return filename;
@@ -240,5 +237,25 @@
if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb");
}
+
+ private static string GetThumbString(string Name)
+ {
+ string result = Name;
+
+ if (result.EndsWith("/")) result = result.Substring(0, result.Length - 1);
+
+ int x = result.IndexOf("//");
+ if (x > 0)
+ {
+ result = result.Substring(x + 2);
+ }
+
+ result = result.Replace("/", "_");
+ result = result.Replace(".", "_");
+ result = result.Replace("?", "_");
+ result = result + ".png";
+
+ return result;
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -32,7 +32,6 @@
{
public string Name = string.Empty;
public string Url = string.Empty;
- public Int64 Id = 0;
public int Visited = 0;
public DateTime LastVisited;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -74,11 +74,6 @@
result.Name = Node.SelectSingleNode("Name").InnerText;
result.Url = Node.SelectSingleNode("URL").InnerText;
- try
- {
- result.Id = Convert.ToInt64(Node.SelectSingleNode("ID").InnerText);
- }
- catch { }
result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
@@ -117,16 +112,18 @@
childElement.AppendChild(sub1);
XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("Visited"); sub3.InnerText = "0";
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = "0";
childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("LastVisited"); sub4.InnerText = "0001-01-01T00:00:00";
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("Created"); sub5.InnerText = DateTime.UtcNow.ToString("u", null);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("isFolder"); sub6.InnerText = "true";
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isSubFolder"); sub7.InnerText = "false";
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "true";
childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "false";
+ childElement.AppendChild(sub8);
XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
parentNode.InsertBefore(childElement, parentNode.FirstChild);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2010-11-17 08:13:53 UTC (rev 3939)
@@ -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\MediaPortal.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-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -126,7 +126,7 @@
}
else
{
- string file = Bookmark.GetSnapPath(bkm.Id);
+ string file = Bookmark.GetSnapPath(bkm.Url);
item.IconImage = file;
item.IconImageBig = file;
}
@@ -168,7 +168,7 @@
item.Label = bkm.Name;
item.Path = bkm.Url;
- string file = Bookmark.GetSnapPath(bkm.Id);
+ string file = Bookmark.GetSnapPath(bkm.Url);
item.IconImage = file;
item.IconImageBig = file;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -78,6 +78,7 @@
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;
@@ -178,7 +179,11 @@
#region add forms
webBrowser = new GeckoWebBrowser();
+ webBrowser.Name = "BrowseTheWeb";
+ webBrowser.NoDefaultContextMenu = true;
GUIGraphicsContext.form.Controls.Add(webBrowser);
+
+ webBrowser.Enabled = false;
webBrowser.Visible = false;
osd_linkID = new OSD_LinkId();
@@ -207,10 +212,18 @@
GUIPropertyManager.SetProperty("#btWeb.linkid", "");
linkId = string.Empty;
+ if (useMouse)
+ {
+ MyLog.debug("Mouse support is enabled");
+ GUIGraphicsContext.MouseSupport = true;
+ }
+
#region init browser
webBrowser.Visible = true;
- webBrowser.Enabled = false;
+ if (!useMouse) webBrowser.Enabled = false;
+ else webBrowser.Enabled = true;
+
webBrowser.Dock = System.Windows.Forms.DockStyle.None;
webBrowser.Location = new System.Drawing.Point(0, 0);
@@ -218,6 +231,7 @@
webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
+ webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
if (statusBar)
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
@@ -260,6 +274,9 @@
timer.Interval = 100;
timer.Tick += new EventHandler(timer_Tick);
timer.Start();
+
+ if (useMouse)
+ GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
}
catch (Exception ex)
{
@@ -269,7 +286,32 @@
base.OnPageLoad();
}
+ protected override void OnPageDestroy(int new_windowId)
+ {
+ if (new_windowId != 54537688)
+ { // not if you got favs
+ if (blankBrowser)
+ {
+ webBrowser.Navigate("about:blank");
+ MyLog.debug("blank on destroy");
+ }
+ }
+ GUIGraphicsContext.form.Focus();
+ webBrowser.Hide();
+
+ osd_linkID.Visible = false;
+
+ webBrowser.DocumentCompleted -= new EventHandler(webBrowser_DocumentCompleted);
+ webBrowser.StatusTextChanged -= new EventHandler(webBrowser_StatusTextChanged);
+ webBrowser.DomKeyDown -= new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
+
+ timer.Tick -= new EventHandler(timer_Tick);
+ timer.Stop();
+
+ base.OnPageDestroy(new_windowId);
+ }
+
private void LoadSettings()
{
string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
@@ -283,6 +325,7 @@
statusBar = xmlreader.GetValueAsBool("btWeb", "status", true);
osd = xmlreader.GetValueAsBool("btWeb", "osd", true);
windowed = xmlreader.GetValueAsBool("btWeb", "window", false);
+ useMouse = xmlreader.GetValueAsBool("btWeb", "mouse", false);
defaultZoom = (float)xmlreader.GetValueAsInt("btWeb", "zoom", 100) / 100;
zoom = defaultZoom;
@@ -300,8 +343,6 @@
remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_UP");
remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
- Setup.actualID = Convert.ToInt64(xmlreader.GetValueAsString("btWeb", "actualID", "123"));
-
useProxy = xmlreader.GetValueAsBool("btWeb", "proxy", false);
Server = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888);
@@ -340,6 +381,9 @@
private void timer_Tick(object sender, EventArgs e)
{
+ if (useMouse)
+ Cursor.Show();
+
if (linkId != string.Empty)
{
if (osd)
@@ -363,28 +407,7 @@
GUIPropertyManager.SetProperty("#btWeb.linkid", linkId);
}
}
- protected override void OnPageDestroy(int new_windowId)
- {
- if (new_windowId != 54537688)
- { // not if you got favs
- if (blankBrowser)
- {
- webBrowser.Navigate("about:blank");
- MyLog.debug("blank on destroy");
- }
- }
- webBrowser.Visible = false;
- osd_linkID.Visible = false;
- webBrowser.DocumentCompleted -= new EventHandler(webBrowser_DocumentCompleted);
- webBrowser.StatusTextChanged -= new EventHandler(webBrowser_StatusTextChanged);
-
- timer.Tick -= new EventHandler(timer_Tick);
- timer.Stop();
-
- base.OnPageDestroy(new_windowId);
- }
-
public override void OnAction(Action action)
{
base.OnAction(action);
@@ -405,16 +428,18 @@
#region selectable buttons
if (strAction == remote_confirm)
{
- if (linkId != string.Empty)
+ if (!useMouse)
{
- MyLog.debug("confirm link pressed");
- OnLinkId(linkId);
+ if (linkId != string.Empty)
+ {
+ MyLog.debug("confirm link pressed");
+ OnLinkId(linkId);
+ }
+ else
+ {
+ MyLog.debug("confirm2 link pressed, no link present");
+ }
}
- else
- {
- MyLog.debug("confirm2 link pressed, no link present");
- }
- return;
}
if (strAction == remote_bookmark)
{
@@ -424,16 +449,12 @@
if ((strAction == remote_zoom_in) ||
(action.wID == Action.ActionType.ACTION_MUSIC_FORWARD))
{
- if (zoom < 2) zoom += 0.1f;
- webBrowser.Zoom = zoom;
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ OnZoomIn();
}
if ((strAction == remote_zoom_out) ||
(action.wID == Action.ActionType.ACTION_MUSIC_REWIND))
{
- if (zoom > 0.1f) zoom -= 0.1f;
- webBrowser.Zoom = zoom;
- if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ OnZoomOut();
}
if (strAction == remote_status)
{
@@ -447,61 +468,75 @@
switch (action.wID)
{
- case Action.ActionType.ACTION_KEY_PRESSED:
- linkTime = 0;
- MyLog.debug("action key press=" + action.m_key.KeyChar);
- switch (action.m_key.KeyChar)
+ case Action.ActionType.ACTION_MOUSE_CLICK:
{
- #region 0..9
- case '1':
- linkId += "1";
- break;
- case '2':
- linkId += "2";
- break;
- case '3':
- linkId += "3";
- break;
- case '4':
- linkId += "4";
- break;
- case '5':
- linkId += "5";
- break;
- case '6':
- linkId += "6";
- break;
- case '7':
- linkId += "7";
- break;
- case '8':
- linkId += "8";
- break;
- case '9':
- linkId += "9";
- break;
- case '0':
- linkId += "0";
- break;
- #endregion
+ break;
}
+ case Action.ActionType.ACTION_MOUSE_MOVE:
+ if (useMouse)
+ {
+
+ }
break;
- case Action.ActionType.ACTION_PLAY:
- case Action.ActionType.ACTION_MUSIC_PLAY:
- webBrowser.Visible = false;
- string selectedUrl = "http://";
- if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
+ case Action.ActionType.ACTION_SHOW_SUBTITLES:
+ if (mouse.Visible)
{
- if (Bookmark.isValidUrl(selectedUrl))
+ mouse.Visible = false;
+
+ }
+ else
+ {
+ //mouse.Visible = true;
+ //mouse.BringToFront();
+ }
+ break;
+ case Action.ActionType.ACTION_KEY_PRESSED:
+ if (!useMouse)
+ {
+ linkTime = 0;
+ MyLog.debug("action key press=" + action.m_key.KeyChar);
+ switch (action.m_key.KeyChar)
{
- webBrowser.Navigate(selectedUrl);
- MyLog.debug("navigate to " + selectedUrl);
+ #region 0..9
+ case '1':
+ linkId += "1";
+ break;
+ case '2':
+ linkId += "2";
+ break;
+ case '3':
+ linkId += "3";
+ break;
+ case '4':
+ linkId += "4";
+ break;
+ case '5':
+ linkId += "5";
+ break;
+ case '6':
+ linkId += "6";
+ break;
+ case '7':
+ linkId += "7";
+ break;
+ case '8':
+ linkId += "8";
+ break;
+ case '9':
+ linkId += "9";
+ break;
+ case '0':
+ linkId += "0";
+ break;
+ #endregion
}
- else
- ShowAlert("Wrong link ?", " The link you entered seems to be not valid.", "Input:", selectedUrl);
+ if (linkId.Length > 4) linkId = linkId.Substring(0, 1);
}
- webBrowser.Visible = true;
break;
+ case Action.ActionType.ACTION_PLAY:
+ case Action.ActionType.ACTION_MUSIC_PLAY:
+ OnEnterNewLink();
+ break;
case Action.ActionType.ACTION_PAUSE:
webBrowser.Navigate(homepage);
MyLog.debug("load home page " + homepage);
@@ -529,17 +564,26 @@
#region move
case Action.ActionType.ACTION_MOVE_RIGHT:
- if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX + 100, webBrowser.Window.ScrollY);
+ OnMoveRight();
break;
case Action.ActionType.ACTION_MOVE_LEFT:
- if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX - 100, webBrowser.Window.ScrollY);
+ OnMoveLeft();
break;
case Action.ActionType.ACTION_MOVE_UP:
- if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - 100);
+ OnMoveUp();
break;
case Action.ActionType.ACTION_MOVE_DOWN:
- if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + 100);
+ OnMoveDown();
break;
+ case Action.ActionType.ACTION_SELECT_ITEM:
+ if (mouse.Visible)
+ {
+ //System.Windows.Forms.Cursor.Show();
+ int x = GUIGraphicsContext.form.Location.X + mouse.Location.X + 20;
+ int y = GUIGraphicsContext.form.Location.Y + mouse.Location.Y + 50;
+ System.Windows.Forms.Cursor.Position = new Point(x, y);
+ }
+ break;
#endregion
}
if (linkId != string.Empty)
@@ -549,35 +593,68 @@
}
- private void OnAddBookmark()
+ private void webBrowser_DomKeyDown(object sender, GeckoDomKeyEventArgs e)
{
- #region save snapshot
+ if (useMouse)
+ {
+ System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString());
- long id = Setup.actualID;
+ if (e.KeyCode == (uint)Keys.Escape)
+ GUIWindowManager.ShowPreviousWindow();
+ System.Diagnostics.Debug.WriteLine(e.KeyCode.ToString());
- if (webBrowser.Url.ToString() != "about:blank")
- {
- int y = webBrowser.Height;
- int x = y / 4 * 3;
+ if (e.KeyCode == (uint)Keys.PageUp) OnZoomIn();
+ if (e.KeyCode == (uint)Keys.PageDown) OnZoomOut();
- int offset = (webBrowser.Width - x) / 2;
+ if (e.KeyCode == (uint)Keys.Down) OnMoveDown();
+ if (e.KeyCode == (uint)Keys.Up) OnMoveUp();
+ if (e.KeyCode == (uint)Keys.Left) OnMoveLeft();
+ if (e.KeyCode == (uint)Keys.Right) OnMoveRight();
- Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
- webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
+ if (e.KeyCode == (uint)Keys.R) OnAddBookmark();
- snap = CopyBitmap(snap, new Rectangle(offset, 0, x, y));
+ if (e.CtrlKey == true)
+ {
+ if (e.KeyCode == (uint)Keys.P)
+ {
+ OnEnterNewLink();
- snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
+ }
+ if (e.KeyCode == (uint)Keys.B)
+ {
+ webBrowser.Navigate("about:blank");
+ }
+ }
- 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, id);
- Setup.IncAndSaveID();
+ private void OnEnterNewLink()
+ {
+ webBrowser.Visible = false;
+ GUIGraphicsContext.form.Focus();
+
+ string selectedUrl = "http://";
+ if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
+ {
+ if (Bookmark.isValidUrl(selectedUrl))
+ {
+ webBrowser.Navigate(selectedUrl);
+ MyLog.debug("navigate to " + selectedUrl);
+ }
+ else
+ ShowAlert("Wrong link ?", " The link you entered seems to be not valid.", "Input:", selectedUrl);
}
- #endregion
+ webBrowser.Visible = true;
+ if (useMouse)
+ GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
+
+ }
+ private void OnAddBookmark()
+ {
webBrowser.Visible = false;
+ GUIGraphicsContext.form.Focus();
string title = webBrowser.Document.Title;
string actualUrl = webBrowser.Document.Url.ToString();
@@ -587,14 +664,99 @@
System.Windows.Forms.DialogResult result = ShowKeyboard(ref title, false);
if (result == System.Windows.Forms.DialogResult.OK)
{
- bool hasSaved = BookmarkXml.AddBookmark(title, actualUrl, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", id);
+ bool hasSaved = BookmarkXml.AddBookmark(title, actualUrl, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", 0);
if (hasSaved)
+ {
ShowAlert("Bookmark has been saved !", "Title : " + title, "URL : " + actualUrl, "");
+ #region save snapshot
+
+ if (webBrowser.Url.ToString() != "about:blank")
+ {
+ int y = webBrowser.Height;
+ int x = y / 4 * 3;
+
+ int offset = (webBrowser.Width - x) / 2;
+
+ Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
+ webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
+
+ snap = CopyBitmap(snap, new Rectangle(offset, 0, x, y));
+
+ 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, actualUrl);
+ }
+ #endregion
+
+ }
else
ShowAlert("Bookmark could not been saved !", "Title : " + title, "URL : " + actualUrl, "");
}
+
webBrowser.Visible = true;
+ if (useMouse)
+ GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select();
}
+ private void OnZoomIn()
+ {
+ if (zoom < 2) zoom += 0.1f;
+ webBrowser.Zoom = zoom;
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
+ private void OnZoomOut()
+ {
+ if (zoom > 0.1f) zoom -= 0.1f;
+ webBrowser.Zoom = zoom;
+ if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
+ }
+ private void OnMoveLeft()
+ {
+ if (!mouse.Visible)
+ {
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX - 100, webBrowser.Window.ScrollY);
+ }
+ else
+ {
+ mouse.Location = new Point(mouse.Location.X - 20, mouse.Location.Y);
+ }
+ }
+ private void OnMoveRight()
+ {
+ if (!mouse.Visible)
+ {
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX + 100, webBrowser.Window.ScrollY);
+ }
+ else
+ {
+ mouse.Location = new Point(mouse.Location.X + 20, mouse.Location.Y);
+ }
+ }
+ private void OnMoveUp()
+ {
+ if (!mouse.Visible)
+ {
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - 100);
+ }
+ else
+ {
+ mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20);
+ }
+ }
+ private void OnMoveDown()
+ {
+ if (!mouse.Visible)
+ {
+ if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + 100);
+ }
+ else
+ {
+ mouse.Location = new Point(mouse.Location.X, mouse.Location.Y + 20);
+ }
+ }
+
private Bitmap CopyBitmap(Bitmap srcBitmap, Rectangle section)
{
Bitmap bmp = new Bitmap(section.Width, section.Height);
@@ -637,60 +799,98 @@
GUIPropertyManager.SetProperty("#btWeb.status", str);
#endregion
- #region add links to page
- _htmlLinkNumbers = new List<HtmlLinkNumber>();
+ if (!useMouse)
+ {
+ #region add links to page
+ _htmlLinkNumbers = new List<HtmlLinkNumber>();
- _links = webBrowser.Document.Links;
- int i = 1;
+ _links = webBrowser.Document.Links;
+ int i = 1;
- MyLog.debug("page links cnt : " + _links.Count);
+ MyLog.debug("page links cnt : " + _links.Count);
- foreach (GeckoElement element in _links)
- {
- string link = element.GetAttribute("href");
+ foreach (GeckoElement element in _links)
+ {
+ string link = element.GetAttribute("href");
- if (!link.StartsWith("javascript:"))
- {
- if (!element.InnerHtml.Contains("gecko_id"))
+ if (!link.StartsWith("javascript:"))
{
- element.InnerHtml += string.Format(_span, i, "", "LINK");
- }
+ if (!element.InnerHtml.Contains("gecko_id"))
+ {
+ element.InnerHtml += string.Format(_span, i, "", "LINK");
+ }
- string gb = element.GetAttribute("gb");
- string id = element.GetAttribute("id");
- string name = element.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- element.SetAttribute("gb", "gecko_link" + i);
+ string gb = element.GetAttribute("gb");
+ string id = element.GetAttribute("id");
+ string name = element.GetAttribute("name");
+ if (string.IsNullOrEmpty(gb))
+ {
+ element.SetAttribute("gb", "gecko_link" + i);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ element.SetAttribute("id", "gb" + i);
+ id = "gb" + i;
+ }
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
+ i++;
}
- if (string.IsNullOrEmpty(id))
- {
- element.SetAttribute("id", "gb" + i);
- id = "gb" + i;
- }
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
- i++;
}
- }
- _forms = webBrowser.Document.GetElementsByTagName("form");
- HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
+ _forms = webBrowser.Document.GetElementsByTagName("form");
+ HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
- MyLog.debug("page forms cnt : " + _forms.Count);
+ MyLog.debug("page forms cnt : " + _forms.Count);
- foreach (GeckoElement element in _forms)
- {
- string action = element.GetAttribute("action");
- doc.LoadHtml(element.InnerHtml);
- foreach (HtmlAgilityPack.HtmlNode link in doc.DocumentNode.SelectNodes("//*"))
+ foreach (GeckoElement element in _forms)
{
- if (link.OriginalName == "input")
+ string action = element.GetAttribute("action");
+ doc.LoadHtml(element.InnerHtml);
+ foreach (HtmlAgilityPack.HtmlNode link in doc.DocumentNode.SelectNodes("//*"))
{
- if (link.Attributes["type"] != null)
+ if (link.OriginalName == "input")
{
- if (link.Attributes["type"].Value != "hidden")
+ if (link.Attributes["type"] != null)
{
+ if (link.Attributes["type"].Value != "hidden")
+ {
+ string gb = link.GetAttributeValue("gb", "");
+ string id = link.GetAttributeValue("id", "");
+ string name = link.GetAttributeValue("name", "");
+ string outerHtml = link.OuterHtml;
+ if (string.IsNullOrEmpty(gb))
+ {
+ link.SetAttributeValue("gb", "gecko_link" + i);
+ }
+ if (string.IsNullOrEmpty(id))
+ {
+ link.SetAttributeValue("id", "gb" + i);
+ id = "gb" + i;
+ }
+
+ if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
+ {
+ string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
+ element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
+ }
+ if (link.Attributes["type"].Value == "submit" ||
+ link.Attributes["type"].Value == "reset" ||
+ link.Attributes["type"].Value == "radio" ||
+ link.Attributes["type"].Value == "image" ||
+ link.Attributes["type"].Value == "checkbox")
+ {
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
+ }
+ else
+ {
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
+ }
+ i++;
+ }
+ }
+ else
+ {
string gb = link.GetAttributeValue("gb", "");
string id = link.GetAttributeValue("id", "");
string name = link.GetAttributeValue("name", "");
@@ -710,51 +910,15 @@
string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
}
- if (link.Attributes["type"].Value == "submit" ||
- link.Attributes["type"].Value == "reset" ||
- link.Attributes["type"].Value == "radio" ||
- link.Attributes["type"].Value == "image" ||
- link.Attributes["type"].Value == "checkbox")
- {
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
- }
- else
- {
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- }
+
+ _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
i++;
}
}
- else
- {
- string gb = link.GetAttributeValue("gb", "");
- string id = link.GetAttributeValue("id", "");
- string name = link.GetAttributeValue("name", "");
- string outerHtml = link.OuterHtml;
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttributeValue("gb", "gecko_link" + i);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttributeValue("id", "gb" + i);
- id = "gb" + i;
- }
-
- if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- string newLink = link.OuterHtml + string.Format(_span, i, action, "INPUT");
- element.InnerHtml = element.InnerHtml.Replace(outerHtml, newLink);
- }
-
- _htmlLinkNumbers.Add(new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- i++;
- }
}
}
+ #endregion
}
- #endregion
-
#region reset zoom
if (zoomPage)
{
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -1,4 +1,28 @@
-using System;
+#region Copyright (C) 2005-2010 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2010 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+#endregion
+
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -13,7 +37,6 @@
public partial class GetThumb : Form
{
public string SelectedUrl = string.Empty;
- private long id = 0;
private GeckoWebBrowser browser;
private Bitmap snap;
@@ -21,14 +44,12 @@
private int time = 0;
private int cancel = 0;
- public GetThumb(long ID)
+ public GetThumb()
{
InitializeComponent();
browser = new GeckoWebBrowser();
this.Controls.Add(browser);
-
- id = ID;
}
private void GetThumb_Load(object sender, EventArgs e)
{
@@ -54,7 +75,7 @@
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, id);
+ Bookmark.SaveSnap(snap, SelectedUrl);
received = true;
chkGetThumb.Checked = true;
}
@@ -68,12 +89,13 @@
private void timer1_Tick(object sender, EventArgs e)
{
cancel++;
- if (cancel > 30) this.Close();
+ if (cancel > 100) this.Close();
if (received)
{
time++;
- if (time > 20) this.Close();
+ // implemented maybe later to get flash loaded...
+ if (time > 0) this.Close();
}
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -87,21 +87,17 @@
{
imported++;
- long id = Setup.actualID;
- Setup.IncAndSaveID();
-
TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
BookmarkElement addBkm = new BookmarkElement();
addBkm.Name = bkm.Name;
addBkm.Url = bkm.Url;
addBkm.isSubFolder = true;
- addBkm.Id = id;
add.Tag = addBkm;
if (chkThumbs.Checked)
{
- GetThumb thumb = new GetThumb(id);
+ GetThumb thumb = new GetThumb();
thumb.SelectedUrl = bkm.Url;
thumb.ShowDialog();
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -85,21 +85,17 @@
{
imported++;
- long id = Setup.actualID;
- Setup.IncAndSaveID();
-
TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
BookmarkElement addBkm = new BookmarkElement();
addBkm.Name = bkm.Name;
addBkm.Url = bkm.Url;
addBkm.isSubFolder = true;
- addBkm.Id = id;
add.Tag = addBkm;
if (chkThumbs.Checked)
{
- GetThumb thumb = new GetThumb(id);
+ GetThumb thumb = new GetThumb();
thumb.SelectedUrl = bkm.Url;
thumb.ShowDialog();
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -130,6 +130,7 @@
this.label22 = new System.Windows.Forms.Label();
this.comboBox4 = new System.Windows.Forms.ComboBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.chkMouse = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -328,6 +329,7 @@
//
// groupBox5
//
+ this.groupBox5.Controls.Add(this.chkMouse);
this.groupBox5.Controls.Add(this.chkWindowed);
this.groupBox5.Controls.Add(this.chkOSD);
this.groupBox5.Controls.Add(this.chkStatus);
@@ -589,7 +591,7 @@
//
this.trkZoom.LargeChange = 10;
this.trkZoom.Location = new System.Drawing.Point(6, 21);
- this.trkZoom.Maximum = 200;
+ this.trkZoom.Maximum = 300;
this.trkZoom.Minimum = 10;
this.trkZoom.Name = "trkZoom";
this.trkZoom.Size = new System.Drawing.Size(525, 45);
@@ -1165,6 +1167,16 @@
this.checkBox1.Text = "Show diagnose on status bar";
this.checkBox1.UseVisualStyleBackColor = true;
//
+ // chkMouse
+ //
+ this.chkMouse.AutoSize = true;
+ this.chkMouse.Location = new System.Drawing.Point(19, 181);
+ this.chkMouse.Name = "chkMouse";
+ this.chkMouse.Size = new System.Drawing.Size(154, 20);
+ this.chkMouse.TabIndex = 6;
+ this.chkMouse.Text = "use mouse to browse";
+ this.chkMouse.UseVisualStyleBackColor = true;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1322,5 +1334,6 @@
private System.Windows.Forms.Button btnDefault;
private System.Windows.Forms.Label label35;
private System.Windows.Forms.ComboBox cmbShowBookmarks;
+ private System.Windows.Forms.CheckBox chkMouse;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-17 08:13:53 UTC (rev 3939)
@@ -49,8 +49,6 @@
private string remote_zoom_out = string.Empty;
private string remote_status = string.Empty;
- public static long actualID = 0;
-
#endregion
public Setup()
@@ -225,7 +223,7 @@
else
{
txtLink.Text = bkm.Url;
- pictureBox1.Image = Bookmark.GetSnap(bkm.Id);
+ pictureBox1.Image = Bookmark.GetSnap(bkm.Url);
}
}
else
@@ -501,12 +499,9 @@
if (res != DialogResult.Yes) return;
}
- long id = actualID;
- IncAndSaveID();
-
if (chkUseThumbs.Checked)
{
- GetThumb thumb = new GetThumb(actualID);
+ GetThumb thumb = new GetThumb();
thumb.SelectedUrl = get.SelectedUrl;
thumb.ShowDialog();
}
@@ -522,7 +517,6 @@
addBkm.Url = get.SelectedUrl;
addBkm.isSubFolder = true;
addBkm.Created = DateTime.Now;
- addBkm.Id = id;
add.Tag = addBkm;
node.ExpandAll();
@@ -535,7 +529,6 @@
addBkm.Name = get.SelectedName;
addBkm.Url = get.SelectedUrl;
addBkm.Created = DateTime.Now;
- addBkm.Id = id;
add.Tag = addBkm;
node.Parent.ExpandAll();
@@ -549,7 +542,6 @@
addBkm.Name = get.SelectedName;
addBkm.Url = get.SelectedUrl;
addBkm.Created = DateTime.Now;
- addBkm.Id = id;
add.Tag = addBkm;
treeView1.Nodes[0].ExpandAll();
@@ -666,6 +658,7 @@
chkStatus.Checked = xmlreader.GetValueAsBool("btWeb", "status", false);
chkOSD.Checked = xmlreader.GetValueAsBool("btWeb", "osd", true);
chkWindowed.Checked = xmlreader.GetValueAsBool("btWeb", "window", false);
+ chkMouse.Checked = xmlreader.GetValueAsBool("btWeb", "mouse", false);
trkZoom.Value = xmlreader.GetValueAsInt("btWeb", "zoom", 100);
trkFont.Value = xmlreader.GetValueAsInt("btWeb", "font", 100);
@@ -682,8 +675,6 @@
remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_DOWN");
remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
- actualID = Convert.ToInt64(xmlreader.GetValueAsString("btWeb", "actualID", "123"));
-
chkProxy.Checked = xmlreader.GetValueAsBool("btWeb", "proxy", false);
txtHttpServer.Text = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
txtHttpPort.Text = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888).ToString();
@@ -704,6 +695,7 @@
xmlwriter.SetValueAsBool("btWeb", "status", chkStatus.Checked);
xmlwriter.SetValueAsBool("btWeb", "osd", chkOSD.Checked);
xmlwriter.SetValueAsBool("btWeb", "window", chkWindowed.Checked);
+ xmlwriter.SetValueAsBool("btWeb", "mouse", chkMouse.Checked);
xmlwriter.SetValue("btWeb", "zoom", trkZoom.Value);
xmlwriter.SetValue("btWeb", "font", trkFont.Value);
@@ -725,18 +717,7 @@
xmlwriter.SetValue("btWeb", "proxy_port", txtHttpPort.Text);
}
}
- public static void IncAndSaveID()
- {
- actualID++;
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- xmlwriter.SetValue("btWeb", "actualID", actualID.ToString());
- }
-
- }
-
#region zoom & font
private void trkRemote_ValueChanged(object sender, EventArgs e)
{
@@ -761,19 +742,13 @@
{
if (!bkm.isFolder)
{
- //if (bkm.Id == 0)
- {
- bkm.Id = Setup.actualID;
- IncAndSaveID();
- }
-
pictureBox1.Image = null;
- GetThumb thumb = new GetThumb(bkm.Id);
+ GetThumb thumb = new GetThumb();
thumb.SelectedUrl = bkm.Url;
thumb.ShowDialog();
- pictureBox1.Image = Bookmark.GetSnap(bkm.Id);
+ pictureBox1.Image = Bookmark.GetSnap(bkm.Url);
}
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-17 08:13:53 UTC (rev 3939)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAATgBAQE4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-15 19:49:11 UTC (rev 3938)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-17 08:13:53 UTC (rev 3939)
@@ -17,7 +17,9 @@
v0.2.4.2 fixed remote link id time
todo:
-better thumb support via id
+better thumb support via id ?
+save thumb by saving bookmark
+mouseless / mouse browsing
planed:
better alternate OSD
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-17 09:20:18
|
Revision: 3940
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3940&view=rev
Author: kroko_koenig
Date: 2010-11-17 09:20:12 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
fix for some websites in mouse mode
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/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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-17 08:13:53 UTC (rev 3939)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-17 09:20:12 UTC (rev 3940)
@@ -779,5 +779,102 @@
<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>5</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add mouse support, remote config, save thumb on bookmark add</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-17 08:13:53 UTC (rev 3939)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-17 09:20:12 UTC (rev 3940)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>4</Build>
- <Revision>2</Revision>
+ <Build>5</Build>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>time OSD fixed AND file added</VersionDescription>
+ <VersionDescription>add mouse support, remote config, save thumb on bookmark add</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{d910f133-7a92-4258-8585-71c44208d78f}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{278ba7f9-5f46-461f-92af-0baaeb2b081c}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 08:13:53 UTC (rev 3939)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 09:20:12 UTC (rev 3940)
@@ -232,6 +232,7 @@
webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
+ webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
if (statusBar)
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
@@ -286,6 +287,7 @@
base.OnPageLoad();
}
+
protected override void OnPageDestroy(int new_windowId)
{
if (new_windowId != 54537688)
@@ -297,8 +299,8 @@
}
}
+ webBrowser.Visible = false;
GUIGraphicsContext.form.Focus();
- webBrowser.Hide();
osd_linkID.Visible = false;
@@ -601,7 +603,6 @@
if (e.KeyCode == (uint)Keys.Escape)
GUIWindowManager.ShowPreviousWindow();
- System.Diagnostics.Debug.WriteLine(e.KeyCode.ToString());
if (e.KeyCode == (uint)Keys.PageUp) OnZoomIn();
if (e.KeyCode == (uint)Keys.PageDown) OnZoomOut();
@@ -613,6 +614,11 @@
if (e.KeyCode == (uint)Keys.R) OnAddBookmark();
+ if (e.KeyCode == (uint)Keys.F3) GUIWindowManager.ActivateWindow(54537688);
+
+ if (e.KeyCode == (uint)Keys.F7) webBrowser.GoBack();
+ if (e.KeyCode == (uint)Keys.F8) webBrowser.GoForward();
+
if (e.CtrlKey == true)
{
if (e.KeyCode == (uint)Keys.P)
@@ -628,7 +634,30 @@
}
}
+ void webBrowser_DomClick(object sender, GeckoDomEventArgs e)
+ {
+ if (useMouse)
+ {
+ GeckoWebBrowser g = (GeckoWebBrowser)sender;
+ string dom = g.Document.Url.AbsoluteUri.ToString();
+ string parent = e.Target.Parent.InnerHtml;
+
+ int x = parent.IndexOf("a href=");
+ if (x >= 0)
+ {
+ int y = parent.IndexOf("\"", x + 8);
+ if (y >= 0)
+ {
+ string link = parent.Substring(x + 7, y - x - 6);
+ link = link.Replace("\"", "");
+ if (link.Contains("http"))
+ g.Navigate(link);
+ }
+ }
+ }
+ }
+
private void OnEnterNewLink()
{
webBrowser.Visible = false;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-17 08:13:53 UTC (rev 3939)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-17 09:20:12 UTC (rev 3940)
@@ -16,13 +16,18 @@
v0.2.4 import from IE and FF, some bug fix
v0.2.4.2 fixed remote link id time
+v0.2.5
+remote is now configurable
+zoom max 300%
+add mouse support
+start work on alternate mouse support
+save thumb if a bookmark is added inside the MP
+
+
todo:
-better thumb support via id ?
-save thumb by saving bookmark
mouseless / mouse browsing
planed:
better alternate OSD
speed up (if possible), partly done
add statistics and sort functions
-mouse support for e.g. flash content
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-17 14:04:35
|
Revision: 3941
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3941&view=rev
Author: kroko_koenig
Date: 2010-11-17 14:04:29 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
small fix
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 09:20:12 UTC (rev 3940)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 14:04:29 UTC (rev 3941)
@@ -731,7 +731,7 @@
}
private void OnZoomIn()
{
- if (zoom < 2) zoom += 0.1f;
+ if (zoom < 3) zoom += 0.1f;
webBrowser.Zoom = zoom;
if (!remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100));
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-17 20:21:35
|
Revision: 3942
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3942&view=rev
Author: kroko_koenig
Date: 2010-11-17 20:21:28 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
change bookmarks to crtl+R and work arround for mouse links
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-17 14:04:29 UTC (rev 3941)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-17 20:21:28 UTC (rev 3942)
@@ -395,7 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{278ba7f9-5f46-461f-92af-0baaeb2b081c}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{8d94308d-c71d-48c4-b821-50a3a2fe9eaf}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 14:04:29 UTC (rev 3941)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-17 20:21:28 UTC (rev 3942)
@@ -599,7 +599,7 @@
{
if (useMouse)
{
- System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString());
+ //System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString());
if (e.KeyCode == (uint)Keys.Escape)
GUIWindowManager.ShowPreviousWindow();
@@ -612,8 +612,6 @@
if (e.KeyCode == (uint)Keys.Left) OnMoveLeft();
if (e.KeyCode == (uint)Keys.Right) OnMoveRight();
- if (e.KeyCode == (uint)Keys.R) OnAddBookmark();
-
if (e.KeyCode == (uint)Keys.F3) GUIWindowManager.ActivateWindow(54537688);
if (e.KeyCode == (uint)Keys.F7) webBrowser.GoBack();
@@ -621,15 +619,9 @@
if (e.CtrlKey == true)
{
- if (e.KeyCode == (uint)Keys.P)
- {
- OnEnterNewLink();
-
- }
- if (e.KeyCode == (uint)Keys.B)
- {
- webBrowser.Navigate("about:blank");
- }
+ if (e.KeyCode == (uint)Keys.R) OnAddBookmark();
+ if (e.KeyCode == (uint)Keys.P) OnEnterNewLink();
+ if (e.KeyCode == (uint)Keys.B) webBrowser.Navigate("about:blank");
}
}
@@ -638,21 +630,24 @@
{
if (useMouse)
{
+ // this is a workarround until i know what wrong on the links...
GeckoWebBrowser g = (GeckoWebBrowser)sender;
string dom = g.Document.Url.AbsoluteUri.ToString();
-
string parent = e.Target.Parent.InnerHtml;
- int x = parent.IndexOf("a href=");
- if (x >= 0)
+ if (!parent.Contains("shockwave"))
{
- int y = parent.IndexOf("\"", x + 8);
- if (y >= 0)
+ int x = parent.IndexOf("a href=");
+ if (x >= 0)
{
- string link = parent.Substring(x + 7, y - x - 6);
- link = link.Replace("\"", "");
- if (link.Contains("http"))
- g.Navigate(link);
+ int y = parent.IndexOf("\"", x + 8);
+ if (y >= 0)
+ {
+ string link = parent.Substring(x + 7, y - x - 6);
+ link = link.Replace("\"", "");
+ if (link.Contains("http"))
+ g.Navigate(link);
+ }
}
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-22 10:45:42
|
Revision: 3964
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3964&view=rev
Author: kroko_koenig
Date: 2010-11-22 10:45:35 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
add selector for facade view bookmarks
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/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.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
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-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -876,5 +876,102 @@
<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>6</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add selector bookmark view</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-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-22 10:45:35 UTC (rev 3964)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>5</Build>
+ <Build>6</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>add mouse support, remote config, save thumb on bookmark add</VersionDescription>
+ <VersionDescription>add selector bookmark view</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{8d94308d-c71d-48c4-b821-50a3a2fe9eaf}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{1cdd8220-5287-482f-a29a-cf42224692a2}-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-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -8,28 +8,55 @@
<controls>
<import>common.time.xml</import>
-
+ <import>common.window.xml</import>
+
<control>
- <description>background image</description>
- <type>image</type>
- <id>1</id>
- <width>720</width>
- <height>576</height>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <width>320</width>
+ <height>720</height>
+ <dimColor>00ffffff</dimColor>
+ <control>
+ <type>image</type>
+ <posX>15</posX>
+ <posY>63</posY>
+ <width>263</width>
+ <height>473</height>
+ <texture>Backslide.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ <posX>40</posX>
+ <posY>97</posY>
+ <layout>StackLayout</layout>
+ <visible>!Control.HasFocus(50)</visible>
+ <control>
+ <description>View-As</description>
+ <type>button</type>
+ <id>2</id>
+ <label>100</label>
+ <onright>50</onright>
+ <onup>17</onup>
+ </control>
+ </control>
</control>
-
+
<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>
@@ -40,8 +67,8 @@
<description>listcontrol</description>
<type>listcontrol</type>
<id>50</id>
- <onleft>50</onleft>
- <onright>50</onright>
+ <onleft>2</onleft>
+ <onright>2</onright>
<scrollOffset>2</scrollOffset>
</control>
<control>
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -8,31 +8,54 @@
<controls>
<import>common.time.xml</import>
-
- <control>
- <description>background image</description>
- <type>image</type>
- <id>1</id>
- <width>1280</width>
- <height>720</height>
- </control>
-
+ <import>common.window.xml</import>
<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>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>106</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <width>568</width>
+ <height>900</height>
+ <dimColor>00ffffff</dimColor>
+ <control>
+ <type>image</type>
+ <posX>26</posX>
+ <posY>78</posY>
+ <width>467</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ <posX>71</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <visible>!Control.HasFocus(50)</visible>
+ <control>
+ <description>View-As</description>
+ <type>button</type>
+ <id>2</id>
+ <label>100</label>
+ <onright>50</onright>
+ <onup>17</onup>
+ </control>
+ </control>
</control>
-
-
-
-
+
<control>
<description>group element</description>
<type>group</type>
@@ -44,8 +67,8 @@
<description>listcontrol</description>
<type>listcontrol</type>
<id>50</id>
- <onleft>50</onleft>
- <onright>50</onright>
+ <onleft>2</onleft>
+ <onright>2</onright>
<scrollOffset>2</scrollOffset>
</control>
<control>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -41,7 +41,13 @@
{
[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
{
get
@@ -61,10 +67,27 @@
protected override void OnPageLoad()
{
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+
+ view = "Large icons";
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+ }
+
LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
Bookmark.InitCachePath();
base.OnPageLoad();
}
+ protected override void OnPageDestroy(int new_windowId)
+ {
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ xmlwriter.SetValue("btWeb", "bookmark", view);
+ }
+ base.OnPageDestroy(new_windowId);
+ }
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
{
if (actionType == Action.ActionType.ACTION_SELECT_ITEM)
@@ -86,13 +109,58 @@
}
}
}
+
+ 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;
+ }
+
+ string strLine = string.Empty;
+ switch (view)
+ {
+ case "Small icons":
+ facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ strLine = GUILocalizeStrings.Get(100);
+ break;
+ case "Large icons":
+ facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ strLine = GUILocalizeStrings.Get(417);
+ break;
+ case "List view":
+ facade.View = GUIFacadeControl.ViewMode.List;
+ strLine = GUILocalizeStrings.Get(101);
+ break;
+ }
+ btnViewAs.Label = strLine;
+ }
}
public void LoadFacade(string Path, string Folder)
{
string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb";
- facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ switch (view)
+ {
+ case "Small icons":
+ facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ break;
+ case "Large icons":
+ facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ break;
+ case "List view":
+ facade.View = GUIFacadeControl.ViewMode.List;
+ break;
+ }
facade.Clear();
GUIListItem item = new GUIListItem();
@@ -178,7 +246,7 @@
}
}
-
+ GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
}
catch { }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -204,6 +204,8 @@
protected override void OnPageLoad()
{
+ GUIPropertyManager.SetProperty("#currentmodule", pluginName);
+
try
{
MyLog.debug("Init browser");
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.5.0")]
-[assembly: AssemblyFileVersion("0.2.5.0")]
+[assembly: AssemblyVersion("0.2.6.0")]
+[assembly: AssemblyFileVersion("0.2.6.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -49,6 +49,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.chkMouse = new System.Windows.Forms.CheckBox();
this.chkWindowed = new System.Windows.Forms.CheckBox();
this.chkOSD = new System.Windows.Forms.CheckBox();
this.chkStatus = new System.Windows.Forms.CheckBox();
@@ -130,7 +131,8 @@
this.label22 = new System.Windows.Forms.Label();
this.comboBox4 = new System.Windows.Forms.ComboBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
- this.chkMouse = new System.Windows.Forms.CheckBox();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
+ this.cmbBookmarkView = new System.Windows.Forms.ComboBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -153,6 +155,7 @@
this.groupBox11.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout();
+ this.groupBox12.SuspendLayout();
this.SuspendLayout();
//
// treeView1
@@ -343,6 +346,16 @@
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Other settings";
//
+ // chkMouse
+ //
+ this.chkMouse.AutoSize = true;
+ this.chkMouse.Location = new System.Drawing.Point(19, 181);
+ this.chkMouse.Name = "chkMouse";
+ this.chkMouse.Size = new System.Drawing.Size(154, 20);
+ this.chkMouse.TabIndex = 6;
+ this.chkMouse.Text = "use mouse to browse";
+ this.chkMouse.UseVisualStyleBackColor = true;
+ //
// chkWindowed
//
this.chkWindowed.AutoSize = true;
@@ -446,6 +459,7 @@
// tabPage2
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage2.Controls.Add(this.groupBox12);
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.groupBox6);
this.tabPage2.Controls.Add(this.groupBox2);
@@ -461,9 +475,9 @@
//
this.groupBox7.Controls.Add(this.chkThumbsOnVisit);
this.groupBox7.Controls.Add(this.chkUseThumbs);
- this.groupBox7.Location = new System.Drawing.Point(22, 382);
+ this.groupBox7.Location = new System.Drawing.Point(6, 303);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(534, 88);
+ this.groupBox7.Size = new System.Drawing.Size(550, 82);
this.groupBox7.TabIndex = 21;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Thumbs caching";
@@ -494,9 +508,9 @@
this.groupBox6.Controls.Add(this.optNoZoom);
this.groupBox6.Controls.Add(this.optZoomDomain);
this.groupBox6.Controls.Add(this.optZoomPage);
- this.groupBox6.Location = new System.Drawing.Point(22, 239);
+ this.groupBox6.Location = new System.Drawing.Point(6, 191);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(534, 137);
+ this.groupBox6.Size = new System.Drawing.Size(550, 106);
this.groupBox6.TabIndex = 20;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Zoom settings";
@@ -505,7 +519,7 @@
//
this.optNoZoom.AutoSize = true;
this.optNoZoom.Checked = true;
- this.optNoZoom.Location = new System.Drawing.Point(26, 95);
+ this.optNoZoom.Location = new System.Drawing.Point(26, 73);
this.optNoZoom.Name = "optNoZoom";
this.optNoZoom.Size = new System.Drawing.Size(132, 20);
this.optNoZoom.TabIndex = 2;
@@ -516,7 +530,7 @@
// optZoomDomain
//
this.optZoomDomain.AutoSize = true;
- this.optZoomDomain.Location = new System.Drawing.Point(26, 69);
+ this.optZoomDomain.Location = new System.Drawing.Point(26, 47);
this.optZoomDomain.Name = "optZoomDomain";
this.optZoomDomain.Size = new System.Drawing.Size(206, 20);
this.optZoomDomain.TabIndex = 1;
@@ -526,7 +540,7 @@
// optZoomPage
//
this.optZoomPage.AutoSize = true;
- this.optZoomPage.Location = new System.Drawing.Point(26, 43);
+ this.optZoomPage.Location = new System.Drawing.Point(26, 21);
this.optZoomPage.Name = "optZoomPage";
this.optZoomPage.Size = new System.Drawing.Size(193, 20);
this.optZoomPage.TabIndex = 0;
@@ -537,9 +551,9 @@
//
this.groupBox2.Controls.Add(this.txtFont);
this.groupBox2.Controls.Add(this.trkFont);
- this.groupBox2.Location = new System.Drawing.Point(22, 130);
+ this.groupBox2.Location = new System.Drawing.Point(6, 97);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(534, 97);
+ this.groupBox2.Size = new System.Drawing.Size(550, 88);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Font";
@@ -560,7 +574,7 @@
this.trkFont.Maximum = 200;
this.trkFont.Minimum = 10;
this.trkFont.Name = "trkFont";
- this.trkFont.Size = new System.Drawing.Size(525, 45);
+ this.trkFont.Size = new System.Drawing.Size(538, 45);
this.trkFont.SmallChange = 10;
this.trkFont.TabIndex = 0;
this.trkFont.TickFrequency = 10;
@@ -571,9 +585,9 @@
//
this.groupBox1.Controls.Add(this.txtZoom);
this.groupBox1.Controls.Add(this.trkZoom);
- this.groupBox1.Location = new System.Drawing.Point(19, 27);
+ this.groupBox1.Location = new System.Drawing.Point(6, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(537, 97);
+ this.groupBox1.Size = new System.Drawing.Size(550, 85);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Zoom";
@@ -594,7 +608,7 @@
this.trkZoom.Maximum = 300;
this.trkZoom.Minimum = 10;
this.trkZoom.Name = "trkZoom";
- this.trkZoom.Size = new System.Drawing.Size(525, 45);
+ this.trkZoom.Size = new System.Drawing.Size(538, 45);
this.trkZoom.SmallChange = 10;
this.trkZoom.TabIndex = 0;
this.trkZoom.TickFrequency = 10;
@@ -1167,16 +1181,24 @@
this.checkBox1.Text = "Show diagnose on status bar";
this.checkBox1.UseVisualStyleBackColor = true;
//
- // chkMouse
+ // groupBox12
//
- this.chkMouse.AutoSize = true;
- this.chkMouse.Location = new System.Drawing.Point(19, 181);
- this.chkMouse.Name = "chkMouse";
- this.chkMouse.Size = new System.Drawing.Size(154, 20);
- this.chkMouse.TabIndex = 6;
- this.chkMouse.Text = "use mouse to browse";
- this.chkMouse.UseVisualStyleBackColor = true;
+ this.groupBox12.Controls.Add(this.cmbBookmarkView);
+ this.groupBox12.Location = new System.Drawing.Point(6, 391);
+ this.groupBox12.Name = "groupBox12";
+ this.groupBox12.Size = new System.Drawing.Size(550, 79);
+ this.groupBox12.TabIndex = 22;
+ this.groupBox12.TabStop = false;
+ this.groupBox12.Text = "Bookmarks view";
//
+ // cmbBookmarkView
+ //
+ this.cmbBookmarkView.FormattingEnabled = true;
+ this.cmbBookmarkView.Location = new System.Drawing.Point(26, 37);
+ this.cmbBookmarkView.Name = "cmbBookmarkView";
+ this.cmbBookmarkView.Size = new System.Drawing.Size(145, 24);
+ this.cmbBookmarkView.TabIndex = 0;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1228,6 +1250,7 @@
this.groupBox10.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
+ this.groupBox12.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1335,5 +1358,7 @@
private System.Windows.Forms.Label label35;
private System.Windows.Forms.ComboBox cmbShowBookmarks;
private System.Windows.Forms.CheckBox chkMouse;
+ private System.Windows.Forms.GroupBox groupBox12;
+ private System.Windows.Forms.ComboBox cmbBookmarkView;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -91,6 +91,10 @@
Bookmark.Load(treeView1, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml");
treeView1.ExpandAll();
+ cmbBookmarkView.Items.Add("Small icons");
+ cmbBookmarkView.Items.Add("Large icons");
+ cmbBookmarkView.Items.Add("List view");
+
LoadSettings();
#region prepare remote setup
@@ -675,6 +679,8 @@
remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_DOWN");
remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
+ cmbBookmarkView.SelectedItem = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+
chkProxy.Checked = xmlreader.GetValueAsBool("btWeb", "proxy", false);
txtHttpServer.Text = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
txtHttpPort.Text = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888).ToString();
@@ -712,6 +718,8 @@
xmlwriter.SetValue("btWeb", "key_4", cmbZoomOut.SelectedItem.ToString());
xmlwriter.SetValue("btWeb", "key_5", cmbStatusBar.SelectedItem.ToString());
+ xmlwriter.SetValue("btWeb", "bookmark", (string)cmbBookmarkView.SelectedItem);
+
xmlwriter.SetValueAsBool("btWeb", "proxy", chkProxy.Checked);
xmlwriter.SetValue("btWeb", "proxy_server", txtHttpServer.Text);
xmlwriter.SetValue("btWeb", "proxy_port", txtHttpPort.Text);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-22 10:45:35 UTC (rev 3964)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAATgBAQE4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAUABAQFAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-22 10:45:35 UTC (rev 3964)
@@ -23,6 +23,9 @@
start work on alternate mouse support
save thumb if a bookmark is added inside the MP
+0.2.6
+add #currentmodule on pageload
+add selector for view bookmarks
todo:
mouseless / mouse browsing
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2010-11-26 12:55:37
|
Revision: 3982
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3982&view=rev
Author: kroko_koenig
Date: 2010-11-26 12:55:30 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
moved thumbs to folder thumbs v0.2.7
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/setup4.jpg
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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-25 19:46:56 UTC (rev 3981)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-26 12:55:30 UTC (rev 3982)
@@ -973,5 +973,102 @@
<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>7</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>moved dir to thumbs</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-25 19:46:56 UTC (rev 3981)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-26 12:55:30 UTC (rev 3982)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>6</Build>
+ <Build>7</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>add selector bookmark view</VersionDescription>
+ <VersionDescription>moved dir to thumbs</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 +395,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{1cdd8220-5287-482f-a29a-cf42224692a2}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{9b38eb10-4fb2-45fd-a4c1-4d77e7de92b6}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/setup4.jpg
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-25 19:46:56 UTC (rev 3981)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2010-11-26 12:55:30 UTC (rev 3982)
@@ -199,7 +199,7 @@
try
{
string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
Snap.Save(filename);
}
@@ -212,7 +212,7 @@
try
{
string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
if (File.Exists(filename))
{
@@ -228,14 +228,25 @@
public static string GetSnapPath(string Url)
{
string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb\\" + filename;
+ filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
return filename;
}
public static void InitCachePath()
{
- if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
- Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb");
+ if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb"))
+ Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb");
+
+
+ if (Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
+ {
+ string[] files = Directory.GetFiles(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb", "*.*");
+ foreach (string f in files)
+ {
+ File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f));
+ }
+ }
+
}
private static string GetThumbString(string Name)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-25 19:46:56 UTC (rev 3981)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-26 12:55:30 UTC (rev 3982)
@@ -147,8 +147,6 @@
public void LoadFacade(string Path, string Folder)
{
- string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb";
-
switch (view)
{
case "Small icons":
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-25 19:46:56 UTC (rev 3981)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-26 12:55:30 UTC (rev 3982)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.6.0")]
-[assembly: AssemblyFileVersion("0.2.6.0")]
+[assembly: AssemblyVersion("0.2.7.0")]
+[assembly: AssemblyFileVersion("0.2.7.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2011-02-02 15:19:01
|
Revision: 4089
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4089&view=rev
Author: kroko_koenig
Date: 2011-02-02 15:18:54 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
fix the link bug ?page2 and some small fix
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2011-02-02 13:55:02 UTC (rev 4088)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2011-02-02 15:18:54 UTC (rev 4089)
@@ -17,13 +17,6 @@
<ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName>
<DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Files\unzip.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName>
- <DestinationFilename>%Cache%\unzip.exe</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
@@ -268,13 +261,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>7</Build>
+ <Build>8</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>moved dir to thumbs</VersionDescription>
+ <VersionDescription>used Ionic.ZIP for extract xulrunner</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>
@@ -321,13 +314,6 @@
<ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName>
<DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Files\unzip.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName>
- <DestinationFilename>%Cache%\unzip.exe</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
@@ -395,7 +381,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{9b38eb10-4fb2-45fd-a4c1-4d77e7de92b6}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{69d2dbe3-4672-4700-8c8f-a915eebcf953}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Deleted: trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-02-02 13:55:02 UTC (rev 4088)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-02-02 15:18:54 UTC (rev 4089)
@@ -4,6 +4,6 @@
<StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 13:55:02 UTC (rev 4088)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 15:18:54 UTC (rev 4089)
@@ -189,6 +189,7 @@
webBrowser = new GeckoWebBrowser();
webBrowser.Name = "BrowseTheWeb";
webBrowser.NoDefaultContextMenu = true;
+
GUIGraphicsContext.form.Controls.Add(webBrowser);
webBrowser.Enabled = false;
@@ -554,6 +555,9 @@
if (linkId.Length > 4) linkId = linkId.Substring(0, 1);
}
break;
+ case Action.ActionType.ACTION_PREVIOUS_MENU:
+ linkId = string.Empty;
+ break;
case Action.ActionType.ACTION_PLAY:
case Action.ActionType.ACTION_MUSIC_PLAY:
OnEnterNewLink();
@@ -594,6 +598,7 @@
OnMoveUp();
return;
case Action.ActionType.ACTION_MOVE_DOWN:
+ OnMoveDown();
return;
case Action.ActionType.ACTION_SELECT_ITEM:
if (mouse.Visible)
@@ -817,9 +822,13 @@
{
string str = DateTime.Now.ToLongTimeString();
str += " ";
- str += web.StatusText.Substring(0, 50);
- if (web.StatusText.Length > 50) str += "...";
+ int l = web.StatusText.Length;
+ if (l > 50) l = 47;
+
+ str += web.StatusText.Substring(0, l);
+ if (l > 50) str += "...";
+
GUIPropertyManager.SetProperty("#btWeb.status", str);
}
}
@@ -1021,6 +1030,21 @@
{
case HtmlInputType.Link:
{
+ if (!id.Link.StartsWith("http://") && !id.Link.StartsWith("https://") && !id.Link.StartsWith("ftp://") && !id.Link.StartsWith("ftps://"))
+ {
+ string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host + webBrowser.Url.AbsolutePath + id.Link;
+ id.Link = result;
+ hln = id;
+ return true;
+ }
+ else
+ {
+ hln = id;
+ return true;
+ }
+ /* old code fails sometimes
+ * http://www.ftd.de/finanzen/maerkte/marktberichte/:boersenausblick-hoffnung-auf-jahresendrally-schwindet/50199183.html#utm_source=rss2&utm_medium=rss_feed&utm_campaign=
+ *
Uri uri;
if (Uri.TryCreate(webBrowser.Url, id.Link, out uri))
{
@@ -1028,6 +1052,7 @@
hln = id;
return true;
}
+ */
}
break;
case HtmlInputType.Input:
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2011-02-02 13:55:02 UTC (rev 4088)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2011-02-02 15:18:54 UTC (rev 4089)
@@ -3,16 +3,32 @@
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseTheWeb", "BrowseTheWeb\BrowseTheWeb.csproj", "{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skybound.Gecko", "Skybound.Gecko\Skybound.Gecko.csproj", "{877D1A24-2D5E-4C46-A933-FCF11EA0403B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug 1.8|Any CPU = Debug 1.8|Any CPU
+ Debug 1.9|Any CPU = Debug 1.9|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.ActiveCfg = Debug|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.Build.0 = Debug|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.ActiveCfg = Debug|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.Build.0 = Debug|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.Build.0 = Release|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.ActiveCfg = Debug 1.8|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.Build.0 = Debug 1.8|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.ActiveCfg = Debug 1.9|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.Build.0 = Debug 1.9|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2011-02-03 08:33:29
|
Revision: 4090
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4090&view=rev
Author: kroko_koenig
Date: 2011-02-03 08:33:22 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
small tweak for some pages
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 15:18:54 UTC (rev 4089)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-03 08:33:22 UTC (rev 4090)
@@ -1032,7 +1032,11 @@
{
if (!id.Link.StartsWith("http://") && !id.Link.StartsWith("https://") && !id.Link.StartsWith("ftp://") && !id.Link.StartsWith("ftps://"))
{
- string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host + webBrowser.Url.AbsolutePath + id.Link;
+ string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host;
+ if (webBrowser.Url.AbsolutePath != "/")
+ result += webBrowser.Url.AbsolutePath;
+ result += id.Link;
+
id.Link = result;
hln = id;
return true;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2011-04-30 14:17:26
|
Revision: 4187
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4187&view=rev
Author: kroko_koenig
Date: 2011-04-30 14:17:19 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
update for the beta
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.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/ImportChrome.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2011-04-30 14:17:19 UTC (rev 4187)
@@ -33,6 +33,11 @@
<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>
<Reference Include="Core, Version=1.1.1.11854, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2011-04-30 14:17:19 UTC (rev 4187)
@@ -129,15 +129,15 @@
switch (view)
{
case "Small icons":
- facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
strLine = GUILocalizeStrings.Get(100);
break;
case "Large icons":
- facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
strLine = GUILocalizeStrings.Get(417);
break;
case "List view":
- facade.View = GUIFacadeControl.ViewMode.List;
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
strLine = GUILocalizeStrings.Get(101);
break;
}
@@ -150,13 +150,13 @@
switch (view)
{
case "Small icons":
- facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
break;
case "Large icons":
- facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
break;
case "List view":
- facade.View = GUIFacadeControl.ViewMode.List;
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
break;
}
facade.Clear();
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-04-30 14:17:19 UTC (rev 4187)
@@ -175,6 +175,8 @@
public override bool Init()
{
+ MyLog.debug("Init Browse the web");
+
try
{
Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
@@ -208,6 +210,8 @@
BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
"\\bookmarks.xml", "Saved by MP");
+ MyLog.debug("Init Browse the web finished");
+
return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
}
@@ -242,6 +246,8 @@
webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
+
+ MyLog.debug("Create dom eventhandler");
webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
@@ -250,6 +256,8 @@
else
webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
+ MyLog.debug("set zoom size to " + font + "/" + zoom);
+
webBrowser.Window.TextZoom = font;
webBrowser.Zoom = zoom;
@@ -450,18 +458,41 @@
#region selectable buttons
if (strAction == remote_confirm)
{
- if (!useMouse)
+ if (!mouse.Visible)
{
- if (linkId != string.Empty)
+ if (!useMouse)
{
- MyLog.debug("confirm link pressed");
- OnLinkId(linkId);
+
+ if (linkId != string.Empty)
+ {
+ MyLog.debug("confirm link pressed");
+ OnLinkId(linkId);
+ }
+ else
+ {
+ MyLog.debug("confirm2 link pressed, no link present");
+ }
}
- else
- {
- MyLog.debug("confirm2 link pressed, no link present");
- }
}
+ else
+ {
+ webBrowser.Enabled = true;
+ webBrowser.BringToFront();
+
+ Cursor.Show();
+ System.Threading.Thread.Sleep(200);
+
+
+ int X = Cursor.Position.X;
+ int Y = Cursor.Position.Y;
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, X, Y, 0, 0);
+
+ Cursor.Hide();
+ //webBrowser.Enabled = false;
+
+ GUIGraphicsContext.form.BringToFront();
+ mouse.BringToFront();
+ }
}
if (strAction == remote_bookmark)
{
@@ -500,7 +531,7 @@
}
break;
- case Action.ActionType.ACTION_SHOW_SUBTITLES:
+ case Action.ActionType.ACTION_NEXT_SUBTITLE:
if (mouse.Visible)
{
mouse.Visible = false;
@@ -508,8 +539,10 @@
}
else
{
- //mouse.Visible = true;
- //mouse.BringToFront();
+ Point x = Cursor.Position;
+ mouse.Location = x;
+ mouse.Visible = true;
+ mouse.BringToFront();
}
break;
case Action.ActionType.ACTION_KEY_PRESSED:
@@ -763,6 +796,7 @@
else
{
mouse.Location = new Point(mouse.Location.X - 20, mouse.Location.Y);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
}
}
private void OnMoveRight()
@@ -774,6 +808,7 @@
else
{
mouse.Location = new Point(mouse.Location.X + 20, mouse.Location.Y);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
}
}
private void OnMoveUp()
@@ -785,6 +820,7 @@
else
{
mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
}
}
private void OnMoveDown()
@@ -796,6 +832,7 @@
else
{
mouse.Location = new Point(mouse.Location.X, mouse.Location.Y + 20);
+ Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y);
}
}
@@ -1035,7 +1072,7 @@
string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host;
if (webBrowser.Url.AbsolutePath != "/")
result += webBrowser.Url.AbsolutePath;
- result += id.Link;
+ result += id.Link;
id.Link = result;
hln = id;
@@ -1110,7 +1147,6 @@
vk.Reset();
vk.Password = PasswordInput;
vk.Text = DefaultText;
- vk.Name = "";
vk.DoModal(GUIWindowManager.ActiveWindow);
if (vk.IsConfirmed)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2011-04-30 14:17:19 UTC (rev 4187)
@@ -134,7 +134,7 @@
string line = sr.ReadToEnd();
sr.Close();
- MyLog.debug("Read " + line.Length + " bytes");
+ MyLog.debug("Read " + line.Length + " bytes");
int x = 0;
int secNo = 1;
@@ -203,7 +203,7 @@
}
-
+
}
}
catch (Exception ex)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2011-04-30 14:17:19 UTC (rev 4187)
@@ -2,6 +2,12 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using MediaPortal.Common.Utils;
+[assembly: CompatibleVersion("1.1.7.0")]
+[assembly: UsesSubsystem("MP.SkinEngine")]
+[assembly: UsesSubsystem("MP.Config")]
+[assembly: UsesSubsystem("MP.DB")]
+
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj 2011-04-22 23:17:06 UTC (rev 4186)
+++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj 2011-04-30 14:17:19 UTC (rev 4187)
@@ -52,7 +52,7 @@
<DocumentationFile>bin\Debug\Skybound.Gecko.xml</DocumentationFile>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kro...@us...> - 2011-04-30 18:51:59
|
Revision: 4188
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4188&view=rev
Author: kroko_koenig
Date: 2011-04-30 18:51:53 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
some more tweaks on ESC and remember last URl in input
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.user
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
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 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2011-04-30 18:51:53 UTC (rev 4188)
@@ -1070,5 +1070,103 @@
<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>3</Minor>
+ <Build>0</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>
+ <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 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2011-04-30 18:51:53 UTC (rev 4188)
@@ -42,61 +42,63 @@
</Files>
</GroupItem>
<GroupItem Name="Blue3">
- <DisplayName>Blue3</DisplayName>
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
<DefaulChecked>true</DefaulChecked>
- <Description>Blue3</Description>
+ <Description>Default</Description>
<Files>
<Items>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\browsetheweb.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\browsetheweb.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\browsethewebbook.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\browsethewebbook.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName>
<ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\Media\hover_browsetheweb.png</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\Media\hover_browsetheweb.png</DestinationFilename>
</FileItem>
</Items>
</Files>
</GroupItem>
<GroupItem Name="Blue3wide">
- <DisplayName>Blue3wide</DisplayName>
+ <ParentGroup />
+ <DisplayName>DefaultWide</DisplayName>
<DefaulChecked>true</DefaulChecked>
- <Description>Blue3wide</Description>
+ <Description>DefaultWide</Description>
<Files>
<Items>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\browsetheweb.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\browsetheweb.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\browsethewebbook.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\browsethewebbook.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName>
<ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\Media\hover_browsetheweb.png</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\Media\hover_browsetheweb.png</DestinationFilename>
</FileItem>
</Items>
</Files>
@@ -260,14 +262,15 @@
<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>8</Build>
+ <Minor>3</Minor>
+ <Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>used Ionic.ZIP for extract xulrunner</VersionDescription>
+ <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>
<ReleaseDate>2010-11-06T15:09:04.5514802+01:00</ReleaseDate>
@@ -335,80 +338,59 @@
<ZipFileName>Installer{CopyFile}\{a57471fc-683c-417b-8a58-b57de15ace66}-Skybound.Gecko.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\Skybound.Gecko.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\browsetheweb.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\browsetheweb.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\browsethewebbook.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\browsethewebbook.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName>
<ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName>
- <DestinationFilename>%Skin%\Blue3\Media\hover_browsetheweb.png</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\Media\hover_browsetheweb.png</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\browsetheweb.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\browsetheweb.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\browsethewebbook.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\browsethewebbook.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName>
<ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide\Media\hover_browsetheweb.png</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\Media\hover_browsetheweb.png</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{69d2dbe3-4672-4700-8c8f-a915eebcf953}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{80ee4eea-74d9-4dc8-b672-d0c792c9a6f9}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
- <FolderGroups>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
- <ZipFileName>Installer{CopyFile}\{8b965339-4bf4-4bd8-af6b-3e88ccd8dcc5}-</ZipFileName>
- <DestinationFilename>%Skin%\Blue3wide</DestinationFilename>
- <Folder>Skin\Blue3wide</Folder>
- <Group>Blue3wide</Group>
- <Recursive>true</Recursive>
- </FolderGroup>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
- <ZipFileName>Installer{CopyFile}\{498c8a98-0745-46db-b751-8090812bde0d}-</ZipFileName>
- <DestinationFilename>%Skin%\Blue3</DestinationFilename>
- <Folder>Skin\Blue3</Folder>
- <Group>Blue3</Group>
- <Recursive>true</Recursive>
- </FolderGroup>
- </FolderGroups>
+ <FolderGroups />
<ProjectFilename>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xmp2</ProjectFilename>
<UpdatePath1>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xml</UpdatePath1>
<UpdatePath2 />
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.user
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-04-30 18:51:53 UTC (rev 4188)
@@ -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/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-04-30 18:51:53 UTC (rev 4188)
@@ -100,6 +100,8 @@
public static string loadFav = string.Empty;
+ private string lastUrl = string.Empty;
+
#endregion
#region ISetupForm Member
@@ -364,12 +366,22 @@
remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_UP");
remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
+ lastUrl = xmlreader.GetValueAsString("btWeb", "lastUrl", string.Empty);
+
useProxy = xmlreader.GetValueAsBool("btWeb", "proxy", false);
Server = xmlreader.GetValueAsString("btWeb", "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt("btWeb", "proxy_port", 8888);
TrySetProxy();
}
}
+ private void SaveSettings()
+ {
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ xmlwriter.SetValue("btWeb", "lastUrl", lastUrl);
+ }
+ }
private void TrySetProxy()
{
@@ -585,6 +597,20 @@
break;
#endregion
}
+ if ((int)action.m_key.KeyChar == 27)
+ {
+ // escape
+ if (!osd_linkID.Visible)
+ {
+ GUIWindowManager.ShowPreviousWindow();
+ }
+ else
+ {
+ linkId = string.Empty;
+ osd_linkID.Visible = false;
+ Application.DoEvents();
+ }
+ }
if (linkId.Length > 4) linkId = linkId.Substring(0, 1);
}
break;
@@ -710,12 +736,20 @@
GUIGraphicsContext.form.Focus();
string selectedUrl = "http://";
+ if (lastUrl != string.Empty)
+ {
+ selectedUrl = lastUrl;
+ }
+
if (ShowKeyboard(ref selectedUrl, false) == System.Windows.Forms.DialogResult.OK)
{
if (Bookmark.isValidUrl(selectedUrl))
{
webBrowser.Navigate(selectedUrl);
MyLog.debug("navigate to " + selectedUrl);
+
+ lastUrl = selectedUrl;
+ SaveSettings();
}
else
ShowAlert("Wrong link ?", " The link you entered seems to be not valid.", "Input:", selectedUrl);
@@ -1070,8 +1104,8 @@
if (!id.Link.StartsWith("http://") && !id.Link.StartsWith("https://") && !id.Link.StartsWith("ftp://") && !id.Link.StartsWith("ftps://"))
{
string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host;
- if (webBrowser.Url.AbsolutePath != "/")
- result += webBrowser.Url.AbsolutePath;
+ //if (webBrowser.Url.AbsolutePath != "/")
+ // result += webBrowser.Url.AbsolutePath;
result += id.Link;
id.Link = result;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2011-04-30 18:51:53 UTC (rev 4188)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.7.0")]
-[assembly: AssemblyFileVersion("0.2.7.0")]
+[assembly: AssemblyVersion("0.3.0.0")]
+[assembly: AssemblyFileVersion("0.3.0.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj 2011-04-30 14:17:19 UTC (rev 4187)
+++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj 2011-04-30 18:51:53 UTC (rev 4188)
@@ -39,7 +39,7 @@
<DefineConstants>TRACE;GECKO_1_9_1 GECKO_1_9</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<DocumentationFile>bin\Release\Skybound.Gecko.xml</DocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-03-12 21:40:25
|
Revision: 4466
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4466&view=rev
Author: doskabouter
Date: 2012-03-12 21:40:16 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
- fixed bug with missing '/'
- converted solution to .NET 3.5
- general cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-03-12 21:40:16 UTC (rev 4466)
@@ -37,6 +37,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -97,6 +100,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -134,6 +138,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -196,6 +203,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -233,6 +241,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -293,6 +304,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -330,6 +342,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -390,6 +405,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -427,6 +443,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -487,6 +506,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -524,6 +544,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -584,6 +607,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -621,6 +645,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -681,6 +708,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -718,6 +746,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -778,6 +809,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -815,6 +847,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -875,6 +910,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -912,6 +948,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -972,6 +1011,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -1009,6 +1049,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -1069,6 +1112,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
<PackageClass>
<Version>2.0</Version>
@@ -1106,6 +1150,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
@@ -1122,7 +1169,7 @@
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
</ExtensionDescription>
- <VersionDescription>import from chrome
+ <VersionDescription>import from chrome
new for the beta 1.2</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
@@ -1167,6 +1214,139 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>3</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Bugfixes</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-03-12 21:40:16 UTC (rev 4466)
@@ -251,31 +251,69 @@
</Items>
</Sections>
<Dependencies>
- <Items />
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
<Author>Mark Koenig (kroko) 2010</Author>
<HomePage>http://www.team-mediaportal.com</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-browse-web-webbrowser-89101/</ForumPage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>0</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
-
-</ExtensionDescription>
- <VersionDescription>import from chrome
-new for the beta 1.2</VersionDescription>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Bugfixes</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2010-11-06T15:09:04.5514802+01:00</ReleaseDate>
+ <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
- <Location>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.mpe1</Location>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
@@ -292,8 +330,8 @@
<Value />
<ValueType>Template</ValueType>
<Description>The file used to configure the extension.
- If have .exe extension the will be executed
- If have .dll extension used like MP plugin configuration</Description>
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
<Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
@@ -301,7 +339,7 @@
<Description>Online stored screenshot urls separated by ; </Description>
</SectionParam>
<SectionParam Name="Force to uninstall on update">
- <Value>yes</Value>
+ <Value>YES</Value>
<ValueType>Bool</ValueType>
<Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
</SectionParam>
@@ -384,16 +422,17 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{80ee4eea-74d9-4dc8-b672-d0c792c9a6f9}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{110abcb7-bb33-4c64-ac7f-ad0e6accd506}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
<FolderGroups />
- <ProjectFilename>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xmp2</ProjectFilename>
- <UpdatePath1>C:\AAA\BrowseTheWeb\Release\BrowseTheWeb.xml</UpdatePath1>
+ <ProjectFilename>BrowseTheWeb.xmp2</ProjectFilename>
+ <UpdatePath1>BrowseTheWeb.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-03-12 21:40:16 UTC (rev 4466)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,14 +10,35 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BrowseTheWeb</RootNamespace>
<AssemblyName>BrowseTheWeb</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <OutputPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -27,57 +48,38 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\Release\Plugins\Windows\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Common.Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
</Reference>
- <Reference Include="Core, Version=1.1.1.11854, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Core">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.1.1.11856, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Databases">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=1.1.1.11860, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Dialogs">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="HtmlAgilityPack, Version=1.4.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\HtmlAgilityPack.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="HtmlAgilityPack">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\HtmlAgilityPack.dll</HintPath>
</Reference>
- <Reference Include="Ionic.Zip, Version=1.7.2.18, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Ionic.Zip">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
</Reference>
- <Reference Include="Skybound.Gecko, Version=1.9.1.1, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Skybound.Gecko.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.7.11849, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -209,6 +211,29 @@
<EmbeddedResource Include="xulrunner.png" />
<EmbeddedResource Include="xulrunnerOff.png" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Skybound.Gecko\Skybound.Gecko.csproj">
+ <Project>{877D1A24-2D5E-4C46-A933-FCF11EA0403B}</Project>
+ <Name>Skybound.Gecko</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -218,6 +243,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>copy $(TargetName).dll "C:\AAA\BrowseTheWeb\Release\Plugins\Windows\"</PostBuildEvent>
+ <PostBuildEvent>if $(ConfigurationName) == Release "C:\Program Files\Team MediaPortal\MediaPortal\MpeMaker" ..\..\BrowseTheWeb.xmp2 /B /UpdateXML</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-03-12 21:40:16 UTC (rev 4466)
@@ -37,217 +37,217 @@
namespace BrowseTheWeb
{
- public class GUIBookmark : GUIWindow
- {
- [SkinControlAttribute(50)]
- private GUIFacadeControl facade = null;
- [SkinControlAttribute(2)]
- protected GUIButtonControl btnViewAs = null;
- [SkinControlAttribute(3)]
- protected GUISortButtonControl btnSortBy = null;
-
- private static string view = string.Empty;
-
- public override int GetID
+ public class GUIBookmark : GUIWindow
{
- get
- {
- return 54537688;
- }
- set
- {
- base.GetID = value;
- }
- }
- public override bool Init()
- {
- bool result = Load(GUIGraphicsContext.Skin + @"\BrowseTheWebBook.xml");
- return result;
- }
+ [SkinControlAttribute(50)]
+ private GUIFacadeControl facade = null;
+ [SkinControlAttribute(2)]
+ protected GUIButtonControl btnViewAs = null;
+ [SkinControlAttribute(3)]
+ protected GUISortButtonControl btnSortBy = null;
- protected override void OnPageLoad()
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ private static string view = string.Empty;
- view = "Large icons";
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
- }
-
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
- Bookmark.InitCachePath();
- base.OnPageLoad();
- }
- protected override void OnPageDestroy(int new_windowId)
- {
- string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
- {
- xmlwriter.SetValue("btWeb", "bookmark", view);
- }
- base.OnPageDestroy(new_windowId);
- }
- protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
- {
- if (actionType == Action.ActionType.ACTION_SELECT_ITEM)
- {
- GUIListItem item = facade.SelectedListItem;
- if (item != null)
+ public override int GetID
{
- if (item.IsFolder)
- {
- if (item.Label == "..")
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
- else
- LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", item.Label);
- }
- else
- {
- GUIPlugin.StartupLink = item.Path;
- GUIWindowManager.ActivateWindow(54537689);
- }
+ get
+ {
+ return 54537688;
+ }
+ set
+ {
+ base.GetID = value;
+ }
}
- }
+ public override bool Init()
+ {
+ bool result = Load(GUIGraphicsContext.Skin + @"\BrowseTheWebBook.xml");
+ return result;
+ }
- if (control == btnViewAs)
- {
- switch (view)
+ protected override void OnPageLoad()
{
- case "Small icons":
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+
view = "Large icons";
- break;
- case "Large icons":
- view = "List view";
- break;
- case "List view":
- view = "Small icons";
- break;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+ }
+
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
+ Bookmark.InitCachePath();
+ base.OnPageLoad();
}
-
- string strLine = string.Empty;
- switch (view)
+ protected override void OnPageDestroy(int new_windowId)
{
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
- strLine = GUILocalizeStrings.Get(100);
- break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
- strLine = GUILocalizeStrings.Get(417);
- break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
- strLine = GUILocalizeStrings.Get(101);
- break;
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ xmlwriter.SetValue("btWeb", "bookmark", view);
+ }
+ base.OnPageDestroy(new_windowId);
}
- btnViewAs.Label = strLine;
- }
- }
+ protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
+ {
+ if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM)
+ {
+ GUIListItem item = facade.SelectedListItem;
+ if (item != null)
+ {
+ if (item.IsFolder)
+ {
+ if (item.Label == "..")
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
+ else
+ LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", item.Label);
+ }
+ else
+ {
+ GUIPlugin.StartupLink = item.Path;
+ GUIWindowManager.ActivateWindow(54537689);
+ }
+ }
+ }
- public void LoadFacade(string Path, string Folder)
- {
- switch (view)
- {
- case "Small icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
- break;
- case "Large icons":
- facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
- break;
- case "List view":
- facade.CurrentLayout = GUIFacadeControl.Layout.List;
- break;
- }
- facade.Clear();
+ if (control == btnViewAs)
+ {
+ switch (view)
+ {
+ case "Small icons":
+ view = "Large icons";
+ break;
+ case "Large icons":
+ view = "List view";
+ break;
+ case "List view":
+ view = "Small icons";
+ break;
+ }
- GUIListItem item = new GUIListItem();
+ string strLine = string.Empty;
+ switch (view)
+ {
+ case "Small icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ strLine = GUILocalizeStrings.Get(100);
+ break;
+ case "Large icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ strLine = GUILocalizeStrings.Get(417);
+ break;
+ case "List view":
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
+ strLine = GUILocalizeStrings.Get(101);
+ break;
+ }
+ btnViewAs.Label = strLine;
+ }
+ }
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- if (Folder == string.Empty)
+ public void LoadFacade(string Path, string Folder)
{
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
- {
- BookmarkElement bkm = BookmarkXml.GetData(node);
+ switch (view)
+ {
+ case "Small icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ break;
+ case "Large icons":
+ facade.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ break;
+ case "List view":
+ facade.CurrentLayout = GUIFacadeControl.Layout.List;
+ break;
+ }
+ facade.Clear();
- string name = bkm.Name.Replace(" ", "_");
- name = name.Replace(".", "_");
+ GUIListItem item = new GUIListItem();
- if ((bkm.isFolder) ||
- (!bkm.isFolder) && (!bkm.isSubFolder))
+ try
{
- item = new GUIListItem();
- item.IsFolder = bkm.isFolder;
- item.Label = bkm.Name;
- item.Path = bkm.Url;
- if (item.IsFolder)
- {
- item.IconImage = "defaultFolder.png";
- item.IconImageBig = "defaultFolderBig.png";
- }
- else
- {
- string file = Bookmark.GetSnapPath(bkm.Url);
- item.IconImage = file;
- item.IconImageBig = file;
- }
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- facade.Add(item);
- }
- }
- }
+ if (Folder == string.Empty)
+ {
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement bkm = BookmarkXml.GetData(node);
- if (Folder != string.Empty)
- {
- item = new GUIListItem();
- item.IsFolder = true;
- item.Label = "..";
- item.Path = "..";
- item.IconImage = "defaultFolderBack.png";
- item.IconImageBig = "defaultFolderBackBig.png";
- facade.Add(item);
+ string name = bkm.Name.Replace(" ", "_");
+ name = name.Replace(".", "_");
- bool found = false;
+ if ((bkm.isFolder) ||
+ (!bkm.isFolder) && (!bkm.isSubFolder))
+ {
+ item = new GUIListItem();
+ item.IsFolder = bkm.isFolder;
+ item.Label = bkm.Name;
+ item.Path = bkm.Url;
+ if (item.IsFolder)
+ {
+ item.IconImage = "defaultFolder.png";
+ item.IconImageBig = "defaultFolderBig.png";
+ }
+ else
+ {
+ string file = Bookmark.GetSnapPath(bkm.Url);
+ item.IconImage = file;
+ item.IconImageBig = file;
+ }
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
- {
- BookmarkElement bkm = BookmarkXml.GetData(node);
+ facade.Add(item);
+ }
+ }
+ }
- if ((bkm.isFolder) || ((!bkm.isSubFolder && !bkm.isFolder))) found = false;
+ if (Folder != string.Empty)
+ {
+ item = new GUIListItem();
+ item.IsFolder = true;
+ item.Label = "..";
+ item.Path = "..";
+ item.IconImage = "defaultFolderBack.png";
+ item.IconImageBig = "defaultFolderBackBig.png";
+ facade.Add(item);
- if (Folder == bkm.Name)
- {
- found = true;
- }
- if (found)
- {
- if (bkm.isSubFolder)
- {
- item = new GUIListItem();
- item.IsFolder = bkm.isFolder;
- item.Label = bkm.Name;
- item.Path = bkm.Url;
+ bool found = false;
- string file = Bookmark.GetSnapPath(bkm.Url);
- item.IconImage = file;
- item.IconImageBig = file;
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement bkm = BookmarkXml.GetData(node);
- facade.Add(item);
- }
+ if ((bkm.isFolder) || ((!bkm.isSubFolder && !bkm.isFolder))) found = false;
+
+ if (Folder == bkm.Name)
+ {
+ found = true;
+ }
+ if (found)
+ {
+ if (bkm.isSubFolder)
+ {
+ item = new GUIListItem();
+ item.IsFolder = bkm.isFolder;
+ item.Label = bkm.Name;
+ item.Path = bkm.Url;
+
+ string file = Bookmark.GetSnapPath(bkm.Url);
+ item.IconImage = file;
+ item.IconImageBig = file;
+
+ facade.Add(item);
+ }
+ }
+ }
+ }
+
+ GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
+ facade.SelectedListItemIndex = 0;
}
- }
+ catch { }
}
-
- GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
- facade.SelectedListItemIndex = 0;
- }
- catch { }
}
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-12 19:34:28 UTC (rev 4465)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-03-12 21:40:16 UTC (rev 4466)
@@ -40,1201 +40,1184 @@
namespace BrowseTheWeb
{
- [PluginIcons("BrowseTheWeb.xulrunner.png", "BrowseTheWeb.xulrunnerOff.png")]
+ [PluginIcons("BrowseTheWeb.xulrunner.png", "BrowseTheWeb.xulrunnerOff.png")]
- public class GUIPlugin : GUIWindow, ISetupForm
- {
- [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
- public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo);
+ public class GUIPlugin : GUIWindow, ISetupForm
+ {
+ [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
+ public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo);
- private const int MOUSEEVENTF_LEFTDOWN = 0x02;
- private const int MOUSEEVENTF_LEFTUP = 0x04;
- private const int MOUSEEVENTF_RIGHTDOWN = 0x08;
- private const int MOUSEEVENTF_RIGHTUP = 0x10;
+ private const int MOUSEEVENTF_LEFTDOWN = 0x02;
+ private const int MOUSEEVENTF_LEFTUP = 0x04;
+ private const int MOUSEEVENTF_RIGHTDOWN = 0x08;
+ private const int MOUSEEVENTF_RIGHTUP = 0x10;
- #region Links
- private static GeckoElementCollection _links;
- private static GeckoElementCollection _forms;
- private static List<HtmlLinkNumber> _htmlLinkNumbers;
- #endregion
+ #region Links
+ private static GeckoElementCollection _links;
+ private static GeckoElementCollection _forms;
+ private static Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
+ #endregion
- #region Constants
- private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\">{0}</span>";
- #endregion
+ #region Constants
+ private const string _span = "<span style=\"font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-left: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;\" gecko_id=\"{0}\" gecko_action=\"{1}\" gecko_type=\"{2}\">{0}</span>";
+ #endregion
- #region declare vars
- private GeckoWebBrowser webBrowser;
- private OSD_LinkId osd_linkID;
- private Mouse mouse;
- private string linkId = string.Empty;
- private int linkTime = 0;
- private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
+ #region declare vars
+ private GeckoWebBrowser webBrowser;
+ private OSD_LinkId osd_linkID;
+ private Mouse mouse;
+ private string linkId = string.Empty;
+ private int linkTime = 0;
+ private System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
- private bool usehome = false;
- private string homepage = string.Empty;
- private int remoteTime = 0;
- private string pluginName = "Browse Web";
- private bool blankBrowser = false;
- private bool statusBar = true;
- private bool osd = false;
- private bool windowed = false;
- private bool useMouse = false;
- private bool zoomPage = false;
- private bool zoomDomain = false;
- private string lastDomain = string.Empty;
- private bool cacheThumbs = false;
- private bool remote = false;
- private string remote_confirm = string.Empty;
- private string remote_bookmark = string.Empty;
- private string remote_zoom_in = string.Empty;
- private string remote_zoom_out = string.Empty;
- private string remote_status = string.Empty;
+ private bool usehome = false;
+ private string homepage = string.Empty;
+ private int remoteTime = 0;
+ private string pluginName = "Browse Web";
+ private bool blankBrowser = false;
+ private bool statusBar = true;
+ private bool osd = false;
+ private bool windowed = false;
+ private bool useMouse = false;
+ private bool zoomPage = false;
+ private bool zoomDomain = false;
+ private string lastDomain = string.Empty;
+ private bool cacheThumbs = false;
+ private bool remote = false;
+ private string remote_confirm = string.Empty;
+ private string remote_bookmark = string.Empty;
+ private string remote_zoom_in = string.Empty;
+ private string remote_zoom_out = string.Empty;
+ private string remote_status = string.Empty;
- private bool useProxy = false;
- private string Server = string.Empty;
- private int Port = 8080;
+ private bool useProxy = false;
+ private string Server = string.Empty;
+ private int Port = 8080;
- private float defaultZoom = 1.0f;
- private float zoom = 1.0f;
- private float font = 1.0f;
+ private float defaultZoom = 1.0f;
+ private float zoom = 1.0f;
+ private float font = 1.0f;
- public static bool ParameterSupported = false;
- public static string Parameter = string.Empty;
+ public static bool ParameterSupported = false;
+ public static string Parameter = string.Empty;
- public static string loadFav = string.Empty;
+ public static string loadFav = string.Empty;
- private string lastUrl = string.Empty;
+ private string lastUrl = string.Empty;
- #endregion
+ #endregion
- #region ISetupForm Member
+ #region ISetupForm Member
- public string Author()
- {
- return "Mark Koenig (kroko) 2010";
- }
- public bool CanEnable()
- {
- return true;
- }
- public bool DefaultEnabled()
- {
- return true;
- }
- public string Description()
- {
- return "Browse the web and have fun. Webbrowser based on XULrunner.";
- }
- public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
- {
- strButtonText = pluginName;
- strButtonImage = String.Empty;
- strButtonImageFocus = String.Empty;
- strPictureImage = @"hover_browsetheweb.png";
- return true;
+ public string Author()
+ {
+ return "Mark Koenig (kroko) 2010";
+ }
+ public bool CanEnable()
+ {
+ return true;
+ }
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+ public string Description()
+ {
+ return "Browse the web and have fun. Webbrowser based on XULrunner.";
+ }
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = pluginName;
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = @"hover_browsetheweb.png";
+ return true;
- }
- public int GetWindowId()
- {
- return GetID;
- }
- public bool HasSetup()
- {
- return true;
- }
- public string PluginName()
- {
- return "BrowseTheWeb";
- }
- public void ShowPlugin()
- {
- Setup setup = new Setup();
- setup.ShowDialog();
- }
-
- #endregion
-
- public override int GetID
- {
- get
- {
- return 54537689;
- }
- set
- {
- base.GetID = value;
- }
- }
-
- public static string StartupLink
- {
- get
- {
- string value = Parameter;
- if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ }
+ public int GetWindowId()
{
- return value.Trim();
+ return GetID;
}
- else
+ public bool HasSetup()
{
- value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
- if (null != value && !string.IsNullOrEmpty(value.Trim()))
- return value.Trim();
+ return true;
}
- return string.Empty;
- }
- set { GUIPropertyManager.SetProperty("#btWeb.startup.link", string.IsNullOrEmpty(value) ? " " : value.Trim()); }
- }
+ public string PluginName()
+ {
+ return "BrowseTheWeb";
+ }
+ public void ShowPlugin()
+ {
+ Setup setup = new Setup();
+ setup.ShowDialog();
+ }
- public override bool Init()
- {
- MyLog.debug("Init Browse the web");
+ #endregion
- AddFormsDelegate d = AddForms;
- GUIGraphicsContext.form.Invoke(d);
+ public override int GetID
+ {
+ get
+ {
+ return 54537689;
+ }
+ set
+ {
+ base.GetID = value;
+ }
+ }
- #region parameters test
- ParameterSupported = false;
- if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
- {
- ParameterSupported = true;
- }
- #endregion
+ public static string StartupLink
+ {
+ get
+ {
+ string value = Parameter;
+ if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ {
+ return value.Trim();
+ }
+ else
+ {
+ value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
+ if (null != value && !string.IsNullOrEmpty(value.Trim()))
+ return value.Trim();
+ }
+ return string.Empty;
+ }
+ set { GUIPropertyManager.SetProperty("#btWeb.startup.link", string.IsNullOrEmpty(value) ? " " : value.Trim()); }
+ }
- LoadSettings();
- BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
- "\\bookmarks.xml", "Saved by MP");
+ public override bool Init()
+ {
+ MyLog.debug("Init Browse the web");
- MyLog.debug("Init Browse the web finished");
+ AddFormsDelegate d = AddForms;
+ GUIGraphicsContext.form.Invoke(d);
- return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
- }
+ #region parameters test
+ ParameterSupported = false;
+ if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
+ {
+ ParameterSupported = true;
+ }
+ #endregion
- private delegate void AddFormsDelegate();
+ LoadSettings();
+ BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
+ "\\bookmarks.xml", "Saved by MP");
- private void AddForms() {
- try
- {
- Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
- }
- catch (Exception ex)
- {
- MyLog.debug("Could not find xulrunner under : " + Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
- MyLog.debug("Reason : " + ex.Message);
- }
+ MyLog.debug("Init Browse the web finished");
- #region add forms
- webBrowser = new GeckoWebBrowser();
- webBrowser.Name = "BrowseTheWeb";
- webBrowser.NoDefaultContextMenu = true;
+ return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
+ }
- GUIGraphicsContext.form.Controls.Add(webBrowser);
- webBrowser.Enabled = false;
- webBrowser.Visible = false;
+ private delegate void AddFormsDelegate();
- osd_linkID = new OSD_LinkId();
- GUIGraphicsContext.form.Controls.Add(osd_linkID);
- osd_linkID.Visible = false;
+ private void AddForms()
+ {
+ try
+ {
+ Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("Could not find xulrunner under : " + Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
+ MyLog.debug("Reason : " + ex.Message);
+ }
- mouse = new Mouse();
- GUIGraphicsContext.form.Controls.Add(mouse);
- mouse.Visible = false;
- #endregion
- }
+ #region add forms
+ webBrowser = new GeckoWebBrowser();
+ webBrowser.Name = "BrowseTheWeb";
+ webBrowser.NoDefaultContextMenu = true;
- protected override void OnPageLoad()
- {
- GUIPropertyManager.SetProperty("#currentmodule", pluginName);
+ GUIGraphicsContext.form.Controls.Add(webBrowser);
+ webBrowser.Enabled = false;
+ webBrowser.Visible = false;
- try
- {
- MyLog.debug("Init browser");
+ osd_linkID = new OSD_LinkId();
+ GUIGraphicsContext.form.Controls.Add(osd_linkID);
+ osd_linkID.Visible = false;
- GUIPropertyManager.SetProperty("#btWeb.status", "Init browser");
- GUIPropertyManager.SetProperty("#btWeb.linkid", "");
- linkId = string.Empty;
-
- if (useMouse)
- {
- MyLog.debug("Mouse support is enabled");
- GUIGraphicsContext.MouseSupport = true;
+ mouse = new Mouse();
+ GUIGraphicsContext.form.Controls.Add(mouse);
+ mouse.Visible = false;
+ #endregion
}
- Parameter = null;
- if (ParameterSupported)
+ protected override void OnPageLoad()
{
- Parameter = _loadParameter;
- }
+ GUIPropertyManager.SetProperty("#currentmodule", pluginName);
- #region init browser
- webBrowser.Visible = true;
+ try
+ {
+ MyLog.debug("Init browser");
- if (!useMouse) webBrowser.Enabled = false;
- else webBrowser.Enabled = true;
+ GUIPropertyManager.SetProperty("#btWeb.status", "Init browser");
+ GUIPropertyManager.SetProperty("#btWeb.linkid", "");
+ linkId = string.Empty;
- webBrowser.Dock = System.Windows.Forms.DockStyle.None;
- webBrowser.Location = new System.Drawing.Point(0, 0);
+ if (useMouse)
+ {
+ MyLog.debug("Mouse support is enabled");
+ GUIGraphicsContext.MouseSupport = true;
+ }
- MyLog.debug("Create eventhandler");
+ Parameter = null;
+ if (ParameterSupported)
+ {
+ Parameter = _loadParameter;
+ }
- webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
- webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
+ #region init browser
+ webBrowser.Visible = true;
- MyLog.debug("Create dom eventhandler");
- webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
- webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
+ if (!useMouse) webBrowser.Enabled = false;
+ else webBrowser.Enabled = true;
- if (statusBar)
- webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
- else
- webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
+ webBrowser.Dock = System.Windows.Forms.DockStyle.None;
+ webBrowser.Location = new System.Drawing.Point(0, 0);
- MyLog.debug("set zoom size to " + font + "/" + zoom);
+ MyLog.debug("Create eventhandler");
- webBrowser.Window.TextZoom = font;
- webBrowser.Zoom = zoom;
+ webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
+ webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged);
- if (windowed)
- {
- MyLog.debug("switch to windowed fullscreen mode");
- GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_SWITCH_FULL_WINDOWED, 0, 0, 0, 0, 0, null);
- GUIWindowManager.SendMessage(msg);
- }
+ MyLog.debug("Create dom eventhandler");
+ webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown);
+ webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick);
- string loadFav = StartupLink;
+ if (statusBar)
+ webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100);
+ else
+ webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height);
- if (webBrowser.Document.Domain == string.Empty)
- {
- if ((usehome) && (string.IsNullOrEmpty(loadFav)))
- {
- webBrowser.Navigate(homepage);
- MyLog.debug("load home page " + homepage);
- }
- }
+ MyLog.debug("set zoom size to " + font + "/" + zoom);
- if (!string.IsNullOrEmpty(loadFav))
- {
- webBrowser.Naviga...
[truncated message content] |
|
From: <dos...@us...> - 2012-04-08 15:34:27
|
Revision: 4472
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4472&view=rev
Author: doskabouter
Date: 2012-04-08 15:34:21 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
release 0.3.4
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:34:21 UTC (rev 4472)
@@ -1348,5 +1348,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>4</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:34:21 UTC (rev 4472)
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>3</Build>
+ <Build>4</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Bugfixes</VersionDescription>
+ <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-03-12T22:36:51.145233+01:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 15:18:09 UTC (rev 4471)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 15:34:21 UTC (rev 4472)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.3.3.0")]
+[assembly: AssemblyVersion("0.3.4.0")]
+[assembly: AssemblyFileVersion("0.3.4.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 15:52:26
|
Revision: 4473
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4473&view=rev
Author: doskabouter
Date: 2012-04-08 15:52:20 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
fixed config-bug
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 15:52:20 UTC (rev 4473)
@@ -1442,7 +1442,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 15:52:20 UTC (rev 4473)
@@ -311,7 +311,7 @@
<VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T17:31:45.084097+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T17:51:46.7830145+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 15:34:21 UTC (rev 4472)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 15:52:20 UTC (rev 4473)
@@ -54,7 +54,7 @@
public int Port { get; set; }
public GUIFacadeControl.Layout View { get; set; }
- private const string section = "btweb";
+ private const string section = "btWeb";
#region Singleton
private static Settings _Instance = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-04-08 18:36:08
|
Revision: 4476
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4476&view=rev
Author: doskabouter
Date: 2012-04-08 18:36:02 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
release 0.3.5
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-04-08 18:36:02 UTC (rev 4476)
@@ -1480,5 +1480,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/plugin-browse-the-web-webbrowser.89101/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>5</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Fixed initial defaultzoom, Fixed crash in configuration</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-04-08T20:35:02.246943+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-04-08 18:36:02 UTC (rev 4476)
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>4</Build>
+ <Build>5</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Configuration code cleanup, fixed missing thumbs of bookmarks, fixed zooming issue, added pageup/pagedown</VersionDescription>
+ <VersionDescription>Fixed initial defaultzoom, Fixed crash in configuration</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-08T18:29:34.428053+02:00</ReleaseDate>
+ <ReleaseDate>2012-04-08T20:35:02.246943+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-04-08 18:36:02 UTC (rev 4476)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.4.0")]
-[assembly: AssemblyFileVersion("0.3.4.0")]
+[assembly: AssemblyVersion("0.3.5.0")]
+[assembly: AssemblyFileVersion("0.3.5.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 17:33:24 UTC (rev 4475)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-04-08 18:36:02 UTC (rev 4476)
@@ -84,8 +84,8 @@
Windowed = xmlreader.GetValueAsBool(section, "window", false);
UseMouse = xmlreader.GetValueAsBool(section, "mouse", false);
- DefaultZoom_percentage = xmlreader.GetValueAsInt(section, "zoom", 100); // /100
- FontZoom_percentage = xmlreader.GetValueAsInt(section, "font", 100);// /100
+ DefaultZoom_percentage = xmlreader.GetValueAsInt(section, "zoom", 100);
+ FontZoom_percentage = xmlreader.GetValueAsInt(section, "font", 100);
ZoomPage = xmlreader.GetValueAsBool(section, "page", true);
ZoomDomain = xmlreader.GetValueAsBool(section, "domain", false);
@@ -108,15 +108,20 @@
Server = xmlreader.GetValueAsString(section, "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt(section, "proxy_port", 8888);
string tmp = xmlreader.GetValueAsString(section, "bookmark", GUIFacadeControl.Layout.LargeIcons.ToString());
- tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
- try
+ if (tmp == "List view") // for backwards compatibility
+ View = GUIFacadeControl.Layout.List;
+ else
{
- View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ tmp = tmp.Replace(" ", String.Empty);// for backwards compatibility
+ try
+ {
+ View = (GUIFacadeControl.Layout)Enum.Parse(typeof(GUIFacadeControl.Layout), tmp, true);
+ }
+ catch
+ {
+ View = GUIFacadeControl.Layout.List;
+ }
}
- catch
- {
- View = GUIFacadeControl.Layout.LargeIcons;
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2012-07-01 19:18:10
|
Revision: 4494
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4494&view=rev
Author: doskabouter
Date: 2012-07-01 19:17:59 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
- Fixed toggle mouse option
- released version 0.3.7
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/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-01 19:17:59 UTC (rev 4494)
@@ -1744,5 +1744,137 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3">
+ <DisplayName>Blue3</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3wide">
+ <DisplayName>Blue3wide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Blue3wide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Mark Koenig (kroko) 2010</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>7</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
+ <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
+ <ReleaseDate>2012-07-01T21:15:38.2282677+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-01 19:17:59 UTC (rev 4494)
@@ -280,7 +280,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.7.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.2.100.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -304,14 +304,14 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
- <Build>6</Build>
+ <Build>7</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed initial defaultzoom again, improved display of numbers of the urls, fixed password dialog (show *), fixed mouse cursor not disappearing</VersionDescription>
+ <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation>
- <ReleaseDate>2012-04-17T23:12:57.385693+02:00</ReleaseDate>
+ <ReleaseDate>2012-07-01T21:15:38.2282677+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-01 19:17:59 UTC (rev 4494)
@@ -175,6 +175,7 @@
<ItemGroup>
<None Include="res\edit-icon.png" />
<Content Include="res\fav-b-icon.png" />
+ <Content Include="res\MouseCursor.cur" />
<Content Include="todo.txt" />
<EmbeddedResource Include="GetThumb.resx">
<DependentUpon>GetThumb.cs</DependentUpon>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-01 19:17:59 UTC (rev 4494)
@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
+using System.IO;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
@@ -43,6 +44,8 @@
{
[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);
+ [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
+ public static extern int ShowCursor(bool bShow);
private const int MOUSEEVENTF_LEFTDOWN = 0x02;
private const int MOUSEEVENTF_LEFTUP = 0x04;
@@ -50,6 +53,7 @@
private const int MOUSEEVENTF_RIGHTUP = 0x10;
private const bool logHtml = false;
private bool mouseVisible = false;
+ private bool clickFromPlugin = false;
#region Links
private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
@@ -440,21 +444,11 @@
else
{
webBrowser.Enabled = true;
- webBrowser.BringToFront();
-
- Cursor.Show();
System.Threading.Thread.Sleep(200);
-
-
+ clickFromPlugin = true;
int X = Cursor.Position.X;
int Y = Cursor.Position.Y;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, X, Y, 0, 0);
-
- Cursor.Hide();
- //webBrowser.Enabled = false;
-
- GUIGraphicsContext.form.BringToFront();
- //mouse.BringToFront();
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
}
}
if (action.wID == settings.Remote_Bookmark)
@@ -503,17 +497,23 @@
}
break;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_SUBTITLE:
- if (mouseVisible)
+ if (!settings.UseMouse)
{
- mouseVisible = false;
+ if (mouseVisible)
+ {
+ mouseVisible = false;
+ Cursor.Hide();
+ }
+ else
+ {
+ using (MemoryStream memoryStream = new MemoryStream(Properties.Resources.MouseCursor))
+ {
+ GUIGraphicsContext.form.Cursor = new Cursor(memoryStream);
+ }
+ mouseVisible = true;
+ while (ShowCursor(true) < 0) ;
+ }
}
- else
- {
- Point x = Cursor.Position;
- //mouse.Location = x;
- mouseVisible = true;
- //mouse.BringToFront();
- }
break;
case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED:
if (!settings.UseMouse)
@@ -648,6 +648,13 @@
}
}
}
+
+ if (clickFromPlugin) // click succeeded, so focus can safely be reset
+ {
+ clickFromPlugin = false;
+ webBrowser.Enabled = false;
+ GUIGraphicsContext.form.Focus();
+ }
}
private void OnEnterNewLink()
@@ -951,6 +958,25 @@
}
}
+ GeckoElementCollection objects = webBrowser.Document.GetElementsByTagName("object");
+ MyLog.debug("page objects cnt : " + objects.Count);
+ foreach (GeckoElement element in objects)
+ if (element.GetAttribute("type") == "application/x-shockwave-flash")
+ {
+ string id, name;
+ GeckoElement element2 = element.Parent;
+ SetLinkAttributes(element2, i, out id, out name);
+
+ if (!element2.InnerHtml.Contains("gecko_id=\"" + i + "\""))
+ {
+ insertSpan(i, String.Empty, "LINK", null, element2);
+ }
+ RectangleF rect = element2.BoundingClientRect;
+ Point p = new Point(Convert.ToInt32(rect.Left + rect.Width / 2), Convert.ToInt32(rect.Top + rect.Height / 2));
+ _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, p, HtmlInputType.FlashObject));
+ i++;
+ }
+
GeckoElementCollection forms = webBrowser.Document.GetElementsByTagName("form");
MyLog.debug("page forms cnt : " + forms.Count);
@@ -1055,8 +1081,9 @@
switch (hln.Type)
{
case HtmlInputType.Link:
- webBrowser.Navigate(hln.Link);
- MyLog.debug("navigate to linkid=" + LinkId + " URL=" + hln.Link);
+ string link = (string)hln.Obj;
+ webBrowser.Navigate(link);
+ MyLog.debug("navigate to linkid=" + LinkId + " URL=" + link);
break;
case HtmlInputType.Input:
case HtmlInputType.InputPassword:
@@ -1066,6 +1093,18 @@
webBrowser.Navigate("javascript:document.getElementById(\"" + hln.Id + "\").click()");
MyLog.debug("action linkid=" + LinkId);
break;
+ case HtmlInputType.FlashObject:
+ MyLog.debug("flash click on " + Cursor.Position.ToString());
+ Point p = (Point)hln.Obj;
+ webBrowser.Enabled = true;
+
+ System.Threading.Thread.Sleep(200);
+ Cursor.Position = webBrowser.PointToScreen(p);
+ int X = Cursor.Position.X;
+ int Y = Cursor.Position.Y;
+ clickFromPlugin = true;
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
+ break;
}
}
}
@@ -1078,7 +1117,8 @@
{
case HtmlInputType.Link:
{
- if (!Uri.IsWellFormedUriString(id.Link, UriKind.Absolute))
+ string link = (string)id.Obj;
+ if (!Uri.IsWellFormedUriString(link, UriKind.Absolute))
{
Uri baseUri = webBrowser.Url;
@@ -1089,11 +1129,12 @@
if (gn != null && !String.IsNullOrEmpty(gn.NodeValue))
baseUri = new Uri(gn.NodeValue);
}
- id.Link = new Uri(baseUri, id.Link).AbsoluteUri;
+ id.Obj = new Uri(baseUri, link).AbsoluteUri;
}
hln = id;
return true;
}
+ case HtmlInputType.FlashObject:
case HtmlInputType.Input:
case HtmlInputType.InputPassword:
case HtmlInputType.Action:
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-07-01 19:17:59 UTC (rev 4494)
@@ -30,6 +30,7 @@
Input,
InputPassword,
Link,
- Action
+ Action,
+ FlashObject
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-07-01 19:17:59 UTC (rev 4494)
@@ -27,13 +27,13 @@
{
public class HtmlLinkNumber
{
- public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type)
+ public HtmlLinkNumber(int number, string id, string name, object obj, HtmlInputType type)
{
Type = type;
Number = number;
Name = name;
Id = id;
- Link = link;
+ Obj =obj;
}
@@ -41,6 +41,6 @@
public string Id { get; set; }
public string Name { get; set; }
public HtmlInputType Type { get; set; }
- public string Link { get; set; }
+ public object Obj { get; set; }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 19:17:59 UTC (rev 4494)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.5.0")]
-[assembly: AssemblyFileVersion("0.3.5.0")]
+[assembly: AssemblyVersion("0.3.7.0")]
+[assembly: AssemblyFileVersion("0.3.7.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-07-01 19:17:59 UTC (rev 4494)
@@ -87,5 +87,12 @@
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static byte[] MouseCursor {
+ get {
+ object obj = ResourceManager.GetObject("MouseCursor", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-07-01 18:51:22 UTC (rev 4493)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-07-01 19:17:59 UTC (rev 4494)
@@ -130,4 +130,7 @@
<data name="file-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\file-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="MouseCursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\res\MouseCursor.cur;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X