Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/zesty into lp:ubiquity-slideshow-ubuntu

Proposed by Aaron Honeycutt on 2017-02-23
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-02-23
Approved revision: no longer in the source branch.
Merged at revision: 761
Proposed branch: lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/zesty
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 41 lines (+8/-6)
2 files modified
kubuntu-slideshow.py (+6/-4)
slideshows/kubuntu/slides/welcome.html (+2/-2)
To merge this branch: bzr merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/zesty
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-02-23 Approve on 2017-02-23
Review via email: mp+318059@code.launchpad.net

Description of the change

Change Kubuntu 16.10 to 17.04. Also updated the kubuntu-slideshow.py from PyQt4 to PyQt5. It opens at least now.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

review: Approve
761. By Mathieu Trudel-Lapierre on 2017-02-23

* Port Kubuntu slideshow to Qt5.
* Update Kubuntu slideshow for 17.04.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kubuntu-slideshow.py'
2--- kubuntu-slideshow.py 2010-02-24 05:38:31 +0000
3+++ kubuntu-slideshow.py 2017-02-23 03:59:02 +0000
4@@ -4,10 +4,12 @@
5 import os, sys
6 import ConfigParser
7
8-from PyQt4.QtCore import *
9-from PyQt4.QtGui import *
10-from PyQt4.QtWebKit import *
11-from PyQt4 import uic
12+from PyQt5.QtCore import *
13+from PyQt5.QtWidgets import *
14+from PyQt5.QtGui import *
15+from PyQt5.QtWebKit import *
16+from PyQt5.QtWebKitWidgets import *
17+from PyQt5 import uic
18
19 base_directory = os.path.dirname (sys.argv[0])
20 slideshow_path = os.path.abspath(base_directory + "/slideshows")
21
22=== modified file 'slideshows/kubuntu/slides/welcome.html'
23--- slideshows/kubuntu/slides/welcome.html 2016-09-13 16:03:22 +0000
24+++ slideshows/kubuntu/slides/welcome.html 2017-02-23 03:59:02 +0000
25@@ -3,14 +3,14 @@
26 <div class="main">
27 <div class="content">
28 <ul>
29- <li>Thank you for choosing Kubuntu 16.10. We hope you enjoy
30+ <li>Thank you for choosing Kubuntu 17.04. We hope you enjoy
31 the experience.</li>
32 <li>We believe every computer user should be free to work in the
33 environment they choose, and be free to download, change, study and
34 share their software with anyone, for any purpose.</li>
35 <li>We want Kubuntu to work for you. So while your software is
36 installing, this slideshow will introduce you to Kubuntu
37- 16.10.</li>
38+ 17.04.</li>
39 </ul>
40 <p class="special">Kubuntu is designed to be easy. Feel free to
41 explore!</p>

Subscribers

People subscribed via source and target branches