Ubuntu Software Center

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

  1. sca-video-updates
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 2742
Proposed branch: lp:~mvo/software-center/sca-video-updates
Merge into: lp:software-center
Diff against target: 54 lines (+9/-5)
3 files modified
softwarecenter/db/update.py (+3/-3)
softwarecenter/ui/gtk3/views/appdetailsview.py (+5/-1)
softwarecenter/ui/gtk3/widgets/videoplayer.py (+1/-1)
To merge this branch: bzr merge lp:~mvo/software-center/sca-video-updates
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Michael Nelson Approve
Review via email: mp+92756@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

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

review: Approve
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Thanks mvo! I'll merge now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/db/update.py'
2--- softwarecenter/db/update.py 2012-02-11 00:11:47 +0000
3+++ softwarecenter/db/update.py 2012-02-13 12:52:12 +0000
4@@ -152,7 +152,7 @@
5 'PPA' : 'archive_id',
6 'Screenshot-Url' : 'screenshot_url',
7 'Thumbnail-Url' : 'thumbnail_url',
8- 'Video-Url' : 'video_url',
9+ 'Video-Url' : 'video_embedded_html_url',
10 'Icon-Url' : 'icon_url',
11 'Support-Url' : 'support_url',
12 'Description' : 'Description',
13@@ -185,8 +185,8 @@
14 self.sca_application.description.split("\n")[1:]).strip()
15
16 # we only support a single video currently :/
17- if hasattr(self.sca_application, "video_urls"):
18- self.sca_application.video_url = self.sca_application.video_urls[0]
19+ if hasattr(self.sca_application, "video_embedded_html_urls"):
20+ self.sca_application.video_embedded_html_url = self.sca_application.video_embedded_html_urls[0]
21
22 # XXX 2012-01-16 bug=917109
23 # We can remove these work-arounds once the above bug is fixed on
24
25=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
26--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-02-09 13:24:38 +0000
27+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-02-13 12:52:12 +0000
28@@ -1165,8 +1165,12 @@
29
30 # video
31 from softwarecenter.ui.gtk3.widgets.videoplayer import VideoPlayer
32+ mini_hb = Gtk.HBox()
33 self.videoplayer = VideoPlayer()
34- vb.pack_start(self.videoplayer, False, False, 0)
35+ mini_hb.pack_start(self.videoplayer, False, False, 0)
36+ # add a empty label here to ensure bg is set properly
37+ mini_hb.pack_start(Gtk.Label(), True, True, 0)
38+ vb.pack_start(mini_hb, False, False, 0)
39
40 # add the links footer to the description widget
41 footer_hb = Gtk.HBox(spacing=6)
42
43=== modified file 'softwarecenter/ui/gtk3/widgets/videoplayer.py'
44--- softwarecenter/ui/gtk3/widgets/videoplayer.py 2012-02-09 20:33:21 +0000
45+++ softwarecenter/ui/gtk3/widgets/videoplayer.py 2012-02-13 12:52:12 +0000
46@@ -38,7 +38,7 @@
47 class VideoPlayer(Gtk.VBox):
48 def __init__(self):
49 super(VideoPlayer, self).__init__()
50- self.set_size_request(400, 400)
51+ self.set_size_request(400, 255)
52 self.webkit = WebKit.WebView()
53 settings = self.webkit.get_settings()
54 # this disables the flash and other plugins so that we force html5

Subscribers

People subscribed via source and target branches