banshee r4578 - in trunk/banshee: . src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager

[gburt svn gnome org]

Author: gburt
Date: Sat Sep 20 06:17:23 2008
New Revision: 4578
URL: http://svn.gnome.org/viewvc/banshee?rev=4578&view=rev

Log:
2008-09-20  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebSource.cs:
	* src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebView.cs: Add
	debugging, and send to hulu not miroguide.com b/c the later doensn't work
	atm due to SSL certs.

	* configure.ac: Echo any manually-enabled unstable/unfinished features.

	* src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:
	Currently transferring => Transferring



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/configure.ac
   trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebSource.cs
   trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebView.cs
   trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Sat Sep 20 06:17:23 2008
@@ -225,11 +225,11 @@
     Unit Tests:        ${do_tests}	(requires nunit >= ${NUNIT_REQUIRED})
 "
 
-#    Unfinished, unstable, under development components:
-#    Moonlight Effects: ${enable_moonlight}
-#    Remote Audio:      ${enable_remote_audio}
-#      MediaWeb:        ${enable_mediaweb}
-#      Torrent Podcasts:${enable_torrent}
+# Unstable/in-development features; only show them if they were manually enabled
+if test "x$enable_moonlight" = "xyes";    then echo "    Moonlight Effects: ${enable_moonlight}"; fi
+if test "x$enable_remote_audio" = "xyes"; then echo "    Remote Audio:      ${enable_remote_audio}"; fi
+if test "x$enable_mediaweb" = "xyes";     then echo "    MediaWeb:          ${enable_mediaweb}"; fi
+if test "x$enable_torrent" = "xyes";      then echo "    Torrent Podcasts:  ${enable_torrent}"; fi
 
 if test -d ${expanded_libdir}/${PACKAGE}; then
 	echo "WARNING: An existing Banshee install is in ${expanded_libdir}/${PACKAGE}"

Modified: trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebSource.cs	Sat Sep 20 06:17:23 2008
@@ -44,16 +44,13 @@
 {
     public class MediaWebSource : Source, IDisposable
     {
-        protected override string TypeUniqueId {
-            get { return "media-web-source"; }
-        }
-
         private MediaWebView view;
         
         // FIXME avoiding new translated strings, for the moment
         //public MediaWebSource () : base (Catalog.GetString ("Media Web"), Catalog.GetString ("Media Web"), 30)
-        public MediaWebSource () : base ("Media Web", "Media Web", 30)
+        public MediaWebSource () : base ("Browser", "Browser", 30)
         {
+            TypeUniqueId = "media-web-source";
             view = new MediaWebView ();
         
             Properties.SetString ("Icon.Name", "applications-internet");

Modified: trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebView.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebView.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.MediaWeb/Banshee.MediaWeb/MediaWebView.cs	Sat Sep 20 06:17:23 2008
@@ -32,6 +32,8 @@
 
 using WebKit;
 
+using Hyena;
+
 using Banshee.Sources;
 using Banshee.ServiceStack;
 using Banshee.MediaEngine;
@@ -58,16 +60,32 @@
 
         public MediaWebView () : base ()
         {
+            this.ConsoleMessage += delegate (object o, ConsoleMessageArgs args)
+            {
+                Log.Debug (args.Message);
+            };
+
+            this.LoadProgressChanged += delegate (object o, LoadProgressChangedArgs args)
+            {
+                Log.DebugFormat ("LoadProgress: {0}", args.Progress);
+            };
+            
             //this.LoadHtmlString ("<html><body><i>fooooo!</i></body></html>", "/");
             //this.MarkTextMatches ("fo", false, 999);
-            //ExecuteScript ("document.location = \"http://www.miroguide.com/\";";);
-            //ExecuteScript ("document.location = \"http://www.hulu.com/watch/24057/the-daily-show-with-jon-stewart-tue-jun-24-2008#s-p1-so-i0\";";);
-            //ExecuteScript ("document.location = \"http://www.google.com/\";";);
-            ExecuteScript ("document.location = \"http://http://www.thedailyshow.com/\";";);
+        }
+
+        private void OpenUrl (string uri)
+        {
+            Hyena.Log.DebugFormat ("MediaWeb.View Opening {0}", uri);
+            //Open (uri);
+            ExecuteScript (String.Format ("document.location = \"{0}\";", uri));
+            //LoadHtmlString ("<b>hi!!</b>", "");
         }
 
         bool Banshee.Sources.Gui.ISourceContents.SetSource (ISource source)
         {
+            //OpenUrl ("http://www.miroguide.com/";);
+            OpenUrl ("http://www.hulu.com/watch/24057/the-daily-show-with-jon-stewart-tue-jun-24-2008#s-p1-so-i0";);
             return true;
         }
 

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs	Sat Sep 20 06:17:23 2008
@@ -117,8 +117,8 @@
 
                 int total = remaining + completed;
                 string fmt = Catalog.GetPluralString (
-                        "Currently transfering {0} file at {1} KB/s",
-                        "Currently transfering {0} of {2} files at {1} KB/s", total
+                        "Transfering {0} file at {1} KB/s",
+                        "Transfering {0} of {2} files at {1} KB/s", total
                 );
 
                 Status = String.Format (fmt, downloading, (bytesPerSecond / 1024), total);