ubiquity-slideshow team mailing list archive

[Simon Quigley <tsimonq2@xxxxxxxxxx>]

Simon Quigley has proposed merging lp:~tsimonq2/ubiquity-slideshow-ubuntu/lp-1761592 into lp:ubiquity-slideshow-ubuntu.

Commit message:
Fix the Kubuntu slideshow so the back arrow doesn't look like a slide advancement.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
  Bug #1761592 in ubiquity-slideshow-ubuntu (Ubuntu): "Kubuntu bionic slideshow's left and right arrow buttons use the same transition"
  https://bugs.launchpad.net/ubuntu/+source/ubiquity-slideshow-ubuntu/+bug/1761592

For more details, see:
https://code.launchpad.net/~tsimonq2/ubiquity-slideshow-ubuntu/lp-1761592/+merge/343760

Fix the Kubuntu slideshow so the back arrow doesn't look like a slide advancement.
-- 
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~tsimonq2/ubiquity-slideshow-ubuntu/lp-1761592 into lp:ubiquity-slideshow-ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-30 07:42:50 +0000
+++ debian/changelog	2018-04-22 04:50:53 +0000
@@ -1,3 +1,10 @@
+ubiquity-slideshow-ubuntu (137) UNRELEASED; urgency=medium
+
+  * Fix the Kubuntu slideshow so the back arrow doesn't look like a slide
+    advancement (LP: #1761592).
+
+ -- Simon Quigley <tsimonq2@xxxxxxxxxx>  Sat, 21 Apr 2018 23:45:39 -0500
+
 ubiquity-slideshow-ubuntu (136) bionic; urgency=medium
 
   [ Jean-Baptiste Lallement ]

=== modified file 'kubuntu-slideshow.py'
--- kubuntu-slideshow.py	2017-02-22 20:57:29 +0000
+++ kubuntu-slideshow.py	2018-04-22 04:50:53 +0000
@@ -29,10 +29,10 @@
         ui.progressBar.setValue(100)
         updateTimer.timeout.disconnect(progress_increment)
         return
-    
+
     ui.progressBar.setValue(newVal)
     return True
-    
+
 def openLink(qUrl):
     QDesktopServices.openUrl(qUrl)
 
@@ -40,23 +40,23 @@
     app = QApplication(sys.argv)
 
     ui = uic.loadUi(os.path.join(base_directory, "slideshow.ui"))
-    
+
     ui.progressBar.setValue(0)
     ui.progressBar.setFormat("Fake install... %p% complete")
-    
+
     ui.webView.setMinimumSize(config_width, config_height)
     ui.webView.linkClicked.connect(openLink)
-    
+
     ui.webView.setContextMenuPolicy(Qt.NoContextMenu)
     ui.webView.page().setLinkDelegationPolicy(QWebPage.DelegateExternalLinks)
     ui.webView.page().mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
     ui.webView.page().mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff)
-    
+
     ui.webView.load(QUrl(os.path.join(slideshow_path, "kubuntu", "slides", "index.html")))
-    
+
     ui.setWindowTitle("Ubiquity Slideshow with Webkit")
     ui.show()
-    
+
     updateTimer.timeout.connect(progress_increment)
     updateTimer.start(2000)
 

=== modified file 'slideshows/kubuntu/slides/00_Welcome.html'
--- slideshows/kubuntu/slides/00_Welcome.html	2018-03-22 02:01:53 +0000
+++ slideshows/kubuntu/slides/00_Welcome.html	2018-04-22 04:50:53 +0000
@@ -9,7 +9,7 @@
 
   <div class="main" id="center-text">
     <p>Thanks for picking Kubuntu!</p>
-    <p>Kubuntu combines the best of the KDE Community's software with Ubuntu's base to make a great desktop experience</p>
-    <p>This slideshow will go over the default applications, how to get help, and how to contribute to Kubuntu</p>
+    <p>Kubuntu combines the best of the KDE Community's software with Ubuntu's base to make a great desktop experience.</p>
+    <p>This slideshow will go over the default applications, how to get help, and how to contribute to Kubuntu.</p>
   </div>
 </div>

=== modified file 'slideshows/kubuntu/slides/01_Applications.html'
--- slideshows/kubuntu/slides/01_Applications.html	2018-03-30 07:42:50 +0000
+++ slideshows/kubuntu/slides/01_Applications.html	2018-04-22 04:50:53 +0000
@@ -5,7 +5,7 @@
 
   <div class="main" id="full-text">
     <p>Kubuntu comes with most of the applications that you need on a daily basis.</p>
-    <p>For everything else, you can install more software in Discover, our software center</p>
+    <p>For everything else, you can install more software in Discover, our software center.</p>
     <table>
       <tr>
         <td>

=== modified file 'slideshows/kubuntu/slides/02_Accessibility.html'
--- slideshows/kubuntu/slides/02_Accessibility.html	2017-08-26 15:28:03 +0000
+++ slideshows/kubuntu/slides/02_Accessibility.html	2018-04-22 04:50:53 +0000
@@ -9,7 +9,7 @@
 
   <div class="main" id="left-text">
     <p>We want Kubuntu to work for everyone.</p>
-    <p>We include a screen reader, modifier keys and more.</p>
+    <p>We include a screen reader, modifier keys, and more.</p>
   </div>
 
 </div>

=== modified file 'slideshows/kubuntu/slides/03_Get-Help.html'
--- slideshows/kubuntu/slides/03_Get-Help.html	2018-03-22 02:01:53 +0000
+++ slideshows/kubuntu/slides/03_Get-Help.html	2018-04-22 04:50:53 +0000
@@ -15,8 +15,8 @@
     community in conjunction with the Ubuntu community, provides free
     technical support in person and over the Internet. Learn more at <a href="http://www.kubuntu.org/support";>Kubuntu Support</a>.
     <ul>
-      <li>Kubuntu Community: <a href="https://www.kubuntu.org/community";>http://www.kubuntu.org/community</a></li>
-      <li>Kubuntu Support: <a href="https://www.kubuntu.org/support";>http://www.kubuntu.org/support</a></li>
+      <li>Kubuntu Community: <a href="https://www.kubuntu.org/community";>https://www.kubuntu.org/community</a></li>
+      <li>Kubuntu Support: <a href="https://www.kubuntu.org/support";>https://www.kubuntu.org/support</a></li>
     </ul>
     </p>
   </div>

=== modified file 'slideshows/kubuntu/slides/04_Get-Involved.html'
--- slideshows/kubuntu/slides/04_Get-Involved.html	2018-03-22 02:01:53 +0000
+++ slideshows/kubuntu/slides/04_Get-Involved.html	2018-04-22 04:50:53 +0000
@@ -9,16 +9,15 @@
 
   <div class="main" id="center-text">
     <p>
-        The Kubuntu community consists of a group of individuals, who
+        The Kubuntu community consists of a group of individuals who
         made up one of the greatest teams in the open source community,
-        working on various aspects of the distribution, providing advice and
-        technical support, as well as helping to promote Kubuntu to a wider
-        audience.
+        who work on various aspects of the distribution, provide advice and
+        technical support, and help to promote Kubuntu to a wider audience.
     </p>
     <p>
         No matter your skill level, getting involved and helping to
         mold the future of Kubuntu is easy, and you are more than welcome
-        to help out.Remember, it is easy to get involved and the work you 
+        to help out. Remember, it is easy to get involved and the work you
         do will be seen by millions of people around the world.
     </p>
     <p>

=== modified file 'slideshows/kubuntu/slides/index.html'
--- slideshows/kubuntu/slides/index.html	2017-07-27 20:26:39 +0000
+++ slideshows/kubuntu/slides/index.html	2018-04-22 04:50:53 +0000
@@ -4,16 +4,16 @@
 
 <head>
 	<title>ubiquity-slideshow-kubuntu</title>
-	
+
 	<link href="link/base.css" rel="stylesheet" type="text/css" />
-	
+
 	<base target="_blank" />
-	
+
 	<script type="text/javascript" src="link-core/jquery.js"></script>
 	<script type="text/javascript" src="link-core/jquery.cycle.all.js"></script>
-	
+
 	<script type="text/javascript" src="link-core/base.js"></script>
-	
+
 	<script type="text/javascript">
 	var SLIDESHOW_OPTIONS = {
 		/* Uncomment to debug */
@@ -22,10 +22,7 @@
 		fit: 1,
 		width: '100%',
 		height: '100%',
-		/* Default slideshow uses the 'scrollHorz' fx, but slides are not
-		resized horizontally with that fx, using 'scrollLeft' workarounds that
-		bug */
-		fx: 'scrollLeft',
+                speed: 6000;
 	};
 	</script>
 	<script type="text/javascript" src="link-core/slideshow.js"></script>

=== modified file 'slideshows/kubuntu/slides/link/base.css'
--- slideshows/kubuntu/slides/link/base.css	2018-03-22 02:01:53 +0000
+++ slideshows/kubuntu/slides/link/base.css	2018-04-22 04:50:53 +0000
@@ -281,7 +281,7 @@
 
 #screenie {
     display:block;
-} 
+}
 
 #double-screenie {
     display:block;