Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [115] trunk/plugins/WebBrowser
|
From: <dal...@us...> - 2007-02-13 09:06:08
|
Revision: 115
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=115&view=rev
Author: dalanorth
Date: 2007-02-13 01:06:06 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/WebBrowser/GUIWebBrowser.cs
trunk/plugins/WebBrowser/GUIWebBrowser.csproj
trunk/plugins/WebBrowser/GUIWebBrowser.suo
trunk/plugins/WebBrowser/WebBrowserControl.Designer.cs
trunk/plugins/WebBrowser/WebBrowserControl.cs
Modified: trunk/plugins/WebBrowser/GUIWebBrowser.cs
===================================================================
--- trunk/plugins/WebBrowser/GUIWebBrowser.cs 2007-02-13 02:16:23 UTC (rev 114)
+++ trunk/plugins/WebBrowser/GUIWebBrowser.cs 2007-02-13 09:06:06 UTC (rev 115)
@@ -256,7 +256,7 @@
private void GetStringFromKeyboard(ref string strLine)
{
- VirtualWebKeyboard keyboard = (VirtualWebKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD);
+ DialogWebKeyboard keyboard = (DialogWebKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD);
if (null == keyboard) return;
keyboard.Reset();
keyboard.Text = strLine;
Modified: trunk/plugins/WebBrowser/GUIWebBrowser.csproj
===================================================================
--- trunk/plugins/WebBrowser/GUIWebBrowser.csproj 2007-02-13 02:16:23 UTC (rev 114)
+++ trunk/plugins/WebBrowser/GUIWebBrowser.csproj 2007-02-13 09:06:06 UTC (rev 115)
@@ -58,10 +58,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\MediaPortal\Dialogs\bin\Release\Dialogs.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
<Reference Include="Utils, Version=1.0.2587.17396, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\MediaPortal\Utils\bin\Release\Utils.dll</HintPath>
@@ -69,6 +72,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Common.cs" />
+ <Compile Include="DialogWebKeyboard.cs" />
<Compile Include="GUIFavorites.cs" />
<Compile Include="GUIWebBrowser.cs" />
<Compile Include="INIFile.cs" />
Modified: trunk/plugins/WebBrowser/GUIWebBrowser.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/WebBrowser/WebBrowserControl.Designer.cs
===================================================================
--- trunk/plugins/WebBrowser/WebBrowserControl.Designer.cs 2007-02-13 02:16:23 UTC (rev 114)
+++ trunk/plugins/WebBrowser/WebBrowserControl.Designer.cs 2007-02-13 09:06:06 UTC (rev 115)
@@ -53,31 +53,31 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebBrowserControl));
- this.axMozillaBrowser1 = new AxMOZILLACONTROLLib.AxMozillaBrowser();
- ((System.ComponentModel.ISupportInitialize)(this.axMozillaBrowser1)).BeginInit();
- this.SuspendLayout();
- //
- // axMozillaBrowser1
- //
- this.axMozillaBrowser1.Enabled = true;
- this.axMozillaBrowser1.Location = new System.Drawing.Point(0, 0);
- this.axMozillaBrowser1.Margin = new System.Windows.Forms.Padding(0);
- this.axMozillaBrowser1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axMozillaBrowser1.OcxState")));
- this.axMozillaBrowser1.Size = new System.Drawing.Size(720, 473);
- this.axMozillaBrowser1.TabIndex = 0;
- //
- // WebBrowserControl
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.axMozillaBrowser1);
- this.Margin = new System.Windows.Forms.Padding(0);
- this.Name = "WebBrowserControl";
- this.Size = new System.Drawing.Size(720, 473);
- this.Layout += new System.Windows.Forms.LayoutEventHandler(this.WebBrowserControl_Layout);
- ((System.ComponentModel.ISupportInitialize)(this.axMozillaBrowser1)).EndInit();
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebBrowserControl));
+ this.axMozillaBrowser1 = new AxMOZILLACONTROLLib.AxMozillaBrowser();
+ ((System.ComponentModel.ISupportInitialize)(this.axMozillaBrowser1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // axMozillaBrowser1
+ //
+ this.axMozillaBrowser1.Enabled = true;
+ this.axMozillaBrowser1.Location = new System.Drawing.Point(0, 0);
+ this.axMozillaBrowser1.Margin = new System.Windows.Forms.Padding(0);
+ this.axMozillaBrowser1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axMozillaBrowser1.OcxState")));
+ this.axMozillaBrowser1.Size = new System.Drawing.Size(1366, 665);
+ this.axMozillaBrowser1.TabIndex = 0;
+ //
+ // WebBrowserControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.axMozillaBrowser1);
+ this.Margin = new System.Windows.Forms.Padding(0);
+ this.Name = "WebBrowserControl";
+ this.Size = new System.Drawing.Size(1366, 665);
+ this.Layout += new System.Windows.Forms.LayoutEventHandler(this.WebBrowserControl_Layout);
+ ((System.ComponentModel.ISupportInitialize)(this.axMozillaBrowser1)).EndInit();
+ this.ResumeLayout(false);
}
Modified: trunk/plugins/WebBrowser/WebBrowserControl.cs
===================================================================
--- trunk/plugins/WebBrowser/WebBrowserControl.cs 2007-02-13 02:16:23 UTC (rev 114)
+++ trunk/plugins/WebBrowser/WebBrowserControl.cs 2007-02-13 09:06:06 UTC (rev 115)
@@ -39,7 +39,6 @@
static readonly WebBrowserControl instance = new WebBrowserControl();
private const int TOP = 55;
private const int LEFT = 4;
- private const int HEIGHT = 493;
private Common.MenuState _CurrentMenuState;
/// <summary>
@@ -122,9 +121,9 @@
{
float fSkinHeight = (float)GUIGraphicsContext.SkinSize.Height; ;
float fPercentY = ((float)GUIGraphicsContext.Height) / fSkinHeight;
- this.Height = (int)Math.Round(((float)HEIGHT) * fPercentY);
+ this.Height = (int)Math.Round((fSkinHeight - 83) * fPercentY);
this.Browser.Height = this.Height;
- }
+ }
/// <summary>
/// Scale y position for current resolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
