demo mode: add icons and desktop files

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

diff --git a/annex.desktop b/annex.desktop
new file mode 100644 (file)
index 0000000..f794694
--- /dev/null
+++ b/annex.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Annex
+Type=Application
+Exec=/usr/bin/xwalk-launcher hnabpnbionlaokfnobomjleblmmiefig
+Icon=/opt/share/widget_demo/annex.png
+

diff --git a/annex.png b/annex.png
new file mode 100644 (file)
index 0000000..d664a74
Binary files /dev/null and b/annex.png differ

diff --git a/bubblewrap.desktop b/bubblewrap.desktop
new file mode 100644 (file)
index 0000000..24df394
--- /dev/null
+++ b/bubblewrap.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Bubblewrap
+Type=Application
+Exec=/usr/bin/xwalk-launcher kmnbdhfbkjkeilhpbooaecgpllbollfn
+Icon=/opt/share/widget_demo/bubblewrap.png
+

diff --git a/bubblewrap.png b/bubblewrap.png
new file mode 100644 (file)
index 0000000..4301515
Binary files /dev/null and b/bubblewrap.png differ

diff --git a/go.desktop b/go.desktop
new file mode 100644 (file)
index 0000000..bf38f9f
--- /dev/null
+++ b/go.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Go
+Type=Application
+Exec=/usr/bin/xwalk-launcher clnlcbphcafhecdadfkjddinnigipace
+Icon=/opt/share/widget_demo/go.png
+

diff --git a/go.png b/go.png
new file mode 100644 (file)
index 0000000..5701af9
Binary files /dev/null and b/go.png differ

diff --git a/install.conf b/install.conf
index a3d51dc..aaca40e 100644 (file)
--- a/install.conf
+++ b/install.conf
@@ -2,4 +2,4 @@ alice:annex.wgt
 bob:bubblewrap.wgt go.wgt
 carol:
 app:mancala.wgt
-guest:BluetoothChat.wgt
+guest:

diff --git a/install_widgets.sh b/install_widgets.sh
index 7165153..f2339ac 100755 (executable)
--- a/install_widgets.sh
+++ b/install_widgets.sh
@@ -20,17 +20,10 @@ for wgt in $(grep "^$USER" $wgtdir/install.conf | cut -f2 -d':'); do
        if [ -x /usr/bin/wrt-installer ]; then
                wrt-installer -i $wgtdir/$wgt
        else
-               xwalkctl -i $wgtdir/$wgt
+               xwalkctl -i $wgtdir/$wgt && ln -sf $wgtdir/$(basename $wgt .wgt).desktop ~/.applications/desktop/
        fi
 done
 
-# setup desktop icons for xwalk
-if [ ! -x /usr/bin/wrt-installer ]; then
-       for id in $(sqlite3 ~/.config/xwalk-service/applications.db 'select id from applications'); do
-               ln -sf /opt/share/applications/xwalk-service.$id.*.desktop ~/.applications/desktop/
-       done
-fi
-
 [[ "$(id -u)" == "0" ]] && chmod -R a+rw ${TZ_SYS_DB}/
 
 if [ -x /usr/bin/wrt-launcher ]; then

diff --git a/mancala.desktop b/mancala.desktop
new file mode 100644 (file)
index 0000000..41a31e9
--- /dev/null
+++ b/mancala.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Mancala
+Type=Application
+Exec=/usr/bin/xwalk-launcher fidoaebfkacalgdedfodionhmopneipb
+Icon=/opt/share/widget_demo/mancala.png
+

diff --git a/mancala.png b/mancala.png
new file mode 100644 (file)
index 0000000..89f5ca3
Binary files /dev/null and b/mancala.png differ

diff --git a/packaging/wrt-widgets.spec b/packaging/wrt-widgets.spec
index 47353f0..2d973db 100644 (file)
--- a/packaging/wrt-widgets.spec
+++ b/packaging/wrt-widgets.spec
@@ -8,6 +8,7 @@ BuildArch:  noarch
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(libtzplatform-config)
 Requires:   libtzplatform-config
+Requires:   desktop-skin
 
 %description
 Wrt-widgets prepare a suitable pc oriented environment to install Web apps
@@ -26,6 +27,8 @@ cp prepare_widgets.sh %{buildroot}/%{_bindir}
 
 mkdir -p  %{buildroot}/%{TZ_SYS_SHARE}/widget_demo
 cp -r *.wgt %{buildroot}/%{TZ_SYS_SHARE}/widget_demo/
+cp -r *.png %{buildroot}/%{TZ_SYS_SHARE}/widget_demo/
+cp -r *.desktop %{buildroot}/%{TZ_SYS_SHARE}/widget_demo/
 cp install.conf %{buildroot}/%{TZ_SYS_SHARE}/widget_demo/
 
 %post