added icon to control panel application

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 8b1cc39..3ff0374 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -33,9 +33,27 @@ dbus_service_DATA = org.maemo.livewp.service
 
 
 desktoppaneldir    = $(datadir)/applications/hildon-control-panel
-desktoppanel_files = livewpp.desktop
+desktoppanel_files = livewp.desktop
 desktoppanel_DATA  = $(desktoppanel_files)
 
+# The icons
+
+icondir = $(datadir)/icons/hicolor
+
+install-data-local:
+       i=livewp; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/40x40/hildon; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/scalable/hildon; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.26.png $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.40.png $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.40.png $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
+
+uninstall-local:
+       i=livewp; \
+       rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
+       rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
+       $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
 
 
 EXTRA_DIST = $(berlintheme_DATA) \

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 26c29db..d5ee9cd 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -239,8 +239,11 @@ matrixtheme_DATA = theme/Matrix/*
 dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.maemo.livewp.service
 desktoppaneldir = $(datadir)/applications/hildon-control-panel
-desktoppanel_files = livewpp.desktop
+desktoppanel_files = livewp.desktop
 desktoppanel_DATA = $(desktoppanel_files)
+
+# The icons
+icondir = $(datadir)/icons/hicolor
 EXTRA_DIST = $(berlintheme_DATA) \
             $(moderntheme_DATA) \
             $(matrixtheme_DATA) \
@@ -457,9 +460,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-berlinthemeDATA install-dbus_serviceDATA \
-       install-desktoppanelDATA install-matrixthemeDATA \
-       install-modernthemeDATA
+install-data-am: install-berlinthemeDATA install-data-local \
+       install-dbus_serviceDATA install-desktoppanelDATA \
+       install-matrixthemeDATA install-modernthemeDATA
 
 install-exec-am:
 
@@ -486,24 +489,40 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \
-       uninstall-desktoppanelDATA uninstall-info-am \
+       uninstall-desktoppanelDATA uninstall-info-am uninstall-local \
        uninstall-matrixthemeDATA uninstall-modernthemeDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am html html-am info info-am install install-am \
        install-berlinthemeDATA install-data install-data-am \
-       install-dbus_serviceDATA install-desktoppanelDATA install-exec \
-       install-exec-am install-info install-info-am install-man \
+       install-data-local install-dbus_serviceDATA \
+       install-desktoppanelDATA install-exec install-exec-am \
+       install-info install-info-am install-man \
        install-matrixthemeDATA install-modernthemeDATA install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
        uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \
-       uninstall-desktoppanelDATA uninstall-info-am \
+       uninstall-desktoppanelDATA uninstall-info-am uninstall-local \
        uninstall-matrixthemeDATA uninstall-modernthemeDATA
 
 
+install-data-local:
+       i=livewp; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/40x40/hildon; \
+       $(mkinstalldirs) $(DESTDIR)$(icondir)/scalable/hildon; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.26.png $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.40.png $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
+       $(INSTALL_DATA) $(srcdir)/icons/$$i.40.png $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
+
+uninstall-local:
+       i=livewp; \
+       rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
+       rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
+       $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
+
 livewpp.desktop: livewpp.desktop.in
        sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
        sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \

diff --git a/applet/data/icons/livewp.26.png b/applet/data/icons/livewp.26.png
new file mode 100644 (file)
index 0000000..427ae05
Binary files /dev/null and b/applet/data/icons/livewp.26.png differ

diff --git a/applet/data/icons/livewp.40.png b/applet/data/icons/livewp.40.png
new file mode 100644 (file)
index 0000000..d01ad07
Binary files /dev/null and b/applet/data/icons/livewp.40.png differ

diff --git a/applet/data/icons/livewp.64.png b/applet/data/icons/livewp.64.png
new file mode 100644 (file)
index 0000000..c9fa596
Binary files /dev/null and b/applet/data/icons/livewp.64.png differ

diff --git a/applet/data/livewp.desktop.in b/applet/data/livewp.desktop.in
index e288eb6..711c98f 100644 (file)
--- a/applet/data/livewp.desktop.in
+++ b/applet/data/livewp.desktop.in
@@ -1,15 +1,10 @@
-[Desktop Entry]
+[Desktop Entry] 
 Encoding=UTF-8
 Version=__VERSION__
-Type=Application
-Name=LiveWallpaper
-Comment=Configuring Live Wallpaoer
-Exec=/usr/bin/livewp
+Name=Live Wallpaper
+Comment=Configuring Live Wallpaper
+Type=HildonControlPanelPlugin
 Icon=livewp
-X-Icon-path=/usr/share/icons/
-X-Window-Icon=livewp
-X-Window-Icon-Dimmed=livewp
-X-Osso-Service=org.maemo.livewp
-X-Osso-Type=application/x-executable
-X-HildonDesk-ShowInToolbar=false
-Terminal=false
+X-control-panel-plugin=liblivewp-panel-widget.so
+Categories=personalisation
+

diff --git a/applet/data/livewpp.desktop.in b/applet/data/livewpp.desktop.in
deleted file mode 100644 (file)
index 7587add..0000000
--- a/applet/data/livewpp.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry] 
-Encoding=UTF-8
-Version=__VERSION__
-Name=Live Wallpaper
-Comment=Configuring Live Wallpaper
-Type=HildonControlPanelPlugin
-Icon=qgn_list_cp_isetup
-X-control-panel-plugin=liblivewp-panel-widget.so
-Categories=personalisation
-