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