From 67a1f7ebc95e149e8fa5c5ad29543b25868c4281 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Mon, 9 Jul 2018 20:31:20 -0500
Subject: [PATCH] Ensure that slideshow images correctly respond to their text.

---
 debian/changelog                                |   1 +
 .../branding/lubuntu/{slide5.png => 2048.png}   | Bin
 .../branding/lubuntu/{slide7.png => IRC.png}    | Bin
 .../lubuntu/{slide3.png => libreoffice.png}     | Bin
 .../branding/lubuntu/{slide6.png => nomacs.png} | Bin
 .../lubuntu/{slide4.png => qpdfview.png}        | Bin
 lubuntu/branding/lubuntu/show.qml               |  16 ++++++++--------
 .../lubuntu/{slide2.png => smplayer.png}        | Bin
 .../lubuntu/{slide1.png => support.png}         | Bin
 .../lubuntu/{slide8.png => trojita.png}         | Bin
 10 files changed, 9 insertions(+), 8 deletions(-)
 rename lubuntu/branding/lubuntu/{slide5.png => 2048.png} (100%)
 rename lubuntu/branding/lubuntu/{slide7.png => IRC.png} (100%)
 rename lubuntu/branding/lubuntu/{slide3.png => libreoffice.png} (100%)
 rename lubuntu/branding/lubuntu/{slide6.png => nomacs.png} (100%)
 rename lubuntu/branding/lubuntu/{slide4.png => qpdfview.png} (100%)
 rename lubuntu/branding/lubuntu/{slide2.png => smplayer.png} (100%)
 rename lubuntu/branding/lubuntu/{slide1.png => support.png} (100%)
 rename lubuntu/branding/lubuntu/{slide8.png => trojita.png} (100%)

diff --git a/debian/changelog b/debian/changelog
index 23e504e..c076a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ calamares-settings-ubuntu (4) UNRELEASED; urgency=medium
   * Remove the right live task (LP: #1780585).
   * Enable GeoIP support by default, to get accurate timezone readings.
   * Make image and text IDs unique in the slideshow.
+  * Ensure that slideshow images correctly respond to their text.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 09 Jul 2018 17:51:16 -0500
 
diff --git a/lubuntu/branding/lubuntu/slide5.png b/lubuntu/branding/lubuntu/2048.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide5.png
rename to lubuntu/branding/lubuntu/2048.png
diff --git a/lubuntu/branding/lubuntu/slide7.png b/lubuntu/branding/lubuntu/IRC.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide7.png
rename to lubuntu/branding/lubuntu/IRC.png
diff --git a/lubuntu/branding/lubuntu/slide3.png b/lubuntu/branding/lubuntu/libreoffice.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide3.png
rename to lubuntu/branding/lubuntu/libreoffice.png
diff --git a/lubuntu/branding/lubuntu/slide6.png b/lubuntu/branding/lubuntu/nomacs.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide6.png
rename to lubuntu/branding/lubuntu/nomacs.png
diff --git a/lubuntu/branding/lubuntu/slide4.png b/lubuntu/branding/lubuntu/qpdfview.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide4.png
rename to lubuntu/branding/lubuntu/qpdfview.png
diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml
index bfa42c1..06ff906 100644
--- a/lubuntu/branding/lubuntu/show.qml
+++ b/lubuntu/branding/lubuntu/show.qml
@@ -19,7 +19,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide1.png"
+            source: "support.png"
         }
 
         Text {
@@ -77,7 +77,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide2.png"
+            source: "trojita.png"
         }
 
         Text {
@@ -135,7 +135,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide3.png"
+            source: "smplayer.png"
         }
 
         Text {
@@ -193,7 +193,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide4.png"
+            source: "libreoffice.png"
         }
 
         Text {
@@ -251,7 +251,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide5.png"
+            source: "nomacs.png"
         }
 
         Text {
@@ -309,7 +309,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide6.png"
+            source: "2048.png"
         }
 
         Text {
@@ -367,7 +367,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide7.png"
+            source: "IRC.png"
         }
 
         Text {
@@ -425,7 +425,7 @@ Presentation
             y: 0
             width: 810
             height: 485
-            source: "slide8.png"
+            source: "qpdfview.png"
         }
 
         Text {
diff --git a/lubuntu/branding/lubuntu/slide2.png b/lubuntu/branding/lubuntu/smplayer.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide2.png
rename to lubuntu/branding/lubuntu/smplayer.png
diff --git a/lubuntu/branding/lubuntu/slide1.png b/lubuntu/branding/lubuntu/support.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide1.png
rename to lubuntu/branding/lubuntu/support.png
diff --git a/lubuntu/branding/lubuntu/slide8.png b/lubuntu/branding/lubuntu/trojita.png
similarity index 100%
rename from lubuntu/branding/lubuntu/slide8.png
rename to lubuntu/branding/lubuntu/trojita.png