mp-plugins-svn Mailing List for Mediaportal Plugins (Page 30)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4237
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4237&view=rev
Author:   SilentException
Date:     2011-06-03 08:10:14 +0000 (Fri, 03 Jun 2011)

Log Message:
-----------
BrowseTheWeb
- load with parameter, thanks JiRo
- thread safe initialization
- select first item in bookmarks screen
- minor bug fixes

Modified Paths:
--------------
    trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
    trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs

Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================

--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs	2011-05-30 07:45:45 UTC (rev 4236)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs	2011-06-03 08:10:14 UTC (rev 4237)
@@ -245,6 +245,7 @@
         }
 
         GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
+        facade.SelectedListItemIndex = 0;
       }
       catch { }
     }

Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs	2011-05-30 07:45:45 UTC (rev 4236)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs	2011-06-03 08:10:14 UTC (rev 4237)
@@ -98,6 +98,9 @@
     private float zoom = 1.0f;
     private float font = 1.0f;
 
+    public static bool ParameterSupported = false;
+    public static string Parameter = string.Empty;
+
     public static string loadFav = string.Empty;
 
     private string lastUrl = string.Empty;
@@ -167,9 +170,17 @@
     {
       get
       {
-        string value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
+        string value = Parameter;
         if (null != value && !string.IsNullOrEmpty(value.Trim()))
+        {
           return value.Trim();
+        }
+        else
+        {
+          value = GUIPropertyManager.GetProperty("#btWeb.startup.link");
+          if (null != value && !string.IsNullOrEmpty(value.Trim()))
+            return value.Trim();
+        }
         return string.Empty;
       }
       set { GUIPropertyManager.SetProperty("#btWeb.startup.link", string.IsNullOrEmpty(value) ? " " : value.Trim()); }
@@ -179,6 +190,29 @@
     {
       MyLog.debug("Init Browse the web");
 
+      AddFormsDelegate d = AddForms;
+      GUIGraphicsContext.form.Invoke(d);
+
+      #region parameters test
+      ParameterSupported = false;
+      if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
+      {
+        ParameterSupported = true;
+      } 
+      #endregion
+
+      LoadSettings();
+      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");
+    }
+
+    private delegate void AddFormsDelegate();
+
+    private void AddForms() {
       try
       {
         Xpcom.Initialize(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
@@ -195,7 +229,6 @@
       webBrowser.NoDefaultContextMenu = true;
 
       GUIGraphicsContext.form.Controls.Add(webBrowser);
-
       webBrowser.Enabled = false;
       webBrowser.Visible = false;
 
@@ -207,14 +240,6 @@
       GUIGraphicsContext.form.Controls.Add(mouse);
       mouse.Visible = false;
       #endregion
-
-      LoadSettings();
-      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");
     }
 
     protected override void OnPageLoad()
@@ -235,6 +260,12 @@
           GUIGraphicsContext.MouseSupport = true;
         }
 
+        Parameter = null;
+        if (ParameterSupported)
+        {
+          Parameter = _loadParameter;
+        }
+
         #region init browser
         webBrowser.Visible = true;
 
@@ -443,7 +474,7 @@
 
     public override bool OnMessage(GUIMessage message)
     {
-      Console.WriteLine("message :" + message.Label);
+      //Console.WriteLine("message :" + message.Label);
       return base.OnMessage(message);
     }
 
@@ -602,7 +633,7 @@
               // escape
               if (!osd_linkID.Visible)
               {
-                GUIWindowManager.ShowPreviousWindow();
+                //GUIWindowManager.ShowPreviousWindow();
               }
               else
               {
@@ -670,6 +701,7 @@
           return;
         #endregion
       }
+      base.OnAction(action);
     }
 
     private void webBrowser_DomKeyDown(object sender, GeckoDomKeyEventArgs e)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan (36)	Feb (79)	Mar (123)	Apr (95)	May (119)	Jun (172)	Jul (124)	Aug (100)	Sep (83)	Oct (52)	Nov (97)	Dec (87)
2008	Jan (131)	Feb (80)	Mar (163)	Apr (178)	May (73)	Jun (54)	Jul (106)	Aug (118)	Sep (50)	Oct (125)	Nov (100)	Dec (99)
2009	Jan (104)	Feb (99)	Mar (68)	Apr (81)	May (52)	Jun (87)	Jul (67)	Aug (33)	Sep (27)	Oct (37)	Nov (60)	Dec (116)
2010	Jan (82)	Feb (79)	Mar (38)	Apr (50)	May (45)	Jun (53)	Jul (23)	Aug (86)	Sep (22)	Oct (96)	Nov (97)	Dec (73)
2011	Jan (24)	Feb (45)	Mar (28)	Apr (31)	May (42)	Jun (25)	Jul	Aug (12)	Sep (28)	Oct (13)	Nov (43)	Dec (13)
2012	Jan (62)	Feb (28)	Mar (6)	Apr (16)	May (7)	Jun	Jul (16)	Aug (2)	Sep (1)	Oct (4)	Nov (1)	Dec (3)
2013	Jan (5)	Feb	Mar (34)	Apr (9)	May (6)	Jun (10)	Jul (32)	Aug (8)	Sep (11)	Oct (35)	Nov (24)	Dec (22)
2014	Jan (44)	Feb (9)	Mar (9)	Apr (15)	May (25)	Jun (34)	Jul (16)	Aug (11)	Sep (7)	Oct (6)	Nov (1)	Dec (12)
2015	Jan (33)	Feb (19)	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (2)	Aug	Sep	Oct	Nov	Dec
2023	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (5)

mp-plugins-svn Mailing List for Mediaportal Plugins (Page 30)

mp-plugins-svn — SVN Update mailing list