From b3679d5ec55e24bcc769b65fd5ed59b6846edc73 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 13 Feb 2018 16:30:12 -0600 Subject: [PATCH 1/4] Initial rewrite of the slideshow in QML. --- lubuntu/branding/lubuntu/show.qml | 65 ++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml index 3e3d7ca..ecf1f9f 100644 --- a/lubuntu/branding/lubuntu/show.qml +++ b/lubuntu/branding/lubuntu/show.qml @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * Copyright 2018, Lubuntu Team * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,11 +17,6 @@ * along with Calamares. If not, see . */ -/* - * Change slides width and height from 800x480px to 810x486px to remove side lines - * Slides images dimensions are 1600x960px. - */ - import QtQuick 2.0; import calamares.slideshow 1.0; @@ -35,21 +31,60 @@ Presentation onTriggered: presentation.goToNextSlide() } Slide { + Image { + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "../../Documents/lubuntu/brand2/calamares/rect5512.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("GET SUPPORT") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font.pixelSize: 24 + } Image { - id: background1 - source: "slide1.png" - width: 810; height: 486 + id: image2 + x: 119 + y: 48 + width: 96 + height: 96 fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + source: "slide-logo.png" } + Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: background1.bottom - text: "" - wrapMode: Text.WordWrap - width: 600 - horizontalAlignment: Text.Center + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("https://lubuntu.me") + font.pixelSize: 16 + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" } } } From 9ee554235ce2e5385627c1a28a21494777db9473 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 13 Feb 2018 16:42:18 -0600 Subject: [PATCH 2/4] Correct the slide 1 URL in show.qml. --- lubuntu/branding/lubuntu/show.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml index ecf1f9f..c7979fb 100644 --- a/lubuntu/branding/lubuntu/show.qml +++ b/lubuntu/branding/lubuntu/show.qml @@ -37,7 +37,7 @@ Presentation y: 0 width: 810 height: 485 - source: "../../Documents/lubuntu/brand2/calamares/rect5512.png" + source: "slide1.png" } Text { From de7500f984459987a32394503ccbe85207267c9c Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 13 Feb 2018 17:29:21 -0600 Subject: [PATCH 3/4] Adjust the first slide from Raf's IRC feedback. --- lubuntu/branding/lubuntu/show.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml index c7979fb..7550eda 100644 --- a/lubuntu/branding/lubuntu/show.qml +++ b/lubuntu/branding/lubuntu/show.qml @@ -32,6 +32,7 @@ Presentation } Slide { Image { + anchors.centerIn: parent id: image1 x: 0 y: 0 @@ -47,16 +48,16 @@ Presentation width: 317 height: 50 color: "#00ffff" - text: qsTr("GET SUPPORT") + text: qsTr("Get Support") verticalAlignment: Text.AlignTop horizontalAlignment: Text.AlignHCenter textFormat: Text.AutoText - font.pixelSize: 24 + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } } Image { id: image2 - x: 119 + x: 110 y: 48 width: 96 height: 96 @@ -72,7 +73,7 @@ Presentation height: 124 color: "#ffffff" text: qsTr("https://lubuntu.me") - font.pixelSize: 16 + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold } horizontalAlignment: Text.AlignHCenter textFormat: Text.AutoText verticalAlignment: Text.AlignTop From 9c754af8c138cea0b9d5cdfcc2f5aeffe881e373 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 13 Feb 2018 17:49:15 -0600 Subject: [PATCH 4/4] Add the rest of the slides. --- lubuntu/branding/lubuntu/show.qml | 408 +++++++++++++++++++++++++++++- 1 file changed, 407 insertions(+), 1 deletion(-) diff --git a/lubuntu/branding/lubuntu/show.qml b/lubuntu/branding/lubuntu/show.qml index 7550eda..6def9a0 100644 --- a/lubuntu/branding/lubuntu/show.qml +++ b/lubuntu/branding/lubuntu/show.qml @@ -25,7 +25,7 @@ Presentation id: presentation Timer { - interval: 20000 + interval: 10000 running: true repeat: true onTriggered: presentation.goToNextSlide() @@ -79,6 +79,412 @@ Presentation verticalAlignment: Text.AlignTop } + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide2.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("Your Mail") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("Managed by Trojitá") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide3.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("SMPlayer") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("To Play All of Your Movies") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide4.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("LibreOffice") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("Edits All Of Your Documents") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide5.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("Pictures") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("Viewed With Nomacs") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide6.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("Have Fun!") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("With the 2048 game") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide7.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("IRC Chat") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("With Quassel IRC") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + + Image { + id: image3 + x: 119 + y: 430 + width: 96 + height: 24 + source: "lubuntu.png" + } + } + Slide { + Image { + anchors.centerIn: parent + id: image1 + x: 0 + y: 0 + width: 810 + height: 485 + source: "slide8.png" + } + + Text { + id: text1 + x: 8 + y: 185 + width: 317 + height: 50 + color: "#00ffff" + text: qsTr("View Your Documents") + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + font { family: "Ubuntu Light"; pixelSize: 24; weight: Font.Bold; capitalization: Font.AllUppercase } + } + + Image { + id: image2 + x: 110 + y: 48 + width: 96 + height: 96 + fillMode: Image.PreserveAspectFit + source: "slide-logo.png" + } + + Text { + id: text2 + x: 8 + y: 261 + width: 317 + height: 124 + color: "#ffffff" + text: qsTr("With QPDFView") + font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold; capitalization: Font.AllUppercase } + horizontalAlignment: Text.AlignHCenter + textFormat: Text.AutoText + verticalAlignment: Text.AlignTop + } + Image { id: image3 x: 119