Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Thu, 29 Jul 2010 13:33:47 +0000 (16:33 +0300)
committerVlad <vlad@gas.by>
Thu, 29 Jul 2010 13:33:47 +0000 (16:33 +0300)
28 files changed:
applet/data/Makefile.am
applet/data/Makefile.in [new file with mode: 0644]
applet/data/theme/Accel/bg.png [new file with mode: 0644]
applet/data/theme/Accel/icon.png [new file with mode: 0644]
applet/data/theme/Accel/icond.png [new file with mode: 0644]
applet/data/theme/Accel/tape1.png [new file with mode: 0644]
applet/data/theme/Accel/tape1_0.png [new file with mode: 0644]
applet/data/theme/Accel/tape1_1.png [new file with mode: 0644]
applet/data/theme/Accel/tape1_2.png [new file with mode: 0644]
applet/data/theme/Accel/tape2.png [new file with mode: 0644]
applet/data/theme/Accel/tape2_0.png [new file with mode: 0644]
applet/data/theme/Accel/tape2_1.png [new file with mode: 0644]
applet/data/theme/Accel/tape2_2.png [new file with mode: 0644]
applet/data/theme/Accel/tape3.png [new file with mode: 0644]
applet/data/theme/Accel/tape3_0.png [new file with mode: 0644]
applet/data/theme/Accel/tape3_1.png [new file with mode: 0644]
applet/data/theme/Accel/tape3_2.png [new file with mode: 0644]
applet/data/theme/Accel/tape4.png [new file with mode: 0644]
applet/data/theme/Accel/tape4_0.png [new file with mode: 0644]
applet/data/theme/Accel/tape4_1.png [new file with mode: 0644]
applet/data/theme/Accel/tape4_2.png [new file with mode: 0644]
applet/src/livewp-actor.c
applet/src/livewp-actor.h
applet/src/livewp-home-widget.c
applet/src/livewp-main.c
applet/src/livewp-scene.c
applet/src/livewp-scene.h
applet/src/livewp-settings.c

index 149bf36..e7a2f70 100644 (file)
@@ -28,6 +28,9 @@ moderntheme_DATA = theme/Modern/*
 matrixthemedir = $(datadir)/livewp/theme/Matrix
 matrixtheme_DATA = theme/Matrix/* 
 
+accelthemedir = $(datadir)/livewp/theme/Accel
+acceltheme_DATA = theme/Accel/* 
+
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
 
@@ -62,6 +65,7 @@ uninstall-local:
 EXTRA_DIST = $(berlintheme_DATA) \
             $(moderntheme_DATA) \
             $(matrixtheme_DATA) \
+            $(acceltheme_DATA) \
             $(videotheme_DATA) \
             $(dbus_service_DATA)
 
diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
new file mode 100644 (file)
index 0000000..412c636
--- /dev/null
@@ -0,0 +1,581 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# This file is part of live wallpaper 
+#
+# Copyright (C) 2010 Vlad Vasiliev
+# Copyright (C) 2010 Tanya Makova
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# 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.
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)"
+accelthemeDATA_INSTALL = $(INSTALL_DATA)
+berlinthemeDATA_INSTALL = $(INSTALL_DATA)
+dbus_serviceDATA_INSTALL = $(INSTALL_DATA)
+desktoppanelDATA_INSTALL = $(INSTALL_DATA)
+matrixthemeDATA_INSTALL = $(INSTALL_DATA)
+modernthemeDATA_INSTALL = $(INSTALL_DATA)
+videothemeDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(acceltheme_DATA) $(berlintheme_DATA) $(dbus_service_DATA) \
+       $(desktoppanel_DATA) $(matrixtheme_DATA) $(moderntheme_DATA) \
+       $(videotheme_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONTROLPANEL_CFLAGS = @CONTROLPANEL_CFLAGS@
+CONTROLPANEL_LIBS = @CONTROLPANEL_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXAMPLE_CFLAGS = @EXAMPLE_CFLAGS@
+EXAMPLE_LIBS = @EXAMPLE_LIBS@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HILDON_DESKTOP_LIB_DIR = @HILDON_DESKTOP_LIB_DIR@
+HILDON_HOME_DESKTOP_DIR = @HILDON_HOME_DESKTOP_DIR@
+HILDON_PANEL_LIB_DIR = @HILDON_PANEL_LIB_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OSSO_CFLAGS = @OSSO_CFLAGS@
+OSSO_LIBS = @OSSO_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+berlinthemedir = $(datadir)/livewp/theme/Berlin
+berlintheme_DATA = theme/Berlin/* 
+modernthemedir = $(datadir)/livewp/theme/Modern
+moderntheme_DATA = theme/Modern/*  
+matrixthemedir = $(datadir)/livewp/theme/Matrix
+matrixtheme_DATA = theme/Matrix/* 
+accelthemedir = $(datadir)/livewp/theme/Accel
+acceltheme_DATA = theme/Accel/* 
+videothemedir = $(datadir)/livewp/theme/Video
+videotheme_DATA = theme/Video/* 
+dbus_servicedir = $(datadir)/dbus-1/services
+dbus_service_DATA = org.maemo.livewp.service
+desktoppaneldir = $(datadir)/applications/hildon-control-panel
+desktoppanel_files = livewp.desktop
+desktoppanel_DATA = $(desktoppanel_files)
+
+# The icons
+icondir = $(datadir)/icons/hicolor
+EXTRA_DIST = $(berlintheme_DATA) \
+            $(moderntheme_DATA) \
+            $(matrixtheme_DATA) \
+            $(acceltheme_DATA) \
+            $(videotheme_DATA) \
+            $(dbus_service_DATA)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+install-accelthemeDATA: $(acceltheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(accelthemedir)" || $(mkdir_p) "$(DESTDIR)$(accelthemedir)"
+       @list='$(acceltheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(accelthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(accelthemedir)/$$f'"; \
+         $(accelthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(accelthemedir)/$$f"; \
+       done
+
+uninstall-accelthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(acceltheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(accelthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(accelthemedir)/$$f"; \
+       done
+install-berlinthemeDATA: $(berlintheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(berlinthemedir)" || $(mkdir_p) "$(DESTDIR)$(berlinthemedir)"
+       @list='$(berlintheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(berlinthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(berlinthemedir)/$$f'"; \
+         $(berlinthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(berlinthemedir)/$$f"; \
+       done
+
+uninstall-berlinthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(berlintheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(berlinthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(berlinthemedir)/$$f"; \
+       done
+install-dbus_serviceDATA: $(dbus_service_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(dbus_servicedir)" || $(mkdir_p) "$(DESTDIR)$(dbus_servicedir)"
+       @list='$(dbus_service_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(dbus_serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbus_servicedir)/$$f'"; \
+         $(dbus_serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbus_servicedir)/$$f"; \
+       done
+
+uninstall-dbus_serviceDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(dbus_service_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(dbus_servicedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(dbus_servicedir)/$$f"; \
+       done
+install-desktoppanelDATA: $(desktoppanel_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(desktoppaneldir)" || $(mkdir_p) "$(DESTDIR)$(desktoppaneldir)"
+       @list='$(desktoppanel_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(desktoppanelDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktoppaneldir)/$$f'"; \
+         $(desktoppanelDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktoppaneldir)/$$f"; \
+       done
+
+uninstall-desktoppanelDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktoppanel_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(desktoppaneldir)/$$f'"; \
+         rm -f "$(DESTDIR)$(desktoppaneldir)/$$f"; \
+       done
+install-matrixthemeDATA: $(matrixtheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(matrixthemedir)" || $(mkdir_p) "$(DESTDIR)$(matrixthemedir)"
+       @list='$(matrixtheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(matrixthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(matrixthemedir)/$$f'"; \
+         $(matrixthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(matrixthemedir)/$$f"; \
+       done
+
+uninstall-matrixthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(matrixtheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(matrixthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(matrixthemedir)/$$f"; \
+       done
+install-modernthemeDATA: $(moderntheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(modernthemedir)" || $(mkdir_p) "$(DESTDIR)$(modernthemedir)"
+       @list='$(moderntheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(modernthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(modernthemedir)/$$f'"; \
+         $(modernthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(modernthemedir)/$$f"; \
+       done
+
+uninstall-modernthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(moderntheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(modernthemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(modernthemedir)/$$f"; \
+       done
+install-videothemeDATA: $(videotheme_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(videothemedir)" || $(mkdir_p) "$(DESTDIR)$(videothemedir)"
+       @list='$(videotheme_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(videothemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(videothemedir)/$$f'"; \
+         $(videothemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(videothemedir)/$$f"; \
+       done
+
+uninstall-videothemeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(videotheme_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f '$(DESTDIR)$(videothemedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(videothemedir)/$$f"; \
+       done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+       for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-accelthemeDATA install-berlinthemeDATA \
+       install-data-local install-dbus_serviceDATA \
+       install-desktoppanelDATA install-matrixthemeDATA \
+       install-modernthemeDATA install-videothemeDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
+       uninstall-dbus_serviceDATA uninstall-desktoppanelDATA \
+       uninstall-info-am uninstall-local uninstall-matrixthemeDATA \
+       uninstall-modernthemeDATA uninstall-videothemeDATA
+
+.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-accelthemeDATA install-am install-berlinthemeDATA \
+       install-data install-data-am 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 \
+       install-videothemeDATA installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am uninstall uninstall-accelthemeDATA uninstall-am \
+       uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \
+       uninstall-desktoppanelDATA uninstall-info-am uninstall-local \
+       uninstall-matrixthemeDATA uninstall-modernthemeDATA \
+       uninstall-videothemeDATA
+
+
+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;
+
+livewp.desktop: livewp.desktop.in
+       sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
+       sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \
+       $(RM) *.tmp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/applet/data/theme/Accel/bg.png b/applet/data/theme/Accel/bg.png
new file mode 100644 (file)
index 0000000..4eab16c
Binary files /dev/null and b/applet/data/theme/Accel/bg.png differ
diff --git a/applet/data/theme/Accel/icon.png b/applet/data/theme/Accel/icon.png
new file mode 100644 (file)
index 0000000..6921b14
Binary files /dev/null and b/applet/data/theme/Accel/icon.png differ
diff --git a/applet/data/theme/Accel/icond.png b/applet/data/theme/Accel/icond.png
new file mode 100644 (file)
index 0000000..329d413
Binary files /dev/null and b/applet/data/theme/Accel/icond.png differ
diff --git a/applet/data/theme/Accel/tape1.png b/applet/data/theme/Accel/tape1.png
new file mode 100644 (file)
index 0000000..d7032b4
Binary files /dev/null and b/applet/data/theme/Accel/tape1.png differ
diff --git a/applet/data/theme/Accel/tape1_0.png b/applet/data/theme/Accel/tape1_0.png
new file mode 100644 (file)
index 0000000..b8b6504
Binary files /dev/null and b/applet/data/theme/Accel/tape1_0.png differ
diff --git a/applet/data/theme/Accel/tape1_1.png b/applet/data/theme/Accel/tape1_1.png
new file mode 100644 (file)
index 0000000..b7a5109
Binary files /dev/null and b/applet/data/theme/Accel/tape1_1.png differ
diff --git a/applet/data/theme/Accel/tape1_2.png b/applet/data/theme/Accel/tape1_2.png
new file mode 100644 (file)
index 0000000..644d29f
Binary files /dev/null and b/applet/data/theme/Accel/tape1_2.png differ
diff --git a/applet/data/theme/Accel/tape2.png b/applet/data/theme/Accel/tape2.png
new file mode 100644 (file)
index 0000000..68bbdc7
Binary files /dev/null and b/applet/data/theme/Accel/tape2.png differ
diff --git a/applet/data/theme/Accel/tape2_0.png b/applet/data/theme/Accel/tape2_0.png
new file mode 100644 (file)
index 0000000..9833c59
Binary files /dev/null and b/applet/data/theme/Accel/tape2_0.png differ
diff --git a/applet/data/theme/Accel/tape2_1.png b/applet/data/theme/Accel/tape2_1.png
new file mode 100644 (file)
index 0000000..cb2743a
Binary files /dev/null and b/applet/data/theme/Accel/tape2_1.png differ
diff --git a/applet/data/theme/Accel/tape2_2.png b/applet/data/theme/Accel/tape2_2.png
new file mode 100644 (file)
index 0000000..7b30df5
Binary files /dev/null and b/applet/data/theme/Accel/tape2_2.png differ
diff --git a/applet/data/theme/Accel/tape3.png b/applet/data/theme/Accel/tape3.png
new file mode 100644 (file)
index 0000000..c811c94
Binary files /dev/null and b/applet/data/theme/Accel/tape3.png differ
diff --git a/applet/data/theme/Accel/tape3_0.png b/applet/data/theme/Accel/tape3_0.png
new file mode 100644 (file)
index 0000000..80e47e6
Binary files /dev/null and b/applet/data/theme/Accel/tape3_0.png differ
diff --git a/applet/data/theme/Accel/tape3_1.png b/applet/data/theme/Accel/tape3_1.png
new file mode 100644 (file)
index 0000000..dd34789
Binary files /dev/null and b/applet/data/theme/Accel/tape3_1.png differ
diff --git a/applet/data/theme/Accel/tape3_2.png b/applet/data/theme/Accel/tape3_2.png
new file mode 100644 (file)
index 0000000..c821211
Binary files /dev/null and b/applet/data/theme/Accel/tape3_2.png differ
diff --git a/applet/data/theme/Accel/tape4.png b/applet/data/theme/Accel/tape4.png
new file mode 100644 (file)
index 0000000..0edd912
Binary files /dev/null and b/applet/data/theme/Accel/tape4.png differ
diff --git a/applet/data/theme/Accel/tape4_0.png b/applet/data/theme/Accel/tape4_0.png
new file mode 100644 (file)
index 0000000..05abbdc
Binary files /dev/null and b/applet/data/theme/Accel/tape4_0.png differ
diff --git a/applet/data/theme/Accel/tape4_1.png b/applet/data/theme/Accel/tape4_1.png
new file mode 100644 (file)
index 0000000..65bf95b
Binary files /dev/null and b/applet/data/theme/Accel/tape4_1.png differ
diff --git a/applet/data/theme/Accel/tape4_2.png b/applet/data/theme/Accel/tape4_2.png
new file mode 100644 (file)
index 0000000..ce3a1e9
Binary files /dev/null and b/applet/data/theme/Accel/tape4_2.png differ
index 8e4e0a3..07098a4 100644 (file)
@@ -98,7 +98,18 @@ set_actor_scale(Actor *actor, double scalex, double scaley)
     );
 
 }
-
+void
+set_actor_rotation(Actor *actor, gint axis, double degrees, gint x, gint y, gint z)
+{
+    hildon_animation_actor_set_rotation(
+            HILDON_ANIMATION_ACTOR(actor->widget),
+            axis,
+            degrees,
+            x,
+            y,
+            z
+    );
+}
 void 
 set_actor_visible(Actor *actor, gboolean visible)
 {
@@ -179,6 +190,44 @@ gchar * read_notification()
     return message;
 }
 
+void
+change_obj(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    char * accel_filename = "/sys/class/i2c-adapter/i2c-3/3-001d/coord";
+    //char * accel_filename = "/home/tanya/coord";
+
+    FILE *fd = NULL;
+    int rs, ax, ay, az, dx, dy;
+    fd = fopen(accel_filename, "r");
+    if (fd == NULL){
+        fprintf(stderr, "cannot open file\n");
+        return;
+    }
+    rs = fscanf((FILE*)fd, "%i %i %i", &ax, &ay, &az);
+    fclose(fd);
+    if (rs != 3){
+        fprintf(stderr, "cannot read information from file\n");
+        return;
+    }
+
+    fprintf(stderr, "change obj %i %i %i\n", ax, ay, az);
+    dx = -ax / 100;
+    dy = -ay / 100;
+
+    actor->x = actor->x + dx;
+    actor->y = actor->y + dy;
+
+    if (actor->x > 800) actor->x = 0;
+    if (actor->x < 0) actor->x = 800;
+
+    if (actor->y > 480) actor->y = 0;
+    if (actor->y < 0) actor->y = 480;
+
+    set_actor_position(actor, actor->x, actor->y, actor->z, desktop_plugin);
+
+
+}
+
 void 
 change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
@@ -622,6 +671,83 @@ change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin)
 }
 
 void
+change_tape(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint x, y,
+        speed[4] = {7, 10, 5, 14}, 
+        i;
+    Actor *a;
+
+    double angle = 0;
+    
+    char * accel_filename = "/sys/class/i2c-adapter/i2c-3/3-001d/coord";
+    //char * accel_filename = "/home/tanya/coord";
+
+    FILE *fd = NULL;
+    int rs, ax, ay, az;
+    fd = fopen(accel_filename, "r");
+    if (fd == NULL){
+        //fprintf(stderr, "cannot open file\n");
+        fd = fopen("/home/user/coord", "r"); 
+    }
+    rs = fscanf((FILE*)fd, "%i %i %i", &ax, &ay, &az);
+    fclose(fd);
+    if (rs != 3){
+        fprintf(stderr, "cannot read information from file\n");
+        return;
+
+    }
+
+    //fprintf(stderr, "change obj %i %i %i angle rad=%f, deg=%f\n", ax, ay, az, atan2(ax, -ay), atan2(ax, -ay)*180/M_PI);
+    int ang = (int)floor(atan2(ay, ax)*180/M_PI);
+    if (ang < 0) ang = 360+ang;
+
+    if (!desktop_plugin->priv->rich_animation) return;
+
+    for (i=0; i<16; i++){
+        a = g_ptr_array_index(actor->child, i);
+        if (a->scale == 100) a->scale = ang;
+        if (abs(a->scale - ang) > 10){
+            if (a->scale > ang)
+                if ((a->scale - ang) < (ang + (360-a->scale))) a->scale--;
+                else a->scale++;
+            if (a->scale < ang)
+                if (ang - a->scale < (a->scale+(360-ang))) a->scale++;
+                else a->scale--;
+            if (a->scale > 360) a->scale = 0;
+            if (a->scale < 0) a->scale = 360;
+        }
+    
+        x = round(a->x - (float)cos(a->scale*M_PI/180)*a->z);
+        y = round(a->y - (float)sin(a->scale*M_PI/180)*a->z);
+        //x = a->x - cos(angle)*a->z;
+        //y = a->y - sin(angle)*a->z;
+        if ((a->scale > 270 || a->scale < 90) && x < -a->width*cos(a->scale*M_PI/180)){ 
+            x = 800; 
+            y = fast_rnd(480);
+        } 
+        if ((a->scale > 90 && a->scale < 270) && x > 800 - a->width*cos(a->scale*M_PI/180)){
+            x = 0;
+            y = fast_rnd(480);
+        }
+        if (a->scale > 0 && a->scale < 180 && y < -a->width*sin(a->scale*M_PI/180)){
+            y = 480;
+            x = fast_rnd(800);
+        }
+        if (a->scale < 360 && a->scale > 180 && y > 480 - a->width*sin(a->scale*M_PI/180)){
+            y = 0;
+            x = fast_rnd(800);
+        }
+        //if (i ==0) fprintf(stderr, "x=%d y=%d ang=%d speed=%d\n", x, y, a->scale, a->z);
+        set_actor_rotation(a, HILDON_AA_Z_AXIS, a->scale, 0, 0, 0);
+        set_actor_position(a, x, y, a->z, desktop_plugin);
+        a->x = x;
+        a->y = y;
+    }
+    
+}
+
+void
 change_layer(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
     gint y, speed1 = 8, speed2 = 16;
index cfe92a5..d385a70 100644 (file)
@@ -73,7 +73,10 @@ Actor* init_object(AWallpaperPlugin *desktop_plugin,
 void destroy_actor(Actor *actor);
 void set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *desktop_plugin);
 void set_actor_scale(Actor *actor, double scalex, double scaley);
+void set_actor_rotation(Actor *actor, gint axis, double degrees, gint x, gint y, gint z);
 void set_actor_visible(Actor *actor, gboolean visible);
+void change_obj(Actor * actor, AWallpaperPlugin *desktop_plugin);
+void change_tape(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin);
 void change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin);
index 70da63e..3d53e65 100644 (file)
@@ -524,16 +524,17 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     priv->xapplet = 0;
     priv->yapplet = 0;
     priv->scene = NULL;
-//    priv->theme = g_strdup("Modern");
+    priv->theme = g_strdup("Modern");
 //#if 0 
     priv->hash_scene_func = g_hash_table_new(g_str_hash, g_str_equal);
     
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix);
+    g_hash_table_insert(priv->hash_scene_func, g_strdup("Accel"), (gpointer)&init_scene_Accel);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Video"), (gpointer)&init_scene_Video);
 //#endif
-    //priv->theme = g_strdup("Modern");
+    //priv->theme = g_strdup("Accel");
     desktop_plugin->priv->main_widget = gtk_fixed_new();
 
     gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 1, 1);
index 9497fe4..b277fa0 100644 (file)
@@ -188,6 +188,7 @@ main(int argc, char *argv[])
     gtk_widget_show_all(GTK_WIDGET(main_widget));
 
     priv->hash_scene_func = g_hash_table_new(g_str_hash, g_str_equal);
+    g_hash_table_insert(priv->hash_scene_func, g_strdup("Accel"),  (gpointer)&init_scene_Accel);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix);
index ce65c06..22fb4c3 100644 (file)
@@ -56,6 +56,58 @@ reload_scene(AWallpaperPlugin *desktop_plugin)
     init_scene_theme(desktop_plugin);
 }
 
+
+void 
+init_scene_Accel(AWallpaperPlugin *desktop_plugin)
+{
+    Actor *actor;
+    Scene *scene;
+    GPtrArray *child;
+    gint now = time(NULL);
+    gchar *str;
+    gint sizes[4] = {170, 229, 130, 150}, 
+        sizes1[4] = {57, 76, 43, 50},
+        heights[4] = {0, 100, 200, 300}, 
+        n, i, j;
+    
+    fprintf(stderr, "init scene accel\n");
+    scene = g_new0(Scene, 1);
+    scene->actors = NULL;
+    desktop_plugin->priv->scene = scene;
+    
+    actor = init_object(desktop_plugin, "background", "bg.png", 
+                      0, 0, 0, 800, 480, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+    scene->actors = g_slist_append(scene->actors, actor);
+
+    child = g_ptr_array_sized_new(16);
+    
+    for (j= 0; j<4; j++){
+    for (n=0; n<4; n++){
+        //for (i=0; i<3; i++){
+            str = g_strdup_printf("tape%i.png", n+1);
+            actor = init_object(desktop_plugin, "tape", str,
+                                fast_rnd(800), fast_rnd(480), 2+fast_rnd(6), 800, sizes1[n],
+                                TRUE, TRUE, 100, 255,
+                                NULL, NULL, NULL);
+            scene->actors = g_slist_append(scene->actors, actor);
+            g_ptr_array_add(child, actor);
+            g_free(str);
+        //}
+    }
+    }
+    actor = init_object(desktop_plugin, "tape", "", 
+                      0, 800, 5, 800, 170, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_tape, NULL, child);
+    actor->time_start_animation = now;
+    actor->duration_animation = G_MAXINT;
+    scene->actors = g_slist_append(scene->actors, actor);
+
+    run_long_timeout(desktop_plugin);
+}
+
 void  
 parsestring(char *line, char **argv)
 {
index 1f89654..bb0c103 100644 (file)
@@ -40,6 +40,7 @@ void reload_scene(AWallpaperPlugin *desktop_plugin);
 void init_scene_Modern(AWallpaperPlugin *desktop_plugin);
 void init_scene_Berlin(AWallpaperPlugin *desktop_plugin);
 void init_scene_Matrix(AWallpaperPlugin *desktop_plugin);
+void init_scene_Accel(AWallpaperPlugin *desktop_plugin);
 void init_scene_Video(AWallpaperPlugin *desktop_plugin);
 void init_scene_theme(AWallpaperPlugin *desktop_plugin);
 
index e08eca6..b97e13a 100644 (file)
@@ -62,6 +62,7 @@ create_theme_selector (void){
       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Berlin"));
       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Modern"));
       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Matrix"));
+      hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Accel"));
       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Video"));
       return selector;
 }
@@ -140,10 +141,12 @@ changed_value_theme_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *
         if (!strcmp(choice, "Matrix")){
             rich_animation_additional_parametr(vbox,priv);
         }
+        if (!strcmp(choice, "Accel")){
+            rich_animation_additional_parametr(vbox,priv);
+        }
         if (!strcmp(choice, "Video")){
             additional_parametr_for_theme_video(vbox, priv);
         }
-
     }
     gtk_widget_show(vbox);
 }
@@ -173,8 +176,13 @@ create_themes_button (gchar *theme){
             hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2);
             hildon_button_set_value(HILDON_BUTTON(button), _("Matrix"));
         }
-        if (!strcmp(theme, "Video")){
+        if (!strcmp(theme, "Accel")){
             hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 3);
+            hildon_button_set_value(HILDON_BUTTON(button), _("Accel"));
+        }
+
+        if (!strcmp(theme, "Video")){
+            hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 4);
             hildon_button_set_value(HILDON_BUTTON(button), _("Video"));
         }
 
@@ -380,6 +388,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                                    vbox, TRUE, TRUE, 5);
     if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin"))||
         !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix"))||
+        !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Accel"))||
         !strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern"))){
         rich_animation_additional_parametr(vbox, priv);
     }
@@ -410,6 +419,8 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) {
                     priv->theme = g_strdup("Modern");
                 if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix")))
                     priv->theme = g_strdup("Matrix");
+                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Accel")))
+                    priv->theme = g_strdup("Accel");
                 if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){
                     priv->theme = g_strdup("Video");
                     button1 = g_object_get_data(G_OBJECT(priv->window), "filename_button");