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