new background for Tizen 3.0 Q4 release - new video too

Change-Id: If3a63307606c508b5816ea3cbe603c0198d59005
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/Script/launch_video.sh b/Script/launch_video.sh
index 5d1ebb5..5b1293b 100755 (executable)
--- a/Script/launch_video.sh
+++ b/Script/launch_video.sh
@@ -7,9 +7,6 @@
 touch $HOME/gstvid-pid
 alreadyrunning=`cat $HOME/gstvid-pid`
 
-#URL=http://intel07.vannes/~sdx/Downloads/Amazing%20Nature%20full%20HD%20720p.mp4
-#URL=http://intel07.vannes/~sdx/Videos/big_buck_bunny_480p_surround-fix.avi
-#URL=http://intel07.vannes/~sdx/Videos/caminandes_480p.avi
 URL=file:///usr/share/media/videos/AmazingNature_480p.mp4
 
 if [ $(echo $alreadyrunning | wc -w) -lt 3  ] ; then

diff --git a/Script/launch_video2.sh b/Script/launch_video2.sh
new file mode 100755 (executable)
index 0000000..017fb0a
--- /dev/null
+++ b/Script/launch_video2.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#
+#  Launch web cam 
+#
+
+touch $HOME/gstvid-pid
+alreadyrunning=`cat $HOME/gstvid-pid`
+
+URL=file:///usr/share/media/videos/Caminandes_1080p.mp4
+
+if [ $(echo $alreadyrunning | wc -w) -lt 1  ] ; then
+    echo "create new"
+    gst-launch-1.0 playbin uri=$URL &
+    echo $!  >> $HOME/gstvid-pid
+else echo "already running"
+    for x in $alreadyrunning; do kill -9 $x; done
+    rm -rf $HOME/gstvid-pid
+fi
+
+

diff --git a/Video/Caminandes_1080p.mp4 b/Video/Caminandes_1080p.mp4
new file mode 100644 (file)
index 0000000..7d63f75
Binary files /dev/null and b/Video/Caminandes_1080p.mp4 differ

diff --git a/applications/tizen/caminandes.desktop b/applications/tizen/caminandes.desktop
new file mode 100644 (file)
index 0000000..1927104
--- /dev/null
+++ b/applications/tizen/caminandes.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Caminandes
+Type=Application
+Exec=/usr/bin/launch_video2.sh
+Icon=/usr/share/icons/tizen/32x32/caminandes.png

diff --git a/applications/tizen/launcher.conf b/applications/tizen/launcher.conf
index 0e185a6..063f66f 100644 (file)
--- a/applications/tizen/launcher.conf
+++ b/applications/tizen/launcher.conf
@@ -1,5 +1,6 @@
 /usr/share/applications/tizen/weston-terminal.desktop
 /usr/share/applications/tizen/webcam.desktop
 /usr/share/applications/tizen/video.desktop
+/usr/share/applications/tizen/video2.desktop
 /usr/share/applications/tizen/calculator.desktop
 /usr/share/applications/tizen/web-browser.desktop

diff --git a/backgrounds/tizen/tizen_common_3.0.png b/backgrounds/tizen/tizen_common_3.0.png
new file mode 100644 (file)
index 0000000..25fdf19
Binary files /dev/null and b/backgrounds/tizen/tizen_common_3.0.png differ

diff --git a/backgrounds/tizen/tizen_common_3.0.xcf b/backgrounds/tizen/tizen_common_3.0.xcf
new file mode 100644 (file)
index 0000000..3c942ec
Binary files /dev/null and b/backgrounds/tizen/tizen_common_3.0.xcf differ

diff --git a/icons/tizen/32x32/caminandes.png b/icons/tizen/32x32/caminandes.png
new file mode 100644 (file)
index 0000000..7dd2ef5
Binary files /dev/null and b/icons/tizen/32x32/caminandes.png differ

diff --git a/icons/tizen/caminandes.xcf b/icons/tizen/caminandes.xcf
new file mode 100644 (file)
index 0000000..af99c91
Binary files /dev/null and b/icons/tizen/caminandes.xcf differ

diff --git a/packaging/desktop-skin.spec b/packaging/desktop-skin.spec
index c873b85..d636b77 100644 (file)
--- a/packaging/desktop-skin.spec
+++ b/packaging/desktop-skin.spec
@@ -28,11 +28,13 @@ cp %{SOURCE1001} .
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 Script/launch_cam.sh %{buildroot}%{_bindir}
 install -m 755 Script/launch_video.sh %{buildroot}%{_bindir}
+install -m 755 Script/launch_video2.sh %{buildroot}%{_bindir}
 install -m 755 Script/mark_image.py %{buildroot}%{_bindir}
 install -m 755 Script/wifi %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/media/videos
 install -m 644 Video/AmazingNature_480p.mp4 %{buildroot}%{_datadir}/media/videos
+install -m 644 Video/Caminandes_1080p.mp4 %{buildroot}%{_datadir}/media/videos
 
 mkdir -p %{buildroot}%{_datadir}/media/photos
 install -m 644 Photos/* %{buildroot}%{_datadir}/media/photos
@@ -44,16 +46,15 @@ mkdir -p %{buildroot}%{_datadir}/applications/tizen
 install -m 644 applications/tizen/* %{buildroot}%{_datadir}/applications/tizen
 
 mkdir -p %{buildroot}%{_datadir}/backgrounds/tizen
-install -m 644  backgrounds/tizen/golfe-morbihan.jpg %{buildroot}%{_datadir}/backgrounds/tizen/golfe-morbihan.jpg
-install -m 644  backgrounds/tizen/tizen_common.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common.png
+install -m 644  backgrounds/tizen/tizen_common_3.0.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common_3.0.png
 
 %post
-ln -sf tizen_common.png %{_datadir}/backgrounds/tizen/current
+ln -sf tizen_common_3.0.png %{_datadir}/backgrounds/tizen/current
 
 %files
 %manifest %{name}.manifest
 %{_bindir}/*
-%{_datadir}/media/videos/AmazingNature_480p.mp4
+%{_datadir}/media/videos/*
 %{_datadir}/media/photos/*
 %{_datadir}/icons/tizen/32x32/*
 %{_datadir}/applications/tizen/*