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. |