Convert the slides to QML instead of using PNGs.

Merge branch 'testing-the-new-slideshow-from-developer-raf'.
ubuntu/focal
Simon Quigley 7 years ago
commit 17e7bf5a25

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Lubuntu Team <lubuntu-devel@lists.ubuntu.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
/*
* 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;
@ -29,27 +25,473 @@ Presentation
id: presentation
Timer {
interval: 20000
interval: 10000
running: true
repeat: true
onTriggered: presentation.goToNextSlide()
}
Slide {
Image {
id: background1
anchors.centerIn: parent
id: image1
x: 0
y: 0
width: 810
height: 485
source: "slide1.png"
width: 810; height: 486
}
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 { 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("https://lubuntu.me")
font { family: "Ubuntu Light"; pixelSize: 16; weight: Font.Bold }
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: "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 {
anchors.horizontalCenter: background1.horizontalCenter
anchors.top: background1.bottom
text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
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
y: 430
width: 96
height: 24
source: "lubuntu.png"
}
}
}

Loading…
Cancel
Save