diff --git a/Makefile b/Makefile index 0c98cd1..6fd884d 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,8 @@ install: mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/lines $(INSTALL) $(wildcard kdm-theme/lines/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/lines - # KSPLASH theme + # KSPLASH themes + ## Joy install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy $(INSTALL) ksplash-theme/joy/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy $(INSTALL) ksplash-theme/joy/Theme.rc $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy @@ -79,6 +80,12 @@ install: $(INSTALL) $(wildcard ksplash-theme/joy/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 $(INSTALL) $(wildcard ksplash-theme/joy/1920x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 + ## Lines + install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines/images + $(INSTALL) $(wildcard ksplash-theme/lines/*.qml) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines + $(INSTALL) $(wildcard ksplash-theme/lines/*.png) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines + $(INSTALL) $(wildcard ksplash-theme/lines/*.rc) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines + $(INSTALL) $(wildcard ksplash-theme/lines/images/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines/images # Xfce 4.6 diff --git a/debian/changelog b/debian/changelog index 908d35b..cf8c74c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ desktop-base (8.0.0~exp2) UNRELEASED; urgency=medium [ Aurélien COUDERC ] * Add plymouth Lines theme. * Add KDM Lines theme and make it default. + * Add QML Lines theme for ksplash and make it default for new users. -- Aurélien COUDERC Wed, 03 Dec 2014 10:37:16 +0100 diff --git a/debian/copyright b/debian/copyright index 269e7a9..96a2741 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,8 +43,7 @@ licensed under the GPL. - PNG splash, splash/gnome-splash-curves.png. They are both based on the Debian “Open Use” (without “Debian” word) logo. -The Lines theme is © 2014 Juliette Taka Belin and released under the Creative -Commons Attribution 3.0 license. +The Lines theme is © 2014 Juliette Taka Belin and released under the GPLv2. The Lines theme is based on the Debian “Open Use” (without “Debian” word) logo. @@ -54,11 +53,14 @@ Copyright © 2010-2014 Aurélien Couderc, Copyright © 2012 Jonathan Carter, Copyright © 2014 Juliette Taka Belin under the GPLv2+. The images used with the Lines plymouth theme are Copyright © 2014 Juliette -Taka Belin under the Creative Commons Attribution 3.0 license. +Taka Belin under the GPLv2. The Lines KDM theme is © 2014 Aurélien Couderc GPLv3 with artwork from -Juliette Taka Belin under the Creative Commons Attribution 3.0 license and -Adrien Aubourg under the GPLv2 license. +Juliette Taka Belin and Adrien Aubourg under the GPLv2 license. + +The Lines KSplash theme is © 2013 Martin Klapetek, © 2014 Aurélien Couderc +under the GPLv2 with artwork from Juliette Taka Belin, Nuno Pinheiro under the +GPLv2 license. The Joy theme is © 2012 Adrien Aubourg and released under the GPLv2 license. diff --git a/ksplash-theme/lines/FadeIn.qml b/ksplash-theme/lines/FadeIn.qml new file mode 100644 index 0000000..d64078f --- /dev/null +++ b/ksplash-theme/lines/FadeIn.qml @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Martin Klapetek + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or (at your option) any later version, as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import QtQuick 1.1 + +NumberAnimation { + id: fadeIn + duration: 1000 + easing.type: Easing.InOutQuad +} diff --git a/ksplash-theme/lines/Preview.png b/ksplash-theme/lines/Preview.png new file mode 100644 index 0000000..048ca28 Binary files /dev/null and b/ksplash-theme/lines/Preview.png differ diff --git a/ksplash-theme/lines/Theme.rc b/ksplash-theme/lines/Theme.rc new file mode 100644 index 0000000..1624891 --- /dev/null +++ b/ksplash-theme/lines/Theme.rc @@ -0,0 +1,7 @@ +[KSplash Theme: Lines] +Name = Lines Splash Screen +Description = Default splash screen for Debian 8.0 Jessie +Version = 1.0 +Author = Juliette Taka BELIN , Aurélien COUDERC , Martin Klapetek +Homepage = http://www.kde.org +Engine = KSplashQML diff --git a/ksplash-theme/lines/images/background.svg b/ksplash-theme/lines/images/background.svg new file mode 100644 index 0000000..9c1d092 --- /dev/null +++ b/ksplash-theme/lines/images/background.svg @@ -0,0 +1,755 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/ksplash-theme/lines/images/background_logo_cropped.svg b/ksplash-theme/lines/images/background_logo_cropped.svg new file mode 100644 index 0000000..603800a --- /dev/null +++ b/ksplash-theme/lines/images/background_logo_cropped.svg @@ -0,0 +1,913 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8 + + + + diff --git a/ksplash-theme/lines/images/icon1.png b/ksplash-theme/lines/images/icon1.png new file mode 100644 index 0000000..8e3c693 Binary files /dev/null and b/ksplash-theme/lines/images/icon1.png differ diff --git a/ksplash-theme/lines/images/icon2.png b/ksplash-theme/lines/images/icon2.png new file mode 100644 index 0000000..c892ced Binary files /dev/null and b/ksplash-theme/lines/images/icon2.png differ diff --git a/ksplash-theme/lines/images/icon3.png b/ksplash-theme/lines/images/icon3.png new file mode 100644 index 0000000..82d1de0 Binary files /dev/null and b/ksplash-theme/lines/images/icon3.png differ diff --git a/ksplash-theme/lines/images/icon4.png b/ksplash-theme/lines/images/icon4.png new file mode 100644 index 0000000..501ce1b Binary files /dev/null and b/ksplash-theme/lines/images/icon4.png differ diff --git a/ksplash-theme/lines/images/icon5.png b/ksplash-theme/lines/images/icon5.png new file mode 100644 index 0000000..95e2ce7 Binary files /dev/null and b/ksplash-theme/lines/images/icon5.png differ diff --git a/ksplash-theme/lines/images/rectangle.png b/ksplash-theme/lines/images/rectangle.png new file mode 100644 index 0000000..676c8be Binary files /dev/null and b/ksplash-theme/lines/images/rectangle.png differ diff --git a/ksplash-theme/lines/main.qml b/ksplash-theme/lines/main.qml new file mode 100644 index 0000000..0300055 --- /dev/null +++ b/ksplash-theme/lines/main.qml @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2013 Martin Klapetek + * Copyright (C) 2014 Aurélien COUDERC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or (at your option) any later version, as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02100-1301, USA. + */ + +import QtQuick 1.1 + +Item { + id: main + + width: screenSize.width + height: screenSize.height + + property int stage + property int iconSize: 78 + + onStageChanged: { + if (stage == 1) { + iconsBackgroundRect.opacity = 1 + } + if (stage == 2) { + icon1.opacity = 1 + } + if (stage == 3) { + icon2.opacity = 1 + } + if (stage == 4) { + icon3.opacity = 1 + } + if (stage == 5) { + icon4.opacity = 1 + } + if (stage == 6) { + icon5.opacity = 1 + } + } + + Image { + id: background + anchors.fill: parent + source: "images/background.svg" + } + + Image { + id: background_logo_cropped + anchors.right: parent.right + anchors.bottom: parent.bottom + height: screenSize.height*0.5 + fillMode: Image.PreserveAspectFit + smooth: true + source: "images/background_logo_cropped.svg" + } + + Image { + id: iconsBackgroundRect + anchors.centerIn: main + source: "images/rectangle.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + + Row { + id: row + anchors.centerIn: parent + height: parent.height + width: icon1.width + icon2.width + icon3.width + icon4.width + icon5.width + + Image { + id: icon1 + anchors.top: parent.top + anchors.topMargin: 95 + source: "images/icon1.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + } + + Image { + id: icon2 + anchors.top: parent.top + anchors.topMargin: 95 + source: "images/icon2.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + } + + + Image { + id: icon3 + anchors.top: parent.top + anchors.topMargin: 95 + source: "images/icon3.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + } + + + Image { + id: icon4 + anchors.top: parent.top + anchors.topMargin: 95 + source: "images/icon4.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + } + + + Image { + id: icon5 + anchors.top: parent.top + anchors.topMargin: 53 + source: "images/icon5.png" + + opacity: 0 + Behavior on opacity { FadeIn {} } + } + } + } +} + diff --git a/profiles/kde-profile/share/config/ksplashrc b/profiles/kde-profile/share/config/ksplashrc index eb9593b..6e6ff5e 100644 --- a/profiles/kde-profile/share/config/ksplashrc +++ b/profiles/kde-profile/share/config/ksplashrc @@ -1,2 +1,3 @@ [KSplash] -Theme=joy +Theme=lines +Engine=KSplashQML