Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3964] trunk/plugins/BrowseTheWeb
|
From: <kro...@us...> - 2010-11-22 10:45:42
|
Revision: 3964
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3964&view=rev
Author: kroko_koenig
Date: 2010-11-22 10:45:35 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
add selector for facade view bookmarks
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/Release/Skin/Blue3/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
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/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-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -876,5 +876,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>6</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.
+
+</ExtensionDescription>
+ <VersionDescription>add selector bookmark view</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-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2010-11-22 10:45:35 UTC (rev 3964)
@@ -268,13 +268,13 @@
<Version>
<Major>0</Major>
<Minor>2</Minor>
- <Build>5</Build>
+ <Build>6</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>
+ <VersionDescription>add selector bookmark view</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}\{8d94308d-c71d-48c4-b821-50a3a2fe9eaf}-xulrunner.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{1cdd8220-5287-482f-a29a-cf42224692a2}-xulrunner.png</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/browsethewebbook.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -8,28 +8,55 @@
<controls>
<import>common.time.xml</import>
-
+ <import>common.window.xml</import>
+
<control>
- <description>background image</description>
- <type>image</type>
- <id>1</id>
- <width>720</width>
- <height>576</height>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <width>320</width>
+ <height>720</height>
+ <dimColor>00ffffff</dimColor>
+ <control>
+ <type>image</type>
+ <posX>15</posX>
+ <posY>63</posY>
+ <width>263</width>
+ <height>473</height>
+ <texture>Backslide.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ <posX>40</posX>
+ <posY>97</posY>
+ <layout>StackLayout</layout>
+ <visible>!Control.HasFocus(50)</visible>
+ <control>
+ <description>View-As</description>
+ <type>button</type>
+ <id>2</id>
+ <label>100</label>
+ <onright>50</onright>
+ <onup>17</onup>
+ </control>
+ </control>
</control>
-
+
<control>
- <description>Selected item Label</description>
- <type>fadelabel</type>
- <id>1</id>
- <posX>700</posX>
- <posY>70</posY>
- <width>355</width>
- <align>right</align>
- <label>#selecteditem</label>
- <font>font14</font>
- </control>
-
- <control>
<description>group element</description>
<type>group</type>
<control>
@@ -40,8 +67,8 @@
<description>listcontrol</description>
<type>listcontrol</type>
<id>50</id>
- <onleft>50</onleft>
- <onright>50</onright>
+ <onleft>2</onleft>
+ <onright>2</onright>
<scrollOffset>2</scrollOffset>
</control>
<control>
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/browsethewebbook.xml 2010-11-22 10:45:35 UTC (rev 3964)
@@ -8,31 +8,54 @@
<controls>
<import>common.time.xml</import>
-
- <control>
- <description>background image</description>
- <type>image</type>
- <id>1</id>
- <width>1280</width>
- <height>720</height>
- </control>
-
+ <import>common.window.xml</import>
<control>
- <description>Selected item Label</description>
- <type>fadelabel</type>
- <id>1</id>
- <posX>1244</posX>
- <posY>70</posY>
- <width>355</width>
- <align>right</align>
- <label>#selecteditem</label>
- <font>font14</font>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>106</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <width>568</width>
+ <height>900</height>
+ <dimColor>00ffffff</dimColor>
+ <control>
+ <type>image</type>
+ <posX>26</posX>
+ <posY>78</posY>
+ <width>467</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="slide" time="450" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="450" end="-300,0" reversible="false">hidden</animation>
+ <posX>71</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <visible>!Control.HasFocus(50)</visible>
+ <control>
+ <description>View-As</description>
+ <type>button</type>
+ <id>2</id>
+ <label>100</label>
+ <onright>50</onright>
+ <onup>17</onup>
+ </control>
+ </control>
</control>
-
-
-
-
+
<control>
<description>group element</description>
<type>group</type>
@@ -44,8 +67,8 @@
<description>listcontrol</description>
<type>listcontrol</type>
<id>50</id>
- <onleft>50</onleft>
- <onright>50</onright>
+ <onleft>2</onleft>
+ <onright>2</onright>
<scrollOffset>2</scrollOffset>
</control>
<control>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -41,7 +41,13 @@
{
[SkinControlAttribute(50)]
private GUIFacadeControl facade = null;
+ [SkinControlAttribute(2)]
+ protected GUIButtonControl btnViewAs = null;
+ [SkinControlAttribute(3)]
+ protected GUISortButtonControl btnSortBy = null;
+ private static string view = string.Empty;
+
public override int GetID
{
get
@@ -61,10 +67,27 @@
protected override void OnPageLoad()
{
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+
+ view = "Large icons";
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ view = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+ }
+
LoadFacade(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml", "");
Bookmark.InitCachePath();
base.OnPageLoad();
}
+ protected override void OnPageDestroy(int new_windowId)
+ {
+ string dir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config);
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(dir + "\\MediaPortal.xml"))
+ {
+ xmlwriter.SetValue("btWeb", "bookmark", view);
+ }
+ base.OnPageDestroy(new_windowId);
+ }
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
{
if (actionType == Action.ActionType.ACTION_SELECT_ITEM)
@@ -86,13 +109,58 @@
}
}
}
+
+ if (control == btnViewAs)
+ {
+ switch (view)
+ {
+ case "Small icons":
+ view = "Large icons";
+ break;
+ case "Large icons":
+ view = "List view";
+ break;
+ case "List view":
+ view = "Small icons";
+ break;
+ }
+
+ string strLine = string.Empty;
+ switch (view)
+ {
+ case "Small icons":
+ facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ strLine = GUILocalizeStrings.Get(100);
+ break;
+ case "Large icons":
+ facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ strLine = GUILocalizeStrings.Get(417);
+ break;
+ case "List view":
+ facade.View = GUIFacadeControl.ViewMode.List;
+ strLine = GUILocalizeStrings.Get(101);
+ break;
+ }
+ btnViewAs.Label = strLine;
+ }
}
public void LoadFacade(string Path, string Folder)
{
string dirCache = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb";
- facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ switch (view)
+ {
+ case "Small icons":
+ facade.View = GUIFacadeControl.ViewMode.SmallIcons;
+ break;
+ case "Large icons":
+ facade.View = GUIFacadeControl.ViewMode.LargeIcons;
+ break;
+ case "List view":
+ facade.View = GUIFacadeControl.ViewMode.List;
+ break;
+ }
facade.Clear();
GUIListItem item = new GUIListItem();
@@ -178,7 +246,7 @@
}
}
-
+ GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
}
catch { }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -204,6 +204,8 @@
protected override void OnPageLoad()
{
+ GUIPropertyManager.SetProperty("#currentmodule", pluginName);
+
try
{
MyLog.debug("Init browser");
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.5.0")]
-[assembly: AssemblyFileVersion("0.2.5.0")]
+[assembly: AssemblyVersion("0.2.6.0")]
+[assembly: AssemblyFileVersion("0.2.6.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -49,6 +49,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.chkMouse = new System.Windows.Forms.CheckBox();
this.chkWindowed = new System.Windows.Forms.CheckBox();
this.chkOSD = new System.Windows.Forms.CheckBox();
this.chkStatus = new System.Windows.Forms.CheckBox();
@@ -130,7 +131,8 @@
this.label22 = new System.Windows.Forms.Label();
this.comboBox4 = new System.Windows.Forms.ComboBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
- this.chkMouse = new System.Windows.Forms.CheckBox();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
+ this.cmbBookmarkView = new System.Windows.Forms.ComboBox();
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -153,6 +155,7 @@
this.groupBox11.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout();
+ this.groupBox12.SuspendLayout();
this.SuspendLayout();
//
// treeView1
@@ -343,6 +346,16 @@
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Other settings";
//
+ // chkMouse
+ //
+ this.chkMouse.AutoSize = true;
+ this.chkMouse.Location = new System.Drawing.Point(19, 181);
+ this.chkMouse.Name = "chkMouse";
+ this.chkMouse.Size = new System.Drawing.Size(154, 20);
+ this.chkMouse.TabIndex = 6;
+ this.chkMouse.Text = "use mouse to browse";
+ this.chkMouse.UseVisualStyleBackColor = true;
+ //
// chkWindowed
//
this.chkWindowed.AutoSize = true;
@@ -446,6 +459,7 @@
// tabPage2
//
this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
+ this.tabPage2.Controls.Add(this.groupBox12);
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.groupBox6);
this.tabPage2.Controls.Add(this.groupBox2);
@@ -461,9 +475,9 @@
//
this.groupBox7.Controls.Add(this.chkThumbsOnVisit);
this.groupBox7.Controls.Add(this.chkUseThumbs);
- this.groupBox7.Location = new System.Drawing.Point(22, 382);
+ this.groupBox7.Location = new System.Drawing.Point(6, 303);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(534, 88);
+ this.groupBox7.Size = new System.Drawing.Size(550, 82);
this.groupBox7.TabIndex = 21;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Thumbs caching";
@@ -494,9 +508,9 @@
this.groupBox6.Controls.Add(this.optNoZoom);
this.groupBox6.Controls.Add(this.optZoomDomain);
this.groupBox6.Controls.Add(this.optZoomPage);
- this.groupBox6.Location = new System.Drawing.Point(22, 239);
+ this.groupBox6.Location = new System.Drawing.Point(6, 191);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(534, 137);
+ this.groupBox6.Size = new System.Drawing.Size(550, 106);
this.groupBox6.TabIndex = 20;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Zoom settings";
@@ -505,7 +519,7 @@
//
this.optNoZoom.AutoSize = true;
this.optNoZoom.Checked = true;
- this.optNoZoom.Location = new System.Drawing.Point(26, 95);
+ this.optNoZoom.Location = new System.Drawing.Point(26, 73);
this.optNoZoom.Name = "optNoZoom";
this.optNoZoom.Size = new System.Drawing.Size(132, 20);
this.optNoZoom.TabIndex = 2;
@@ -516,7 +530,7 @@
// optZoomDomain
//
this.optZoomDomain.AutoSize = true;
- this.optZoomDomain.Location = new System.Drawing.Point(26, 69);
+ this.optZoomDomain.Location = new System.Drawing.Point(26, 47);
this.optZoomDomain.Name = "optZoomDomain";
this.optZoomDomain.Size = new System.Drawing.Size(206, 20);
this.optZoomDomain.TabIndex = 1;
@@ -526,7 +540,7 @@
// optZoomPage
//
this.optZoomPage.AutoSize = true;
- this.optZoomPage.Location = new System.Drawing.Point(26, 43);
+ this.optZoomPage.Location = new System.Drawing.Point(26, 21);
this.optZoomPage.Name = "optZoomPage";
this.optZoomPage.Size = new System.Drawing.Size(193, 20);
this.optZoomPage.TabIndex = 0;
@@ -537,9 +551,9 @@
//
this.groupBox2.Controls.Add(this.txtFont);
this.groupBox2.Controls.Add(this.trkFont);
- this.groupBox2.Location = new System.Drawing.Point(22, 130);
+ this.groupBox2.Location = new System.Drawing.Point(6, 97);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(534, 97);
+ this.groupBox2.Size = new System.Drawing.Size(550, 88);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Font";
@@ -560,7 +574,7 @@
this.trkFont.Maximum = 200;
this.trkFont.Minimum = 10;
this.trkFont.Name = "trkFont";
- this.trkFont.Size = new System.Drawing.Size(525, 45);
+ this.trkFont.Size = new System.Drawing.Size(538, 45);
this.trkFont.SmallChange = 10;
this.trkFont.TabIndex = 0;
this.trkFont.TickFrequency = 10;
@@ -571,9 +585,9 @@
//
this.groupBox1.Controls.Add(this.txtZoom);
this.groupBox1.Controls.Add(this.trkZoom);
- this.groupBox1.Location = new System.Drawing.Point(19, 27);
+ this.groupBox1.Location = new System.Drawing.Point(6, 6);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(537, 97);
+ this.groupBox1.Size = new System.Drawing.Size(550, 85);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Zoom";
@@ -594,7 +608,7 @@
this.trkZoom.Maximum = 300;
this.trkZoom.Minimum = 10;
this.trkZoom.Name = "trkZoom";
- this.trkZoom.Size = new System.Drawing.Size(525, 45);
+ this.trkZoom.Size = new System.Drawing.Size(538, 45);
this.trkZoom.SmallChange = 10;
this.trkZoom.TabIndex = 0;
this.trkZoom.TickFrequency = 10;
@@ -1167,16 +1181,24 @@
this.checkBox1.Text = "Show diagnose on status bar";
this.checkBox1.UseVisualStyleBackColor = true;
//
- // chkMouse
+ // groupBox12
//
- this.chkMouse.AutoSize = true;
- this.chkMouse.Location = new System.Drawing.Point(19, 181);
- this.chkMouse.Name = "chkMouse";
- this.chkMouse.Size = new System.Drawing.Size(154, 20);
- this.chkMouse.TabIndex = 6;
- this.chkMouse.Text = "use mouse to browse";
- this.chkMouse.UseVisualStyleBackColor = true;
+ this.groupBox12.Controls.Add(this.cmbBookmarkView);
+ this.groupBox12.Location = new System.Drawing.Point(6, 391);
+ this.groupBox12.Name = "groupBox12";
+ this.groupBox12.Size = new System.Drawing.Size(550, 79);
+ this.groupBox12.TabIndex = 22;
+ this.groupBox12.TabStop = false;
+ this.groupBox12.Text = "Bookmarks view";
//
+ // cmbBookmarkView
+ //
+ this.cmbBookmarkView.FormattingEnabled = true;
+ this.cmbBookmarkView.Location = new System.Drawing.Point(26, 37);
+ this.cmbBookmarkView.Name = "cmbBookmarkView";
+ this.cmbBookmarkView.Size = new System.Drawing.Size(145, 24);
+ this.cmbBookmarkView.TabIndex = 0;
+ //
// Setup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1228,6 +1250,7 @@
this.groupBox10.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
+ this.groupBox12.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1335,5 +1358,7 @@
private System.Windows.Forms.Label label35;
private System.Windows.Forms.ComboBox cmbShowBookmarks;
private System.Windows.Forms.CheckBox chkMouse;
+ private System.Windows.Forms.GroupBox groupBox12;
+ private System.Windows.Forms.ComboBox cmbBookmarkView;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2010-11-22 10:45:35 UTC (rev 3964)
@@ -91,6 +91,10 @@
Bookmark.Load(treeView1, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml");
treeView1.ExpandAll();
+ cmbBookmarkView.Items.Add("Small icons");
+ cmbBookmarkView.Items.Add("Large icons");
+ cmbBookmarkView.Items.Add("List view");
+
LoadSettings();
#region prepare remote setup
@@ -675,6 +679,8 @@
remote_zoom_out = xmlreader.GetValueAsString("btWeb", "key_4", "ACTION_PAGE_DOWN");
remote_status = xmlreader.GetValueAsString("btWeb", "key_5", "ACTION_SHOW_GUI");
+ cmbBookmarkView.SelectedItem = xmlreader.GetValueAsString("btWeb", "bookmark", "Large icons");
+
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();
@@ -712,6 +718,8 @@
xmlwriter.SetValue("btWeb", "key_4", cmbZoomOut.SelectedItem.ToString());
xmlwriter.SetValue("btWeb", "key_5", cmbStatusBar.SelectedItem.ToString());
+ xmlwriter.SetValue("btWeb", "bookmark", (string)cmbBookmarkView.SelectedItem);
+
xmlwriter.SetValueAsBool("btWeb", "proxy", chkProxy.Checked);
xmlwriter.SetValue("btWeb", "proxy_server", txtHttpServer.Text);
xmlwriter.SetValue("btWeb", "proxy_port", txtHttpPort.Text);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2010-11-22 10:45:35 UTC (rev 3964)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAATgBAQE4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAUABAQFAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-19 20:58:52 UTC (rev 3963)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/todo.txt 2010-11-22 10:45:35 UTC (rev 3964)
@@ -23,6 +23,9 @@
start work on alternate mouse support
save thumb if a bookmark is added inside the MP
+0.2.6
+add #currentmodule on pageload
+add selector for view bookmarks
todo:
mouseless / mouse browsing
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.
|
