Will have to figure out how to get it to appear as my subscribed address, anyway, commits: ---------- Forwarded message ---------- From: <music-owner@xxxxxxxxxxxxxxxxxxxxxxx> Date: 27 October 2012 12:37 Subject: 5 commits - fedora-jam-kde-theme/src To: imalone@xxxxxxxxxxxxxxxxx You are not allowed to post to this mailing list, and your message has been automatically rejected. If you think that your messages are being rejected in error, contact the mailing list owner at music-owner@xxxxxxxxxxxxxxxxxxxxxxx. ---------- Forwarded message ---------- From: Ian Malone <imalone@xxxxxxxxxxxxxxxxx> To: music@xxxxxxxxxxxxxxxxxxxxxxx Cc: Date: Sat, 27 Oct 2012 11:37:08 +0000 (UTC) Subject: 5 commits - fedora-jam-kde-theme/src fedora-jam-kde-theme/src/fedora-jam-kde-theme.spec | 2 fedora-jam-kde-theme/src/ksplash/F-Jam/Preview.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/README | 3 fedora-jam-kde-theme/src/ksplash/F-Jam/Theme.rc | 9 fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-headphones-refl.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-input-microphone-refl.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/images/kmplayer-refl.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/images/preferences-desktop-sound-refl.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/images/start-here-kde-fedora-refl.png |binary fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-headphones.png | 1 fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-input-microphone.png | 1 fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/kmplayer.png | 1 fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/preferences-desktop-sound.png | 1 fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/start-here-kde-fedora.png | 1 fedora-jam-kde-theme/src/ksplash/F-Jam/main.qml | 189 ++++++++++ fedora-jam-kde-theme/src/ksplash/F-Jam/simplereflect.sh | 25 + 16 files changed, 233 insertions(+) New commits: commit f42ecdaf2b87e7125564bd44f0f8cebd79c5bf53 Merge: 8253452 5423fab Author: Ian Malone <ibmalone@xxxxxxxxx> Date: Sat Oct 27 12:36:34 2012 +0100 Merge branch 'fjam-theme' commit 5423fab3488425f94ac6f8d4fee67aecc4db4d8b Author: Ian Malone <ibmalone@xxxxxxxxx> Date: Sat Oct 27 12:35:26 2012 +0100 Set default splash back to the ksplash theme. diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks index cdfb2f2..b400286 100644 --- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks +++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks @@ -211,8 +211,8 @@ EOF # Set default splash cat >> /etc/skel/.kde/share/config/ksplashrc << EOF [KSplash] -Engine=KSplashQML -Theme=F-Jam +Engine=KSplashX +Theme=FedoraJam EOF commit 4c58f673be12bcdd59c614cf7ba37955a4c964b4 Author: Ian Malone <ibmalone@xxxxxxxxx> Date: Sat Oct 20 11:37:19 2012 +0100 Default splash theme change. diff --git a/fedora-jam-kde-theme/src/fedora-jam-kde-theme.spec b/fedora-jam-kde-theme/src/fedora-jam-kde-theme.spec index 27130e1..a536e64 100644 --- a/fedora-jam-kde-theme/src/fedora-jam-kde-theme.spec +++ b/fedora-jam-kde-theme/src/fedora-jam-kde-theme.spec @@ -68,6 +68,7 @@ popd ## KSplash mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ +cp -rp ksplash/F-Jam/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ cp -rp ksplash/FedoraJam/ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ ln -s ../../../../../../backgrounds/fedora-jam/default/standard/fedora-jam.png \ %{buildroot}%{_kde4_appsdir}/ksplash/Themes/FedoraJam/2048x1536/ @@ -87,6 +88,7 @@ ln -s ../../../../../../pixmaps/system-logo-white.png %{buildroot}%{_kde4_appsdi %{_kde4_appsdir}/desktoptheme/Fedora_Jam-netbook/ %{_kde4_appsdir}/kdm/themes/FedoraJam/ %{_kde4_appsdir}/ksplash/Themes/FedoraJam/ +%{_kde4_appsdir}/ksplash/Themes/F-Jam/ %changelog * Thu Aug 02 2012 Brendan Jones <brendan.jones.it@xxxxxxxxx> 0.0.1-1 diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks index b400286..cdfb2f2 100644 --- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks +++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks @@ -211,8 +211,8 @@ EOF # Set default splash cat >> /etc/skel/.kde/share/config/ksplashrc << EOF [KSplash] -Engine=KSplashX -Theme=FedoraJam +Engine=KSplashQML +Theme=F-Jam EOF commit d2c2a3e2d9e8950ea9a993bfca2756c01c89d692 Author: Ian Malone <ibmalone@xxxxxxxxx> Date: Sat Oct 20 02:15:05 2012 +0100 Fix mistakes in sed line. diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks index be04421..b400286 100644 --- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks +++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks @@ -196,7 +196,7 @@ FavoriteURLs=$JAMFAVORITES EOF # Override fedora-live-kde-base.ks settings -sed /etc/rc.d/init.d/livesys -ires"#^(FavoriteURLs=)=.*#\1${JAMFAVORITES}#" +sed -i /etc/rc.d/init.d/livesys -res"#^(FavoriteURLs=).*#\1${JAMFAVORITES}#" # Set default theme (to be changed to a customized one) cat >> /etc/skel/.kde/share/config/plasmarc << EOF commit 2c231d43f037490af7ca9a980c3bdb12f755fb20 Author: Ian Malone <ibmalone@xxxxxxxxx> Date: Fri Oct 19 21:22:59 2012 +0100 QML theme for the spin diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/Preview.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/Preview.png new file mode 100644 index 0000000..d5878ac Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/Preview.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/README b/fedora-jam-kde-theme/src/ksplash/F-Jam/README new file mode 100644 index 0000000..c5a0f00 --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/README @@ -0,0 +1,3 @@ +Depends on linked files from standard KDE4 themes, the Fedora Jam wallpaper +and ImageMagick. The script simplereflect.sh can be sourced to generate +blu-ised reflected icons from .png links in imagesin. diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/Theme.rc b/fedora-jam-kde-theme/src/ksplash/F-Jam/Theme.rc new file mode 100644 index 0000000..1e3c37d --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/Theme.rc @@ -0,0 +1,9 @@ +[KSplash Theme: F-Jam] +Name = Fedora Jam Splash Screen +Description = Appearing logos on Fedora Jam background +Version = 1.0 +Author = Ian Malone <ibmalone at gmail.com> +Homepage = http://fedoraproject.org/wiki/Fedora_jam + +# Theme behaviour settings. +Engine = KSplashQML diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-headphones-refl.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-headphones-refl.png new file mode 100644 index 0000000..ec5d2fa Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-headphones-refl.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-input-microphone-refl.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-input-microphone-refl.png new file mode 100644 index 0000000..39a3dae Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/audio-input-microphone-refl.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/images/kmplayer-refl.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/kmplayer-refl.png new file mode 100644 index 0000000..365f6d7 Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/kmplayer-refl.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/images/preferences-desktop-sound-refl.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/preferences-desktop-sound-refl.png new file mode 100644 index 0000000..b83f5cd Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/preferences-desktop-sound-refl.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/images/start-here-kde-fedora-refl.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/start-here-kde-fedora-refl.png new file mode 100644 index 0000000..d8fead7 Binary files /dev/null and b/fedora-jam-kde-theme/src/ksplash/F-Jam/images/start-here-kde-fedora-refl.png differ diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-headphones.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-headphones.png new file mode 120000 index 0000000..3beac31 --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-headphones.png @@ -0,0 +1 @@ +/usr/share/icons/default.kde4/64x64/devices/audio-headphones.png \ No newline at end of file diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-input-microphone.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-input-microphone.png new file mode 120000 index 0000000..48a3adb --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/audio-input-microphone.png @@ -0,0 +1 @@ +/usr/share/icons/default.kde4/64x64/devices/audio-input-microphone.png \ No newline at end of file diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/kmplayer.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/kmplayer.png new file mode 120000 index 0000000..d9a876e --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/kmplayer.png @@ -0,0 +1 @@ +/usr/share/icons/default.kde4/64x64/apps/kmplayer.png \ No newline at end of file diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/preferences-desktop-sound.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/preferences-desktop-sound.png new file mode 120000 index 0000000..f230ff3 --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/preferences-desktop-sound.png @@ -0,0 +1 @@ +/usr/share/icons/default.kde4/64x64/apps/preferences-desktop-sound.png \ No newline at end of file diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/start-here-kde-fedora.png b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/start-here-kde-fedora.png new file mode 120000 index 0000000..dc74aa4 --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/imagesin/start-here-kde-fedora.png @@ -0,0 +1 @@ +/usr/share/icons/default.kde4/256x256/places/start-here-kde-fedora.png \ No newline at end of file diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/main.qml b/fedora-jam-kde-theme/src/ksplash/F-Jam/main.qml new file mode 100644 index 0000000..b71f255 --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/main.qml @@ -0,0 +1,189 @@ +/* vim:set foldenable foldmethod=marker: + * + * + * Copyright (C) 2012 Ian Malone <ibmalone(at)gmail.com> + * Derived from Ivan Cukic's Minimalistic splash screen + * Copyright (C) 2011 Ivan Cukic <ivan.cukic(at)kde.org> + * + * 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 Qt 4.7 + +Item { + id: main + + width: screenSize.width + height: screenSize.height + + /* property declarations --------------------------{{{ */ + property int stage + property int iconSize: (screenSize.width <= 1024) ? 64 : 128 + property int smallIconSize: (screenSize.width <= 1024) ? 32 : 64 + property int shuffleX : (iconSize - smallIconSize) / 2 + property int stepX: screenSize.width / 12 + property int yrow: screenSize.height - 1.5 * iconSize + + + /* }}} */ + + /* signal declarations ----------------------------{{{ */ + + /* }}} */ + + /* JavaScript functions ---------------------------{{{ */ + + onStageChanged: { + if (stage == 1) { + background.opacity = 1 + icon1.opacity = 1 + } + if (stage == 2) { + icon2.opacity = 1 + } + if (stage == 3) { + icon3.opacity = 1 + } + if (stage == 4) { + icon4.opacity = 1 + } + if (stage == 5) { + logo.opacity = 1 + } + //if (stage == 6) { + //} + } + + /* }}} */ + + /* object properties ------------------------------{{{ */ + + /* }}} */ + + /* child objects ----------------------------------{{{ */ + + Image { + id: background + + height: parent.height + width: parent.width + source: "/usr/share/wallpapers/Fedora_Jam/contents/images/2048x1536.png" + fillMode: Image.PreserveAspectCrop + + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } } + } + + Image { + id: logo + + //height: iconSize + width: iconSize + height: (sourceSize.height * width) / sourceSize.width + fillMode: Image.PreserveAspectFit + smooth: true + + x: stepX * 6 - width/2 + y: yrow - height / 2 + + //source: "/usr/share/icons/default.kde4/256x256/places/start-here-kde-fedora.png" + source: "images/start-here-kde-fedora-refl.png" + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } } + } + + Image { + id: icon1 + + width: smallIconSize + height: (sourceSize.height * width) / sourceSize.width + fillMode: Image.PreserveAspectFit + smooth: true + + x: stepX * 2 - width/2 - shuffleX + y: yrow - height / 2 + + //source: "/usr/share/icons/default.kde4/64x64/apps/kmplayer.png" + source: "images/kmplayer-refl.png" + + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } } + } + Image { + id: icon2 + + width: smallIconSize + height: (sourceSize.height * width) / sourceSize.width + fillMode: Image.PreserveAspectFit + smooth: true + + x: stepX * 3 - width/2 - shuffleX + y: yrow - height / 2 + + //source: "/usr/share/icons/default.kde4/64x64/devices/audio-input-microphone.png" + source: "images/audio-input-microphone-refl.png" + + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } } + } + Image { + id: icon3 + + width: smallIconSize + height: (sourceSize.height * width) / sourceSize.width + fillMode: Image.PreserveAspectFit + smooth: true + + x: stepX * 4 - width/2 - shuffleX + y: yrow - height / 2 + + //source: "/usr/share/icons/default.kde4/64x64/devices/audio-headphones.png" + source: "images/audio-headphones-refl.png" + + opacity: 0 + Behavior on opacity { + NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } + } + } + Image { + id: icon4 + + width: smallIconSize + height: (sourceSize.height * width) / sourceSize.width + fillMode: Image.PreserveAspectFit + smooth: true + + x: stepX * 5 - width/2 - shuffleX + y: yrow - height / 2 + + //source: "/usr/share/icons/default.kde4/64x64/apps/preferences-desktop-sound.png" + source: "images/preferences-desktop-sound-refl.png" + + opacity: 0 + Behavior on opacity { NumberAnimation { duration: 1000; easing { type: Easing.InOutQuad } } } + } + + /* }}} */ + + /* stages -----------------------------------------{{{ */ + + /* }}} */ + + /* transitions ------------------------------------{{{ */ + + /* }}} */ +} + diff --git a/fedora-jam-kde-theme/src/ksplash/F-Jam/simplereflect.sh b/fedora-jam-kde-theme/src/ksplash/F-Jam/simplereflect.sh new file mode 100644 index 0000000..c0d981b --- /dev/null +++ b/fedora-jam-kde-theme/src/ksplash/F-Jam/simplereflect.sh @@ -0,0 +1,25 @@ +for infile in imagesin/*png ; do +#http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=15371 + ramp=100 + spacer=5 + fade=80 + colorpc=30 + [ $(basename $infile) = "start-here-kde-fedora.png" ] && colorpc=0 + ww=`convert $infile -format "%w" info:` + hh=`convert $infile -format "%h" info:` + hhr=`convert xc: -format "%[fx:$hh*$ramp/100]" info:` + outfile=images/$(basename $infile .png)-refl.png + convert $infile \( -size ${ww}x${spacer} xc:none \) \ + \( -clone 0 -flip -crop ${ww}x${hhr}+0+0 +repage \) \ + \( -clone 0 -alpha extract -flip -crop ${ww}x${hhr}+0+0 +repage \ + -size ${ww}x${hhr} gradient: +level 0x${fade2}% -compose multiply \ + -composite \) \ + \( -clone 2 -clone 3 -alpha off -compose copy_opacity -composite \) \ + -delete 2,3 \ + -channel rgba -alpha on -append \ + \( -clone 0 -alpha off -fill 'rgb(60,110,180)' -colorize ${colorpc}% \) \ + \( -clone 0 -alpha extract \) \ + \( -clone 1 -clone 2 -compose copy_opacity -composite \) \ + -delete 0,1,2 -alpha on $outfile + +done -- imalone http://ibmalone.blogspot.co.uk _______________________________________________ music mailing list music@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/music