ubiquity-slideshow team mailing list archive

[Aaron Honeycutt <honeycuttaaron3@xxxxxxxxx>]

Aaron Honeycutt has proposed merging lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/yakkety into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)

For more details, see:
https://code.launchpad.net/~aaronhoneycutt/ubiquity-slideshow-ubuntu/yakkety/+merge/302978

Fixes the test-slideshow.sh to work now for all Flavors.
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/yakkety into lp:ubiquity-slideshow-ubuntu.

=== modified file 'kubuntu-slideshow.py'
--- kubuntu-slideshow.py	2010-02-24 05:38:31 +0000
+++ kubuntu-slideshow.py	2016-08-15 23:38:36 +0000
@@ -4,10 +4,12 @@
 import os, sys
 import ConfigParser
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from PyQt4.QtWebKit import *
-from PyQt4 import uic
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
+from PyQt5.QtWebKit import *
+from PyQt5.QtWebKitWidgets import *
+from PyQt5.QtWidgets import *
+from PyQt5 import uic
 
 base_directory = os.path.dirname (sys.argv[0])
 slideshow_path = os.path.abspath(base_directory + "/slideshows")
@@ -31,8 +33,8 @@
     ui.progressBar.setValue(newVal)
     return True
     
-def openLink(qUrl):
-    QDesktopServices.openUrl(qUrl)
+def openLink(QUrl):
+    QDesktopServices.openUrl(QUrl &url)
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)

=== added file 'slideshows/kubuntu/slides/icons/amarok.png'
Binary files slideshows/kubuntu/slides/icons/amarok.png	1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/amarok.png	2016-08-15 23:38:36 +0000 differ
=== removed file 'slideshows/kubuntu/slides/icons/applications-multimedia.png'
Binary files slideshows/kubuntu/slides/icons/applications-multimedia.png	2015-03-31 23:45:03 +0000 and slideshows/kubuntu/slides/icons/applications-multimedia.png	1970-01-01 00:00:00 +0000 differ
=== added file 'slideshows/kubuntu/slides/icons/dragonplayer.png'
Binary files slideshows/kubuntu/slides/icons/dragonplayer.png	1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/dragonplayer.png	2016-08-15 23:38:36 +0000 differ
=== modified file 'slideshows/kubuntu/slides/multimedia.html'
--- slideshows/kubuntu/slides/multimedia.html	2015-03-31 23:17:41 +0000
+++ slideshows/kubuntu/slides/multimedia.html	2016-08-15 23:38:36 +0000
@@ -12,4 +12,5 @@
 	</ul>
     </div>
 </div>
-<img class="icon" src="icons/applications-multimedia.png" alt="" />
+<img class="icon" src="icons/amarok.png" alt="" />
+

=== modified file 'slideshows/kubuntu/slides/welcome.html'
--- slideshows/kubuntu/slides/welcome.html	2016-03-10 14:20:39 +0000
+++ slideshows/kubuntu/slides/welcome.html	2016-08-15 23:38:36 +0000
@@ -3,14 +3,11 @@
 <div class="main">
     <div class="content">
 	<ul>
-	    <li>Thank you for choosing Kubuntu 16.04. We hope you enjoy
-	    the experience.</li>
+        <li>Thank you for choosing Kubuntu 16.10. We hope you enjoy the experience.</li>
+	    <li> Kubuntu is  community-produced Ubuntu flavor with the Plasma desktop and KDE applications. </li>
 	    <li>We believe every computer user should be free to work in the
 	    environment they choose, and be free to download, change, study and
 	    share their software with anyone, for any purpose.</li>
-	    <li>We want Kubuntu to work for you. So while your software is
-	    installing, this slideshow will introduce you to Kubuntu
-	    16.04.</li>
 	</ul>
 	    <p class="special">Kubuntu is designed to be easy. Feel free to
 	    explore!</p>