diff --git a/calamares/branding/GXDE-OS/show.qml b/calamares/branding/GXDE-OS/show.qml index 0c9be19b00a81e2e9a7821e89679d8524706a17a..c6504a938c3d0a1045673965d70230986f5f87cf 100644 --- a/calamares/branding/GXDE-OS/show.qml +++ b/calamares/branding/GXDE-OS/show.qml @@ -23,29 +23,75 @@ Presentation { id: presentation + function nextSlide() { + console.log("QML Component (default slideshow) Next slide"); + presentation.goToNextSlide(); + } + Timer { + id: advanceTimer interval: 20000 + running: true repeat: true - onTriggered: presentation.goToNextSlide() + onTriggered: nextSlide() + } + + Slide { + Image { + id: background_1 + source: "slide_1.png" + width: 1000; height: 650 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } } Slide { Image { - id: background1 - source: "slide1.png" - width: 467; height: 280 + id: background_2 + source: "slide_2.png" + width: 1000; height: 650 fillMode: Image.PreserveAspectFit anchors.centerIn: parent } - Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: background1.bottom - text: qsTr("欢迎使用 GXDE OS。
"+ - "只需一杯咖啡的时间,您就可以体验GXDE给您带来的畅快感。") - wrapMode: Text.WordWrap - width: 600 - horizontalAlignment: Text.Center + } + + Slide { + Image { + id: background_3 + source: "slide_3.png" + width: 1000; height: 650 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent } } + Slide { + Image { + id: background_4 + source: "slide_4.png" + width: 1000; height: 650 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + } + + Slide { + Image { + id: background_5 + source: "slide_5.png" + width: 1000; height: 650 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + } + + function onActivate() { + console.log("QML Component (default slideshow) activated"); + presentation.currentSlide = 0; + } + + function onLeave() { + console.log("QML Component (default slideshow) deactivated"); + } } diff --git a/calamares/branding/GXDE-OS/slide1.png b/calamares/branding/GXDE-OS/slide1.png deleted file mode 100644 index baed546b48e34fe3687da333df7c2e5d8b09fa53..0000000000000000000000000000000000000000 Binary files a/calamares/branding/GXDE-OS/slide1.png and /dev/null differ diff --git a/calamares/branding/GXDE-OS/slide_1.png b/calamares/branding/GXDE-OS/slide_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8732451af724155820f6d938899abd42f995c528 Binary files /dev/null and b/calamares/branding/GXDE-OS/slide_1.png differ diff --git a/calamares/branding/GXDE-OS/slide_2.png b/calamares/branding/GXDE-OS/slide_2.png new file mode 100644 index 0000000000000000000000000000000000000000..47f3c0e1bb016f02d002e0ff752a8cc25a40f41d Binary files /dev/null and b/calamares/branding/GXDE-OS/slide_2.png differ diff --git a/calamares/branding/GXDE-OS/slide_3.png b/calamares/branding/GXDE-OS/slide_3.png new file mode 100644 index 0000000000000000000000000000000000000000..63a610b2e5b035abae05e5c914b1d90efa43f1cf Binary files /dev/null and b/calamares/branding/GXDE-OS/slide_3.png differ diff --git a/calamares/branding/GXDE-OS/slide_4.png b/calamares/branding/GXDE-OS/slide_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2c70bafa1ca8bf2ef4924531daa9ff1c86f2fc54 Binary files /dev/null and b/calamares/branding/GXDE-OS/slide_4.png differ diff --git a/calamares/branding/GXDE-OS/slide_5.png b/calamares/branding/GXDE-OS/slide_5.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef72ec567446bdeec15daaf7f352e8dfcef559b Binary files /dev/null and b/calamares/branding/GXDE-OS/slide_5.png differ