[Mp-plugins-svn] SF.net SVN: mp-plugins:[4237] trunk/plugins/BrowseTheWeb/Source/ BrowseTheWeb

[<Sil...@us...>]

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.