diff --git a/debian/changelog b/debian/changelog index 646fdec..36b5873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:23.04.6) lunar; urgency=medium + + * Updated the installer slideshow. + + -- Aaron Rainbolt Mon, 13 Mar 2023 19:40:55 -0500 + calamares-settings-ubuntu (1:23.04.5) lunar; urgency=medium * Ensure the langpacks for GNOME and KDE applications are installed too. diff --git a/lubuntu/branding/lubuntu/Accessories.png b/lubuntu/branding/lubuntu/Accessories.png deleted file mode 100644 index 1f982cc..0000000 Binary files a/lubuntu/branding/lubuntu/Accessories.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/FindUs.png b/lubuntu/branding/lubuntu/FindUs.png deleted file mode 100644 index df4056d..0000000 Binary files a/lubuntu/branding/lubuntu/FindUs.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/Firefox.png b/lubuntu/branding/lubuntu/Firefox.png deleted file mode 100644 index e2281ad..0000000 Binary files a/lubuntu/branding/lubuntu/Firefox.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/Help.png b/lubuntu/branding/lubuntu/Help.png deleted file mode 100644 index 95403c9..0000000 Binary files a/lubuntu/branding/lubuntu/Help.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/Media.png b/lubuntu/branding/lubuntu/Media.png deleted file mode 100644 index 5e683a9..0000000 Binary files a/lubuntu/branding/lubuntu/Media.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/NewLook.png b/lubuntu/branding/lubuntu/NewLook.png deleted file mode 100644 index 42015dd..0000000 Binary files a/lubuntu/branding/lubuntu/NewLook.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/Office.png b/lubuntu/branding/lubuntu/Office.png deleted file mode 100644 index a5468ea..0000000 Binary files a/lubuntu/branding/lubuntu/Office.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/TweakIt.png b/lubuntu/branding/lubuntu/TweakIt.png deleted file mode 100644 index 3c14b32..0000000 Binary files a/lubuntu/branding/lubuntu/TweakIt.png and /dev/null differ diff --git a/lubuntu/branding/lubuntu/apps.png b/lubuntu/branding/lubuntu/apps.png new file mode 100644 index 0000000..ec17151 Binary files /dev/null and b/lubuntu/branding/lubuntu/apps.png differ diff --git a/lubuntu/branding/lubuntu/desktop.png b/lubuntu/branding/lubuntu/desktop.png new file mode 100644 index 0000000..519c2a6 Binary files /dev/null and b/lubuntu/branding/lubuntu/desktop.png differ diff --git a/lubuntu/branding/lubuntu/enjoy.png b/lubuntu/branding/lubuntu/enjoy.png new file mode 100644 index 0000000..499b17a Binary files /dev/null and b/lubuntu/branding/lubuntu/enjoy.png differ diff --git a/lubuntu/branding/lubuntu/lightweight.png b/lubuntu/branding/lubuntu/lightweight.png new file mode 100644 index 0000000..39a03e8 Binary files /dev/null and b/lubuntu/branding/lubuntu/lightweight.png differ diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml index 6f8481b..cf1b92b 100644 --- a/lubuntu/branding/lubuntu/show.qml +++ b/lubuntu/branding/lubuntu/show.qml @@ -6,22 +6,34 @@ Presentation id: presentation Timer { - interval: 10000 + interval: 15000 running: true repeat: true - onTriggered: presentation.goToNextSlide() + onTriggered: { + presentation.goToNextSlide() + // We want the last slide to be where the slideshow stops. But + // thanks either to QML's limitations or my lack of knowledge, I + // can't figure out how to declare a counter variable outside of + // the Javascript block. However, incrementing the interval value + // won't make any perceptible change in how long the slideshow + // plays, and it does the job. + interval++ + if (interval == 15005) { + stop() + } + } } Slide { Image { anchors.centerIn: parent id: image1 - x:0 - y:0 + x: 0 + y: 0 width: 810 height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "FindUs.png" + source: "lightweight.png" } } Slide { @@ -34,7 +46,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "NewLook.png" + source: "apps.png" } } Slide { @@ -47,7 +59,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "Accessories.png" + source: "store.png" } } Slide { @@ -60,7 +72,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "TweakIt.png" + source: "desktop.png" } } Slide { @@ -73,7 +85,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "Media.png" + source: "support.png" } } Slide { @@ -86,34 +98,8 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "Firefox.png" + source: "enjoy.png" } } - Slide { - Image { - anchors.centerIn: parent - id: image7 - x: 0 - y: 0 - width: 810 - height: 485 - fillMode: Image.PreserveAspectFit - smooth: true - source: "Office.png" - } - } - Slide { - Image { - anchors.centerIn: parent - id: image8 - x: 0 - y: 0 - width: 810 - height: 485 - fillMode: Image.PreserveAspectFit - smooth: true - source: "Help.png" - } - } } diff --git a/lubuntu/branding/lubuntu/store.png b/lubuntu/branding/lubuntu/store.png new file mode 100644 index 0000000..c48450c Binary files /dev/null and b/lubuntu/branding/lubuntu/store.png differ diff --git a/lubuntu/branding/lubuntu/support.png b/lubuntu/branding/lubuntu/support.png new file mode 100644 index 0000000..696de3f Binary files /dev/null and b/lubuntu/branding/lubuntu/support.png differ diff --git a/lubuntu/branding/lubuntu/welcome.png b/lubuntu/branding/lubuntu/welcome.png index c2e79d3..439861f 100644 Binary files a/lubuntu/branding/lubuntu/welcome.png and b/lubuntu/branding/lubuntu/welcome.png differ