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