Merge lp:~mvo/software-center/sca-video-updates into lp:software-center

[Michael Vogt]

Small branch that updates the client to follow the server side changes for videos from software-center-agent.

[Michael Nelson (michael.nelson)]

Looks great mvo. Let us know if you'd like the config updated for the vimeo iframe size on the vps.

review: Approve

[Gary Lasker (gary-lasker)]

Thanks mvo! I'll merge now.

review: Approve

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-02-11 00:11:47 +0000
+++ softwarecenter/db/update.py	2012-02-13 12:52:12 +0000
@@ -152,7 +152,7 @@
                 'PPA'        : 'archive_id',
                 'Screenshot-Url' : 'screenshot_url',
                 'Thumbnail-Url' : 'thumbnail_url',
-                'Video-Url' :  'video_url',
+                'Video-Url' :  'video_embedded_html_url',
                 'Icon-Url'   : 'icon_url',
                 'Support-Url'   : 'support_url',
                 'Description' : 'Description',
@@ -185,8 +185,8 @@
                 self.sca_application.description.split("\n")[1:]).strip()
 
         # we only support a single video currently :/
-        if hasattr(self.sca_application, "video_urls"):
-            self.sca_application.video_url = self.sca_application.video_urls[0]
+        if hasattr(self.sca_application, "video_embedded_html_urls"):
+            self.sca_application.video_embedded_html_url = self.sca_application.video_embedded_html_urls[0]
 
         # XXX 2012-01-16 bug=917109
         # We can remove these work-arounds once the above bug is fixed on
 
=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-02-09 13:24:38 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-02-13 12:52:12 +0000
@@ -1165,8 +1165,12 @@
 
         # video
         from softwarecenter.ui.gtk3.widgets.videoplayer import VideoPlayer
+        mini_hb = Gtk.HBox()
         self.videoplayer = VideoPlayer()
-        vb.pack_start(self.videoplayer, False, False, 0)
+        mini_hb.pack_start(self.videoplayer, False, False, 0)
+        # add a empty label here to ensure bg is set properly
+        mini_hb.pack_start(Gtk.Label(), True, True, 0)
+        vb.pack_start(mini_hb, False, False, 0)
 
         # add the links footer to the description widget
         footer_hb = Gtk.HBox(spacing=6)
 
=== modified file 'softwarecenter/ui/gtk3/widgets/videoplayer.py'
--- softwarecenter/ui/gtk3/widgets/videoplayer.py	2012-02-09 20:33:21 +0000
+++ softwarecenter/ui/gtk3/widgets/videoplayer.py	2012-02-13 12:52:12 +0000
@@ -38,7 +38,7 @@
 class VideoPlayer(Gtk.VBox):
     def __init__(self):
         super(VideoPlayer, self).__init__()
-        self.set_size_request(400, 400)
+        self.set_size_request(400, 255)
         self.webkit = WebKit.WebView()
         settings = self.webkit.get_settings()
         # this disables the flash and other plugins so that we force html5